Prepare rebase to auto import test PR

Author: mkgrgis

Makefile

@@ -17,21 +17,23 @@ DATA = sqlite_fdw--1.0.sql sqlite_fdw--1.0--1.1.sql
 
 ifdef ENABLE_GIS
 PG_CFLAGS += -DSQLITE_FDW_GIS_ENABLE
-GISTEST = postgis
-GISPREF = ok
+GIS_DEP_TESTS_DIR = with_gis_support
+GIS_TEST = postgis
+$(info  There is PostGIS support for SQLite FDW)
 else
-GISTEST = nogis
-GISPREF = no
+GIS_DEP_TESTS_DIR = without_gis_support
+GIS_TEST = nogis
+$(info  There is NO PostGIS support for SQLite FDW)
 endif
 
 # Tests for PostgreSQL data types support
-TYPETESTS = types/bitstring types/bool types/float4 types/float8 types/int4 types/int8 types/numeric types/$(GISTEST) types/macaddr types/macaddr8 types/out_of_range types/timestamp types/uuid
+DATA_TYPE_TESTS = types/bitstring types/bool types/float4 types/float8 types/int4 types/int8 types/numeric  types/macaddr types/macaddr8 types/out_of_range types/timestamp types/uuid
 # Tests with different versions with GIS support and without GIS support
-GISDEPTESTS = gis_$(GISPREF)/type gis_$(GISPREF)/auto_import
+GIS_DEP_TESTS = $(GIS_DEP_TESTS_DIR)/type $(GIS_DEP_TESTS_DIR)/auto_import $(GIS_DEP_TESTS_DIR)/$(GIS_TEST)
 
 ifndef REGRESS
 # System tests, full default sequence
-REGRESS = libsqlite extra/sqlite_fdw_post $(TYPETESTS) extra/join extra/limit extra/aggregates extra/prepare extra/select_having extra/select extra/insert extra/update extra/encodings sqlite_fdw aggregate selectfunc $(GISDEPTESTS)
+REGRESS = libsqlite extra/sqlite_fdw_post $(DATA_TYPE_TESTS) extra/join extra/limit extra/aggregates extra/prepare extra/select_having extra/select extra/insert extra/update extra/encodings sqlite_fdw aggregate selectfunc $(GIS_DEP_TESTS)
 endif
 
 # Other encodings also are tested. Client encoding should be UTF-8-
@@ -82,7 +84,7 @@ endif
 REGRESS := $(addprefix $(REGRESS_PREFIX_SUB)/,$(REGRESS))
 $(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/extra)
 $(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/types)
-$(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/gis_$(GISPREF))
+$(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/$(GIS_DEP_TESTS_DIR))
 
 # $(info    ENABLE_GIS      is $(ENABLE_GIS))
  $(info    SHLIB_LINK      is $(SHLIB_LINK))

connection.c

@@ -199,7 +199,6 @@ sqlite_open_db(const char *dbpath, int flags)
 		ereport(ERROR,
 				(errcode(ERRCODE_FDW_UNABLE_TO_ESTABLISH_CONNECTION),
 				 errmsg("Failed to open SQLite DB, file '%s', result code %d", dbpath, rc)));
-	sqlite3_extended_result_codes(conn, true);
 	/* make 'LIKE' of SQLite case sensitive like PostgreSQL */
 	rc = sqlite3_exec(conn, "pragma case_sensitive_like=1",
 					  NULL, NULL, &err);
@@ -392,13 +391,14 @@ sqlite_begin_remote_xact(ConnCacheEntry *entry)
 
 
 /*
- * Report an sqlite execution error
+ * Report an SQLite execution error.
  */
 void
 sqlitefdw_report_error(int elevel, sqlite3_stmt * stmt, sqlite3 * conn,
 					   const char *sql, int rc)
 {
 	const char *message = sqlite3_errmsg(conn);
+	int			erc = sqlite3_extended_errcode(conn);
 	int			sqlstate = ERRCODE_FDW_ERROR;
 
 	/* copy sql before callling another SQLite API */
@@ -415,11 +415,10 @@ sqlitefdw_report_error(int elevel, sqlite3_stmt * stmt, sqlite3 * conn,
 			(errcode(sqlstate),
 			 errmsg("Failed to execute remote SQL"),
 			 errcontext("SQL query: %s", sql ? sql : ""),
-			 errhint("SQLite error '%s', SQLite result code %d", message ? message : "", rc)
+			 errhint("SQLite error '%s', SQLite primary result code %d, extended result code %d", message ? message : "", rc, erc)
 			));
 }
 
