Skip to content

Commit 46750f3

Browse files
committed
Fix common type test for GIS mode
1 parent 644fbb6 commit 46750f3

File tree

4 files changed

+0
-244
lines changed

4 files changed

+0
-244
lines changed

expected/13.15/with_gis_support/type.out

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -535,64 +535,3 @@ SELECT * FROM "type_DOUBLE"; -- OK, +- Inf
535535
SET client_min_messages TO ERROR;
536536
--Testcase 301: no details
537537
DROP EXTENSION sqlite_fdw CASCADE;
538-
<<<<<<< HEAD:expected/13.15/with_gis_support/type.out
539-
=======
540-
NOTICE: drop cascades to 57 other objects
541-
DETAIL: drop cascades to server sqlite_svr
542-
drop cascades to foreign table department
543-
drop cascades to foreign table employee
544-
drop cascades to foreign table empdata
545-
drop cascades to foreign table numbers
546-
drop cascades to foreign table t
547-
drop cascades to foreign table multiprimary
548-
drop cascades to foreign table columntest
549-
drop cascades to foreign table noprimary
550-
drop cascades to foreign table limittest
551-
drop cascades to foreign table grem1_1
552-
drop cascades to foreign table grem1_2
553-
drop cascades to foreign table case_exp
554-
drop cascades to foreign table "type_STRING"
555-
drop cascades to foreign table "type_BOOLEANpk"
556-
drop cascades to foreign table "type_BYTE"
557-
drop cascades to foreign table "type_SINT"
558-
drop cascades to foreign table "type_BINT"
559-
drop cascades to foreign table "type_INTEGER"
560-
drop cascades to foreign table "type_FLOAT"
561-
drop cascades to foreign table "type_DOUBLE"
562-
drop cascades to foreign table "type_TIMESTAMP"
563-
drop cascades to foreign table "type_BLOB"
564-
drop cascades to foreign table "type_DATE"
565-
drop cascades to foreign table "type_TIME"
566-
drop cascades to foreign table "type_BIT"
567-
drop cascades to foreign table "type_VARBIT"
568-
drop cascades to foreign table "type_UUIDpk"
569-
drop cascades to foreign table "type_UUID"
570-
drop cascades to foreign table "type_MACADDRpk"
571-
drop cascades to foreign table "type_MACADDR"
572-
drop cascades to foreign table "type_MACADDR8pk"
573-
drop cascades to foreign table "type_MACADDR8"
574-
drop cascades to foreign table "type_INETpk"
575-
drop cascades to foreign table "type_INET"
576-
drop cascades to foreign table "types_PostGIS"
577-
drop cascades to foreign table "BitT"
578-
drop cascades to foreign table notype
579-
drop cascades to foreign table typetest
580-
drop cascades to foreign table "type_TEXT"
581-
drop cascades to foreign table alltypetest
582-
drop cascades to foreign table shorty
583-
drop cascades to foreign table "A a"
584-
drop cascades to foreign table fts_table
585-
drop cascades to foreign table fts_table_data
586-
drop cascades to foreign table fts_table_idx
587-
drop cascades to foreign table fts_table_content
588-
drop cascades to foreign table fts_table_docsize
589-
drop cascades to foreign table fts_table_config
590-
drop cascades to foreign table "RO_RW_test"
591-
drop cascades to foreign table "Unicode data"
592-
drop cascades to foreign table "type_BOOLEAN_oper"
593-
drop cascades to foreign table "♁"
594-
drop cascades to foreign table "♂"
595-
drop cascades to foreign table type_json
596-
drop cascades to foreign table "type_BOOLEAN"
597-
drop cascades to server sqlite2
598-
>>>>>>> 8f05c67 (Initial inet data type implementation):expected/14.12/type_nogis.out

