NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitba69b41

committed

Avoid locale dependency in expected output.

We'll have to settle for just listing the extensions' data types,since function arguments seem to sort differently in different locales.Per buildfarm results.

1 parentcb5c2ba commitba69b41Copy full SHA for ba69b41

File tree

2 files changed

-190

lines changed

contrib/earthdistance
- expected
  - earthdistance.out
- sql
  - earthdistance.sql

2 files changed

-190

lines changed

`‎contrib/earthdistance/expected/earthdistance.out‎`

Lines changed: 0 additions & 184 deletions

Original file line number	Diff line number	Diff line change
`@@ -965,74 +965,6 @@ SELECT abs(cube_distance(ll_to_earth(-30,-90), '(0)'::cube) / earth() - 1) <`
`965`	`965`	`public \| earth \|`
`966`	`966`	`(2 rows)`
`967`	`967`
`968`		`-\df`
`969`		`- List of functions`
`970`		`- Schema \| Name \| Result data type \| Argument data types \| Type`
`971`		`---------+-------------------+------------------+------------------------------------------+--------`
`972`		`- public \| cube \| cube \| cube, double precision \| normal`
`973`		`- public \| cube \| cube \| cube, double precision, double precision \| normal`
`974`		`- public \| cube \| cube \| double precision \| normal`
`975`		`- public \| cube \| cube \| double precision, double precision \| normal`
`976`		`- public \| cube \| cube \| double precision[] \| normal`
`977`		`- public \| cube \| cube \| double precision[], double precision[] \| normal`
`978`		`- public \| cube_cmp \| integer \| cube, cube \| normal`
`979`		`- public \| cube_contained \| boolean \| cube, cube \| normal`
`980`		`- public \| cube_contains \| boolean \| cube, cube \| normal`
`981`		`- public \| cube_dim \| integer \| cube \| normal`
`982`		`- public \| cube_distance \| double precision \| cube, cube \| normal`
`983`		`- public \| cube_enlarge \| cube \| cube, double precision, integer \| normal`
`984`		`- public \| cube_eq \| boolean \| cube, cube \| normal`
`985`		`- public \| cube_ge \| boolean \| cube, cube \| normal`
`986`		`- public \| cube_gt \| boolean \| cube, cube \| normal`
`987`		`- public \| cube_in \| cube \| cstring \| normal`
`988`		`- public \| cube_inter \| cube \| cube, cube \| normal`
`989`		`- public \| cube_is_point \| boolean \| cube \| normal`
`990`		`- public \| cube_le \| boolean \| cube, cube \| normal`
`991`		`- public \| cube_ll_coord \| double precision \| cube, integer \| normal`
`992`		`- public \| cube_lt \| boolean \| cube, cube \| normal`
`993`		`- public \| cube_ne \| boolean \| cube, cube \| normal`
`994`		`- public \| cube_out \| cstring \| cube \| normal`
`995`		`- public \| cube_overlap \| boolean \| cube, cube \| normal`
`996`		`- public \| cube_size \| double precision \| cube \| normal`
`997`		`- public \| cube_subset \| cube \| cube, integer[] \| normal`
`998`		`- public \| cube_union \| cube \| cube, cube \| normal`
`999`		`- public \| cube_ur_coord \| double precision \| cube, integer \| normal`
`1000`		`- public \| earth \| double precision \| \| normal`
`1001`		`- public \| earth_box \| cube \| earth, double precision \| normal`
`1002`		`- public \| earth_distance \| double precision \| earth, earth \| normal`
`1003`		`- public \| g_cube_compress \| internal \| internal \| normal`
`1004`		`- public \| g_cube_consistent \| boolean \| internal, cube, integer, oid, internal \| normal`
`1005`		`- public \| g_cube_decompress \| internal \| internal \| normal`
`1006`		`- public \| g_cube_penalty \| internal \| internal, internal, internal \| normal`
`1007`		`- public \| g_cube_picksplit \| internal \| internal, internal \| normal`
`1008`		`- public \| g_cube_same \| internal \| cube, cube, internal \| normal`
`1009`		`- public \| g_cube_union \| cube \| internal, internal \| normal`
`1010`		`- public \| gc_to_sec \| double precision \| double precision \| normal`
`1011`		`- public \| geo_distance \| double precision \| point, point \| normal`
`1012`		`- public \| latitude \| double precision \| earth \| normal`
`1013`		`- public \| ll_to_earth \| earth \| double precision, double precision \| normal`
`1014`		`- public \| longitude \| double precision \| earth \| normal`
`1015`		`- public \| sec_to_gc \| double precision \| double precision \| normal`
`1016`		`-(44 rows)`
`1017`		`-`
`1018`		`-\do`
`1019`		`- List of operators`
`1020`		`- Schema \| Name \| Left arg type \| Right arg type \| Result type \| Description`
`1021`		`---------+------+---------------+----------------+------------------+--------------------------`
`1022`		`- public \| && \| cube \| cube \| boolean \| overlaps`
`1023`		`- public \| < \| cube \| cube \| boolean \| lower than`
`1024`		`- public \| <= \| cube \| cube \| boolean \| lower than or equal to`
`1025`		`- public \| <> \| cube \| cube \| boolean \| different`
`1026`		`- public \| <@ \| cube \| cube \| boolean \| contained in`
`1027`		`- public \| <@> \| point \| point \| double precision \|`
`1028`		`- public \| = \| cube \| cube \| boolean \| same as`
`1029`		`- public \| > \| cube \| cube \| boolean \| greater than`
`1030`		`- public \| >= \| cube \| cube \| boolean \| greater than or equal to`
`1031`		`- public \| @ \| cube \| cube \| boolean \| contains`
`1032`		`- public \| @> \| cube \| cube \| boolean \| contains`
`1033`		`- public \| ~ \| cube \| cube \| boolean \| contained in`
`1034`		`-(12 rows)`
`1035`		`-`
`1036`	`968`	`drop extension cube; -- fail, earthdistance requires it`
`1037`	`969`	`ERROR: cannot drop extension cube because other objects depend on it`
`1038`	`970`	`DETAIL: extension earthdistance depends on extension cube`
`@@ -1049,64 +981,6 @@ HINT: You can drop extension cube instead.`
`1049`	`981`	`public \| cube \| multi-dimensional cube '(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)'`
`1050`	`982`	`(1 row)`
`1051`	`983`
`1052`		`-\df`
`1053`		`- List of functions`
`1054`		`- Schema \| Name \| Result data type \| Argument data types \| Type`
`1055`		`---------+-------------------+------------------+------------------------------------------+--------`
`1056`		`- public \| cube \| cube \| cube, double precision \| normal`
`1057`		`- public \| cube \| cube \| cube, double precision, double precision \| normal`
`1058`		`- public \| cube \| cube \| double precision \| normal`
`1059`		`- public \| cube \| cube \| double precision, double precision \| normal`
`1060`		`- public \| cube \| cube \| double precision[] \| normal`
`1061`		`- public \| cube \| cube \| double precision[], double precision[] \| normal`
`1062`		`- public \| cube_cmp \| integer \| cube, cube \| normal`
`1063`		`- public \| cube_contained \| boolean \| cube, cube \| normal`
`1064`		`- public \| cube_contains \| boolean \| cube, cube \| normal`
`1065`		`- public \| cube_dim \| integer \| cube \| normal`
`1066`		`- public \| cube_distance \| double precision \| cube, cube \| normal`
`1067`		`- public \| cube_enlarge \| cube \| cube, double precision, integer \| normal`
`1068`		`- public \| cube_eq \| boolean \| cube, cube \| normal`
`1069`		`- public \| cube_ge \| boolean \| cube, cube \| normal`
`1070`		`- public \| cube_gt \| boolean \| cube, cube \| normal`
`1071`		`- public \| cube_in \| cube \| cstring \| normal`
`1072`		`- public \| cube_inter \| cube \| cube, cube \| normal`
`1073`		`- public \| cube_is_point \| boolean \| cube \| normal`
`1074`		`- public \| cube_le \| boolean \| cube, cube \| normal`
`1075`		`- public \| cube_ll_coord \| double precision \| cube, integer \| normal`
`1076`		`- public \| cube_lt \| boolean \| cube, cube \| normal`
`1077`		`- public \| cube_ne \| boolean \| cube, cube \| normal`
`1078`		`- public \| cube_out \| cstring \| cube \| normal`
`1079`		`- public \| cube_overlap \| boolean \| cube, cube \| normal`
`1080`		`- public \| cube_size \| double precision \| cube \| normal`
`1081`		`- public \| cube_subset \| cube \| cube, integer[] \| normal`
`1082`		`- public \| cube_union \| cube \| cube, cube \| normal`
`1083`		`- public \| cube_ur_coord \| double precision \| cube, integer \| normal`
`1084`		`- public \| g_cube_compress \| internal \| internal \| normal`
`1085`		`- public \| g_cube_consistent \| boolean \| internal, cube, integer, oid, internal \| normal`
`1086`		`- public \| g_cube_decompress \| internal \| internal \| normal`
`1087`		`- public \| g_cube_penalty \| internal \| internal, internal, internal \| normal`
`1088`		`- public \| g_cube_picksplit \| internal \| internal, internal \| normal`
`1089`		`- public \| g_cube_same \| internal \| cube, cube, internal \| normal`
`1090`		`- public \| g_cube_union \| cube \| internal, internal \| normal`
`1091`		`-(35 rows)`
`1092`		`-`
`1093`		`-\do`
`1094`		`- List of operators`
`1095`		`- Schema \| Name \| Left arg type \| Right arg type \| Result type \| Description`
`1096`		`---------+------+---------------+----------------+-------------+--------------------------`
`1097`		`- public \| && \| cube \| cube \| boolean \| overlaps`
`1098`		`- public \| < \| cube \| cube \| boolean \| lower than`
`1099`		`- public \| <= \| cube \| cube \| boolean \| lower than or equal to`
`1100`		`- public \| <> \| cube \| cube \| boolean \| different`
`1101`		`- public \| <@ \| cube \| cube \| boolean \| contained in`
`1102`		`- public \| = \| cube \| cube \| boolean \| same as`
`1103`		`- public \| > \| cube \| cube \| boolean \| greater than`
`1104`		`- public \| >= \| cube \| cube \| boolean \| greater than or equal to`
`1105`		`- public \| @ \| cube \| cube \| boolean \| contains`
`1106`		`- public \| @> \| cube \| cube \| boolean \| contains`
`1107`		`- public \| ~ \| cube \| cube \| boolean \| contained in`
`1108`		`-(11 rows)`
`1109`		`-`
`1110`	`984`	`create table foo (f1 cube, f2 int);`
`1111`	`985`	`drop extension cube; -- fail, foo.f1 requires it`
`1112`	`986`	`ERROR: cannot drop extension cube because other objects depend on it`
`@@ -1161,64 +1035,6 @@ create extension cube with schema c;`
`1161`	`1035`	`c \| c.cube \| multi-dimensional cube '(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)'`
`1162`	`1036`	`(1 row)`
`1163`	`1037`
`1164`		`-\df c.*`
`1165`		`- List of functions`
`1166`		`- Schema \| Name \| Result data type \| Argument data types \| Type`
`1167`		`---------+-------------------+------------------+--------------------------------------------+--------`
`1168`		`- c \| cube \| c.cube \| c.cube, double precision \| normal`
`1169`		`- c \| cube \| c.cube \| c.cube, double precision, double precision \| normal`
`1170`		`- c \| cube \| c.cube \| double precision \| normal`
`1171`		`- c \| cube \| c.cube \| double precision, double precision \| normal`
`1172`		`- c \| cube \| c.cube \| double precision[] \| normal`
`1173`		`- c \| cube \| c.cube \| double precision[], double precision[] \| normal`
`1174`		`- c \| cube_cmp \| integer \| c.cube, c.cube \| normal`
`1175`		`- c \| cube_contained \| boolean \| c.cube, c.cube \| normal`
`1176`		`- c \| cube_contains \| boolean \| c.cube, c.cube \| normal`
`1177`		`- c \| cube_dim \| integer \| c.cube \| normal`
`1178`		`- c \| cube_distance \| double precision \| c.cube, c.cube \| normal`
`1179`		`- c \| cube_enlarge \| c.cube \| c.cube, double precision, integer \| normal`
`1180`		`- c \| cube_eq \| boolean \| c.cube, c.cube \| normal`
`1181`		`- c \| cube_ge \| boolean \| c.cube, c.cube \| normal`
`1182`		`- c \| cube_gt \| boolean \| c.cube, c.cube \| normal`
`1183`		`- c \| cube_in \| c.cube \| cstring \| normal`
`1184`		`- c \| cube_inter \| c.cube \| c.cube, c.cube \| normal`
`1185`		`- c \| cube_is_point \| boolean \| c.cube \| normal`
`1186`		`- c \| cube_le \| boolean \| c.cube, c.cube \| normal`
`1187`		`- c \| cube_ll_coord \| double precision \| c.cube, integer \| normal`
`1188`		`- c \| cube_lt \| boolean \| c.cube, c.cube \| normal`
`1189`		`- c \| cube_ne \| boolean \| c.cube, c.cube \| normal`
`1190`		`- c \| cube_out \| cstring \| c.cube \| normal`
`1191`		`- c \| cube_overlap \| boolean \| c.cube, c.cube \| normal`
`1192`		`- c \| cube_size \| double precision \| c.cube \| normal`
`1193`		`- c \| cube_subset \| c.cube \| c.cube, integer[] \| normal`
`1194`		`- c \| cube_union \| c.cube \| c.cube, c.cube \| normal`
`1195`		`- c \| cube_ur_coord \| double precision \| c.cube, integer \| normal`
`1196`		`- c \| g_cube_compress \| internal \| internal \| normal`
`1197`		`- c \| g_cube_consistent \| boolean \| internal, c.cube, integer, oid, internal \| normal`
`1198`		`- c \| g_cube_decompress \| internal \| internal \| normal`
`1199`		`- c \| g_cube_penalty \| internal \| internal, internal, internal \| normal`
`1200`		`- c \| g_cube_picksplit \| internal \| internal, internal \| normal`
`1201`		`- c \| g_cube_same \| internal \| c.cube, c.cube, internal \| normal`
`1202`		`- c \| g_cube_union \| c.cube \| internal, internal \| normal`
`1203`		`-(35 rows)`
`1204`		`-`
`1205`		`-\do c.*`
`1206`		`- List of operators`
`1207`		`- Schema \| Name \| Left arg type \| Right arg type \| Result type \| Description`
`1208`		`---------+------+---------------+----------------+-------------+--------------------------`
`1209`		`- c \| && \| c.cube \| c.cube \| boolean \| overlaps`
`1210`		`- c \| < \| c.cube \| c.cube \| boolean \| lower than`
`1211`		`- c \| <= \| c.cube \| c.cube \| boolean \| lower than or equal to`
`1212`		`- c \| <> \| c.cube \| c.cube \| boolean \| different`
`1213`		`- c \| <@ \| c.cube \| c.cube \| boolean \| contained in`
`1214`		`- c \| = \| c.cube \| c.cube \| boolean \| same as`
`1215`		`- c \| > \| c.cube \| c.cube \| boolean \| greater than`
`1216`		`- c \| >= \| c.cube \| c.cube \| boolean \| greater than or equal to`
`1217`		`- c \| @ \| c.cube \| c.cube \| boolean \| contains`
`1218`		`- c \| @> \| c.cube \| c.cube \| boolean \| contains`
`1219`		`- c \| ~ \| c.cube \| c.cube \| boolean \| contained in`
`1220`		`-(11 rows)`
`1221`		`-`
`1222`	`1038`	`create table foo (f1 c.cube, f2 int);`
`1223`	`1039`	`drop extension cube; -- fail, foo.f1 requires it`
`1224`	`1040`	`ERROR: cannot drop extension cube because other objects depend on it`

