Skip to content

Commit 9257943

Browse files
mkgrgismkgrgis
committed
Fix PostGIS TCs
1 parent 4b5216d commit 9257943

10 files changed

Lines changed: 436 additions & 239 deletions

File tree

‎expected/13.15/with_gis_support/auto_import.out‎

Lines changed: 79 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,12 @@ SELECT * FROM ft;
7171
contrib_regression | public | RO_RW_test | contrib_regression | sqlite_svr | 51
7272
contrib_regression | public | Unicode data | contrib_regression | sqlite_svr | 52
7373
contrib_regression | public | type_BOOLEAN_oper | contrib_regression | sqlite_svr | 53
74-
contrib_regression | public | ♁ | contrib_regression | sqlite_svr | 54
75-
contrib_regression | public | ♂ | contrib_regression | sqlite_svr | 55
76-
(55 rows)
74+
contrib_regression | public | ret_base | contrib_regression | sqlite_svr | 54
75+
contrib_regression | public | ret_j1t | contrib_regression | sqlite_svr | 55
76+
contrib_regression | public | ret_j2t | contrib_regression | sqlite_svr | 56
77+
contrib_regression | public | ♁ | contrib_regression | sqlite_svr | 57
78+
contrib_regression | public | ♂ | contrib_regression | sqlite_svr | 58
79+
(58 rows)
7780