expected/14.12/with_gis_support/type.out

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -535,64 +535,3 @@ SELECT * FROM "type_DOUBLE"; -- OK, +- Inf
535535
SET client_min_messages TO ERROR;
536536
--Testcase 301: no details
537537
DROP EXTENSION sqlite_fdw CASCADE;
538-
<<<<<<< HEAD:expected/14.12/with_gis_support/type.out
539-
=======
540-
NOTICE: drop cascades to 57 other objects
541-
DETAIL: drop cascades to server sqlite_svr
542-
drop cascades to foreign table department
543-
drop cascades to foreign table employee
544-
drop cascades to foreign table empdata
545-
drop cascades to foreign table numbers
546-
drop cascades to foreign table t
547-
drop cascades to foreign table multiprimary
548-
drop cascades to foreign table columntest
549-
drop cascades to foreign table noprimary
550-
drop cascades to foreign table limittest
551-
drop cascades to foreign table grem1_1
552-
drop cascades to foreign table grem1_2
553-
drop cascades to foreign table case_exp
554-
drop cascades to foreign table "type_STRING"
555-
drop cascades to foreign table "type_BOOLEANpk"
556-
drop cascades to foreign table "type_BYTE"
557-
drop cascades to foreign table "type_SINT"
558-
drop cascades to foreign table "type_BINT"
559-
drop cascades to foreign table "type_INTEGER"
560-
drop cascades to foreign table "type_FLOAT"
561-
drop cascades to foreign table "type_DOUBLE"
562-
drop cascades to foreign table "type_TIMESTAMP"
563-
drop cascades to foreign table "type_BLOB"
564-
drop cascades to foreign table "type_DATE"
565-
drop cascades to foreign table "type_TIME"
566-
drop cascades to foreign table "type_BIT"
567-
drop cascades to foreign table "type_VARBIT"
568-
drop cascades to foreign table "type_UUIDpk"
569-
drop cascades to foreign table "type_UUID"
570-
drop cascades to foreign table "type_MACADDRpk"
571-
drop cascades to foreign table "type_MACADDR"
572-
drop cascades to foreign table "type_MACADDR8pk"
573-
drop cascades to foreign table "type_MACADDR8"
574-
drop cascades to foreign table "type_INETpk"
575-
drop cascades to foreign table "type_INET"
576-
drop cascades to foreign table "types_PostGIS"
577-
drop cascades to foreign table "BitT"
578-
drop cascades to foreign table notype
579-
drop cascades to foreign table typetest
580-
drop cascades to foreign table "type_TEXT"
581-
drop cascades to foreign table alltypetest
582-
drop cascades to foreign table shorty
583-
drop cascades to foreign table "A a"
584-
drop cascades to foreign table fts_table
585-
drop cascades to foreign table fts_table_data
586-
drop cascades to foreign table fts_table_idx
587-
drop cascades to foreign table fts_table_content
588-
drop cascades to foreign table fts_table_docsize
589-
drop cascades to foreign table fts_table_config
590-
drop cascades to foreign table "RO_RW_test"
591-
drop cascades to foreign table "Unicode data"
592-
drop cascades to foreign table "type_BOOLEAN_oper"
593-
drop cascades to foreign table "♁"
594-
drop cascades to foreign table "♂"
595-
drop cascades to foreign table type_json
596-
drop cascades to foreign table "type_BOOLEAN"
597-
drop cascades to server sqlite2
598-
>>>>>>> 8f05c67 (Initial inet data type implementation):expected/13.15/type_nogis.out

expected/15.7/with_gis_support/type.out

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -535,64 +535,3 @@ SELECT * FROM "type_DOUBLE"; -- OK, +- Inf
535535
SET client_min_messages TO ERROR;
536536
--Testcase 301: no details
537537
DROP EXTENSION sqlite_fdw CASCADE;
538-
<<<<<<< HEAD:expected/15.7/with_gis_support/type.out
539-
=======
540-
NOTICE: drop cascades to 57 other objects
541-
DETAIL: drop cascades to server sqlite_svr
542-
drop cascades to foreign table department
543-
drop cascades to foreign table employee
544-
drop cascades to foreign table empdata
545-
drop cascades to foreign table numbers
546-
drop cascades to foreign table t
547-
drop cascades to foreign table multiprimary
548-
drop cascades to foreign table columntest
549-
drop cascades to foreign table noprimary
550-
drop cascades to foreign table limittest
551-
drop cascades to foreign table grem1_1
552-
drop cascades to foreign table grem1_2
553-
drop cascades to foreign table case_exp
554-
drop cascades to foreign table "type_STRING"
555-
drop cascades to foreign table "type_BOOLEANpk"
556-
drop cascades to foreign table "type_BYTE"
557-
drop cascades to foreign table "type_SINT"
558-
drop cascades to foreign table "type_BINT"
559-
drop cascades to foreign table "type_INTEGER"
560-
drop cascades to foreign table "type_FLOAT"
561-
drop cascades to foreign table "type_DOUBLE"
562-
drop cascades to foreign table "type_TIMESTAMP"
563-
drop cascades to foreign table "type_BLOB"
564-
drop cascades to foreign table "type_DATE"
565-
drop cascades to foreign table "type_TIME"
566-
drop cascades to foreign table "type_BIT"
567-
drop cascades to foreign table "type_VARBIT"
568-
drop cascades to foreign table "type_UUIDpk"
569-
drop cascades to foreign table "type_UUID"
570-
drop cascades to foreign table "type_MACADDRpk"
571-
drop cascades to foreign table "type_MACADDR"
572-
drop cascades to foreign table "type_MACADDR8pk"
573-
drop cascades to foreign table "type_MACADDR8"
574-
drop cascades to foreign table "type_INETpk"
575-
drop cascades to foreign table "type_INET"
576-
drop cascades to foreign table "types_PostGIS"
577-
drop cascades to foreign table "BitT"
578-
drop cascades to foreign table notype
579-
drop cascades to foreign table typetest
580-
drop cascades to foreign table "type_TEXT"
581-
drop cascades to foreign table alltypetest
582-
drop cascades to foreign table shorty
583-
drop cascades to foreign table "A a"
584-
drop cascades to foreign table fts_table
585-
drop cascades to foreign table fts_table_data
586-
drop cascades to foreign table fts_table_idx
587-
drop cascades to foreign table fts_table_content
588-
drop cascades to foreign table fts_table_docsize
589-
drop cascades to foreign table fts_table_config
590-
drop cascades to foreign table "RO_RW_test"
591-
drop cascades to foreign table "Unicode data"
592-
drop cascades to foreign table "type_BOOLEAN_oper"
593-
drop cascades to foreign table "♁"
594-
drop cascades to foreign table "♂"
595-
drop cascades to foreign table type_json
596-
drop cascades to foreign table "type_BOOLEAN"
597-
drop cascades to server sqlite2
598-
>>>>>>> 8f05c67 (Initial inet data type implementation):expected/16.3/type_nogis.out

