From cc59dfa77f2cd2e24ebefce56f31444e2c1b3634 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Tue, 7 Dec 2021 12:23:36 -0300 Subject: [PATCH] Remove custom postgres image, any standard one should work with jdbcconfig's initdb=true now --- config | 2 +- docker-compose.yml | 3 +- .../stable/jdbcconfig/docker-compose.yml | 3 +- docs/develop/index.md | 1 - support-services/database/.gitignore | 1 - support-services/database/Dockerfile | 10 - support-services/database/pom.xml | 32 - .../10_create_jdbcconfig.sql | 664 ------------------ .../postgresql_initdb/20_create_jdbcstore.sql | 30 - support-services/pom.xml | 1 - 10 files changed, 5 insertions(+), 742 deletions(-) delete mode 100644 support-services/database/.gitignore delete mode 100644 support-services/database/Dockerfile delete mode 100644 support-services/database/pom.xml delete mode 100644 support-services/database/postgresql_initdb/10_create_jdbcconfig.sql delete mode 100644 support-services/database/postgresql_initdb/20_create_jdbcstore.sql diff --git a/config b/config index 7fe381b9..518575bf 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 7fe381b98d5a5d98824dd406332e433863d36d65 +Subproject commit 518575bf49903a6b0bcc25ad67aa6c6feb734414 diff --git a/docker-compose.yml b/docker-compose.yml index bba17e41..a16eaf05 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,8 @@ services: memory: 1G database: - image: geoservercloud/geoserver-cloud-postgres-jdbcconfig:${TAG} + # be sure geoserver.backend.jdbcconfig.initdb is set to true in application.yml at lease for the first app run + image: postgres:13-alpine environment: POSTGRES_DB: "${JDBCCONFIG_DBNAME}" POSTGRES_USER: "${JDBCCONFIG_USERNAME}" diff --git a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml index 9c795fae..f27af458 100644 --- a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml +++ b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml @@ -22,7 +22,8 @@ services: memory: 1G database: - image: geoservercloud/geoserver-cloud-postgres-jdbcconfig:1.0-RC3 + # be sure geoserver.backend.jdbcconfig.initdb is set to true in application.yml at lease for the first app run + image: postgres:13-alpine environment: POSTGRES_DB: geoserver_config POSTGRES_USER: geoserver diff --git a/docs/develop/index.md b/docs/develop/index.md index 870a3c47..18e31027 100644 --- a/docs/develop/index.md +++ b/docs/develop/index.md @@ -95,7 +95,6 @@ geoservercloud/geoserver-cloud-catalog 1.0-SNAPSHOT afed2dc geoservercloud/geoserver-cloud-config 1.0-SNAPSHOT be987ff2a85e 42 minutes ago 319MB geoservercloud/geoserver-cloud-discovery 1.0-SNAPSHOT abc5a17cf14c 42 minutes ago 320MB geoservercloud/geoserver-cloud-gateway 1.0-SNAPSHOT 10f267950c15 42 minutes ago 317MB -geoservercloud/geoserver-cloud-postgres-jdbcconfig 1.0-SNAPSHOT 6014df31f1ee 2 hours ago 196MB geoservercloud/geoserver-cloud-rest 1.0-SNAPSHOT 29406a1e1fdb 36 minutes ago 429MB geoservercloud/geoserver-cloud-wcs 1.0-SNAPSHOT c77ac22aa522 37 minutes ago 391MB geoservercloud/geoserver-cloud-webui 1.0-SNAPSHOT 876d6fc3fac0 36 minutes ago 449MB diff --git a/support-services/database/.gitignore b/support-services/database/.gitignore deleted file mode 100644 index ae3c1726..00000000 --- a/support-services/database/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/support-services/database/Dockerfile b/support-services/database/Dockerfile deleted file mode 100644 index 476a83fe..00000000 --- a/support-services/database/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM postgres:13-alpine -LABEL maintainer="GeoServer PSC " - -VOLUME [ "/var/lib/postgresql/data" ] - -ADD ./postgresql_initdb /docker-entrypoint-initdb.d - -COPY --chown=postgres ./postgresql_initdb/* /docker-entrypoint-initdb.d/ - -HEALTHCHECK --interval=10s --timeout=1s --retries=5 CMD pg_isready -d $POSTGRES_DB -U $POSTGRES_USER diff --git a/support-services/database/pom.xml b/support-services/database/pom.xml deleted file mode 100644 index b93d7ef9..00000000 --- a/support-services/database/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - org.geoserver.cloud - gs-support-services - ${revision} - - gs-cloud-database - pom - Database service - - false - geoserver-cloud-postgres-jdbcconfig - - - - docker - - true - - - - - com.spotify - dockerfile-maven-plugin - - - - - - diff --git a/support-services/database/postgresql_initdb/10_create_jdbcconfig.sql b/support-services/database/postgresql_initdb/10_create_jdbcconfig.sql deleted file mode 100644 index 9fdf4f1f..00000000 --- a/support-services/database/postgresql_initdb/10_create_jdbcconfig.sql +++ /dev/null @@ -1,664 +0,0 @@ --- tables -CREATE TABLE object ( - oid serial NOT NULL, - type_id int4 NOT NULL, - id text NOT NULL, - blob text NOT NULL, - PRIMARY KEY (oid) -); - -CREATE TABLE object_property ( - oid int4 NOT NULL, - property_type int4 NOT NULL, - id text NOT NULL, - related_oid int4, - related_property_type int4, - colindex int4 NOT NULL, - value text, - PRIMARY KEY (oid, property_type, colindex) -); - -CREATE TABLE type ( - oid serial NOT NULL, - typename text NOT NULL, - PRIMARY KEY (OID) -); - -CREATE TABLE property_type ( - oid serial NOT NULL, - target_property int4, - type_id int4 NOT NULL, - name text NOT NULL, - collection bool NOT NULL, - text bool NOT NULL, - PRIMARY KEY (oid) -); - -CREATE TABLE default_object ( - def_key text NOT NULL, - id text NOT NULL - -); - --- foreign keys -ALTER TABLE object_property ADD CONSTRAINT fk_object_property - FOREIGN KEY (oid) REFERENCES object (oid) ON DELETE CASCADE; - -ALTER TABLE property_type ADD CONSTRAINT - fk_type_property_type FOREIGN KEY (type_id) REFERENCES type (oid); - -ALTER TABLE object ADD CONSTRAINT - fk_object_type FOREIGN KEY (type_id) REFERENCES type (oid); - -ALTER TABLE property_type ADD CONSTRAINT - fk_property_type_target_property FOREIGN KEY (target_property) REFERENCES property_type (oid); - -ALTER TABLE object_property ADD CONSTRAINT - fk_object_property_property_type FOREIGN KEY (property_type) REFERENCES property_type (oid); - --- indexes -CREATE INDEX object_type_id_idx ON object (type_id); -CREATE UNIQUE INDEX object_id_idx ON object (id); - -CREATE INDEX object_property_value_upper_idx ON object_property (UPPER(value)); -CREATE INDEX object_property_property_type_idx ON object_property (property_type); -CREATE INDEX object_property_id_idx ON object_property (id); -CREATE INDEX object_property_related_oid_idx ON object_property (related_oid); -CREATE INDEX object_property_related_property_type_idx ON object_property (related_property_type); -CREATE INDEX object_property_colindex_idx ON object_property (colindex); -CREATE INDEX object_property_value_idx ON object_property (value); - -CREATE UNIQUE INDEX type_typename_idx ON type (typename); - -CREATE INDEX property_type_target_property_idx ON property_type (target_property); -CREATE INDEX property_type_type_id_idx ON property_type (type_id); -CREATE INDEX property_type_name_idx ON property_type (name); -CREATE INDEX property_type_collection_idx ON property_type (collection); --- Avoid creating the same target property mapping twice -CREATE UNIQUE INDEX property_type_unique_target_idx ON property_type (target_property, type_id, name); - -CREATE INDEX default_object_def_key_idx ON default_object (def_key); -CREATE INDEX default_object_id_idx ON default_object (id); - --- views --- workspace view -CREATE OR REPLACE VIEW workspace AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT e.value - FROM object_property e, property_type f - WHERE e.property_type = f.oid - AND e.oid = (SELECT g.oid - FROM object_property g, property_type h - WHERE g.property_type = h.oid - AND g.value = (SELECT i.value - FROM object_property i, property_type j - WHERE i.oid = a.oid - AND i.property_type = j.oid - AND j.name = 'name') - AND h.name = 'prefix') - AND f.name = 'URI') as uri - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.WorkspaceInfo'; - --- datastore view -CREATE OR REPLACE VIEW datastore AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'description') as description, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'type') as type, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'workspace.id') workspace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.DataStoreInfo'; - --- feature type view -CREATE OR REPLACE VIEW featuretype AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'nativeName') as native_name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'prefixedName') as prefixed_name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'title') as title, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'abstract') as abstract, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'SRS') as srs, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'projectionPolicy') as projection_policy, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'store.id') store, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'namespace.id') namespace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.FeatureTypeInfo'; - --- coveragestore view -CREATE OR REPLACE VIEW coveragestore AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'description') as description, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'type') as type, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'workspace.id') workspace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.CoverageStoreInfo'; - --- coverage view -CREATE OR REPLACE VIEW coverage AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'nativeName') as native_name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'prefixedName') as prefixed_name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'title') as title, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'abstract') as abstract, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'SRS') as srs, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'projectionPolicy') as projection_policy, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'store.id') store, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'namespace.id') namespace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.CoverageInfo'; - --- wmsstore view -CREATE OR REPLACE VIEW wmsstore AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'description') as description, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'capabilitiesURL') as capabilities_url, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'type') as type, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'workspace.id') workspace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.WMSStoreInfo'; - --- wms layer view -CREATE OR REPLACE VIEW wmslayer AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'nativeName') as native_name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'prefixedName') as prefixed_name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'title') as title, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'abstract') as abstract, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'SRS') as srs, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'projectionPolicy') as projection_policy, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'store.id') store, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'namespace.id') namespace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.WMSLayerInfo'; - --- style view -CREATE OR REPLACE VIEW style AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'filename') as filename, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'workspace.id') workspace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.StyleInfo'; - --- layer view -CREATE OR REPLACE VIEW layer AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'title') as title, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'abstract') as abstract, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'type') as type, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'defaultStyle.id') default_style, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'resource.id') resource - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.LayerInfo'; - --- layergroup styles -CREATE OR REPLACE VIEW layer_style AS -SELECT a.oid, b.related_oid as style - FROM object a, object_property b, property_type c, type d - WHERE a.oid = b.oid - AND a.type_id = d.oid - AND b.property_type = c.oid - AND c.name = 'styles.id' - AND d.typename = 'org.geoserver.catalog.LayerInfo'; - --- layer group view -CREATE OR REPLACE VIEW layergroup AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'title') as title, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'abstract') as abstract, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'mode') as mode, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'workspace.id') workspace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.catalog.LayerGroupInfo'; - --- layergroup layers -CREATE OR REPLACE VIEW layergroup_layer AS -SELECT a.oid, b.related_oid as layer - FROM object a, object_property b, property_type c, type d - WHERE a.oid = b.oid - AND a.type_id = d.oid - AND b.property_type = c.oid - AND c.name = 'layers.id' - AND d.typename = 'org.geoserver.catalog.LayerGroupInfo'; - --- layergroup styles -CREATE OR REPLACE VIEW layergroup_style AS -SELECT a.oid, b.related_oid as style - FROM object a, object_property b, property_type c, type d - WHERE a.oid = b.oid - AND a.type_id = d.oid - AND b.property_type = c.oid - AND c.name = 'styles.id' - AND d.typename = 'org.geoserver.catalog.LayerGroupInfo'; - --- global view -CREATE OR REPLACE VIEW global AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'featureTypeCacheSize') as feature_type_cache_size, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'globalServices') as global_services, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'xmlPostRequestLogBufferSize') as xml_post_request_log_buffer_size, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'updateSequence') as update_sequence, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'settings.id') as settings - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.config.GeoServerInfo'; - --- settings view -CREATE OR REPLACE VIEW settings AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'title') as title, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'charset') as charset, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'verbose') as verbose, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'verboseExceptions') as verbose_exceptions, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'numDecimals') as num_decimals, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'onlineResource') as online_resource, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'proxyBaseUrl') as proxy_base_url, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'schemaBaseUrl') as schema_base_url, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'workspace.id') as workspace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.config.SettingsInfo'; - --- service view -CREATE OR REPLACE VIEW service AS -SELECT a.oid, - a.id, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'name') as name, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'title') as title, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'abstract') as abstract, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'maintainer') as maintainer, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'verbose') as verbose, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'citeCompliant') as cite_compliant, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'outputStrategy') as output_strategy, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'onlineResource') as online_resource, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'schemaBaseURL') as schema_base_url, - (SELECT c.value - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'enabled') as enabled, - (SELECT c.related_oid - FROM object_property c, property_type d - WHERE c.oid = a.oid - AND c.property_type = d.oid - AND d.name = 'workspace.id') as workspace - FROM object a, type b - WHERE a.type_id = b.oid - AND b.typename = 'org.geoserver.config.ServiceInfo'; diff --git a/support-services/database/postgresql_initdb/20_create_jdbcstore.sql b/support-services/database/postgresql_initdb/20_create_jdbcstore.sql deleted file mode 100644 index 0260d800..00000000 --- a/support-services/database/postgresql_initdb/20_create_jdbcstore.sql +++ /dev/null @@ -1,30 +0,0 @@ -CREATE TABLE resources -( - oid serial NOT NULL, - name character varying NOT NULL, - parent integer, - last_modified timestamp without time zone NOT NULL DEFAULT timezone('UTC'::text, now()), - content bytea, - CONSTRAINT resources_pkey PRIMARY KEY (oid), - CONSTRAINT resources_parent_fkey FOREIGN KEY (parent) - REFERENCES resources (oid) - ON UPDATE RESTRICT ON DELETE CASCADE, - CONSTRAINT resources_parent_name_key UNIQUE (parent, name), - CONSTRAINT resources_only_one_root_check CHECK (parent IS NOT NULL OR oid = 0) -); - -CREATE INDEX resources_parent_name_idx - ON resources (parent NULLS FIRST, name NULLS FIRST); - -INSERT INTO resources (oid, name, parent, content) VALUES (0, '', NULL, NULL); - --- only the required table(s) to support distributed locking, from --- spring-integration-jdbc-.jar/org/springframework/integration/jdbc/schema-postgresql.sql --- Table named RESOURCE_LOCK instead of INT_LOCK -CREATE TABLE RESOURCE_LOCK ( - LOCK_KEY CHAR(36) NOT NULL, - REGION VARCHAR(100) NOT NULL, - CLIENT_ID CHAR(36), - CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) -); diff --git a/support-services/pom.xml b/support-services/pom.xml index 7315fac3..53150847 100644 --- a/support-services/pom.xml +++ b/support-services/pom.xml @@ -13,7 +13,6 @@ discovery config api-gateway - database