7881
--Testcase 07:
7982
CREATE VIEW fc AS (
@@ -232,20 +235,29 @@ SELECT n, table_name, column_name, tab_no, def, "null", data_type, udt_schema, u
232235
53 | type_BOOLEAN_oper | b1 | 3 | | YES | bytea | pg_catalog | bytea
233236
53 | type_BOOLEAN_oper | i2 | 4 | | YES | bytea | pg_catalog | bytea
234237
53 | type_BOOLEAN_oper | b2 | 5 | | YES | bytea | pg_catalog | bytea
235-
54 | ♁ | geom | 1 | | NO | USER-DEFINED | public | geometry
236-
54 | ♁ | osm_type | 2 | | NO | character varying | pg_catalog | varchar
237-
54 | ♁ | osm_id | 3 | | NO | bigint | pg_catalog | int8
238-
54 | ♁ | ver | 4 | | NO | bigint | pg_catalog | int8
239-
54 | ♁ | arr | 5 | | YES | text | pg_catalog | text
240-
54 | ♁ | t | 6 | | YES | jsonb | pg_catalog | jsonb
241-
55 | ♂ | id | 1 | | YES | bigint | pg_catalog | int8
242-
55 | ♂ | UAI | 2 | | YES | character varying | pg_catalog | varchar
243-
55 | ♂ | ⌖ | 3 | | YES | USER-DEFINED | public | geometry
244-
55 | ♂ | geom | 4 | | YES | USER-DEFINED | public | geometry
245-
55 | ♂ | t₀ | 5 | | YES | date | pg_catalog | date
246-
55 | ♂ | class | 6 | | YES | text | pg_catalog | text
247-
55 | ♂ | URL | 7 | | YES | character varying | pg_catalog | varchar
248-
(159 rows)
238+
54 | ret_base | c1 | 1 | | YES | bigint | pg_catalog | int8
239+
54 | ret_base | c2 | 2 | | YES | bigint | pg_catalog | int8
240+
54 | ret_base | c3 | 3 | | YES | text | pg_catalog | text
241+
55 | ret_j1t | c1 | 1 | | YES | bigint | pg_catalog | int8
242+
55 | ret_j1t | c2 | 2 | | YES | bigint | pg_catalog | int8
243+
55 | ret_j1t | c3 | 3 | | YES | double precision | pg_catalog | float8
244+
56 | ret_j2t | c1 | 1 | | YES | bigint | pg_catalog | int8
245+
56 | ret_j2t | c2 | 2 | | YES | bigint | pg_catalog | int8
246+
56 | ret_j2t | c3 | 3 | | YES | double precision | pg_catalog | float8
247+
57 | ♁ | geom | 1 | | NO | USER-DEFINED | public | geometry
248+
57 | ♁ | osm_type | 2 | | NO | character varying | pg_catalog | varchar
249+
57 | ♁ | osm_id | 3 | | NO | bigint | pg_catalog | int8
250+
57 | ♁ | ver | 4 | | NO | bigint | pg_catalog | int8
251+
57 | ♁ | arr | 5 | | YES | text | pg_catalog | text
252+
57 | ♁ | t | 6 | | YES | jsonb | pg_catalog | jsonb
253+
58 | ♂ | id | 1 | | YES | bigint | pg_catalog | int8
254+
58 | ♂ | UAI | 2 | | YES | character varying | pg_catalog | varchar
255+
58 | ♂ | ⌖ | 3 | | YES | USER-DEFINED | public | geometry
256+
58 | ♂ | geom | 4 | | YES | USER-DEFINED | public | geometry
257+
58 | ♂ | t₀ | 5 | | YES | date | pg_catalog | date
258+
58 | ♂ | class | 6 | | YES | text | pg_catalog | text
259+
58 | ♂ | URL | 7 | | YES | character varying | pg_catalog | varchar
260+
(168 rows)
249261

250262
--Testcase 09: size/length/presision metadata
251263
SELECT n, table_name, column_name, tab_no, c_max_len, c_oct_len, num_pr, num_rdx, num_sc, dtp FROM fc;
@@ -397,20 +409,29 @@ SELECT n, table_name, column_name, tab_no, c_max_len, c_oct_len, num_pr, num_rdx
397409
53 | type_BOOLEAN_oper | b1 | 3 | | | | | |
398410
53 | type_BOOLEAN_oper | i2 | 4 | | | | | |
399411
53 | type_BOOLEAN_oper | b2 | 5 | | | | | |
400-
54 | ♁ | geom | 1 | | | | | |
401-
54 | ♁ | osm_type | 2 | 16 | 64 | | | |
402-
54 | ♁ | osm_id | 3 | | | 64 | 2 | 0 |
403-
54 | ♁ | ver | 4 | | | 64 | 2 | 0 |
404-
54 | ♁ | arr | 5 | | 1073741824 | | | |
405-
54 | ♁ | t | 6 | | | | | |
406-
55 | ♂ | id | 1 | | | 64 | 2 | 0 |
407-
55 | ♂ | UAI | 2 | 254 | 1016 | | | |
408-
55 | ♂ | ⌖ | 3 | | | | | |
409-
55 | ♂ | geom | 4 | | | | | |
410-
55 | ♂ | t₀ | 5 | | | | | | 0
411-
55 | ♂ | class | 6 | | 1073741824 | | | |
412-
55 | ♂ | URL | 7 | 80 | 320 | | | |
413-
(159 rows)
412+
54 | ret_base | c1 | 1 | | | 64 | 2 | 0 |
413+
54 | ret_base | c2 | 2 | | | 64 | 2 | 0 |
414+
54 | ret_base | c3 | 3 | | 1073741824 | | | |
415+
55 | ret_j1t | c1 | 1 | | | 64 | 2 | 0 |
416+
55 | ret_j1t | c2 | 2 | | | 64 | 2 | 0 |
417+
55 | ret_j1t | c3 | 3 | | | 53 | 2 | |
418+
56 | ret_j2t | c1 | 1 | | | 64 | 2 | 0 |
419+
56 | ret_j2t | c2 | 2 | | | 64 | 2 | 0 |
420+
56 | ret_j2t | c3 | 3 | | | 53 | 2 | |
421+
57 | ♁ | geom | 1 | | | | | |
422+
57 | ♁ | osm_type | 2 | 16 | 64 | | | |
423+
57 | ♁ | osm_id | 3 | | | 64 | 2 | 0 |
424+
57 | ♁ | ver | 4 | | | 64 | 2 | 0 |
425+
57 | ♁ | arr | 5 | | 1073741824 | | | |
426+
57 | ♁ | t | 6 | | | | | |
427+
58 | ♂ | id | 1 | | | 64 | 2 | 0 |
428+
58 | ♂ | UAI | 2 | 254 | 1016 | | | |
429+
58 | ♂ | ⌖ | 3 | | | | | |
430+
58 | ♂ | geom | 4 | | | | | |
431+
58 | ♂ | t₀ | 5 | | | | | | 0
432+
58 | ♂ | class | 6 | | 1073741824 | | | |
433+
58 | ♂ | URL | 7 | 80 | 320 | | | |
434+
(168 rows)
414435

415436
--Testcase 10: other metadata
416437
SELECT n, table_name, column_name, tab_no, it, ip, max_crd, dtdid, sref, ididt, isgen FROM fc;
@@ -562,20 +583,29 @@ SELECT n, table_name, column_name, tab_no, it, ip, max_crd, dtdid, sref, ididt,
562583
53 | type_BOOLEAN_oper | b1 | 3 | | | | 3 | NO | NO | NEVER
563584
53 | type_BOOLEAN_oper | i2 | 4 | | | | 4 | NO | NO | NEVER
564585
53 | type_BOOLEAN_oper | b2 | 5 | | | | 5 | NO | NO | NEVER
565-
54 | ♁ | geom | 1 | | | | 1 | NO | NO | NEVER
566-
54 | ♁ | osm_type | 2 | | | | 2 | NO | NO | NEVER
567-
54 | ♁ | osm_id | 3 | | | | 3 | NO | NO | NEVER
568-
54 | ♁ | ver | 4 | | | | 4 | NO | NO | NEVER
569-
54 | ♁ | arr | 5 | | | | 5 | NO | NO | NEVER
570-
54 | ♁ | t | 6 | | | | 6 | NO | NO | NEVER
571-
55 | ♂ | id | 1 | | | | 1 | NO | NO | NEVER
572-
55 | ♂ | UAI | 2 | | | | 2 | NO | NO | NEVER
573-
55 | ♂ | ⌖ | 3 | | | | 3 | NO | NO | NEVER
574-
55 | ♂ | geom | 4 | | | | 4 | NO | NO | NEVER
575-
55 | ♂ | t₀ | 5 | | | | 5 | NO | NO | NEVER
576-
55 | ♂ | class | 6 | | | | 6 | NO | NO | NEVER
577-
55 | ♂ | URL | 7 | | | | 7 | NO | NO | NEVER
578-
(159 rows)
586+
54 | ret_base | c1 | 1 | | | | 1 | NO | NO | NEVER
587+
54 | ret_base | c2 | 2 | | | | 2 | NO | NO | NEVER
588+
54 | ret_base | c3 | 3 | | | | 3 | NO | NO | NEVER
589+
55 | ret_j1t | c1 | 1 | | | | 1 | NO | NO | NEVER
590+
55 | ret_j1t | c2 | 2 | | | | 2 | NO | NO | NEVER
591+
55 | ret_j1t | c3 | 3 | | | | 3 | NO | NO | NEVER
592+
56 | ret_j2t | c1 | 1 | | | | 1 | NO | NO | NEVER
593+
56 | ret_j2t | c2 | 2 | | | | 2 | NO | NO | NEVER
594+
56 | ret_j2t | c3 | 3 | | | | 3 | NO | NO | NEVER
595+
57 | ♁ | geom | 1 | | | | 1 | NO | NO | NEVER
596+
57 | ♁ | osm_type | 2 | | | | 2 | NO | NO | NEVER
597+
57 | ♁ | osm_id | 3 | | | | 3 | NO | NO | NEVER
598+
57 | ♁ | ver | 4 | | | | 4 | NO | NO | NEVER
599+
57 | ♁ | arr | 5 | | | | 5 | NO | NO | NEVER
600+
57 | ♁ | t | 6 | | | | 6 | NO | NO | NEVER
601+
58 | ♂ | id | 1 | | | | 1 | NO | NO | NEVER
602+
58 | ♂ | UAI | 2 | | | | 2 | NO | NO | NEVER
603+
58 | ♂ | ⌖ | 3 | | | | 3 | NO | NO | NEVER
604+
58 | ♂ | geom | 4 | | | | 4 | NO | NO | NEVER
605+
58 | ♂ | t₀ | 5 | | | | 5 | NO | NO | NEVER
606+
58 | ♂ | class | 6 | | | | 6 | NO | NO | NEVER
607+
58 | ♂ | URL | 7 | | | | 7 | NO | NO | NEVER
608+
(168 rows)
579609

580610
--Testcase 11:
581611
SELECT * FROM information_schema.column_options
@@ -624,7 +654,10 @@ IN (SELECT foreign_table_catalog, foreign_table_schema, foreign_table_name FROM
624654
contrib_regression | public | fts_table_config | k | key | true
625655
contrib_regression | public | RO_RW_test | i | key | true
626656
contrib_regression | public | Unicode data | i | key | true
627-
(41 rows)
657+
contrib_regression | public | ret_base | c1 | key | true
658+
contrib_regression | public | ret_j1t | c1 | key | true
659+
contrib_regression | public | ret_j2t | c1 | key | true
660+
(44 rows)
628661

629662
--Testcase 11:
630663
DROP VIEW fc;

0 commit comments

Comments
 (0)