Author: tchemit Date: 2013-12-16 22:43:46 +0100 (Mon, 16 Dec 2013) New Revision: 913 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/913 Log: refs #4018: Migration de base en erreur (add cascade on each drop command to avoid migration failures Modified: trunk/echobase-services/src/main/resources/postgis-structure.sql trunk/echobase-services/src/main/resources/postgis-view.sql Modified: trunk/echobase-services/src/main/resources/postgis-structure.sql =================================================================== --- trunk/echobase-services/src/main/resources/postgis-structure.sql 2013-12-16 21:21:32 UTC (rev 912) +++ trunk/echobase-services/src/main/resources/postgis-structure.sql 2013-12-16 21:43:46 UTC (rev 913) @@ -22,69 +22,63 @@ --- CREATE EXTENSION IF NOT EXISTS postgis; -DROP VIEW IF EXISTS TotalCatchSpOpWide; -DROP VIEW IF EXISTS echobase_spatial_cell_result; -DROP VIEW IF EXISTS echobase_spatial_cell_data; -DROP VIEW IF EXISTS TotalSampleEngrEnc; -DROP VIEW IF EXISTS TotalSampleSardPil; -DROP VIEW IF EXISTS TotalSampleTracTru; -DROP VIEW IF EXISTS TotalSampleSpraSpr; -DROP VIEW IF EXISTS TotalSampleScomSco; -DROP VIEW IF EXISTS TotalSampleMicrPou; -DROP VIEW IF EXISTS cellmapview; +DROP VIEW IF EXISTS TotalCatchSpOpWide CASCADE; +DROP VIEW IF EXISTS echobase_cell_spatial_data CASCADE; +DROP VIEW IF EXISTS echobase_cell_spatial_result CASCADE; +DROP VIEW IF EXISTS TotalSampleEngrEnc CASCADE; +DROP VIEW IF EXISTS TotalSampleSardPil CASCADE; +DROP VIEW IF EXISTS TotalSampleTracTru CASCADE; +DROP VIEW IF EXISTS TotalSampleSpraSpr CASCADE; +DROP VIEW IF EXISTS TotalSampleScomSco CASCADE; +DROP VIEW IF EXISTS TotalSampleMicrPou CASCADE; +DROP VIEW IF EXISTS cellmapview CASCADE; -DROP TABLE IF EXISTS echobase_cell_spatial; -DROP INDEX IF EXISTS echobase_cell_spatial_coordinate_gix; -DROP INDEX IF EXISTS echobase_cell_spatial_coordinate3D_gix; -DROP INDEX IF EXISTS echobase_cell_spatial_shape_gix; -DROP INDEX IF EXISTS echobase_cell_spatial_voyageid_idx; -DROP TABLE IF EXISTS echobase_cell_spatial_temp; +DROP INDEX IF EXISTS echobase_cell_spatial_coordinate_gix CASCADE; +DROP INDEX IF EXISTS echobase_cell_spatial_coordinate3D_gix CASCADE; +DROP INDEX IF EXISTS echobase_cell_spatial_shape_gix CASCADE; +DROP INDEX IF EXISTS echobase_cell_spatial_voyageid_idx CASCADE; +DROP TABLE IF EXISTS echobase_cell_spatial CASCADE; +DROP TABLE IF EXISTS echobase_cell_spatial_temp CASCADE; -DROP TRIGGER IF EXISTS echobase_fill_cell_spatial_work_table_trigger ON data; -DROP FUNCTION IF EXISTS echobase_fill_spatial_temp_table(); -DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_temp_table(); - -DROP TRIGGER IF EXISTS echobase_delete_cell ON cell; -DROP FUNCTION IF EXISTS echobase_delete_cell(); -DROP FUNCTION IF EXISTS echobase_compute_all_cell_spatial_data(); -DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_table(); -DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_row(cell_id VARCHAR); -DROP FUNCTION IF EXISTS echobase_fill_esdu_cell_spatial_table(cell_id VARCHAR); -DROP FUNCTION IF EXISTS echobase_fill_elementary_cell_spatial_table(cell_id VARCHAR); -DROP FUNCTION IF EXISTS echobase_fill_region_cell_spatial_table(cell_id VARCHAR); -DROP FUNCTION IF EXISTS echobase_fill_map_cell_spatial_table(cell_id VARCHAR); +DROP TRIGGER IF EXISTS echobase_fill_cell_spatial_work_table_trigger ON data CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_spatial_temp_table() CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_temp_table() CASCADE; +DROP TRIGGER IF EXISTS echobase_delete_cell ON cell CASCADE; +DROP FUNCTION IF EXISTS echobase_delete_cell() CASCADE; +DROP FUNCTION IF EXISTS echobase_compute_all_cell_spatial_data() CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_table() CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_row(cell_id VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_esdu_cell_spatial_table(cell_id VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_elementary_cell_spatial_table(cell_id VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_region_cell_spatial_table(cell_id VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_map_cell_spatial_table(cell_id VARCHAR) CASCADE; DROP FUNCTION IF EXISTS echobase_create_echobase_cell_spatial_row( cell_id VARCHAR, coordinateText VARCHAR, coordinate3dText VARCHAR, -shapeText VARCHAR); +shapeText VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_get_cell_type(cell_id VARCHAR) CASCADE; -DROP FUNCTION IF EXISTS echobase_get_cell_type(cell_id VARCHAR); - - -DROP TABLE IF EXISTS echobase_operation_spatial; DROP INDEX IF EXISTS echobase_operation_spatial_coordinate_gix; DROP INDEX IF EXISTS echobase_operation_spatial_voyageid_idx; -DROP TABLE IF EXISTS echobase_operation_spatial_temp; -DROP TRIGGER IF EXISTS echobase_fill_operation_spatial_work_table_trigger ON operation; -DROP FUNCTION IF EXISTS echobase_fill_operation_spatial_temp_table(); -DROP TRIGGER IF EXISTS echobase_delete_operation ON operation; -DROP FUNCTION IF EXISTS echobase_delete_operation(); - -DROP FUNCTION IF EXISTS echobase_compute_all_operation_spatial_data(); -DROP FUNCTION IF EXISTS echobase_fill_operation_spatial_table(); -DROP FUNCTION IF EXISTS echobase_fill_operation_spatial_row(operation_id VARCHAR); - +DROP TABLE IF EXISTS echobase_operation_spatial CASCADE ; +DROP TABLE IF EXISTS echobase_operation_spatial_temp CASCADE; +DROP TRIGGER IF EXISTS echobase_fill_operation_spatial_work_table_trigger ON operation CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_operation_spatial_temp_table() CASCADE; +DROP TRIGGER IF EXISTS echobase_delete_operation ON operation CASCADE; +DROP FUNCTION IF EXISTS echobase_delete_operation() CASCADE; +DROP FUNCTION IF EXISTS echobase_compute_all_operation_spatial_data() CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_operation_spatial_table() CASCADE; +DROP FUNCTION IF EXISTS echobase_fill_operation_spatial_row(operation_id VARCHAR) CASCADE; DROP FUNCTION IF EXISTS echobase_create_echobase_operation_spatial_row( operation_id VARCHAR, -coordinateText VARCHAR); +coordinateText VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_latitudetext_to_dd(latitude VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_longitudetext_to_dd(longitude VARCHAR) CASCADE; +DROP FUNCTION IF EXISTS echobase_dms2dd(D INTEGER, M INTEGER, S INTEGER, HEMI CHARACTER VARYING(1)) CASCADE; +DROP FUNCTION IF EXISTS echobase_compute_all_spatial_data() CASCADE; -DROP FUNCTION IF EXISTS echobase_latitudetext_to_dd(latitude VARCHAR); -DROP FUNCTION IF EXISTS echobase_longitudetext_to_dd(longitude VARCHAR); -DROP FUNCTION IF EXISTS echobase_dms2dd(D INTEGER, M INTEGER, S INTEGER, HEMI CHARACTER VARYING(1)); -DROP FUNCTION IF EXISTS echobase_compute_all_spatial_data(); - -------------------------------------------------------------------------------- -- Table spatial pour les cellules --------------------------------------------- -------------------------------------------------------------------------------- Modified: trunk/echobase-services/src/main/resources/postgis-view.sql =================================================================== --- trunk/echobase-services/src/main/resources/postgis-view.sql 2013-12-16 21:21:32 UTC (rev 912) +++ trunk/echobase-services/src/main/resources/postgis-view.sql 2013-12-16 21:43:46 UTC (rev 913) @@ -1,7 +1,7 @@ -- ajout de vues liés aux tables spatiales -DROP VIEW IF EXISTS echobase_spatial_cell_result; -CREATE OR REPLACE VIEW echobase_spatial_cell_result AS +DROP VIEW IF EXISTS echobase_cell_spatial_result; +CREATE OR REPLACE VIEW echobase_cell_spatial_result AS SELECT s.*, m.topiaId AS metaDataId, @@ -16,8 +16,8 @@ s.cellid = r.cell AND r.datametadata = m.topiaid; -DROP VIEW IF EXISTS echobase_spatial_cell_data; -CREATE OR REPLACE VIEW echobase_spatial_cell_data AS +DROP VIEW IF EXISTS echobase_cell_spatial_data; +CREATE OR REPLACE VIEW echobase_cell_spatial_data AS SELECT s.*, m.topiaId AS metaDataId,