Author: desruisseaux
Date: Tue Aug 18 12:42:24 2026
New Revision: 1937210

Log:
Change order between `COLLATE` and `NON NULL` in SQL statements for 
compatibility with HSQLDB.

Modified:
   sis/data/non-free/EPSG/Tables.sql

Modified: sis/data/non-free/EPSG/Tables.sql
==============================================================================
--- sis/data/non-free/EPSG/Tables.sql   Tue Aug 18 10:42:30 2026        
(r1937209)
+++ sis/data/non-free/EPSG/Tables.sql   Tue Aug 18 12:42:24 2026        
(r1937210)
@@ -17,13 +17,13 @@ alias_code         INTEGER      NOT NULL
 object_table_name  "Table Name" NOT NULL,
 object_code        INTEGER      NOT NULL,
 naming_system_code INTEGER      NOT NULL,
-alias              VARCHAR(78)  NOT NULL COLLATE "Ignore Accent and Case",
+alias              VARCHAR(78)  COLLATE "Ignore Accent and Case" NOT NULL,
 remarks            VARCHAR(253),
 CONSTRAINT pk_alias PRIMARY KEY (alias_code));
 
 CREATE TABLE "Conventional RS" (
 conventional_rs_code INTEGER     NOT NULL,
-conventional_rs_name VARCHAR(42) NOT NULL COLLATE "Ignore Accent and Case",
+conventional_rs_name VARCHAR(42) COLLATE "Ignore Accent and Case" NOT NULL,
 remarks              VARCHAR(75),
 deprecated           BOOLEAN     NOT NULL,
 CONSTRAINT pk_conventional_rs PRIMARY KEY (conventional_rs_code));
@@ -40,7 +40,7 @@ CONSTRAINT pk_coordinateaxis PRIMARY KEY
 
 CREATE TABLE "Coordinate Axis Name" (
 coord_axis_name_code INTEGER     NOT NULL,
-coord_axis_name      VARCHAR(22) NOT NULL COLLATE "Ignore Accent and Case",
+coord_axis_name      VARCHAR(22) COLLATE "Ignore Accent and Case" NOT NULL,
 description          VARCHAR(217),
 remarks              VARCHAR(254),
 deprecated           BOOLEAN NOT NULL,
@@ -48,7 +48,7 @@ CONSTRAINT pk_coordinateaxisname PRIMARY
 
 CREATE TABLE "Coordinate Reference System" (
 coord_ref_sys_code   INTEGER     NOT NULL,
-coord_ref_sys_name   VARCHAR(73) NOT NULL COLLATE "Ignore Accent and Case",
+coord_ref_sys_name   VARCHAR(73) COLLATE "Ignore Accent and Case" NOT NULL,
 coord_ref_sys_kind   "CRS Kind"  NOT NULL,
 coord_sys_code       INTEGER,
 datum_code           INTEGER,
@@ -63,7 +63,7 @@ CONSTRAINT pk_coordinatereferencesystem
 
 CREATE TABLE "Coordinate System" (
 coord_sys_code INTEGER      NOT NULL,
-coord_sys_name VARCHAR(254) NOT NULL COLLATE "Ignore Accent and Case",
+coord_sys_name VARCHAR(254) COLLATE "Ignore Accent and Case" NOT NULL,
 coord_sys_type "CS Kind"    NOT NULL,
 dimension      SMALLINT     NOT NULL,
 remarks        VARCHAR(254),
@@ -72,7 +72,7 @@ CONSTRAINT pk_coordinatesystem PRIMARY K
 
 CREATE TABLE "Coordinate_Operation" (
 coord_op_code              INTEGER     NOT NULL,
-coord_op_name              VARCHAR(80) NOT NULL COLLATE "Ignore Accent and 
Case",
+coord_op_name              VARCHAR(80) COLLATE "Ignore Accent and Case" NOT 
NULL,
 coord_op_type              VARCHAR(22) NOT NULL,
 source_crs_code            INTEGER,
 target_crs_code            INTEGER,
@@ -89,7 +89,7 @@ CONSTRAINT pk_coordinate_operation PRIMA
 
 CREATE TABLE "Coordinate_Operation Method" (
 coord_op_method_code INTEGER     NOT NULL,
-coord_op_method_name VARCHAR(79) NOT NULL COLLATE "Ignore Accent and Case",
+coord_op_method_name VARCHAR(79) COLLATE "Ignore Accent and Case" NOT NULL,
 reverse_op           BOOLEAN     NOT NULL,
 formula              VARCHAR(3967),
 remarks              VARCHAR(339),
@@ -98,7 +98,7 @@ CONSTRAINT pk_coordinate_operationmethod
 
 CREATE TABLE "Coordinate_Operation Parameter" (
 parameter_code INTEGER     NOT NULL,
-parameter_name VARCHAR(68) NOT NULL COLLATE "Ignore Accent and Case",
+parameter_name VARCHAR(68) COLLATE "Ignore Accent and Case" NOT NULL,
 description    VARCHAR(682),
 deprecated     BOOLEAN NOT NULL,
 CONSTRAINT pk_coordinate_operationparamet PRIMARY KEY (parameter_code));
@@ -154,7 +154,7 @@ CONSTRAINT pk_datumensemble_members PRIM
 
 CREATE TABLE "Datum Realization Method" (
 realization_method_code INTEGER     NOT NULL,
-realization_method_name VARCHAR(15) NOT NULL COLLATE "Ignore Accent and Case",
+realization_method_name VARCHAR(15) COLLATE "Ignore Accent and Case" NOT NULL,
 remarks                 VARCHAR(151),
 deprecated              BOOLEAN NOT NULL,
 CONSTRAINT pk_datumrealizationmethod PRIMARY KEY (realization_method_code));
@@ -175,7 +175,7 @@ CONSTRAINT pk_deprecation PRIMARY KEY (d
 
 CREATE TABLE "Ellipsoid" (
 ellipsoid_code  INTEGER          NOT NULL,
-ellipsoid_name  VARCHAR(34)      NOT NULL COLLATE "Ignore Accent and Case",
+ellipsoid_name  VARCHAR(34)      COLLATE "Ignore Accent and Case" NOT NULL,
 semi_major_axis DOUBLE PRECISION NOT NULL,
 uom_code        INTEGER          NOT NULL,
 inv_flattening  DOUBLE PRECISION,
@@ -187,7 +187,7 @@ CONSTRAINT pk_ellipsoid PRIMARY KEY (ell
 
 CREATE TABLE "Extent" (
 extent_code              INTEGER       NOT NULL,
-extent_name              VARCHAR(79)   NOT NULL COLLATE "Ignore Accent and 
Case",
+extent_name              VARCHAR(79)   COLLATE "Ignore Accent and Case" NOT 
NULL,
 extent_description       VARCHAR(3035) NOT NULL,
 bbox_south_bound_lat     DOUBLE PRECISION,
 bbox_west_bound_lon      DOUBLE PRECISION,
@@ -214,7 +214,7 @@ CONSTRAINT pk_namingsystem PRIMARY KEY (
 
 CREATE TABLE "Prime Meridian" (
 prime_meridian_code INTEGER          NOT NULL,
-prime_meridian_name VARCHAR(10)      NOT NULL COLLATE "Ignore Accent and Case",
+prime_meridian_name VARCHAR(10)      COLLATE "Ignore Accent and Case" NOT NULL,
 greenwich_longitude DOUBLE PRECISION NOT NULL,
 uom_code            INTEGER          NOT NULL,
 remarks             VARCHAR(232),

Reply via email to