Implement pure floating numbers mode

Author: mkgrgis

.github/workflows/CI.yml

@@ -73,6 +73,17 @@ jobs:
             bash GitHubActions/build_postgis.sh ${{ matrix.pg }} ${{ env.POSTGIS_VERSION }}
           fi
 
+<<<<<<< HEAD
+=======
+      - name: install SQLite, ${{ matrix.config }} mode
+        run: |
+          if [[ "${{ matrix.config }}" == "default" ]]; then
+            bash GitHubActions/install_sqlite.sh ${{ env.SQLITE_VERSION }} ${{ env.SQLITE_YEAR }} "${{ matrix.config }}"
+          elif [[ "${{ matrix.config }}" == "postgis" ]]; then
+            bash GitHubActions/install_sqlite.sh ${{ env.SQLITE_VERSION }} ${{ env.SQLITE_YEAR }} "${{ matrix.config }}" --enable-rtree
+          fi
+
+>>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
       - name: build sqlite_fdw, ${{ matrix.config }} mode
         run: |
           bash GitHubActions/build_sqlite_fdw.sh ${{ matrix.pg }} ${{ matrix.config }} ${{ env.SQLITE_FOR_TESTING_DIR }}

GitHubActions/install_sqlite.sh

@@ -5,6 +5,7 @@
 # This sript downloads SQLite source code from the official web site into
 # ./workdir then builds and installs it.
 #
+<<<<<<< HEAD
 # Usage: ./install_sqlite.sh version year testing_mode sqlite_for_testing_dir [configure_options]
 #     version: SQLite version to be installed.
 #     year: A year of SQLite released. It is used for determining a download URL.
@@ -13,6 +14,15 @@
 #     configure_options: are a list of option for sqlite server.
 #
 #     Ex) ./install_sqlite.sh 3420000 2023 postgis /opt/sqlite_for_testing --enable-rtree
+=======
+# Usage: ./install_sqlite.sh version year testing_mode [configure_options]
+#     version: SQLite version to be installed.
+#     year: A year of SQLite released. It is used for determining a download URL.
+#     testing_mode:	'default' or 'postgis' value.
+#     configure_options: are a list of option for sqlite server.
+#
+#     Ex) ./install_sqlite.sh 3420000 2023 postgis --enable-rtree
+>>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
 #
 # Requirements
 # - be able to connect to the SQLite official web site by curl.
@@ -23,12 +33,19 @@
 VERSION="$1"
 YEAR="$2"
 TESTING_MODE="$3"
+<<<<<<< HEAD
 SQLITE_FOR_TESTING_DIR="$4"
+=======
+>>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
 
 CONFIGURE_OPTIONS=""
 
 while (( "$#" )); do
+<<<<<<< HEAD
   CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $5"
+=======
+  CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $4"
+>>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
   shift
 done
 

Makefile

@@ -36,7 +36,7 @@ ifndef REGRESS
 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-
+# Other encodings also are tested. Client encoding should be UTF-8.
 REGRESS_OPTS = --encoding=utf8
 
 UNAME = uname
@@ -47,12 +47,7 @@ else
 DLSUFFIX = .so
 endif
 
-ifdef SQLITE_FOR_TESTING_DIR
-SHLIB_LINK := -L$(SQLITE_FOR_TESTING_DIR)/lib -lsqlite3
-PG_CFLAGS += -I$(SQLITE_FOR_TESTING_DIR)/include -Wl,-rpath,$(SQLITE_FOR_TESTING_DIR)/lib
-else
 SHLIB_LINK := -lsqlite3
-endif
 
 ifdef ENABLE_GIS
 override SHLIB_LINK += -lspatialite

README.md

@@ -616,6 +616,7 @@ Array support is experimental. Please be careful.
 - SQLite does not support `numeric` type as PostgreSQL. Therefore, it does not allow to store numbers with too high precision and scale. Error out of range occurs.
 - SQLite does not support `NaN` special value for IEEE 754-2008 numbers. Please use this special value very cerefully because there is no such conception in SQLite at all and `NaN` value treated in SQLite as `NULL`.
 - SQLite support `+Infinity` and `-Infinity` special values for IEEE 754-2008 numbers in SQL expressions with numeric context. This values can be readed with both `text` and `real` affiniy, but can be writed to SQLite only with `real` affinity (as signed out of range value `9.0e999`).