-
 /*
  * sqlitefdw_xact_callback --- cleanup at main-transaction end.
  */

expected/13.15/extra/insert.out

@@ -11,7 +11,7 @@ CREATE FOREIGN TABLE inserttest01 (col1 int4, col2 int4 NOT NULL, col3 text defa
 --Testcase 1:
 insert into inserttest01 (col1, col2, col3) values (DEFAULT, DEFAULT, DEFAULT);
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'NOT NULL constraint failed: inserttest01.col2', SQLite result code 1299
+HINT:  SQLite error 'NOT NULL constraint failed: inserttest01.col2', SQLite primary result code 19, extended result code 1299
 CONTEXT:  SQL query: INSERT INTO main."inserttest01"(`col1`, `col2`, `col3`) VALUES (?, ?, ?)
 --Testcase 2:
 insert into inserttest01 (col2, col3) values (3, DEFAULT);

expected/13.15/extra/sqlite_fdw_post.out

@@ -6437,7 +6437,7 @@ ALTER FOREIGN TABLE ft1_constraint RENAME TO ft1;
 --Testcase 319:
 INSERT INTO ft1(c1, c2) VALUES(11, 12);  -- duplicate key
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'UNIQUE constraint failed: t1_constraint.c1', SQLite result code 1555
+HINT:  SQLite error 'UNIQUE constraint failed: t1_constraint.c1', SQLite primary result code 19, extended result code 1555
 CONTEXT:  SQL query: INSERT INTO main."t1_constraint"(`c1`, `c2`, `c3`, `c4`, `c5`, `c6`, `c7`, `c8`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 --Testcase 320:
 INSERT INTO ft1(c1, c2) VALUES(11, 12) ON CONFLICT (c1, c2) DO NOTHING; -- unsupported
@@ -6448,12 +6448,12 @@ ERROR:  there is no unique or exclusion constraint matching the ON CONFLICT spec
 --Testcase 743:
 INSERT INTO ft1(c1, c2) VALUES(1111, -2);  -- c2positive
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite result code 275
+HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite primary result code 19, extended result code 275
 CONTEXT:  SQL query: INSERT INTO main."t1_constraint"(`c1`, `c2`, `c3`, `c4`, `c5`, `c6`, `c7`, `c8`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 --Testcase 744:
 UPDATE ft1 SET c2 = -c2 WHERE c1 = 1;  -- c2positive
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite result code 275
+HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite primary result code 19, extended result code 275
 CONTEXT:  SQL query: UPDATE main."t1_constraint" SET `c2` = (- `c2`) WHERE ((`c1` = 1))
 --Testcase 750:
 ALTER FOREIGN TABLE ft1 RENAME TO ft1_constraint;
@@ -6856,12 +6856,12 @@ RESET constraint_exclusion;
 --Testcase 745:
 INSERT INTO ft1(c1, c2) VALUES(1111, -2);  -- c2positive
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite result code 275
+HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite primary result code 19, extended result code 275
 CONTEXT:  SQL query: INSERT INTO main."t1_constraint"(`c1`, `c2`, `c3`, `c4`, `c5`, `c6`, `c7`, `c8`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
 --Testcase 746:
 UPDATE ft1 SET c2 = -c2 WHERE c1 = 1;  -- c2positive
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite result code 275
+HINT:  SQLite error 'CHECK constraint failed: c2 >= 0', SQLite primary result code 19, extended result code 275
 CONTEXT:  SQL query: UPDATE main."t1_constraint" SET `c2` = (- `c2`) WHERE ((`c1` = 1))
 ALTER FOREIGN TABLE ft1 DROP CONSTRAINT ft1_c2positive;
 -- But inconsistent check constraints provide inconsistent results

expected/13.15/sqlite_fdw.out

@@ -576,7 +576,7 @@ SELECT * from numbers;
 --Testcase 68:
 INSERT INTO numbers VALUES(1, 'One');
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'UNIQUE constraint failed: numbers.b', SQLite result code 2067
+HINT:  SQLite error 'UNIQUE constraint failed: numbers.b', SQLite primary result code 19, extended result code 2067
 CONTEXT:  SQL query: INSERT INTO main."numbers"(`a`, `b`) VALUES (?, ?)
 --Testcase 69:
 DELETE from numbers;
@@ -590,7 +590,7 @@ COMMIT;
 --Testcase 72:
 UPDATE numbers SET b='Two' WHERE a = 1; 
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'UNIQUE constraint failed: numbers.b', SQLite result code 2067
+HINT:  SQLite error 'UNIQUE constraint failed: numbers.b', SQLite primary result code 19, extended result code 2067
 CONTEXT:  SQL query: UPDATE main."numbers" SET `b` = 'Two' WHERE ((`a` = 1))
 --Testcase 73:
 SELECT * from numbers;

expected/13.15/types/bitstring.out

@@ -5,8 +5,6 @@ CREATE EXTENSION sqlite_fdw;
 --Testcase 002:
 CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
 OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
---Testcase 003:
-CREATE SERVER sqlite2 FOREIGN DATA WRAPPER sqlite_fdw;
 --Testcase 02:
 CREATE FOREIGN TABLE "type_BIT"( "i" int OPTIONS (key 'true'), "b" bit(6)) SERVER sqlite_svr OPTIONS (table 'type_BIT');
 --Testcase 03:
@@ -801,10 +799,9 @@ SELECT "i", "b" FROM "type_BIT" WHERE (~ "b") IS NOT NULL;
 
 --Testcase 005:
 DROP EXTENSION sqlite_fdw CASCADE;
-NOTICE:  drop cascades to 6 other objects
+NOTICE:  drop cascades to 5 other objects
 DETAIL:  drop cascades to server sqlite_svr
 drop cascades to foreign table "type_BIT"
 drop cascades to foreign table "type_BIT+"
 drop cascades to foreign table "type_VARBIT"
 drop cascades to foreign table "type_VARBIT+"
-drop cascades to server sqlite2

expected/13.15/types/bool.out

@@ -5,8 +5,6 @@ CREATE EXTENSION sqlite_fdw;
 --Testcase 001:
 CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
 OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
---Testcase 002:
-CREATE SERVER sqlite2 FOREIGN DATA WRAPPER sqlite_fdw;
 --Testcase 01:
 CREATE FOREIGN TABLE "type_BOOLEAN" (i int OPTIONS (key 'true'), b bool) SERVER sqlite_svr;
 --Testcase 02:
@@ -239,7 +237,7 @@ INSERT INTO "type_BOOLEANpk" VALUES (FALSE);
 --Testcase 44: ERR - primary key
 INSERT INTO "type_BOOLEANpk" VALUES (TRUE);
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'UNIQUE constraint failed: type_BOOLEANpk.col', SQLite result code 1555
+HINT:  SQLite error 'UNIQUE constraint failed: type_BOOLEANpk.col', SQLite primary result code 19, extended result code 1555
 CONTEXT:  SQL query: INSERT INTO main."type_BOOLEANpk"(`col`) VALUES (?)
 --Testcase 45:
 DELETE FROM "type_BOOLEANpk";
@@ -1267,10 +1265,9 @@ SELECT DISTINCT b1, b2 FROM "type_BOOLEAN_oper";
 DELETE FROM "type_BOOLEAN";
 --Testcase 003:
 DROP EXTENSION sqlite_fdw CASCADE;
-NOTICE:  drop cascades to 6 other objects
+NOTICE:  drop cascades to 5 other objects
 DETAIL:  drop cascades to server sqlite_svr
 drop cascades to foreign table "type_BOOLEAN"
 drop cascades to foreign table "type_BOOLEAN+"
 drop cascades to foreign table "type_BOOLEANpk"
 drop cascades to foreign table "type_BOOLEAN_oper"
-drop cascades to server sqlite2

expected/13.15/types/macaddr.out

@@ -5,8 +5,6 @@ CREATE EXTENSION sqlite_fdw;
 --Testcase 002:
 CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
 OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
---Testcase 003:
-CREATE SERVER sqlite2 FOREIGN DATA WRAPPER sqlite_fdw;
 --Testcase 009:
 CREATE FOREIGN TABLE "type_MACADDR"( "i" int OPTIONS (key 'true'), "m" macaddr) SERVER sqlite_svr OPTIONS (table 'type_MACADDR');
 --Testcase 010:
@@ -840,7 +838,7 @@ ALTER FOREIGN TABLE "type_MACADDRpk" ALTER COLUMN col OPTIONS (SET column_type '
 --Testcase 158: ERR - primary key
 INSERT INTO "type_MACADDRpk" VALUES ('01-02-03-04-05-06');
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'UNIQUE constraint failed: type_MACADDRpk.col', SQLite result code 1555
+HINT:  SQLite error 'UNIQUE constraint failed: type_MACADDRpk.col', SQLite primary result code 19, extended result code 1555
 CONTEXT:  SQL query: INSERT INTO main."type_MACADDRpk"(`col`) VALUES (?)
 --Testcase 159:
 SELECT * FROM "type_MACADDRpk";
@@ -946,9 +944,8 @@ SELECT "m" != '01:02:03:04:05:06' FROM "type_MACADDR";
 
 --Testcase 200:
 DROP EXTENSION sqlite_fdw CASCADE;
-NOTICE:  drop cascades to 5 other objects
+NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to server sqlite_svr
 drop cascades to foreign table "type_MACADDR"
 drop cascades to foreign table "type_MACADDR+"
 drop cascades to foreign table "type_MACADDRpk"
-drop cascades to server sqlite2

expected/13.15/types/macaddr8.out

@@ -5,8 +5,6 @@ CREATE EXTENSION sqlite_fdw;
 --Testcase 002:
 CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
 OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
---Testcase 003:
-CREATE SERVER sqlite2 FOREIGN DATA WRAPPER sqlite_fdw;
 --Testcase 009:
 CREATE FOREIGN TABLE "type_MACADDR8"( "i" int OPTIONS (key 'true'), "m" macaddr8) SERVER sqlite_svr OPTIONS (table 'type_MACADDR8');
 --Testcase 010:
@@ -841,7 +839,7 @@ ERROR:  option "column_type" provided more than once
 --Testcase 158: ERR - primary key
 INSERT INTO "type_MACADDR8pk" VALUES ('01-02-03-04-05-06-07-08');
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'UNIQUE constraint failed: type_MACADDR8pk.col', SQLite result code 1555
+HINT:  SQLite error 'UNIQUE constraint failed: type_MACADDR8pk.col', SQLite primary result code 19, extended result code 1555
 CONTEXT:  SQL query: INSERT INTO main."type_MACADDR8pk"(`col`) VALUES (?)
 --Testcase 159:
 SELECT * FROM "type_MACADDR8pk";
@@ -947,9 +945,8 @@ SELECT "m" != '01:02:03:04:05:06:07:08' FROM "type_MACADDR8";
 
 --Testcase 200:
 DROP EXTENSION sqlite_fdw CASCADE;
-NOTICE:  drop cascades to 5 other objects
+NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to server sqlite_svr
 drop cascades to foreign table "type_MACADDR8"
 drop cascades to foreign table "type_MACADDR8+"
 drop cascades to foreign table "type_MACADDR8pk"
-drop cascades to server sqlite2

expected/13.15/types/uuid.out

@@ -5,8 +5,6 @@ CREATE EXTENSION sqlite_fdw;
 --Testcase 002:
 CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
 OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
---Testcase 003:
-CREATE SERVER sqlite2 FOREIGN DATA WRAPPER sqlite_fdw;
 --Testcase 009:
 CREATE FOREIGN TABLE "type_UUID"( "i" int OPTIONS (key 'true'), "u" uuid) SERVER sqlite_svr OPTIONS (table 'type_UUID');
 --Testcase 010:
@@ -522,7 +520,7 @@ SELECT * FROM "type_UUIDpk";
 --Testcase 105: ERR - primary key
 INSERT INTO "type_UUIDpk" VALUES ('{b0eebc99-9c0b4ef8-bb6d6bb9-bd380a12}');
 ERROR:  Failed to execute remote SQL
-HINT:  SQLite error 'UNIQUE constraint failed: type_UUIDpk.col', SQLite result code 1555
+HINT:  SQLite error 'UNIQUE constraint failed: type_UUIDpk.col', SQLite primary result code 19, extended result code 1555
 CONTEXT:  SQL query: INSERT INTO main."type_UUIDpk"(`col`) VALUES (?)
 --Testcase 106:
 ALTER FOREIGN TABLE "type_UUIDpk" ALTER COLUMN col OPTIONS (SET column_type 'BLOB');
@@ -541,9 +539,8 @@ SELECT * FROM "type_UUIDpk";
 DELETE FROM "type_UUIDpk";
 --Testcase 200:
 DROP EXTENSION sqlite_fdw CASCADE;
-NOTICE:  drop cascades to 5 other objects
+NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to server sqlite_svr
 drop cascades to foreign table "type_UUID"
 drop cascades to foreign table "type_UUID+"
 drop cascades to foreign table "type_UUIDpk"
-drop cascades to server sqlite2