diff --git a/Oracle/SQLScripts/DISABLE_VERSIONING2.sql b/Oracle/SQLScripts/DISABLE_VERSIONING2.sql index 63ec94fa..09a5fa3c 100644 --- a/Oracle/SQLScripts/DISABLE_VERSIONING2.sql +++ b/Oracle/SQLScripts/DISABLE_VERSIONING2.sql @@ -29,6 +29,7 @@ SELECT 'DisableVersioning procedure is working, that takes a while.' as message -- for Oracle locator, the RASTER_RELIEF and GRID_COVERAGE_RDT tables are not exist BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN DBMS_WM.DisableVersioning('ADDRESS,ADDRESS_TO_BRIDGE,ADDRESS_TO_BUILDING,APPEAR_TO_SURFACE_DATA,APPEARANCE,BREAKLINE_RELIEF,BRIDGE,BRIDGE_CONSTR_ELEMENT,BRIDGE_FURNITURE,BRIDGE_INSTALLATION,BRIDGE_OPEN_TO_THEM_SRF,BRIDGE_OPENING,BRIDGE_ROOM,BRIDGE_THEMATIC_SURFACE,BUILDING,BUILDING_FURNITURE,BUILDING_INSTALLATION,CITY_FURNITURE,CITYMODEL,CITYOBJECT,CITYOBJECT_GENERICATTRIB,CITYOBJECT_MEMBER,CITYOBJECTGROUP,EXTERNAL_REFERENCE,GENERALIZATION,GENERIC_CITYOBJECT,GROUP_TO_CITYOBJECT,IMPLICIT_GEOMETRY,LAND_USE,MASSPOINT_RELIEF,OPENING,OPENING_TO_THEM_SURFACE,PLANT_COVER,GRID_COVERAGE_RDT,RASTER_RELIEF,RELIEF_COMPONENT,RELIEF_FEAT_TO_REL_COMP,RELIEF_FEATURE,ROOM,SOLITARY_VEGETAT_OBJECT,SURFACE_DATA,SURFACE_GEOMETRY,TEX_IMAGE,TEXTUREPARAM,THEMATIC_SURFACE,TIN_RELIEF,TRAFFIC_AREA,TRANSPORTATION_COMPLEX,TUNNEL,TUNNEL_FURNITURE,TUNNEL_HOLLOW_SPACE,TUNNEL_INSTALLATION,TUNNEL_OPEN_TO_THEM_SRF,TUNNEL_OPENING,TUNNEL_THEMATIC_SURFACE,WATERBOD_TO_WATERBND_SRF,WATERBODY,WATERBOUNDARY_SURFACE',true,true); ELSE diff --git a/Oracle/SQLScripts/DROP_DB.sql b/Oracle/SQLScripts/DROP_DB.sql index fe76db9f..82c8effc 100644 --- a/Oracle/SQLScripts/DROP_DB.sql +++ b/Oracle/SQLScripts/DROP_DB.sql @@ -35,6 +35,7 @@ accept DBVERSION CHAR DEFAULT 'S' PROMPT 'Which database license are you using? prompt VARIABLE BATCHFILE VARCHAR2(50); +VARIABLE GEORASTER_SUPPORT NUMBER; BEGIN IF NOT (upper('&DBVERSION')='L' or upper('&DBVERSION')='S') THEN @@ -45,6 +46,20 @@ BEGIN END; / +-- Check for SDO_GEORASTER support +BEGIN + :GEORASTER_SUPPORT := 0; + IF (upper('&DBVERSION')='S') THEN + SELECT COUNT(*) INTO :GEORASTER_SUPPORT FROM ALL_SYNONYMS + WHERE SYNONYM_NAME='SDO_GEORASTER'; + END IF; + + IF :GEORASTER_SUPPORT = 0 THEN + dbms_output.put_line('NOTE: The data type SDO_GEORASTER is not available for this database. Raster relief tables will not be created.'); + END IF; +END; +/ + -- Transfer the value from the bind variable to the substitution variable column mc new_value BATCHFILE2 print select :BATCHFILE mc from dual; diff --git a/Oracle/SQLScripts/DROP_DB2.sql b/Oracle/SQLScripts/DROP_DB2.sql index 92565a7a..af9ce72f 100644 --- a/Oracle/SQLScripts/DROP_DB2.sql +++ b/Oracle/SQLScripts/DROP_DB2.sql @@ -28,6 +28,10 @@ -- Disable versioning (if it was enabled before) @@DISABLE_VERSIONING2.sql +-- Transfer the value from the bind variable to the substitution variable +column mc2 new_value GEORASTER_SUPPORT print +select :GEORASTER_SUPPORT mc2 from dual; + ALTER TABLE ADDRESS_TO_BRIDGE DROP CONSTRAINT "ADDRESS_TO_BRIDGE_FK"; ALTER TABLE ADDRESS_TO_BRIDGE DROP CONSTRAINT "ADDRESS_TO_BRIDGE_FK1"; ALTER TABLE ADDRESS_TO_BUILDING DROP CONSTRAINT "ADDRESS_TO_BUILDING_FK"; @@ -184,7 +188,7 @@ ALTER TABLE PLANT_COVER DROP CONSTRAINT "PLANT_COVER_LOD3MSRF_FK"; ALTER TABLE PLANT_COVER DROP CONSTRAINT "PLANT_COVER_LOD4MSOLID_FK"; ALTER TABLE PLANT_COVER DROP CONSTRAINT "PLANT_COVER_LOD4MSRF_FK"; BEGIN - IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN + IF (upper('&DBVERSION')='S' and &GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'ALTER TABLE RASTER_RELIEF DROP CONSTRAINT "RASTER_RELIEF_COMP_FK"'; EXECUTE IMMEDIATE 'ALTER TABLE RASTER_RELIEF DROP CONSTRAINT "RASTER_RELIEF_COVERAGE_FK"'; END IF; @@ -328,7 +332,7 @@ DROP TABLE EXTERNAL_REFERENCE CASCADE CONSTRAINTS; DROP TABLE GENERALIZATION CASCADE CONSTRAINTS; DROP TABLE GENERIC_CITYOBJECT CASCADE CONSTRAINTS; BEGIN - IF ('&DBVERSION'='S' or '&DBVERSION'='s') THEN + IF (upper('&DBVERSION')='S' and &GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'DROP TABLE GRID_COVERAGE CASCADE CONSTRAINTS'; EXECUTE IMMEDIATE 'DROP TABLE GRID_COVERAGE_RDT CASCADE CONSTRAINTS'; END IF; @@ -343,7 +347,7 @@ DROP TABLE OPENING CASCADE CONSTRAINTS; DROP TABLE OPENING_TO_THEM_SURFACE CASCADE CONSTRAINTS; DROP TABLE PLANT_COVER CASCADE CONSTRAINTS; BEGIN - IF ('&DBVERSION'='S' or '&DBVERSION'='s') THEN + IF (upper('&DBVERSION')='S' and &GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'DROP TABLE RASTER_RELIEF CASCADE CONSTRAINTS'; END IF; END; @@ -381,7 +385,7 @@ DROP SEQUENCE CITYOBJECT_SEQ; DROP SEQUENCE EXTERNAL_REF_SEQ; DROP SEQUENCE IMPLICIT_GEOMETRY_SEQ; BEGIN - IF ('&DBVERSION'='S' or '&DBVERSION'='s') THEN + IF (upper('&DBVERSION')='S' and &GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'DROP SEQUENCE GRID_COVERAGE_SEQ'; EXECUTE IMMEDIATE 'DROP SEQUENCE GRID_COVERAGE_RDT_SEQ'; END IF; diff --git a/Oracle/SQLScripts/ENABLE_VERSIONING2.sql b/Oracle/SQLScripts/ENABLE_VERSIONING2.sql index c056ca21..3c0e3a18 100644 --- a/Oracle/SQLScripts/ENABLE_VERSIONING2.sql +++ b/Oracle/SQLScripts/ENABLE_VERSIONING2.sql @@ -29,6 +29,7 @@ SELECT 'EnableVersioning procedure is working, that takes a while.' as message f -- for Oracle locator, the RASTER_RELIEF and GRID_COVERAGE_RDT tables are not exist BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN DBMS_WM.EnableVersioning('ADDRESS,ADDRESS_TO_BRIDGE,ADDRESS_TO_BUILDING,APPEAR_TO_SURFACE_DATA,APPEARANCE,BREAKLINE_RELIEF,BRIDGE,BRIDGE_CONSTR_ELEMENT,BRIDGE_FURNITURE,BRIDGE_INSTALLATION,BRIDGE_OPEN_TO_THEM_SRF,BRIDGE_OPENING,BRIDGE_ROOM,BRIDGE_THEMATIC_SURFACE,BUILDING,BUILDING_FURNITURE,BUILDING_INSTALLATION,CITY_FURNITURE,CITYMODEL,CITYOBJECT,CITYOBJECT_GENERICATTRIB,CITYOBJECT_MEMBER,CITYOBJECTGROUP,EXTERNAL_REFERENCE,GENERALIZATION,GENERIC_CITYOBJECT,GROUP_TO_CITYOBJECT,IMPLICIT_GEOMETRY,LAND_USE,MASSPOINT_RELIEF,OPENING,OPENING_TO_THEM_SURFACE,PLANT_COVER,GRID_COVERAGE_RDT,RASTER_RELIEF,RELIEF_COMPONENT,RELIEF_FEAT_TO_REL_COMP,RELIEF_FEATURE,ROOM,SOLITARY_VEGETAT_OBJECT,SURFACE_DATA,SURFACE_GEOMETRY,TEX_IMAGE,TEXTUREPARAM,THEMATIC_SURFACE,TIN_RELIEF,TRAFFIC_AREA,TRANSPORTATION_COMPLEX,TUNNEL,TUNNEL_FURNITURE,TUNNEL_HOLLOW_SPACE,TUNNEL_INSTALLATION,TUNNEL_OPEN_TO_THEM_SRF,TUNNEL_OPENING,TUNNEL_THEMATIC_SURFACE,WATERBOD_TO_WATERBND_SRF,WATERBODY,WATERBOUNDARY_SURFACE','VIEW_WO_OVERWRITE'); ELSE diff --git a/Oracle/SQLScripts/MIGRATION/CONSTRAINTS_V3.sql b/Oracle/SQLScripts/MIGRATION/CONSTRAINTS_V3.sql index cf21afe4..92f941d7 100644 --- a/Oracle/SQLScripts/MIGRATION/CONSTRAINTS_V3.sql +++ b/Oracle/SQLScripts/MIGRATION/CONSTRAINTS_V3.sql @@ -1533,6 +1533,7 @@ REFERENCES SURFACE_GEOMETRY ENABLE; BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'ALTER TABLE RASTER_RELIEF ADD CONSTRAINT RASTER_RELIEF_COMP_FK FOREIGN KEY diff --git a/Oracle/SQLScripts/MIGRATION/CREATE_INDEXES_V3.sql b/Oracle/SQLScripts/MIGRATION/CREATE_INDEXES_V3.sql index aada3bd2..811c5900 100644 --- a/Oracle/SQLScripts/MIGRATION/CREATE_INDEXES_V3.sql +++ b/Oracle/SQLScripts/MIGRATION/CREATE_INDEXES_V3.sql @@ -314,6 +314,7 @@ CREATE INDEX PLANT_COVER_LOD4MSOLID_FKX ON PLANT_COVER (LOD4_MULTI_SOLID_ID); CREATE INDEX PLANT_COVER_LOD4MSRF_FKX ON PLANT_COVER (LOD4_MULTI_SURFACE_ID); BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'CREATE INDEX RASTER_RELIEF_COVERAGE_FKX ON RASTER_RELIEF (COVERAGE_ID)'; END IF; diff --git a/Oracle/SQLScripts/MIGRATION/DROP_INDEXES_V3.sql b/Oracle/SQLScripts/MIGRATION/DROP_INDEXES_V3.sql index 320ca387..1f3cd73b 100644 --- a/Oracle/SQLScripts/MIGRATION/DROP_INDEXES_V3.sql +++ b/Oracle/SQLScripts/MIGRATION/DROP_INDEXES_V3.sql @@ -312,6 +312,7 @@ DROP INDEX PLANT_COVER_LOD4MSOLID_FKX; DROP INDEX PLANT_COVER_LOD4MSRF_FKX; BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'DROP INDEX RASTER_RELIEF_COVERAGE_FKX'; END IF; diff --git a/Oracle/SQLScripts/MIGRATION/MIGRATE_DB.sql b/Oracle/SQLScripts/MIGRATION/MIGRATE_DB.sql index ff5e4c12..641393d3 100644 --- a/Oracle/SQLScripts/MIGRATION/MIGRATE_DB.sql +++ b/Oracle/SQLScripts/MIGRATION/MIGRATE_DB.sql @@ -94,6 +94,7 @@ BEGIN END; / BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN :MGRPBATCHFILE := 'MIGRATE_DB_V2_V3_Sptl'; END IF; diff --git a/Oracle/SQLScripts/SCHEMA/CONSTRAINTS/CONSTRAINTS.sql b/Oracle/SQLScripts/SCHEMA/CONSTRAINTS/CONSTRAINTS.sql index f3e34502..03d566eb 100644 --- a/Oracle/SQLScripts/SCHEMA/CONSTRAINTS/CONSTRAINTS.sql +++ b/Oracle/SQLScripts/SCHEMA/CONSTRAINTS/CONSTRAINTS.sql @@ -1731,6 +1731,7 @@ REFERENCES SURFACE_GEOMETRY ENABLE; BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'ALTER TABLE RASTER_RELIEF ADD CONSTRAINT RASTER_RELIEF_COMP_FK FOREIGN KEY diff --git a/Oracle/SQLScripts/SCHEMA/INDEXES/SIMPLE_INDEX.sql b/Oracle/SQLScripts/SCHEMA/INDEXES/SIMPLE_INDEX.sql index 64b60b90..cbfe6c2d 100644 --- a/Oracle/SQLScripts/SCHEMA/INDEXES/SIMPLE_INDEX.sql +++ b/Oracle/SQLScripts/SCHEMA/INDEXES/SIMPLE_INDEX.sql @@ -312,6 +312,7 @@ CREATE INDEX PLANT_COVER_LOD4MSOLID_FKX ON PLANT_COVER (LOD4_MULTI_SOLID_ID); CREATE INDEX PLANT_COVER_LOD4MSRF_FKX ON PLANT_COVER (LOD4_MULTI_SURFACE_ID); BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'CREATE INDEX RASTER_RELIEF_COVERAGE_FKX ON RASTER_RELIEF (COVERAGE_ID)'; END IF; diff --git a/Oracle/SQLScripts/SCHEMA/SEQUENCES/SEQUENCES.sql b/Oracle/SQLScripts/SCHEMA/SEQUENCES/SEQUENCES.sql index 56324818..18d075ed 100644 --- a/Oracle/SQLScripts/SCHEMA/SEQUENCES/SEQUENCES.sql +++ b/Oracle/SQLScripts/SCHEMA/SEQUENCES/SEQUENCES.sql @@ -40,6 +40,7 @@ CREATE SEQUENCE EXTERNAL_REF_SEQ INCREMENT BY 1 START WITH 1 MINVALUE 1 CACHE 10 CREATE SEQUENCE IMPLICIT_GEOMETRY_SEQ INCREMENT BY 1 START WITH 1 MINVALUE 1 CACHE 10000; BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'CREATE SEQUENCE GRID_COVERAGE_SEQ INCREMENT BY 1 START WITH 1 MINVALUE 1 NOCACHE'; EXECUTE IMMEDIATE 'CREATE SEQUENCE GRID_COVERAGE_RDT_SEQ INCREMENT BY 1 START WITH 1 MINVALUE 1 NOCACHE'; diff --git a/Oracle/SQLScripts/SCHEMA/TABLES/TABLES.sql b/Oracle/SQLScripts/SCHEMA/TABLES/TABLES.sql index d5cf4319..ffc01e75 100644 --- a/Oracle/SQLScripts/SCHEMA/TABLES/TABLES.sql +++ b/Oracle/SQLScripts/SCHEMA/TABLES/TABLES.sql @@ -775,6 +775,7 @@ CREATE TABLE PLANT_COVER ); BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN EXECUTE IMMEDIATE 'CREATE TABLE RASTER_RELIEF ( diff --git a/Oracle/SQLScripts/UPGRADE/FROM_3_0/UPGRADE_DB_FROM_3_0.sql b/Oracle/SQLScripts/UPGRADE/FROM_3_0/UPGRADE_DB_FROM_3_0.sql index bb484b57..1279ba68 100644 --- a/Oracle/SQLScripts/UPGRADE/FROM_3_0/UPGRADE_DB_FROM_3_0.sql +++ b/Oracle/SQLScripts/UPGRADE/FROM_3_0/UPGRADE_DB_FROM_3_0.sql @@ -114,6 +114,7 @@ END; / BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN :DELETE_FILE := '../../PL_SQL/CITYDB_PKG/DELETE/DELETE.sql'; ELSE diff --git a/Oracle/SQLScripts/UPGRADE/FROM_3_1_OR_HIGHER/UPGRADE_DB_FROM_3_1.sql b/Oracle/SQLScripts/UPGRADE/FROM_3_1_OR_HIGHER/UPGRADE_DB_FROM_3_1.sql index 8b99071d..5981bd48 100644 --- a/Oracle/SQLScripts/UPGRADE/FROM_3_1_OR_HIGHER/UPGRADE_DB_FROM_3_1.sql +++ b/Oracle/SQLScripts/UPGRADE/FROM_3_1_OR_HIGHER/UPGRADE_DB_FROM_3_1.sql @@ -59,6 +59,7 @@ END; / BEGIN + :GEORASTER_SUPPORT := :GEORASTER_SUPPORT; IF (upper('&DBVERSION')='S' and :GEORASTER_SUPPORT <> 0) THEN :DELETE_FILE := '../../PL_SQL/CITYDB_PKG/DELETE/DELETE.sql'; ELSE