+- Please note you can turn off processing of IEEE 754-2008 values with `text` affiniy thorough `real` value of `column_type` option. This can increase `SELECT` or `ORDER` speed, becasuse there will be no normalize function wrapping, but in this case any query will have unsuccessfilly result in case of any value with `text` affiniy.
 
 ### Boolean values
 - `sqlite_fdw` boolean values support exists only for `bool` columns in foreign table. SQLite documentation recommends to store boolean as value with `integer` [affinity](https://www.sqlite.org/datatype3.html). `NULL` isn't converted, 1 converted to `true`, all other `NOT NULL` values converted to `false`. During `SELECT ... WHERE condition_column` condition converted only to `condition_column`.

deparse.c

@@ -2285,6 +2285,8 @@ sqlite_deparse_column_ref(StringInfo buf, int varno, int varattno, PlannerInfo *
 		ListCell   *lc;
 		Oid			pg_atttyp = InvalidOid;
 		bool		no_unification = false;
+		char	   *coltype = NULL;
+		int			colaff = SQLITE_NULL;
 
 		/* varno must not be any of OUTER_VAR, INNER_VAR and INDEX_VAR. */
 		Assert(!IS_SPECIAL_VARNO(varno));
@@ -2301,9 +2303,21 @@ sqlite_deparse_column_ref(StringInfo buf, int varno, int varattno, PlannerInfo *
 			if (strcmp(def->defname, "column_name") == 0)
 			{
 				colname = defGetString(def);
+<<<<<<< HEAD
+				elog(DEBUG1, "column name = %s\n", colname);
+				break;
+			}
+			if (strcmp(def->defname, "column_type") == 0)
+			{
+				coltype = defGetString(def);
+				elog(DEBUG4, "column type = %s", coltype);
+				colaff = sqlite_affinity_code(coltype);
+			}
+=======
 				elog(DEBUG3, "sqlite_fdw : %s, column_name opt = %s\n", __func__, colname);
 				break;
 			}
+>>>>>>> 9764c26 (Add initial SpatiaLite ↔ PostGIS support (#96))
 		}
 
 		/*
@@ -2332,12 +2346,22 @@ sqlite_deparse_column_ref(StringInfo buf, int varno, int varattno, PlannerInfo *
 				case FLOAT4OID:
 				case NUMERICOID:
 				{
-					elog(DEBUG2, "floatN unification for \"%s\"", colname);
-					appendStringInfoString(buf, "sqlite_fdw_float(");
-					if (qualify_col)
-						ADD_REL_QUALIFIER(buf, varno);
-					appendStringInfoString(buf, sqlite_quote_identifier(colname, '`'));
-					appendStringInfoString(buf, ")");
+					if (colaff != SQLITE_FLOAT)
+					{
+						elog(DEBUG2, "floatN unification for \"%s\"", colname);
+						appendStringInfoString(buf, "sqlite_fdw_float(");
+						if (qualify_col)
+							ADD_REL_QUALIFIER(buf, varno);
+						appendStringInfoString(buf, sqlite_quote_identifier(colname, '`'));
+						appendStringInfoString(buf, ")");
+					}
+					else
+					{
+						elog(DEBUG2, "floatN real affinity only for \"%s\"", colname);
+						if (qualify_col)
+							ADD_REL_QUALIFIER(buf, varno);
+						appendStringInfoString(buf, sqlite_quote_identifier(colname, '`'));
+					}
 					break;
 				}
 				case BOOLOID:
@@ -2966,6 +2990,21 @@ get_complementary_var_node(Expr *node)
 	}
 }
 
+/* IEEE 754-2008 : ∞ and NaN */
+const char * CHAR_INF_SHORT = "Inf";
+const char * CHAR_INF_LONG = "Infinity";
+const char * CHAR_NAN = "NaN";
+
+bool
+isInfinity (const char * s)
+{
+return strcasecmp(s, CHAR_INF_SHORT) == 0 ||
+	   strcasecmp(s, CHAR_INF_LONG) == 0 ||
+	   strcasecmp(s + sizeof(char), CHAR_INF_SHORT) == 0 ||
+	   strcasecmp(s + sizeof(char), CHAR_INF_LONG) == 0;
+}
+
+
 /*
  * Deparse given constant value into context->buf.
  *
@@ -3031,10 +3070,7 @@ sqlite_deparse_const(Const *node, deparse_expr_cxt *context, int showtype)
 					else
 						appendStringInfoString(buf, extval);
 				}
-				else if (strcasecmp(extval, infs) == 0 ||
-						 strcasecmp(extval, infl) == 0 ||
-						 strcasecmp(extval + 1, infs) == 0 ||
-						 strcasecmp(extval + 1, infl) == 0)
+				else if (isInfinity(extval))
 				{
 					bool is_negative_or_positive = false;
 					if (extval[0] == '-' || extval[0] == '+')

expected/13.15/types/float4.out

@@ -1885,12 +1885,81 @@ SELECT * FROM "type_FLOAT_INF+" WHERE f = 'NaN' ORDER BY i;
 (6 rows)
 
 --Testcase 351:
-DELETE FROM "type_FLOAT_INF" WHERE i >= 10;
+ALTER FOREIGN TABLE "type_FLOAT_INF" ALTER COLUMN f OPTIONS (ADD column_type 'real');
 --Testcase 352:
-DROP FOREIGN TABLE "type_FLOAT_INF";
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM "type_FLOAT_INF";
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Foreign Scan on public."type_FLOAT_INF"
+   Output: i, f
+   SQLite query: SELECT `i`, `f` FROM main."type_FLOAT_INF"
+(3 rows)
+
 --Testcase 353:
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM "type_FLOAT_INF+";
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Foreign Scan on public."type_FLOAT_INF+"
+   Output: i, f, t, l
+   SQLite query: SELECT `i`, sqlite_fdw_float(`f`), `t`, `l` FROM main."type_FLOAT_INF+"
+(3 rows)
+
+--Testcase 354: ERR - remove real
+SELECT * FROM "type_FLOAT_INF";
+ERROR:  you should disable column_type = real for this column for infinity value processing
+HINT:  SQLite value with "text" affinity (8 bytes) : 'Infinity'
+CONTEXT:  foreign table "type_FLOAT_INF" foreign column "f" have data type "double precision" (usual affinity "real"), in query there is reference to foreign column
+--Testcase 355:
+DELETE FROM "type_FLOAT_INF" WHERE i IN (SELECT i FROM "type_FLOAT_INF+" WHERE t = 'text');
+--Testcase 356:
+SELECT * FROM "type_FLOAT_INF";
+ i  |     f     
+----+-----------
+  1 | -Infinity
+  2 |  Infinity
+  3 | -Infinity
+  4 |  Infinity
+  5 |   -1e+308
+  6 |         0
+  7 |    1e+308
+ 10 |  Infinity
+ 11 |  Infinity
+ 12 | -Infinity
+ 13 |  Infinity
+ 14 |  Infinity
+ 15 | -Infinity
+ 16 |          
+(14 rows)
+
+--Testcase 357:
+SELECT * FROM "type_FLOAT_INF+";
+ i  |     f     |  t   | l 
+----+-----------+------+---
+  1 | -Infinity | real | 4
+  2 |  Infinity | real | 3
+  3 | -Infinity | real | 4
+  4 |  Infinity | real | 3
+  5 |   -1e+308 | real | 9
+  6 |         0 | real | 3
+  7 |    1e+308 | real | 8
+ 10 |  Infinity | real | 3
+ 11 |  Infinity | real | 3
+ 12 | -Infinity | real | 4
+ 13 |  Infinity | real | 3
+ 14 |  Infinity | real | 3
+ 15 | -Infinity | real | 4
+ 16 |           | null |  
+(14 rows)
+
+--Testcase 358:
+DELETE FROM "type_FLOAT_INF" WHERE i >= 10;
+--Testcase 359:
+DROP FOREIGN TABLE "type_FLOAT_INF";
+--Testcase 360:
 DROP FOREIGN TABLE "type_FLOAT_INF+";
---Testcase 270:
+--Testcase 390:
 DROP SERVER sqlite_svr;
---Testcase 271:
+--Testcase 391:
 DROP EXTENSION sqlite_fdw CASCADE;

expected/13.15/types/float8.out

@@ -2304,12 +2304,81 @@ SELECT * FROM "type_FLOAT_INF+" WHERE f = 'NaN' ORDER BY i;
 (6 rows)
 
 --Testcase 351:
-DELETE FROM "type_FLOAT_INF" WHERE i >= 10;
+ALTER FOREIGN TABLE "type_FLOAT_INF" ALTER COLUMN f OPTIONS (ADD column_type 'real');
 --Testcase 352:
-DROP FOREIGN TABLE "type_FLOAT_INF";
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM "type_FLOAT_INF";
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Foreign Scan on public."type_FLOAT_INF"
+   Output: i, f
+   SQLite query: SELECT `i`, `f` FROM main."type_FLOAT_INF"
+(3 rows)
+
 --Testcase 353:
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM "type_FLOAT_INF+";
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Foreign Scan on public."type_FLOAT_INF+"
+   Output: i, f, t, l
+   SQLite query: SELECT `i`, sqlite_fdw_float(`f`), `t`, `l` FROM main."type_FLOAT_INF+"
+(3 rows)
+
+--Testcase 354: ERR - remove real
+SELECT * FROM "type_FLOAT_INF";
+ERROR:  you should disable column_type = real for this column for infinity value processing
+HINT:  SQLite value with "text" affinity (8 bytes) : 'Infinity'
+CONTEXT:  foreign table "type_FLOAT_INF" foreign column "f" have data type "double precision" (usual affinity "real"), in query there is reference to foreign column
+--Testcase 355:
+DELETE FROM "type_FLOAT_INF" WHERE i IN (SELECT i FROM "type_FLOAT_INF+" WHERE t = 'text');
+--Testcase 356:
+SELECT * FROM "type_FLOAT_INF";
+ i  |     f     
+----+-----------
+  1 | -Infinity
+  2 |  Infinity
+  3 | -Infinity
+  4 |  Infinity
+  5 |   -1e+308
+  6 |         0
+  7 |    1e+308
+ 10 |  Infinity
+ 11 |  Infinity
+ 12 | -Infinity
+ 13 |  Infinity
+ 14 |  Infinity
+ 15 | -Infinity
+ 16 |          
+(14 rows)
+
+--Testcase 357:
+SELECT * FROM "type_FLOAT_INF+";
+ i  |     f     |  t   | l 
+----+-----------+------+---
+  1 | -Infinity | real | 4
+  2 |  Infinity | real | 3
+  3 | -Infinity | real | 4
+  4 |  Infinity | real | 3
+  5 |   -1e+308 | real | 9
+  6 |         0 | real | 3
+  7 |    1e+308 | real | 8
+ 10 |  Infinity | real | 3
+ 11 |  Infinity | real | 3
+ 12 | -Infinity | real | 4
+ 13 |  Infinity | real | 3
+ 14 |  Infinity | real | 3
+ 15 | -Infinity | real | 4
+ 16 |           | null |  
+(14 rows)
+
+--Testcase 358:
+DELETE FROM "type_FLOAT_INF" WHERE i >= 10;
+--Testcase 359:
+DROP FOREIGN TABLE "type_FLOAT_INF";
+--Testcase 360:
 DROP FOREIGN TABLE "type_FLOAT_INF+";
---Testcase 270:
+--Testcase 390:
 DROP SERVER sqlite_svr;
---Testcase 271:
+--Testcase 391:
 DROP EXTENSION sqlite_fdw CASCADE;