diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-01-11 09:41:45 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-01-11 09:41:45 +0000 |
| commit | a5d67a0a050a9d32c351183992c3f08631735c37 (patch) | |
| tree | a7c9f5957180e78b89c00299d033c3ef1ec93d1e /src | |
| parent | 43a57cf3657faba593ba72c3d67f3397ae84c60d (diff) | |
| download | postgresql-a5d67a0a050a9d32c351183992c3f08631735c37.tar.gz postgresql-a5d67a0a050a9d32c351183992c3f08631735c37.zip | |
Make tests pass with or without locale.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/expected/foreign_data.out | 10 | ||||
| -rw-r--r-- | src/test/regress/sql/foreign_data.sql | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out index bbd1f015e39..35dcae672b4 100644 --- a/src/test/regress/expected/foreign_data.out +++ b/src/test/regress/expected/foreign_data.out @@ -667,25 +667,25 @@ SELECT * FROM information_schema.foreign_server_options ORDER BY 1, 2, 3; regression | s8 | dbname | db1 (6 rows) -SELECT * FROM information_schema.user_mappings ORDER BY 1, 2, 3; +SELECT * FROM information_schema.user_mappings ORDER BY lower(authorization_identifier), 2, 3; authorization_identifier | foreign_server_catalog | foreign_server_name --------------------------+------------------------+--------------------- + foreign_data_user | regression | s4 + foreign_data_user | regression | s8 PUBLIC | regression | s4 PUBLIC | regression | s8 PUBLIC | regression | st1 - foreign_data_user | regression | s4 - foreign_data_user | regression | s8 regress_test_role | regression | s5 regress_test_role | regression | s6 regress_test_role | regression | st1 (8 rows) -SELECT * FROM information_schema.user_mapping_options ORDER BY 1, 2, 3, 4; +SELECT * FROM information_schema.user_mapping_options ORDER BY lower(authorization_identifier), 2, 3, 4; authorization_identifier | foreign_server_catalog | foreign_server_name | option_name | option_value --------------------------+------------------------+---------------------+-------------+-------------- + foreign_data_user | regression | s8 | password | public PUBLIC | regression | s4 | mapping | is public PUBLIC | regression | st1 | modified | 1 - foreign_data_user | regression | s8 | password | public regress_test_role | regression | s5 | modified | 1 regress_test_role | regression | s6 | username | test regress_test_role | regression | st1 | password | boo diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql index 946df17d1c5..1424fc68f08 100644 --- a/src/test/regress/sql/foreign_data.sql +++ b/src/test/regress/sql/foreign_data.sql @@ -264,8 +264,8 @@ SELECT * FROM information_schema.foreign_data_wrappers ORDER BY 1, 2; SELECT * FROM information_schema.foreign_data_wrapper_options ORDER BY 1, 2, 3; SELECT * FROM information_schema.foreign_servers ORDER BY 1, 2; SELECT * FROM information_schema.foreign_server_options ORDER BY 1, 2, 3; -SELECT * FROM information_schema.user_mappings ORDER BY 1, 2, 3; -SELECT * FROM information_schema.user_mapping_options ORDER BY 1, 2, 3, 4; +SELECT * FROM information_schema.user_mappings ORDER BY lower(authorization_identifier), 2, 3; +SELECT * FROM information_schema.user_mapping_options ORDER BY lower(authorization_identifier), 2, 3, 4; SELECT * FROM information_schema.usage_privileges WHERE object_type LIKE 'FOREIGN%' ORDER BY 1, 2, 3, 4, 5; SELECT * FROM information_schema.role_usage_grants WHERE object_type LIKE 'FOREIGN%' ORDER BY 1, 2, 3, 4, 5; SET ROLE regress_test_role; |