Merge branch 'pgspider:master' into pure_float

Author: mkgrgis

Makefile

@@ -16,20 +16,29 @@ EXTENSION = sqlite_fdw
 DATA = sqlite_fdw--1.0.sql sqlite_fdw--1.0--1.1.sql
 
 ifdef ENABLE_GIS
-override PG_CFLAGS += -DSQLITE_FDW_GIS_ENABLE
-GISTEST=postgis
+PG_CFLAGS += -DSQLITE_FDW_GIS_ENABLE
+GIS_DEP_TESTS_DIR = with_gis_support
+GIS_TEST = postgis
+$(info  There is PostGIS support for SQLite FDW)
 else
-GISTEST=nogis
+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
+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
+GIS_DEP_TESTS = $(GIS_DEP_TESTS_DIR)/type $(GIS_DEP_TESTS_DIR)/auto_import $(GIS_DEP_TESTS_DIR)/$(GIS_TEST)
+
 ifndef REGRESS
-REGRESS = extra/sqlite_fdw_post 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 extra/join extra/limit extra/aggregates extra/prepare extra/select_having extra/select extra/insert extra/update extra/encodings sqlite_fdw type_$(GISTEST) aggregate selectfunc 
+# System tests, full default sequence
+REGRESS = 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.
 REGRESS_OPTS = --encoding=utf8
 
-SQLITE_LIB = sqlite3
-
 UNAME = uname
 OS := $(shell $(UNAME))
 ifeq ($(OS), Darwin)
@@ -70,6 +79,8 @@ 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_DEP_TESTS_DIR))
+
 
 ifdef ENABLE_GIS
 check: temp-install

connection.c

@@ -391,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 */
@@ -414,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 19
+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 19
+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 19
+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 19
+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 19
+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 19
+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 19
+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 19
+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;