expected/16.3/with_gis_support/type.out

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -535,64 +535,3 @@ SELECT * FROM "type_DOUBLE"; -- OK, +- Inf
535535
SET client_min_messages TO ERROR;
536536
--Testcase 301: no details
537537
DROP EXTENSION sqlite_fdw CASCADE;
538-
<<<<<<< HEAD:expected/16.3/with_gis_support/type.out
539-
=======
540-
NOTICE: drop cascades to 57 other objects
541-
DETAIL: drop cascades to server sqlite_svr
542-
drop cascades to foreign table department
543-
drop cascades to foreign table employee
544-
drop cascades to foreign table empdata
545-
drop cascades to foreign table numbers
546-
drop cascades to foreign table t
547-
drop cascades to foreign table multiprimary
548-
drop cascades to foreign table columntest
549-
drop cascades to foreign table noprimary
550-
drop cascades to foreign table limittest
551-
drop cascades to foreign table grem1_1
552-
drop cascades to foreign table grem1_2
553-
drop cascades to foreign table case_exp
554-
drop cascades to foreign table "type_STRING"
555-
drop cascades to foreign table "type_BOOLEANpk"
556-
drop cascades to foreign table "type_BYTE"
557-
drop cascades to foreign table "type_SINT"
558-
drop cascades to foreign table "type_BINT"
559-
drop cascades to foreign table "type_INTEGER"
560-
drop cascades to foreign table "type_FLOAT"
561-
drop cascades to foreign table "type_DOUBLE"
562-
drop cascades to foreign table "type_TIMESTAMP"
563-
drop cascades to foreign table "type_BLOB"
564-
drop cascades to foreign table "type_DATE"
565-
drop cascades to foreign table "type_TIME"
566-
drop cascades to foreign table "type_BIT"
567-
drop cascades to foreign table "type_VARBIT"
568-
drop cascades to foreign table "type_UUIDpk"
569-
drop cascades to foreign table "type_UUID"
570-
drop cascades to foreign table "type_MACADDRpk"
571-
drop cascades to foreign table "type_MACADDR"
572-
drop cascades to foreign table "type_MACADDR8pk"
573-
drop cascades to foreign table "type_MACADDR8"
574-
drop cascades to foreign table "type_INETpk"
575-
drop cascades to foreign table "type_INET"
576-
drop cascades to foreign table "types_PostGIS"
577-
drop cascades to foreign table "BitT"
578-
drop cascades to foreign table notype
579-
drop cascades to foreign table typetest
580-
drop cascades to foreign table "type_TEXT"
581-
drop cascades to foreign table alltypetest
582-
drop cascades to foreign table shorty
583-
drop cascades to foreign table "A a"
584-
drop cascades to foreign table fts_table
585-
drop cascades to foreign table fts_table_data
586-
drop cascades to foreign table fts_table_idx
587-
drop cascades to foreign table fts_table_content
588-
drop cascades to foreign table fts_table_docsize
589-
drop cascades to foreign table fts_table_config
590-
drop cascades to foreign table "RO_RW_test"
591-
drop cascades to foreign table "Unicode data"
592-
drop cascades to foreign table "type_BOOLEAN_oper"
593-
drop cascades to foreign table "♁"
594-
drop cascades to foreign table "♂"
595-
drop cascades to foreign table type_json
596-
drop cascades to foreign table "type_BOOLEAN"
597-
drop cascades to server sqlite2
598-
>>>>>>> 8f05c67 (Initial inet data type implementation):expected/15.7/type_nogis.out

0 commit comments

Comments
 (0)