`‎contrib/earthdistance/sql/earthdistance.sql‎`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -305,8 +305,6 @@ SELECT abs(cube_distance(ll_to_earth(-30,-90), '(0)'::cube) / earth() - 1) <`
`305`	`305`
`306`	`306`	`-- list what's installed`
`307`	`307`	`\dT`
`308`		`-\df`
`309`		`-\do`
`310`	`308`
`311`	`309`	`drop extension cube;-- fail, earthdistance requires it`
`312`	`310`
`@@ -316,8 +314,6 @@ drop type cube; -- fail, extension cube requires it`
`316`	`314`
`317`	`315`	`-- list what's installed`
`318`	`316`	`\dT`
`319`		`-\df`
`320`		`-\do`
`321`	`317`
`322`	`318`	`createtablefoo (f1 cube, f2int);`
`323`	`319`
`@@ -341,8 +337,6 @@ create extension cube with schema c;`
`341`	`337`	`\df public.*`
`342`	`338`	`\do public.*`
`343`	`339`	`\dT c.*`
`344`		`-\df c.*`
`345`		`-\do c.*`
`346`	`340`
`347`	`341`	`createtablefoo (f1c.cube, f2int);`
`348`	`342`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitba69b41

File tree

2 files changed

2 files changed

`‎contrib/earthdistance/expected/earthdistance.out‎`

`‎contrib/earthdistance/sql/earthdistance.sql‎`

0 commit comments