Author: tchemit Date: 2013-12-12 14:50:57 +0100 (Thu, 12 Dec 2013) New Revision: 901 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/901 Log: fixes #3852: Ajout de vues spatiales Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 11:14:47 UTC (rev 900) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 13:50:57 UTC (rev 901) @@ -168,6 +168,7 @@ // add operation data view queries.add("DROP VIEW IF EXISTS TotalSampleEngrEnc;"); queries.add("CREATE OR REPLACE VIEW TotalSampleEngrEnc AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -178,13 +179,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM\n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -193,10 +194,11 @@ " speciescategory.sizecategory = sizecategory.topiaid AND\n" + " speciescategory.species = species.topiaid AND\n" + " sampletype.name = 'Total' AND\n" + - " species.baracoudacode='ENGR-ENC';"); + " species.baracoudacode='ENGR-ENC';\n"); queries.add("DROP VIEW IF EXISTS TotalSampleSardPil;"); queries.add("CREATE OR REPLACE VIEW TotalSampleSardPil AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -207,13 +209,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -226,6 +228,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleTracTru;"); queries.add("CREATE OR REPLACE VIEW TotalSampleTracTru AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -236,13 +239,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -255,6 +258,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleSpraSpr;"); queries.add("CREATE OR REPLACE VIEW TotalSampleSpraSpr AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -265,13 +269,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -284,6 +288,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleScomSco;"); queries.add("CREATE OR REPLACE VIEW TotalSampleScomSco AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -294,13 +299,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -313,6 +318,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleMicrPou;"); queries.add("CREATE OR REPLACE VIEW TotalSampleMicrPou AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -323,13 +329,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -342,6 +348,7 @@ queries.add("DROP VIEW IF EXISTS TotalCatchSpOpWide;"); queries.add("CREATE OR REPLACE VIEW TotalCatchSpOpWide AS\n" + + "\n" + "SELECT\n" + " echobase_operation_spatial.voyagename,\n" + " echobase_operation_spatial.operationname,\n" + @@ -351,8 +358,8 @@ " (Select SUM(totalsamplespraspr.sampleweight) From totalsamplespraspr Where totalsamplespraspr.operation_id = echobase_operation_spatial.operationname) as TotalCatchSPRASPR,\n" + " (Select SUM(totalsamplemicrpou.sampleweight) From totalsamplemicrpou Where totalsamplemicrpou.operation_id = echobase_operation_spatial.operationname) as TotalCatchMICRPOU,\n" + " (Select SUM(totalsamplescomsco.sampleweight) From totalsamplescomsco Where totalsamplescomsco.operation_id = echobase_operation_spatial.operationname) as TotalCatchSCOMSCO,\n" + - " (Select SUM(totalsampletractru.sampleweight) From totalsampletractru Where totalsampletractru.operation_id = echobase_operation_spatial.operationname) as TotalCatchTRACTRU\n" + - "From echobase_operation_spatial;"); + " (Select SUM(totalsampletractru.sampleweight) From totalsampletractru Where totalsampletractru.operation_id = echobase_operation_spatial.operationname) as TotalCatchTRACTRU,\n" + + " echobase_operation_spatial.operationid;"); queries.add("DROP VIEW IF EXISTS cellmapview;"); queries.add("CREATE OR REPLACE VIEW cellmapview AS \n" +