diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-02-06 05:09:42 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-02-06 05:09:42 +0000 |
| commit | a64d3bc4335ceabcf2122cb488c88edfa88b12ab (patch) | |
| tree | 4a81acf603563d180d5b08022346fded4ca14004 /src/test/locale | |
| parent | 81fc1d5edb36773fe28f3b5dc5daf5eb7d468a61 (diff) | |
| download | postgresql-a64d3bc4335ceabcf2122cb488c88edfa88b12ab.tar.gz | |
Solaris has always had problems with 1947 in the
regression tests so I prepared a set of expected
files to make things look OK.
There's also a file to account for minor variations
in the geopmetry output and a resultmap patch to
pull them all together.
With these changes PostgreSQL, from CVS, builds and
regression tests (runcheck) cleanly.
Keith Parks.
Diffstat (limited to 'src/test/locale')
16 files changed, 496 insertions, 508 deletions
diff --git a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-char.sql.out b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-char.sql.out index 302a2ecc75..eb62e52c82 100644 --- a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-char.sql.out +++ b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-char.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_gr -------+--------------------+------------------------------------------------------------ -AK |Alaska |ÁëÜóêá -AL |Alabama |ÁëáìðÜìá -AZ |Arizona |Áñéæüíá -AR |Arkansas |Áñêáíóáò -ID |Idaho |Áúíôá÷ï -IA |Iowa |Áúüâá -VT |Vermont |Âåñìüíô -VA |Virginia |Âéñôæßíéá -NC |North Carolina |Âüñåéá Êáñïëßíá -ND |North Dakota |Âüñåéá Íôáêüôá -UT |Utah |Ãéïýôá -WY |Wyoming |Ãïõáúüìéíãê -WV |West Virginia |Ãïõåóô Âéñôæßíéá -WI |Wisconsin |Ãïõéóêüíóéí -WA |Washington |Ãïõüóéíãêôïí -DC |Washington DC |Ãïõüóéíãôïí Íôß Óé -IL |Illinois |Éëëéíüéò -IN |Indiana |ÉíôéÜíá -KA |Kansas |ÊÜíóáò -CA |California |Êáëéöüñíéá -KY |Kentucky |ÊåíôÜêé -CO |Colorado |ÊïëïñÜíôï -CT |Connecticut |ÊïííÝêôéêáô -LA |Louisiana |ËïõúæéÜíá -ME |Maine |ÌÝéí -MI |Michigan |Ìßôóéãêáí -MD |Maryland |Ìáßñõëáíô -MA |Massachusetts |Ìáóóá÷ïõóÝôç -MN |Minnesota |Ìéíåóóüôá -MS |Mississippi |Ìéóéóóßðé -MO |Missouri |Ìéóóïýñé -MT |Montana |ÌïíôÜíá -NJ |New Jersey |ÍÝá ÕåñóÝç -NY |New York |ÍÝá Õüñêç -NM |New Mexico |ÍÝï Ìåîéêü -NH |New Hampshire |ÍÝï ×Üìðóáúñ -NV |Nevada |ÍåâÜäá -NE |Nebraska |ÍåìðñÜóêá -DE |Delaware |ÍôÝëáãïõåñ -SC |South Carolina |Íüôéá Êáñïëßíá -SD |South Dakota |Íüôéá Íôáêüôá -OK |Oklahoma |Ïêëá÷üìá -OR |Oregon |Ïñåãêïí -OH |Ohio |Ï÷Üéï -PA |Pennsylvania |ÐåííóõëâÜíéá -RI |Rhode Island |Ñüïõíô Áúëáíô -TX |Texas |ÔÝîáò -TN |Tennessee |Ôåííåóß -GA |Georgia |Ôæüñôæéá -FL |Florida |Öëüñéíôá + abbrev | name_en | name_gr +--------+----------------------+-------------------------------------------------------------- + ID | Idaho | Áúíôá÷ï + IA | Iowa | Áúüâá + AL | Alabama | ÁëáìðÜìá + AK | Alaska | ÁëÜóêá + AZ | Arizona | Áñéæüíá + AR | Arkansas | Áñêáíóáò + VT | Vermont | Âåñìüíô + VA | Virginia | Âéñôæßíéá + NC | North Carolina | Âüñåéá Êáñïëßíá + ND | North Dakota | Âüñåéá Íôáêüôá + FL | Florida | Öëüñéíôá + IL | Illinois | Éëëéíüéò + IN | Indiana | ÉíôéÜíá + CA | California | Êáëéöüñíéá + KY | Kentucky | ÊåíôÜêé + CO | Colorado | ÊïëïñÜíôï + CT | Connecticut | ÊïííÝêôéêáô + KA | Kansas | ÊÜíóáò + LA | Louisiana | ËïõúæéÜíá + MA | Massachusetts | Ìáóóá÷ïõóÝôç + MD | Maryland | Ìáßñõëáíô + MN | Minnesota | Ìéíåóóüôá + MS | Mississippi | Ìéóéóóßðé + MO | Missouri | Ìéóóïýñé + MT | Montana | ÌïíôÜíá + ME | Maine | ÌÝéí + MI | Michigan | Ìßôóéãêáí + NV | Nevada | ÍåâÜäá + NE | Nebraska | ÍåìðñÜóêá + DE | Delaware | ÍôÝëáãïõåñ + NJ | New Jersey | ÍÝá ÕåñóÝç + NY | New York | ÍÝá Õüñêç + NH | New Hampshire | ÍÝï ×Üìðóáúñ + NM | New Mexico | ÍÝï Ìåîéêü + SC | South Carolina | Íüôéá Êáñïëßíá + SD | South Dakota | Íüôéá Íôáêüôá + OH | Ohio | Ï÷Üéï + OK | Oklahoma | Ïêëá÷üìá + OR | Oregon | Ïñåãêïí + PA | Pennsylvania | ÐåííóõëâÜíéá + TN | Tennessee | Ôåííåóß + GA | Georgia | Ôæüñôæéá + TX | Texas | ÔÝîáò + UT | Utah | Ãéïýôá + WY | Wyoming | Ãïõáúüìéíãê + WV | West Virginia | Ãïõåóô Âéñôæßíéá + WI | Wisconsin | Ãïõéóêüíóéí + WA | Washington | Ãïõüóéíãêôïí + DC | Washington DC | Ãïõüóéíãôïí Íôß Óé + RI | Rhode Island | Ñüïõíô Áúëáíô (50 rows) -EOF diff --git a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-select.sql.out b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-select.sql.out index d77585fdd7..abfce69f28 100644 --- a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-select.sql.out +++ b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-select.sql.out @@ -1,11 +1,10 @@ -abbrev|name_en |name_gr -------+--------------------+------------------ -UT |Utah |Ãéïýôá -WY |Wyoming |Ãïõáúüìéíãê -WV |West Virginia |Ãïõåóô Âéñôæßíéá -WI |Wisconsin |Ãïõéóêüíóéí -WA |Washington |Ãïõüóéíãêôïí -DC |Washington DC |Ãïõüóéíãôïí Íôß Óé + abbrev | name_en | name_gr +--------+----------------------+-------------------- + UT | Utah | Ãéïýôá + WY | Wyoming | Ãïõáúüìéíãê + WV | West Virginia | Ãïõåóô Âéñôæßíéá + WI | Wisconsin | Ãïõéóêüíóéí + WA | Washington | Ãïõüóéíãêôïí + DC | Washington DC | Ãïõüóéíãôïí Íôß Óé (6 rows) -EOF diff --git a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-text.sql.out b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-text.sql.out index ce18789da0..0a128a7913 100644 --- a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-text.sql.out +++ b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-text.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_gr -------+--------------------+------------------ -AK |Alaska |ÁëÜóêá -AL |Alabama |ÁëáìðÜìá -AZ |Arizona |Áñéæüíá -AR |Arkansas |Áñêáíóáò -ID |Idaho |Áúíôá÷ï -IA |Iowa |Áúüâá -VT |Vermont |Âåñìüíô -VA |Virginia |Âéñôæßíéá -NC |North Carolina |Âüñåéá Êáñïëßíá -ND |North Dakota |Âüñåéá Íôáêüôá -UT |Utah |Ãéïýôá -WY |Wyoming |Ãïõáúüìéíãê -WV |West Virginia |Ãïõåóô Âéñôæßíéá -WI |Wisconsin |Ãïõéóêüíóéí -WA |Washington |Ãïõüóéíãêôïí -DC |Washington DC |Ãïõüóéíãôïí Íôß Óé -IL |Illinois |Éëëéíüéò -IN |Indiana |ÉíôéÜíá -KA |Kansas |ÊÜíóáò -CA |California |Êáëéöüñíéá -KY |Kentucky |ÊåíôÜêé -CO |Colorado |ÊïëïñÜíôï -CT |Connecticut |ÊïííÝêôéêáô -LA |Louisiana |ËïõúæéÜíá -ME |Maine |ÌÝéí -MI |Michigan |Ìßôóéãêáí -MD |Maryland |Ìáßñõëáíô -MA |Massachusetts |Ìáóóá÷ïõóÝôç -MN |Minnesota |Ìéíåóóüôá -MS |Mississippi |Ìéóéóóßðé -MO |Missouri |Ìéóóïýñé -MT |Montana |ÌïíôÜíá -NJ |New Jersey |ÍÝá ÕåñóÝç -NY |New York |ÍÝá Õüñêç -NM |New Mexico |ÍÝï Ìåîéêü -NH |New Hampshire |ÍÝï ×Üìðóáúñ -NV |Nevada |ÍåâÜäá -NE |Nebraska |ÍåìðñÜóêá -DE |Delaware |ÍôÝëáãïõåñ -SC |South Carolina |Íüôéá Êáñïëßíá -SD |South Dakota |Íüôéá Íôáêüôá -OK |Oklahoma |Ïêëá÷üìá -OR |Oregon |Ïñåãêïí -OH |Ohio |Ï÷Üéï -PA |Pennsylvania |ÐåííóõëâÜíéá -RI |Rhode Island |Ñüïõíô Áúëáíô -TX |Texas |ÔÝîáò -TN |Tennessee |Ôåííåóß -GA |Georgia |Ôæüñôæéá -FL |Florida |Öëüñéíôá + abbrev | name_en | name_gr +--------+----------------------+-------------------- + ID | Idaho | Áúíôá÷ï + IA | Iowa | Áúüâá + AL | Alabama | ÁëáìðÜìá + AK | Alaska | ÁëÜóêá + AZ | Arizona | Áñéæüíá + AR | Arkansas | Áñêáíóáò + VT | Vermont | Âåñìüíô + VA | Virginia | Âéñôæßíéá + NC | North Carolina | Âüñåéá Êáñïëßíá + ND | North Dakota | Âüñåéá Íôáêüôá + FL | Florida | Öëüñéíôá + IL | Illinois | Éëëéíüéò + IN | Indiana | ÉíôéÜíá + CA | California | Êáëéöüñíéá + KY | Kentucky | ÊåíôÜêé + CO | Colorado | ÊïëïñÜíôï + CT | Connecticut | ÊïííÝêôéêáô + KA | Kansas | ÊÜíóáò + LA | Louisiana | ËïõúæéÜíá + MA | Massachusetts | Ìáóóá÷ïõóÝôç + MD | Maryland | Ìáßñõëáíô + MN | Minnesota | Ìéíåóóüôá + MS | Mississippi | Ìéóéóóßðé + MO | Missouri | Ìéóóïýñé + MT | Montana | ÌïíôÜíá + ME | Maine | ÌÝéí + MI | Michigan | Ìßôóéãêáí + NV | Nevada | ÍåâÜäá + NE | Nebraska | ÍåìðñÜóêá + DE | Delaware | ÍôÝëáãïõåñ + NJ | New Jersey | ÍÝá ÕåñóÝç + NY | New York | ÍÝá Õüñêç + NH | New Hampshire | ÍÝï ×Üìðóáúñ + NM | New Mexico | ÍÝï Ìåîéêü + SC | South Carolina | Íüôéá Êáñïëßíá + SD | South Dakota | Íüôéá Íôáêüôá + OH | Ohio | Ï÷Üéï + OK | Oklahoma | Ïêëá÷üìá + OR | Oregon | Ïñåãêïí + PA | Pennsylvania | ÐåííóõëâÜíéá + TN | Tennessee | Ôåííåóß + GA | Georgia | Ôæüñôæéá + TX | Texas | ÔÝîáò + UT | Utah | Ãéïýôá + WY | Wyoming | Ãïõáúüìéíãê + WV | West Virginia | Ãïõåóô Âéñôæßíéá + WI | Wisconsin | Ãïõéóêüíóéí + WA | Washington | Ãïõüóéíãêôïí + DC | Washington DC | Ãïõüóéíãôïí Íôß Óé + RI | Rhode Island | Ñüïõíô Áúëáíô (50 rows) -EOF diff --git a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-varchar.sql.out b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-varchar.sql.out index ce18789da0..0a128a7913 100644 --- a/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-varchar.sql.out +++ b/src/test/locale/gr_GR.ISO8859-7/expected/test-gr-varchar.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_gr -------+--------------------+------------------ -AK |Alaska |ÁëÜóêá -AL |Alabama |ÁëáìðÜìá -AZ |Arizona |Áñéæüíá -AR |Arkansas |Áñêáíóáò -ID |Idaho |Áúíôá÷ï -IA |Iowa |Áúüâá -VT |Vermont |Âåñìüíô -VA |Virginia |Âéñôæßíéá -NC |North Carolina |Âüñåéá Êáñïëßíá -ND |North Dakota |Âüñåéá Íôáêüôá -UT |Utah |Ãéïýôá -WY |Wyoming |Ãïõáúüìéíãê -WV |West Virginia |Ãïõåóô Âéñôæßíéá -WI |Wisconsin |Ãïõéóêüíóéí -WA |Washington |Ãïõüóéíãêôïí -DC |Washington DC |Ãïõüóéíãôïí Íôß Óé -IL |Illinois |Éëëéíüéò -IN |Indiana |ÉíôéÜíá -KA |Kansas |ÊÜíóáò -CA |California |Êáëéöüñíéá -KY |Kentucky |ÊåíôÜêé -CO |Colorado |ÊïëïñÜíôï -CT |Connecticut |ÊïííÝêôéêáô -LA |Louisiana |ËïõúæéÜíá -ME |Maine |ÌÝéí -MI |Michigan |Ìßôóéãêáí -MD |Maryland |Ìáßñõëáíô -MA |Massachusetts |Ìáóóá÷ïõóÝôç -MN |Minnesota |Ìéíåóóüôá -MS |Mississippi |Ìéóéóóßðé -MO |Missouri |Ìéóóïýñé -MT |Montana |ÌïíôÜíá -NJ |New Jersey |ÍÝá ÕåñóÝç -NY |New York |ÍÝá Õüñêç -NM |New Mexico |ÍÝï Ìåîéêü -NH |New Hampshire |ÍÝï ×Üìðóáúñ -NV |Nevada |ÍåâÜäá -NE |Nebraska |ÍåìðñÜóêá -DE |Delaware |ÍôÝëáãïõåñ -SC |South Carolina |Íüôéá Êáñïëßíá -SD |South Dakota |Íüôéá Íôáêüôá -OK |Oklahoma |Ïêëá÷üìá -OR |Oregon |Ïñåãêïí -OH |Ohio |Ï÷Üéï -PA |Pennsylvania |ÐåííóõëâÜíéá -RI |Rhode Island |Ñüïõíô Áúëáíô -TX |Texas |ÔÝîáò -TN |Tennessee |Ôåííåóß -GA |Georgia |Ôæüñôæéá -FL |Florida |Öëüñéíôá + abbrev | name_en | name_gr +--------+----------------------+-------------------- + ID | Idaho | Áúíôá÷ï + IA | Iowa | Áúüâá + AL | Alabama | ÁëáìðÜìá + AK | Alaska | ÁëÜóêá + AZ | Arizona | Áñéæüíá + AR | Arkansas | Áñêáíóáò + VT | Vermont | Âåñìüíô + VA | Virginia | Âéñôæßíéá + NC | North Carolina | Âüñåéá Êáñïëßíá + ND | North Dakota | Âüñåéá Íôáêüôá + FL | Florida | Öëüñéíôá + IL | Illinois | Éëëéíüéò + IN | Indiana | ÉíôéÜíá + CA | California | Êáëéöüñíéá + KY | Kentucky | ÊåíôÜêé + CO | Colorado | ÊïëïñÜíôï + CT | Connecticut | ÊïííÝêôéêáô + KA | Kansas | ÊÜíóáò + LA | Louisiana | ËïõúæéÜíá + MA | Massachusetts | Ìáóóá÷ïõóÝôç + MD | Maryland | Ìáßñõëáíô + MN | Minnesota | Ìéíåóóüôá + MS | Mississippi | Ìéóéóóßðé + MO | Missouri | Ìéóóïýñé + MT | Montana | ÌïíôÜíá + ME | Maine | ÌÝéí + MI | Michigan | Ìßôóéãêáí + NV | Nevada | ÍåâÜäá + NE | Nebraska | ÍåìðñÜóêá + DE | Delaware | ÍôÝëáãïõåñ + NJ | New Jersey | ÍÝá ÕåñóÝç + NY | New York | ÍÝá Õüñêç + NH | New Hampshire | ÍÝï ×Üìðóáúñ + NM | New Mexico | ÍÝï Ìåîéêü + SC | South Carolina | Íüôéá Êáñïëßíá + SD | South Dakota | Íüôéá Íôáêüôá + OH | Ohio | Ï÷Üéï + OK | Oklahoma | Ïêëá÷üìá + OR | Oregon | Ïñåãêïí + PA | Pennsylvania | ÐåííóõëâÜíéá + TN | Tennessee | Ôåííåóß + GA | Georgia | Ôæüñôæéá + TX | Texas | ÔÝîáò + UT | Utah | Ãéïýôá + WY | Wyoming | Ãïõáúüìéíãê + WV | West Virginia | Ãïõåóô Âéñôæßíéá + WI | Wisconsin | Ãïõéóêüíóéí + WA | Washington | Ãïõüóéíãêôïí + DC | Washington DC | Ãïõüóéíãôïí Íôß Óé + RI | Rhode Island | Ñüïõíô Áúëáíô (50 rows) -EOF diff --git a/src/test/locale/gr_GR.ISO8859-7/runall b/src/test/locale/gr_GR.ISO8859-7/runall index 94bbd0c8c8..da7650bb7f 100755 --- a/src/test/locale/gr_GR.ISO8859-7/runall +++ b/src/test/locale/gr_GR.ISO8859-7/runall @@ -39,7 +39,7 @@ for f in char varchar text; do fi echo "Testing PgSQL: sort on $ftype type..." - destroydb testlocale >/dev/null 2>&1 + dropdb testlocale >/dev/null 2>&1 createdb testlocale || abort "createdb failed" psql -d testlocale -c "CREATE TABLE usastates (abbrev char(2), name_en char(20), name_gr $ftype);" >/dev/null 2>&1 || abort "createtable failed" psql testlocale < test-gr.sql.in > test-gr-$f.sql.out 2>/dev/null || abort "test query failed" @@ -48,5 +48,5 @@ done echo "Testing PgSQL: select on regexp..." psql testlocale < test-gr-select.sql.in > test-gr-select.sql.out 2>/dev/null || abort "select query failed" diff expected/test-gr-select.sql.out test-gr-select.sql.out -destroydb testlocale || abort "destroydb failed" +dropdb testlocale || abort "dropdb failed" echo "Finished." diff --git a/src/test/locale/koi8-r/expected/test-koi8-char.sql.out b/src/test/locale/koi8-r/expected/test-koi8-char.sql.out index c574ff0677..95f52d8af8 100644 --- a/src/test/locale/koi8-r/expected/test-koi8-char.sql.out +++ b/src/test/locale/koi8-r/expected/test-koi8-char.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_ru -------+--------------------+------------------------------------------------------------ -ID |Idaho |áÊÄÁÈÏ -IA |Iowa |áÊÏ×Á -AL |Alabama |áÌÁÂÁÍÁ -AK |Alaska |áÌÑÓËÁ -AZ |Arizona |áÒÉÚÏÎÁ -AR |Arkansas |áÒËÁÎÚÁÓ -WY |Wyoming |÷ÁÊÏÍÉÎÇ -WA |Washington |÷ÁÛÉÎÇÔÏÎ -VT |Vermont |÷ÅÒÍÏÎÔ -VA |Virginia |÷ÉÒÄÖÉÎÉÑ -WI |Wisconsin |÷ÉÓËÏÎÓÉÎ -DE |Delaware |äÅÌÁ×ÜÒ -GA |Georgia |äÖÏÒÄÖÉÑ -WV |West Virginia |úÁÐÁÄÎÁÑ ÷ÉÒÄÖÉÎÉÑ -IL |Illinois |éÌÌÉÎÏÊÓ -IN |Indiana |éÎÄÉÁÎÁ -CA |California |ëÁÌÉÆÏÒÎÉÑ -KA |Kansas |ëÁÎÚÁÓ -KY |Kentucky |ëÅÎÔÕËËÉ -CO |Colorado |ëÏÌÏÒÁÄÏ -CT |Connecticut |ëÏÎÎÅËÔÉËÕÔ -LA |Louisiana |ìÕÉÚÉÁÎÁ -MA |Massachusetts |íÁÓÓÁÞÕÓÅÔÓ -MN |Minnesota |íÉÎÎÅÓÏÔÁ -MS |Mississippi |íÉÓÓÉÓÉÐÉ -MO |Missouri |íÉÓÓÕÒÉ -MI |Michigan |íÉÞÉÇÁÎ -MT |Montana |íÏÎÔÁÎÁ -ME |Maine |íÜÎ -MD |Maryland |íÜÒÉÌÅÎÄ -NE |Nebraska |îÅÂÒÁÓËÁ -NV |Nevada |îÅ×ÁÄÁ -NH |New Hampshire |îØÀ-çÜÍÐÛÉÒ -NJ |New Jersey |îØÀ-äÖÅÒÓÉ -NY |New York |îØÀ-êÏÒË -NM |New Mexico |îØÀ-íÅËÓÉËÏ -OH |Ohio |ïÇÁÊÏ -OK |Oklahoma |ïËÌÁÈÏÍÁ -DC |Washington DC |ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) -OR |Oregon |ïÒÅÇÏÎ -PA |Pennsylvania |ðÅÎÓÉÌØ×ÁÎÉÑ -RI |Rhode Island |òÏÄ-áÊÌÅÎÄ -ND |North Dakota |óÅ×ÅÒÎÁÑ äÁËÏÔÁ -NC |North Carolina |óÅ×ÅÒÎÁÑ ëÁÒÏÌÉÎÁ -TN |Tennessee |ôÅÎÎÅÓÓÉ -TX |Texas |ôÅÈÁÓ -FL |Florida |æÌÏÒÉÄÁ -SD |South Dakota |àÖÎÁÑ äÁËÏÔÁ -SC |South Carolina |àÖÎÁÑ ëÁÒÏÌÉÎÁ -UT |Utah |àÔÁ + abbrev | name_en | name_ru +--------+----------------------+-------------------------------------------------------------- + ID | Idaho | áÊÄÁÈÏ + IA | Iowa | áÊÏ×Á + AL | Alabama | áÌÁÂÁÍÁ + AK | Alaska | áÌÑÓËÁ + AZ | Arizona | áÒÉÚÏÎÁ + AR | Arkansas | áÒËÁÎÚÁÓ + WY | Wyoming | ÷ÁÊÏÍÉÎÇ + WA | Washington | ÷ÁÛÉÎÇÔÏÎ + VT | Vermont | ÷ÅÒÍÏÎÔ + VA | Virginia | ÷ÉÒÄÖÉÎÉÑ + WI | Wisconsin | ÷ÉÓËÏÎÓÉÎ + DE | Delaware | äÅÌÁ×ÜÒ + GA | Georgia | äÖÏÒÄÖÉÑ + WV | West Virginia | úÁÐÁÄÎÁÑ ÷ÉÒÄÖÉÎÉÑ + IL | Illinois | éÌÌÉÎÏÊÓ + IN | Indiana | éÎÄÉÁÎÁ + CA | California | ëÁÌÉÆÏÒÎÉÑ + KA | Kansas | ëÁÎÚÁÓ + KY | Kentucky | ëÅÎÔÕËËÉ + CO | Colorado | ëÏÌÏÒÁÄÏ + CT | Connecticut | ëÏÎÎÅËÔÉËÕÔ + LA | Louisiana | ìÕÉÚÉÁÎÁ + MA | Massachusetts | íÁÓÓÁÞÕÓÅÔÓ + MN | Minnesota | íÉÎÎÅÓÏÔÁ + MS | Mississippi | íÉÓÓÉÓÉÐÉ + MO | Missouri | íÉÓÓÕÒÉ + MI | Michigan | íÉÞÉÇÁÎ + MT | Montana | íÏÎÔÁÎÁ + ME | Maine | íÜÎ + MD | Maryland | íÜÒÉÌÅÎÄ + NE | Nebraska | îÅÂÒÁÓËÁ + NV | Nevada | îÅ×ÁÄÁ + NH | New Hampshire | îØÀ-çÜÍÐÛÉÒ + NJ | New Jersey | îØÀ-äÖÅÒÓÉ + NY | New York | îØÀ-êÏÒË + NM | New Mexico | îØÀ-íÅËÓÉËÏ + OH | Ohio | ïÇÁÊÏ + OK | Oklahoma | ïËÌÁÈÏÍÁ + DC | Washington DC | ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) + OR | Oregon | ïÒÅÇÏÎ + PA | Pennsylvania | ðÅÎÓÉÌØ×ÁÎÉÑ + RI | Rhode Island | òÏÄ-áÊÌÅÎÄ + ND | North Dakota | óÅ×ÅÒÎÁÑ äÁËÏÔÁ + NC | North Carolina | óÅ×ÅÒÎÁÑ ëÁÒÏÌÉÎÁ + TN | Tennessee | ôÅÎÎÅÓÓÉ + TX | Texas | ôÅÈÁÓ + FL | Florida | æÌÏÒÉÄÁ + SD | South Dakota | àÖÎÁÑ äÁËÏÔÁ + SC | South Carolina | àÖÎÁÑ ëÁÒÏÌÉÎÁ + UT | Utah | àÔÁ (50 rows) -EOF diff --git a/src/test/locale/koi8-r/expected/test-koi8-select.sql.out b/src/test/locale/koi8-r/expected/test-koi8-select.sql.out index 1e9f97de3c..f5be657f16 100644 --- a/src/test/locale/koi8-r/expected/test-koi8-select.sql.out +++ b/src/test/locale/koi8-r/expected/test-koi8-select.sql.out @@ -1,9 +1,8 @@ -abbrev|name_en |name_ru -------+--------------------+---------------------------------------------- -OH |Ohio |ïÇÁÊÏ -OK |Oklahoma |ïËÌÁÈÏÍÁ -DC |Washington DC |ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) -OR |Oregon |ïÒÅÇÏÎ + abbrev | name_en | name_ru +--------+----------------------+------------------------------------------------ + OH | Ohio | ïÇÁÊÏ + OK | Oklahoma | ïËÌÁÈÏÍÁ + DC | Washington DC | ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) + OR | Oregon | ïÒÅÇÏÎ (4 rows) -EOF diff --git a/src/test/locale/koi8-r/expected/test-koi8-text.sql.out b/src/test/locale/koi8-r/expected/test-koi8-text.sql.out index 210a8e2b68..3dc3acf4b1 100644 --- a/src/test/locale/koi8-r/expected/test-koi8-text.sql.out +++ b/src/test/locale/koi8-r/expected/test-koi8-text.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_ru -------+--------------------+---------------------------------------------- -ID |Idaho |áÊÄÁÈÏ -IA |Iowa |áÊÏ×Á -AL |Alabama |áÌÁÂÁÍÁ -AK |Alaska |áÌÑÓËÁ -AZ |Arizona |áÒÉÚÏÎÁ -AR |Arkansas |áÒËÁÎÚÁÓ -WY |Wyoming |÷ÁÊÏÍÉÎÇ -WA |Washington |÷ÁÛÉÎÇÔÏÎ -VT |Vermont |÷ÅÒÍÏÎÔ -VA |Virginia |÷ÉÒÄÖÉÎÉÑ -WI |Wisconsin |÷ÉÓËÏÎÓÉÎ -DE |Delaware |äÅÌÁ×ÜÒ -GA |Georgia |äÖÏÒÄÖÉÑ -WV |West Virginia |úÁÐÁÄÎÁÑ ÷ÉÒÄÖÉÎÉÑ -IL |Illinois |éÌÌÉÎÏÊÓ -IN |Indiana |éÎÄÉÁÎÁ -CA |California |ëÁÌÉÆÏÒÎÉÑ -KA |Kansas |ëÁÎÚÁÓ -KY |Kentucky |ëÅÎÔÕËËÉ -CO |Colorado |ëÏÌÏÒÁÄÏ -CT |Connecticut |ëÏÎÎÅËÔÉËÕÔ -LA |Louisiana |ìÕÉÚÉÁÎÁ -MA |Massachusetts |íÁÓÓÁÞÕÓÅÔÓ -MN |Minnesota |íÉÎÎÅÓÏÔÁ -MS |Mississippi |íÉÓÓÉÓÉÐÉ -MO |Missouri |íÉÓÓÕÒÉ -MI |Michigan |íÉÞÉÇÁÎ -MT |Montana |íÏÎÔÁÎÁ -ME |Maine |íÜÎ -MD |Maryland |íÜÒÉÌÅÎÄ -NE |Nebraska |îÅÂÒÁÓËÁ -NV |Nevada |îÅ×ÁÄÁ -NH |New Hampshire |îØÀ-çÜÍÐÛÉÒ -NJ |New Jersey |îØÀ-äÖÅÒÓÉ -NY |New York |îØÀ-êÏÒË -NM |New Mexico |îØÀ-íÅËÓÉËÏ -OH |Ohio |ïÇÁÊÏ -OK |Oklahoma |ïËÌÁÈÏÍÁ -DC |Washington DC |ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) -OR |Oregon |ïÒÅÇÏÎ -PA |Pennsylvania |ðÅÎÓÉÌØ×ÁÎÉÑ -RI |Rhode Island |òÏÄ-áÊÌÅÎÄ -ND |North Dakota |óÅ×ÅÒÎÁÑ äÁËÏÔÁ -NC |North Carolina |óÅ×ÅÒÎÁÑ ëÁÒÏÌÉÎÁ -TN |Tennessee |ôÅÎÎÅÓÓÉ -TX |Texas |ôÅÈÁÓ -FL |Florida |æÌÏÒÉÄÁ -SD |South Dakota |àÖÎÁÑ äÁËÏÔÁ -SC |South Carolina |àÖÎÁÑ ëÁÒÏÌÉÎÁ -UT |Utah |àÔÁ + abbrev | name_en | name_ru +--------+----------------------+------------------------------------------------ + ID | Idaho | áÊÄÁÈÏ + IA | Iowa | áÊÏ×Á + AL | Alabama | áÌÁÂÁÍÁ + AK | Alaska | áÌÑÓËÁ + AZ | Arizona | áÒÉÚÏÎÁ + AR | Arkansas | áÒËÁÎÚÁÓ + WY | Wyoming | ÷ÁÊÏÍÉÎÇ + WA | Washington | ÷ÁÛÉÎÇÔÏÎ + VT | Vermont | ÷ÅÒÍÏÎÔ + VA | Virginia | ÷ÉÒÄÖÉÎÉÑ + WI | Wisconsin | ÷ÉÓËÏÎÓÉÎ + DE | Delaware | äÅÌÁ×ÜÒ + GA | Georgia | äÖÏÒÄÖÉÑ + WV | West Virginia | úÁÐÁÄÎÁÑ ÷ÉÒÄÖÉÎÉÑ + IL | Illinois | éÌÌÉÎÏÊÓ + IN | Indiana | éÎÄÉÁÎÁ + CA | California | ëÁÌÉÆÏÒÎÉÑ + KA | Kansas | ëÁÎÚÁÓ + KY | Kentucky | ëÅÎÔÕËËÉ + CO | Colorado | ëÏÌÏÒÁÄÏ + CT | Connecticut | ëÏÎÎÅËÔÉËÕÔ + LA | Louisiana | ìÕÉÚÉÁÎÁ + MA | Massachusetts | íÁÓÓÁÞÕÓÅÔÓ + MN | Minnesota | íÉÎÎÅÓÏÔÁ + MS | Mississippi | íÉÓÓÉÓÉÐÉ + MO | Missouri | íÉÓÓÕÒÉ + MI | Michigan | íÉÞÉÇÁÎ + MT | Montana | íÏÎÔÁÎÁ + ME | Maine | íÜÎ + MD | Maryland | íÜÒÉÌÅÎÄ + NE | Nebraska | îÅÂÒÁÓËÁ + NV | Nevada | îÅ×ÁÄÁ + NH | New Hampshire | îØÀ-çÜÍÐÛÉÒ + NJ | New Jersey | îØÀ-äÖÅÒÓÉ + NY | New York | îØÀ-êÏÒË + NM | New Mexico | îØÀ-íÅËÓÉËÏ + OH | Ohio | ïÇÁÊÏ + OK | Oklahoma | ïËÌÁÈÏÍÁ + DC | Washington DC | ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) + OR | Oregon | ïÒÅÇÏÎ + PA | Pennsylvania | ðÅÎÓÉÌØ×ÁÎÉÑ + RI | Rhode Island | òÏÄ-áÊÌÅÎÄ + ND | North Dakota | óÅ×ÅÒÎÁÑ äÁËÏÔÁ + NC | North Carolina | óÅ×ÅÒÎÁÑ ëÁÒÏÌÉÎÁ + TN | Tennessee | ôÅÎÎÅÓÓÉ + TX | Texas | ôÅÈÁÓ + FL | Florida | æÌÏÒÉÄÁ + SD | South Dakota | àÖÎÁÑ äÁËÏÔÁ + SC | South Carolina | àÖÎÁÑ ëÁÒÏÌÉÎÁ + UT | Utah | àÔÁ (50 rows) -EOF diff --git a/src/test/locale/koi8-r/expected/test-koi8-varchar.sql.out b/src/test/locale/koi8-r/expected/test-koi8-varchar.sql.out index 210a8e2b68..3dc3acf4b1 100644 --- a/src/test/locale/koi8-r/expected/test-koi8-varchar.sql.out +++ b/src/test/locale/koi8-r/expected/test-koi8-varchar.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_ru -------+--------------------+---------------------------------------------- -ID |Idaho |áÊÄÁÈÏ -IA |Iowa |áÊÏ×Á -AL |Alabama |áÌÁÂÁÍÁ -AK |Alaska |áÌÑÓËÁ -AZ |Arizona |áÒÉÚÏÎÁ -AR |Arkansas |áÒËÁÎÚÁÓ -WY |Wyoming |÷ÁÊÏÍÉÎÇ -WA |Washington |÷ÁÛÉÎÇÔÏÎ -VT |Vermont |÷ÅÒÍÏÎÔ -VA |Virginia |÷ÉÒÄÖÉÎÉÑ -WI |Wisconsin |÷ÉÓËÏÎÓÉÎ -DE |Delaware |äÅÌÁ×ÜÒ -GA |Georgia |äÖÏÒÄÖÉÑ -WV |West Virginia |úÁÐÁÄÎÁÑ ÷ÉÒÄÖÉÎÉÑ -IL |Illinois |éÌÌÉÎÏÊÓ -IN |Indiana |éÎÄÉÁÎÁ -CA |California |ëÁÌÉÆÏÒÎÉÑ -KA |Kansas |ëÁÎÚÁÓ -KY |Kentucky |ëÅÎÔÕËËÉ -CO |Colorado |ëÏÌÏÒÁÄÏ -CT |Connecticut |ëÏÎÎÅËÔÉËÕÔ -LA |Louisiana |ìÕÉÚÉÁÎÁ -MA |Massachusetts |íÁÓÓÁÞÕÓÅÔÓ -MN |Minnesota |íÉÎÎÅÓÏÔÁ -MS |Mississippi |íÉÓÓÉÓÉÐÉ -MO |Missouri |íÉÓÓÕÒÉ -MI |Michigan |íÉÞÉÇÁÎ -MT |Montana |íÏÎÔÁÎÁ -ME |Maine |íÜÎ -MD |Maryland |íÜÒÉÌÅÎÄ -NE |Nebraska |îÅÂÒÁÓËÁ -NV |Nevada |îÅ×ÁÄÁ -NH |New Hampshire |îØÀ-çÜÍÐÛÉÒ -NJ |New Jersey |îØÀ-äÖÅÒÓÉ -NY |New York |îØÀ-êÏÒË -NM |New Mexico |îØÀ-íÅËÓÉËÏ -OH |Ohio |ïÇÁÊÏ -OK |Oklahoma |ïËÌÁÈÏÍÁ -DC |Washington DC |ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) -OR |Oregon |ïÒÅÇÏÎ -PA |Pennsylvania |ðÅÎÓÉÌØ×ÁÎÉÑ -RI |Rhode Island |òÏÄ-áÊÌÅÎÄ -ND |North Dakota |óÅ×ÅÒÎÁÑ äÁËÏÔÁ -NC |North Carolina |óÅ×ÅÒÎÁÑ ëÁÒÏÌÉÎÁ -TN |Tennessee |ôÅÎÎÅÓÓÉ -TX |Texas |ôÅÈÁÓ -FL |Florida |æÌÏÒÉÄÁ -SD |South Dakota |àÖÎÁÑ äÁËÏÔÁ -SC |South Carolina |àÖÎÁÑ ëÁÒÏÌÉÎÁ -UT |Utah |àÔÁ + abbrev | name_en | name_ru +--------+----------------------+------------------------------------------------ + ID | Idaho | áÊÄÁÈÏ + IA | Iowa | áÊÏ×Á + AL | Alabama | áÌÁÂÁÍÁ + AK | Alaska | áÌÑÓËÁ + AZ | Arizona | áÒÉÚÏÎÁ + AR | Arkansas | áÒËÁÎÚÁÓ + WY | Wyoming | ÷ÁÊÏÍÉÎÇ + WA | Washington | ÷ÁÛÉÎÇÔÏÎ + VT | Vermont | ÷ÅÒÍÏÎÔ + VA | Virginia | ÷ÉÒÄÖÉÎÉÑ + WI | Wisconsin | ÷ÉÓËÏÎÓÉÎ + DE | Delaware | äÅÌÁ×ÜÒ + GA | Georgia | äÖÏÒÄÖÉÑ + WV | West Virginia | úÁÐÁÄÎÁÑ ÷ÉÒÄÖÉÎÉÑ + IL | Illinois | éÌÌÉÎÏÊÓ + IN | Indiana | éÎÄÉÁÎÁ + CA | California | ëÁÌÉÆÏÒÎÉÑ + KA | Kansas | ëÁÎÚÁÓ + KY | Kentucky | ëÅÎÔÕËËÉ + CO | Colorado | ëÏÌÏÒÁÄÏ + CT | Connecticut | ëÏÎÎÅËÔÉËÕÔ + LA | Louisiana | ìÕÉÚÉÁÎÁ + MA | Massachusetts | íÁÓÓÁÞÕÓÅÔÓ + MN | Minnesota | íÉÎÎÅÓÏÔÁ + MS | Mississippi | íÉÓÓÉÓÉÐÉ + MO | Missouri | íÉÓÓÕÒÉ + MI | Michigan | íÉÞÉÇÁÎ + MT | Montana | íÏÎÔÁÎÁ + ME | Maine | íÜÎ + MD | Maryland | íÜÒÉÌÅÎÄ + NE | Nebraska | îÅÂÒÁÓËÁ + NV | Nevada | îÅ×ÁÄÁ + NH | New Hampshire | îØÀ-çÜÍÐÛÉÒ + NJ | New Jersey | îØÀ-äÖÅÒÓÉ + NY | New York | îØÀ-êÏÒË + NM | New Mexico | îØÀ-íÅËÓÉËÏ + OH | Ohio | ïÇÁÊÏ + OK | Oklahoma | ïËÌÁÈÏÍÁ + DC | Washington DC | ÏËÒÕÇ ëÏÌÕÍÂÉÑ (ÓÏÚÄÁÎ ÓÐÅÃÉÁÌØÎÏ ÐÏÄ ÓÔÏÌÉÃÕ) + OR | Oregon | ïÒÅÇÏÎ + PA | Pennsylvania | ðÅÎÓÉÌØ×ÁÎÉÑ + RI | Rhode Island | òÏÄ-áÊÌÅÎÄ + ND | North Dakota | óÅ×ÅÒÎÁÑ äÁËÏÔÁ + NC | North Carolina | óÅ×ÅÒÎÁÑ ëÁÒÏÌÉÎÁ + TN | Tennessee | ôÅÎÎÅÓÓÉ + TX | Texas | ôÅÈÁÓ + FL | Florida | æÌÏÒÉÄÁ + SD | South Dakota | àÖÎÁÑ äÁËÏÔÁ + SC | South Carolina | àÖÎÁÑ ëÁÒÏÌÉÎÁ + UT | Utah | àÔÁ (50 rows) -EOF diff --git a/src/test/locale/koi8-r/runall b/src/test/locale/koi8-r/runall index a6b81baa82..2fb6a5de41 100755 --- a/src/test/locale/koi8-r/runall +++ b/src/test/locale/koi8-r/runall @@ -39,7 +39,7 @@ for f in char varchar text; do fi echo "Testing PgSQL: sort on $ftype type..." - destroydb testlocale >/dev/null 2>&1 + dropdb testlocale >/dev/null 2>&1 createdb testlocale || abort "createdb failed" psql -d testlocale -c "CREATE TABLE usastates (abbrev char(2), name_en char(20), name_ru $ftype);" >/dev/null 2>&1 || abort "createtable failed" psql testlocale < test-koi8.sql.in > test-koi8-$f.sql.out 2>/dev/null || abort "test query failed" @@ -48,5 +48,5 @@ done echo "Testing PgSQL: select on regexp..." psql testlocale < test-koi8-select.sql.in > test-koi8-select.sql.out 2>/dev/null || abort "select query failed" diff expected/test-koi8-select.sql.out test-koi8-select.sql.out -destroydb testlocale || abort "destroydb failed" +dropdb testlocale || abort "dropdb failed" echo "Finished." diff --git a/src/test/locale/koi8-to-win1251/expected/test-koi8-char.sql.out b/src/test/locale/koi8-to-win1251/expected/test-koi8-char.sql.out index 391af87c1d..52d8b334a9 100644 --- a/src/test/locale/koi8-to-win1251/expected/test-koi8-char.sql.out +++ b/src/test/locale/koi8-to-win1251/expected/test-koi8-char.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_ru -------+--------------------+------------------------------------------------------------ -ID |Idaho |Àéäàõî -IA |Iowa |Àéîâà -AL |Alabama |Àëàáàìà -AK |Alaska |Àëÿñêà -AZ |Arizona |Àðèçîíà -AR |Arkansas |Àðêàíçàñ -WY |Wyoming |Âàéîìèíã -WA |Washington |Âàøèíãòîí -VT |Vermont |Âåðìîíò -VA |Virginia |Âèðäæèíèÿ -WI |Wisconsin |Âèñêîíñèí -DE |Delaware |Äåëàâýð -GA |Georgia |Äæîðäæèÿ -WV |West Virginia |Çàïàäíàÿ Âèðäæèíèÿ -IL |Illinois |Èëëèíîéñ -IN |Indiana |Èíäèàíà -CA |California |Êàëèôîðíèÿ -KA |Kansas |Êàíçàñ -KY |Kentucky |Êåíòóêêè -CO |Colorado |Êîëîðàäî -CT |Connecticut |Êîííåêòèêóò -LA |Louisiana |Ëóèçèàíà -MA |Massachusetts |Ìàññà÷óñåòñ -MN |Minnesota |Ìèííåñîòà -MS |Mississippi |Ìèññèñèïè -MO |Missouri |Ìèññóðè -MI |Michigan |Ìè÷èãàí -MT |Montana |Ìîíòàíà -ME |Maine |Ìýí -MD |Maryland |Ìýðèëåíä -NE |Nebraska |Íåáðàñêà -NV |Nevada |Íåâàäà -NH |New Hampshire |Íüþ-Ãýìïøèð -NJ |New Jersey |Íüþ-Äæåðñè -NY |New York |Íüþ-Éîðê -NM |New Mexico |Íüþ-Ìåêñèêî -OH |Ohio |Îãàéî -OK |Oklahoma |Îêëàõîìà -DC |Washington DC |îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) -OR |Oregon |Îðåãîí -PA |Pennsylvania |Ïåíñèëüâàíèÿ -RI |Rhode Island |Ðîä-Àéëåíä -ND |North Dakota |Ñåâåðíàÿ Äàêîòà -NC |North Carolina |Ñåâåðíàÿ Êàðîëèíà -TN |Tennessee |Òåííåññè -TX |Texas |Òåõàñ -FL |Florida |Ôëîðèäà -SD |South Dakota |Þæíàÿ Äàêîòà -SC |South Carolina |Þæíàÿ Êàðîëèíà -UT |Utah |Þòà + abbrev | name_en | name_ru +--------+----------------------+-------------------------------------------------------------- + ID | Idaho | Àéäàõî + IA | Iowa | Àéîâà + AL | Alabama | Àëàáàìà + AK | Alaska | Àëÿñêà + AZ | Arizona | Àðèçîíà + AR | Arkansas | Àðêàíçàñ + WY | Wyoming | Âàéîìèíã + WA | Washington | Âàøèíãòîí + VT | Vermont | Âåðìîíò + VA | Virginia | Âèðäæèíèÿ + WI | Wisconsin | Âèñêîíñèí + DE | Delaware | Äåëàâýð + GA | Georgia | Äæîðäæèÿ + WV | West Virginia | Çàïàäíàÿ Âèðäæèíèÿ + IL | Illinois | Èëëèíîéñ + IN | Indiana | Èíäèàíà + CA | California | Êàëèôîðíèÿ + KA | Kansas | Êàíçàñ + KY | Kentucky | Êåíòóêêè + CO | Colorado | Êîëîðàäî + CT | Connecticut | Êîííåêòèêóò + LA | Louisiana | Ëóèçèàíà + MA | Massachusetts | Ìàññà÷óñåòñ + MN | Minnesota | Ìèííåñîòà + MS | Mississippi | Ìèññèñèïè + MO | Missouri | Ìèññóðè + MI | Michigan | Ìè÷èãàí + MT | Montana | Ìîíòàíà + ME | Maine | Ìýí + MD | Maryland | Ìýðèëåíä + NE | Nebraska | Íåáðàñêà + NV | Nevada | Íåâàäà + NH | New Hampshire | Íüþ-Ãýìïøèð + NJ | New Jersey | Íüþ-Äæåðñè + NY | New York | Íüþ-Éîðê + NM | New Mexico | Íüþ-Ìåêñèêî + OH | Ohio | Îãàéî + OK | Oklahoma | Îêëàõîìà + DC | Washington DC | îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) + OR | Oregon | Îðåãîí + PA | Pennsylvania | Ïåíñèëüâàíèÿ + RI | Rhode Island | Ðîä-Àéëåíä + ND | North Dakota | Ñåâåðíàÿ Äàêîòà + NC | North Carolina | Ñåâåðíàÿ Êàðîëèíà + TN | Tennessee | Òåííåññè + TX | Texas | Òåõàñ + FL | Florida | Ôëîðèäà + SD | South Dakota | Þæíàÿ Äàêîòà + SC | South Carolina | Þæíàÿ Êàðîëèíà + UT | Utah | Þòà (50 rows) -EOF diff --git a/src/test/locale/koi8-to-win1251/expected/test-koi8-select.sql.out b/src/test/locale/koi8-to-win1251/expected/test-koi8-select.sql.out index 7d73f0e47f..0feffa2548 100644 --- a/src/test/locale/koi8-to-win1251/expected/test-koi8-select.sql.out +++ b/src/test/locale/koi8-to-win1251/expected/test-koi8-select.sql.out @@ -1,9 +1,8 @@ -abbrev|name_en |name_ru -------+--------------------+---------------------------------------------- -OH |Ohio |Îãàéî -OK |Oklahoma |Îêëàõîìà -DC |Washington DC |îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) -OR |Oregon |Îðåãîí + abbrev | name_en | name_ru +--------+----------------------+------------------------------------------------ + OH | Ohio | Îãàéî + OK | Oklahoma | Îêëàõîìà + DC | Washington DC | îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) + OR | Oregon | Îðåãîí (4 rows) -EOF diff --git a/src/test/locale/koi8-to-win1251/expected/test-koi8-sort.out b/src/test/locale/koi8-to-win1251/expected/test-koi8-sort.out index 9b35ecdeaa..72242ccbfa 100644 --- a/src/test/locale/koi8-to-win1251/expected/test-koi8-sort.out +++ b/src/test/locale/koi8-to-win1251/expected/test-koi8-sort.out @@ -2,8 +2,8 @@ Bording hoarding Vesta vesta +Öàïëÿ +Þã àëüÿíñ Àôðèêà Ñåâåð -Öàïëÿ -Þã diff --git a/src/test/locale/koi8-to-win1251/expected/test-koi8-text.sql.out b/src/test/locale/koi8-to-win1251/expected/test-koi8-text.sql.out index 7a1dad22ff..eccc1cbfc0 100644 --- a/src/test/locale/koi8-to-win1251/expected/test-koi8-text.sql.out +++ b/src/test/locale/koi8-to-win1251/expected/test-koi8-text.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_ru -------+--------------------+---------------------------------------------- -ID |Idaho |Àéäàõî -IA |Iowa |Àéîâà -AL |Alabama |Àëàáàìà -AK |Alaska |Àëÿñêà -AZ |Arizona |Àðèçîíà -AR |Arkansas |Àðêàíçàñ -WY |Wyoming |Âàéîìèíã -WA |Washington |Âàøèíãòîí -VT |Vermont |Âåðìîíò -VA |Virginia |Âèðäæèíèÿ -WI |Wisconsin |Âèñêîíñèí -DE |Delaware |Äåëàâýð -GA |Georgia |Äæîðäæèÿ -WV |West Virginia |Çàïàäíàÿ Âèðäæèíèÿ -IL |Illinois |Èëëèíîéñ -IN |Indiana |Èíäèàíà -CA |California |Êàëèôîðíèÿ -KA |Kansas |Êàíçàñ -KY |Kentucky |Êåíòóêêè -CO |Colorado |Êîëîðàäî -CT |Connecticut |Êîííåêòèêóò -LA |Louisiana |Ëóèçèàíà -MA |Massachusetts |Ìàññà÷óñåòñ -MN |Minnesota |Ìèííåñîòà -MS |Mississippi |Ìèññèñèïè -MO |Missouri |Ìèññóðè -MI |Michigan |Ìè÷èãàí -MT |Montana |Ìîíòàíà -ME |Maine |Ìýí -MD |Maryland |Ìýðèëåíä -NE |Nebraska |Íåáðàñêà -NV |Nevada |Íåâàäà -NH |New Hampshire |Íüþ-Ãýìïøèð -NJ |New Jersey |Íüþ-Äæåðñè -NY |New York |Íüþ-Éîðê -NM |New Mexico |Íüþ-Ìåêñèêî -OH |Ohio |Îãàéî -OK |Oklahoma |Îêëàõîìà -DC |Washington DC |îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) -OR |Oregon |Îðåãîí -PA |Pennsylvania |Ïåíñèëüâàíèÿ -RI |Rhode Island |Ðîä-Àéëåíä -ND |North Dakota |Ñåâåðíàÿ Äàêîòà -NC |North Carolina |Ñåâåðíàÿ Êàðîëèíà -TN |Tennessee |Òåííåññè -TX |Texas |Òåõàñ -FL |Florida |Ôëîðèäà -SD |South Dakota |Þæíàÿ Äàêîòà -SC |South Carolina |Þæíàÿ Êàðîëèíà -UT |Utah |Þòà + abbrev | name_en | name_ru +--------+----------------------+------------------------------------------------ + ID | Idaho | Àéäàõî + IA | Iowa | Àéîâà + AL | Alabama | Àëàáàìà + AK | Alaska | Àëÿñêà + AZ | Arizona | Àðèçîíà + AR | Arkansas | Àðêàíçàñ + WY | Wyoming | Âàéîìèíã + WA | Washington | Âàøèíãòîí + VT | Vermont | Âåðìîíò + VA | Virginia | Âèðäæèíèÿ + WI | Wisconsin | Âèñêîíñèí + DE | Delaware | Äåëàâýð + GA | Georgia | Äæîðäæèÿ + WV | West Virginia | Çàïàäíàÿ Âèðäæèíèÿ + IL | Illinois | Èëëèíîéñ + IN | Indiana | Èíäèàíà + CA | California | Êàëèôîðíèÿ + KA | Kansas | Êàíçàñ + KY | Kentucky | Êåíòóêêè + CO | Colorado | Êîëîðàäî + CT | Connecticut | Êîííåêòèêóò + LA | Louisiana | Ëóèçèàíà + MA | Massachusetts | Ìàññà÷óñåòñ + MN | Minnesota | Ìèííåñîòà + MS | Mississippi | Ìèññèñèïè + MO | Missouri | Ìèññóðè + MI | Michigan | Ìè÷èãàí + MT | Montana | Ìîíòàíà + ME | Maine | Ìýí + MD | Maryland | Ìýðèëåíä + NE | Nebraska | Íåáðàñêà + NV | Nevada | Íåâàäà + NH | New Hampshire | Íüþ-Ãýìïøèð + NJ | New Jersey | Íüþ-Äæåðñè + NY | New York | Íüþ-Éîðê + NM | New Mexico | Íüþ-Ìåêñèêî + OH | Ohio | Îãàéî + OK | Oklahoma | Îêëàõîìà + DC | Washington DC | îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) + OR | Oregon | Îðåãîí + PA | Pennsylvania | Ïåíñèëüâàíèÿ + RI | Rhode Island | Ðîä-Àéëåíä + ND | North Dakota | Ñåâåðíàÿ Äàêîòà + NC | North Carolina | Ñåâåðíàÿ Êàðîëèíà + TN | Tennessee | Òåííåññè + TX | Texas | Òåõàñ + FL | Florida | Ôëîðèäà + SD | South Dakota | Þæíàÿ Äàêîòà + SC | South Carolina | Þæíàÿ Êàðîëèíà + UT | Utah | Þòà (50 rows) -EOF diff --git a/src/test/locale/koi8-to-win1251/expected/test-koi8-varchar.sql.out b/src/test/locale/koi8-to-win1251/expected/test-koi8-varchar.sql.out index 7a1dad22ff..eccc1cbfc0 100644 --- a/src/test/locale/koi8-to-win1251/expected/test-koi8-varchar.sql.out +++ b/src/test/locale/koi8-to-win1251/expected/test-koi8-varchar.sql.out @@ -1,55 +1,54 @@ -abbrev|name_en |name_ru -------+--------------------+---------------------------------------------- -ID |Idaho |Àéäàõî -IA |Iowa |Àéîâà -AL |Alabama |Àëàáàìà -AK |Alaska |Àëÿñêà -AZ |Arizona |Àðèçîíà -AR |Arkansas |Àðêàíçàñ -WY |Wyoming |Âàéîìèíã -WA |Washington |Âàøèíãòîí -VT |Vermont |Âåðìîíò -VA |Virginia |Âèðäæèíèÿ -WI |Wisconsin |Âèñêîíñèí -DE |Delaware |Äåëàâýð -GA |Georgia |Äæîðäæèÿ -WV |West Virginia |Çàïàäíàÿ Âèðäæèíèÿ -IL |Illinois |Èëëèíîéñ -IN |Indiana |Èíäèàíà -CA |California |Êàëèôîðíèÿ -KA |Kansas |Êàíçàñ -KY |Kentucky |Êåíòóêêè -CO |Colorado |Êîëîðàäî -CT |Connecticut |Êîííåêòèêóò -LA |Louisiana |Ëóèçèàíà -MA |Massachusetts |Ìàññà÷óñåòñ -MN |Minnesota |Ìèííåñîòà -MS |Mississippi |Ìèññèñèïè -MO |Missouri |Ìèññóðè -MI |Michigan |Ìè÷èãàí -MT |Montana |Ìîíòàíà -ME |Maine |Ìýí -MD |Maryland |Ìýðèëåíä -NE |Nebraska |Íåáðàñêà -NV |Nevada |Íåâàäà -NH |New Hampshire |Íüþ-Ãýìïøèð -NJ |New Jersey |Íüþ-Äæåðñè -NY |New York |Íüþ-Éîðê -NM |New Mexico |Íüþ-Ìåêñèêî -OH |Ohio |Îãàéî -OK |Oklahoma |Îêëàõîìà -DC |Washington DC |îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) -OR |Oregon |Îðåãîí -PA |Pennsylvania |Ïåíñèëüâàíèÿ -RI |Rhode Island |Ðîä-Àéëåíä -ND |North Dakota |Ñåâåðíàÿ Äàêîòà -NC |North Carolina |Ñåâåðíàÿ Êàðîëèíà -TN |Tennessee |Òåííåññè -TX |Texas |Òåõàñ -FL |Florida |Ôëîðèäà -SD |South Dakota |Þæíàÿ Äàêîòà -SC |South Carolina |Þæíàÿ Êàðîëèíà -UT |Utah |Þòà + abbrev | name_en | name_ru +--------+----------------------+------------------------------------------------ + ID | Idaho | Àéäàõî + IA | Iowa | Àéîâà + AL | Alabama | Àëàáàìà + AK | Alaska | Àëÿñêà + AZ | Arizona | Àðèçîíà + AR | Arkansas | Àðêàíçàñ + WY | Wyoming | Âàéîìèíã + WA | Washington | Âàøèíãòîí + VT | Vermont | Âåðìîíò + VA | Virginia | Âèðäæèíèÿ + WI | Wisconsin | Âèñêîíñèí + DE | Delaware | Äåëàâýð + GA | Georgia | Äæîðäæèÿ + WV | West Virginia | Çàïàäíàÿ Âèðäæèíèÿ + IL | Illinois | Èëëèíîéñ + IN | Indiana | Èíäèàíà + CA | California | Êàëèôîðíèÿ + KA | Kansas | Êàíçàñ + KY | Kentucky | Êåíòóêêè + CO | Colorado | Êîëîðàäî + CT | Connecticut | Êîííåêòèêóò + LA | Louisiana | Ëóèçèàíà + MA | Massachusetts | Ìàññà÷óñåòñ + MN | Minnesota | Ìèííåñîòà + MS | Mississippi | Ìèññèñèïè + MO | Missouri | Ìèññóðè + MI | Michigan | Ìè÷èãàí + MT | Montana | Ìîíòàíà + ME | Maine | Ìýí + MD | Maryland | Ìýðèëåíä + NE | Nebraska | Íåáðàñêà + NV | Nevada | Íåâàäà + NH | New Hampshire | Íüþ-Ãýìïøèð + NJ | New Jersey | Íüþ-Äæåðñè + NY | New York | Íüþ-Éîðê + NM | New Mexico | Íüþ-Ìåêñèêî + OH | Ohio | Îãàéî + OK | Oklahoma | Îêëàõîìà + DC | Washington DC | îêðóã Êîëóìáèÿ (ñîçäàí ñïåöèàëüíî ïîä ñòîëèöó) + OR | Oregon | Îðåãîí + PA | Pennsylvania | Ïåíñèëüâàíèÿ + RI | Rhode Island | Ðîä-Àéëåíä + ND | North Dakota | Ñåâåðíàÿ Äàêîòà + NC | North Carolina | Ñåâåðíàÿ Êàðîëèíà + TN | Tennessee | Òåííåññè + TX | Texas | Òåõàñ + FL | Florida | Ôëîðèäà + SD | South Dakota | Þæíàÿ Äàêîòà + SC | South Carolina | Þæíàÿ Êàðîëèíà + UT | Utah | Þòà (50 rows) -EOF diff --git a/src/test/locale/koi8-to-win1251/runall b/src/test/locale/koi8-to-win1251/runall index e0fef2f0b9..a9aeadfa47 100755 --- a/src/test/locale/koi8-to-win1251/runall +++ b/src/test/locale/koi8-to-win1251/runall @@ -36,7 +36,7 @@ for f in char varchar text; do fi echo "Testing PgSQL: sort on $ftype type..." - destroydb testlocale >/dev/null 2>&1 + dropdb testlocale >/dev/null 2>&1 createdb testlocale || abort "createdb failed" psql -d testlocale -c "CREATE TABLE usastates (abbrev char(2), name_en char(20), name_ru $ftype);" >/dev/null 2>&1 || abort "createtable failed" psql testlocale < test-koi8.sql.in > test-koi8-$f.sql.out 2>/dev/null || abort "test query failed" @@ -45,5 +45,5 @@ done echo "Testing PgSQL: select on regexp..." psql testlocale < test-koi8-select.sql.in > test-koi8-select.sql.out 2>/dev/null || abort "select query failed" diff expected/test-koi8-select.sql.out test-koi8-select.sql.out -destroydb testlocale || abort "destroydb failed" +dropdb testlocale || abort "dropdb failed" echo "Finished." |