Skip to content

Commit 9ef9feb

Browse files
mkgrgismkgrgis
committed
Fix PostGIS tests
1 parent 817d59a commit 9ef9feb

14 files changed

Lines changed: 42 additions & 56 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ GIS_DEP_TESTS = $(GIS_DEP_TESTS_DIR)/type $(GIS_DEP_TESTS_DIR)/auto_import $(GIS
3333

3434
ifndef REGRESS
3535
# System tests, full default sequence
36-
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)
36+
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)
3737
endif
3838

39-
# Other encodings also are tested. Client encoding should be UTF-8-
39+
# Other encodings also are tested. Client encoding should be UTF-8.
4040
REGRESS_OPTS = --encoding=utf8
4141

4242
UNAME = uname

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ Features
5252
- `json`: `text`(default) or `blob` as SQLite `jsonb` object.
5353
- Support mixed SQLite [data affinity](https://www.sqlite.org/datatype3.html) output (`INSERT`/`UPDATE`) for such data types as
5454
- `timestamp`: `text`(default) or `int`,
55-
- `uuid`: `text`(36) or `blob`(16)(default),
56-
- `macaddr`: `text`(17) or `blob`(6) or `integer`(default),
57-
- `macaddr8`: `text`(23) or `blob`(8) or `integer`(default).
55+
- `uuid`: `text`(36) or `blob`(16)(default),
56+
- `macaddr`: `text`(17) or `blob`(6) or `integer`(default),
57+
- `macaddr8`: `text`(23) or `blob`(8) or `integer`(default).
5858
- Full support for `+Infinity` (means ∞) and `-Infinity` (means -∞) special values for IEEE 754-2008 numbers in `double precision`, `float` and `numeric` columns including such conditions as ` n < '+Infinity'` or ` m > '-Infinity'`.
5959
- Bidirectional data transformation for `geometry` and `geography` data types for SpatiaLite ↔ PostGIS. [EWKB](https://libgeos.org/specifications/wkb/#extended-wkb) data transport is used. See [GIS support description](GIS.md).
6060

@@ -516,7 +516,7 @@ Once for a foreign datasource you need, as PostgreSQL superuser. Please specify
516516
CREATE SERVER sqlite_server
517517
FOREIGN DATA WRAPPER sqlite_fdw
518518
OPTIONS (
519-
database '/path/to/database'
519+
database '/path/to/database'
520520
);
521521
```
522522

‎expected/13.15/with_gis_support/auto_import.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ SELECT n, table_name, column_name, tab_no, def, "null", data_type, udt_schema, u
142142
33 | type_MACADDR8 | i | 1 | | YES | bigint | pg_catalog | int8
143143
33 | type_MACADDR8 | m | 2 | | YES | macaddr8 | pg_catalog | macaddr8
144144
34 | types_PostGIS | i | 1 | | YES | bigint | pg_catalog | int8
145-
34 | types_PostGIS | gm | 2 | | YES | bytea | pg_catalog | bytea
146-
34 | types_PostGIS | gg | 3 | | YES | bytea | pg_catalog | bytea
145+
34 | types_PostGIS | gm | 2 | | YES | USER-DEFINED | public | geometry
146+
34 | types_PostGIS | gg | 3 | | YES | USER-DEFINED | public | geography
147147
34 | types_PostGIS | r | 4 | | YES | numeric | pg_catalog | numeric
148148
34 | types_PostGIS | t | 5 | | YES | text | pg_catalog | text
149-
34 | types_PostGIS | gm1 | 6 | | YES | bytea | pg_catalog | bytea
150-
34 | types_PostGIS | gg1 | 7 | | YES | bytea | pg_catalog | bytea
149+
34 | types_PostGIS | gm1 | 6 | | YES | USER-DEFINED | public | geometry
150+
34 | types_PostGIS | gg1 | 7 | | YES | USER-DEFINED | public | geography
151151
35 | type_JSON | i | 1 | | YES | bigint | pg_catalog | int8
152152
35 | type_JSON | j | 2 | | YES | json | pg_catalog | json
153153
35 | type_JSON | ot | 3 | | YES | character varying | pg_catalog | varchar
@@ -232,16 +232,16 @@ SELECT n, table_name, column_name, tab_no, def, "null", data_type, udt_schema, u
232232
53 | type_BOOLEAN_oper | b1 | 3 | | YES | bytea | pg_catalog | bytea
233233
53 | type_BOOLEAN_oper | i2 | 4 | | YES | bytea | pg_catalog | bytea
234234
53 | type_BOOLEAN_oper | b2 | 5 | | YES | bytea | pg_catalog | bytea
235-
54 | ♁ | geom | 1 | | NO | bytea | pg_catalog | bytea
235+
54 | ♁ | geom | 1 | | NO | USER-DEFINED | public | geometry
236236
54 | ♁ | osm_type | 2 | | NO | character varying | pg_catalog | varchar
237237
54 | ♁ | osm_id | 3 | | NO | bigint | pg_catalog | int8
238238
54 | ♁ | ver | 4 | | NO | bigint | pg_catalog | int8
239239
54 | ♁ | arr | 5 | | YES | text | pg_catalog | text
240240
54 | ♁ | t | 6 | | YES | jsonb | pg_catalog | jsonb
241241
55 | ♂ | id | 1 | | YES | bigint | pg_catalog | int8
242242
55 | ♂ | UAI | 2 | | YES | character varying | pg_catalog | varchar
243-
55 | ♂ | ⌖ | 3 | | YES | bytea | pg_catalog | bytea
244-
55 | ♂ | geom | 4 | | YES | bytea | pg_catalog | bytea
243+
55 | ♂ | ⌖ | 3 | | YES | USER-DEFINED | public | geometry
244+
55 | ♂ | geom | 4 | | YES | USER-DEFINED | public | geometry
245245
55 | ♂ | t₀ | 5 | | YES | date | pg_catalog | date
246246
55 | ♂ | class | 6 | | YES | text | pg_catalog | text
247247
55 | ♂ | URL | 7 | | YES | character varying | pg_catalog | varchar

‎expected/13.15/with_gis_support/type.out‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
77
OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
88
--Testcase 47:
99
CREATE EXTENSION postgis;
10-
1110
IMPORT FOREIGN SCHEMA main FROM SERVER sqlite_svr INTO public;
1211
--Testcase 1:
1312
INSERT INTO "type_STRING"(col) VALUES ('string');

‎expected/14.12/with_gis_support/auto_import.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ SELECT n, table_name, column_name, tab_no, def, "null", data_type, udt_schema, u
142142
33 | type_MACADDR8 | i | 1 | | YES | bigint | pg_catalog | int8
143143
33 | type_MACADDR8 | m | 2 | | YES | macaddr8 | pg_catalog | macaddr8
144144
34 | types_PostGIS | i | 1 | | YES | bigint | pg_catalog | int8
145-
34 | types_PostGIS | gm | 2 | | YES | bytea | pg_catalog | bytea
146-
34 | types_PostGIS | gg | 3 | | YES | bytea | pg_catalog | bytea
145+
34 | types_PostGIS | gm | 2 | | YES | USER-DEFINED | public | geometry
146+
34 | types_PostGIS | gg | 3 | | YES | USER-DEFINED | public | geography
147147
34 | types_PostGIS | r | 4 | | YES | numeric | pg_catalog | numeric
148148
34 | types_PostGIS | t | 5 | | YES | text | pg_catalog | text
149-
34 | types_PostGIS | gm1 | 6 | | YES | bytea | pg_catalog | bytea
150-
34 | types_PostGIS | gg1 | 7 | | YES | bytea | pg_catalog | bytea
149+
34 | types_PostGIS | gm1 | 6 | | YES | USER-DEFINED | public | geometry
150+
34 | types_PostGIS | gg1 | 7 | | YES | USER-DEFINED | public | geography
151151
35 | type_JSON | i | 1 | | YES | bigint | pg_catalog | int8
152152
35 | type_JSON | j | 2 | | YES | json | pg_catalog | json
153153
35 | type_JSON | ot | 3 | | YES | character varying | pg_catalog | varchar
@@ -232,16 +232,16 @@ SELECT n, table_name, column_name, tab_no, def, "null", data_type, udt_schema, u
232232
53 | type_BOOLEAN_oper | b1 | 3 | | YES | bytea | pg_catalog | bytea
233233
53 | type_BOOLEAN_oper | i2 | 4 | | YES | bytea | pg_catalog | bytea
234234
53 | type_BOOLEAN_oper | b2 | 5 | | YES | bytea | pg_catalog | bytea
235-
54 | ♁ | geom | 1 | | NO | bytea | pg_catalog | bytea
235+
54 | ♁ | geom | 1 | | NO | USER-DEFINED | public | geometry
236236
54 | ♁ | osm_type | 2 | | NO | character varying | pg_catalog | varchar
237237
54 | ♁ | osm_id | 3 | | NO | bigint | pg_catalog | int8
238238
54 | ♁ | ver | 4 | | NO | bigint | pg_catalog | int8
239239
54 | ♁ | arr | 5 | | YES | text | pg_catalog | text
240240
54 | ♁ | t | 6 | | YES | jsonb | pg_catalog | jsonb
241241
55 | ♂ | id | 1 | | YES | bigint | pg_catalog | int8
242242
55 | ♂ | UAI | 2 | | YES | character varying | pg_catalog | varchar
243-
55 | ♂ | ⌖ | 3 | | YES | bytea | pg_catalog | bytea
244-
55 | ♂ | geom | 4 | | YES | bytea | pg_catalog | bytea
243+
55 | ♂ | ⌖ | 3 | | YES | USER-DEFINED | public | geometry
244+
55 | ♂ | geom | 4 | | YES | USER-DEFINED | public | geometry
245245
55 | ♂ | t₀ | 5 | | YES | date | pg_catalog | date
246246
55 | ♂ | class | 6 | | YES | text | pg_catalog | text
247247
55 | ♂ | URL | 7 | | YES | character varying | pg_catalog | varchar

‎expected/14.12/with_gis_support/type.out‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
77
OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
88
--Testcase 47:
99
CREATE EXTENSION postgis;
10-
1110
IMPORT FOREIGN SCHEMA main FROM SERVER sqlite_svr INTO public;
1211
--Testcase 1:
1312
INSERT INTO "type_STRING"(col) VALUES ('string');

‎expected/15.7/with_gis_support/auto_import.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@ SELECT n, table_name, column_name, tab_no, def, "null", data_type, udt_schema, u
142142
33 | type_MACADDR8 | i | 1 | | YES | bigint | pg_catalog | int8
143143
33 | type_MACADDR8 | m | 2 | | YES | macaddr8 | pg_catalog | macaddr8
144144
34 | types_PostGIS | i | 1 | | YES | bigint | pg_catalog | int8
145-
34 | types_PostGIS | gm | 2 | | YES | bytea | pg_catalog | bytea
146-
34 | types_PostGIS | gg | 3 | | YES | bytea | pg_catalog | bytea
145+
34 | types_PostGIS | gm | 2 | | YES | USER-DEFINED | public | geometry
146+
34 | types_PostGIS | gg | 3 | | YES | USER-DEFINED | public | geography
147147
34 | types_PostGIS | r | 4 | | YES | numeric | pg_catalog | numeric
148148
34 | types_PostGIS | t | 5 | | YES | text | pg_catalog | text
149-
34 | types_PostGIS | gm1 | 6 | | YES | bytea | pg_catalog | bytea
150-
34 | types_PostGIS | gg1 | 7 | | YES | bytea | pg_catalog | bytea
149+
34 | types_PostGIS | gm1 | 6 | | YES | USER-DEFINED | public | geometry
150+
34 | types_PostGIS | gg1 | 7 | | YES | USER-DEFINED | public | geography
151151
35 | type_JSON | i | 1 | | YES | bigint | pg_catalog | int8
152152
35 | type_JSON | j | 2 | | YES | json | pg_catalog | json
153153
35 | type_JSON | ot | 3 | | YES | character varying | pg_catalog | varchar
@@ -232,16 +232,16 @@ SELECT n, table_name, column_name, tab_no, def, "null", data_type, udt_schema, u
232232
53 | type_BOOLEAN_oper | b1 | 3 | | YES | bytea | pg_catalog | bytea
233233
53 | type_BOOLEAN_oper | i2 | 4 | | YES | bytea | pg_catalog | bytea
234234
53 | type_BOOLEAN_oper | b2 | 5 | | YES | bytea | pg_catalog | bytea
235-
54 | ♁ | geom | 1 | | NO | bytea | pg_catalog | bytea
235+
54 | ♁ | geom | 1 | | NO | USER-DEFINED | public | geometry
236236
54 | ♁ | osm_type | 2 | | NO | character varying | pg_catalog | varchar
237237
54 | ♁ | osm_id | 3 | | NO | bigint | pg_catalog | int8
238238
54 | ♁ | ver | 4 | | NO | bigint | pg_catalog | int8
239239
54 | ♁ | arr | 5 | | YES | text | pg_catalog | text
240240
54 | ♁ | t | 6 | | YES | jsonb | pg_catalog | jsonb
241241
55 | ♂ | id | 1 | | YES | bigint | pg_catalog | int8
242242
55 | ♂ | UAI | 2 | | YES | character varying | pg_catalog | varchar
243-
55 | ♂ | ⌖ | 3 | | YES | bytea | pg_catalog | bytea
244-
55 | ♂ | geom | 4 | | YES | bytea | pg_catalog | bytea
243+
55 | ♂ | ⌖ | 3 | | YES | USER-DEFINED | public | geometry
244+
55 | ♂ | geom | 4 | | YES | USER-DEFINED | public | geometry
245245
55 | ♂ | t₀ | 5 | | YES | date | pg_catalog | date
246246
55 | ♂ | class | 6 | | YES | text | pg_catalog | text
247247
55 | ♂ | URL | 7 | | YES | character varying | pg_catalog | varchar

‎expected/15.7/with_gis_support/type.out‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ CREATE SERVER sqlite_svr FOREIGN DATA WRAPPER sqlite_fdw
77
OPTIONS (database '/tmp/sqlite_fdw_test/common.db');
88
--Testcase 47:
99
CREATE EXTENSION postgis;
10-
1110
IMPORT FOREIGN SCHEMA main FROM SERVER sqlite_svr INTO public;
1211
--Testcase 1:
1312
INSERT INTO "type_STRING"(col) VALUES ('string');

0 commit comments

Comments
 (0)