sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1796286 - in /sis/trunk/core/sis-metadata/src: main/resources/org/apache/sis/metadata/sql/Create.sql test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
Date Fri, 26 May 2017 14:20:33 GMT
Author: desruisseaux
Date: Fri May 26 14:20:33 2017
New Revision: 1796286

URL: http://svn.apache.org/viewvc?rev=1796286&view=rev
Log:
The mechanism added in previous commit (which allows to compute ISO 19115:2003 deprecated
properties from
ISO 19115:2014 non-deprecated properties) now allows SIS trunk to use the same SQL than other
SIS branches.

Modified:
    sis/trunk/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Create.sql
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java

Modified: sis/trunk/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Create.sql
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Create.sql?rev=1796286&r1=1796285&r2=1796286&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Create.sql
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Create.sql
[UTF-8] Fri May 26 14:20:33 2017
@@ -82,8 +82,7 @@ FOREIGN KEY ("authority") REFERENCES met
 
 CREATE TABLE metadata."MD_Format" (
   ID                            VARCHAR(15) NOT NULL PRIMARY KEY,
-  "name"                        VARCHAR(120),
-  "specification"               VARCHAR(120),
+  "formatSpecificationCitation" VARCHAR(15) REFERENCES metadata."CI_Citation" (ID) ON UPDATE
RESTRICT ON DELETE RESTRICT,
   "amendmentNumber"             VARCHAR(120),
   "fileDecompressionTechnique"  VARCHAR(120));
 
@@ -125,10 +124,10 @@ INSERT INTO metadata."CI_Citation" (ID,
   ('CSV-MF',  'CSV',     'OGC Moving Features Encoding Extension: Simple Comma-Separated
Values (CSV)'),
   ('GPX',     'GPX',     'GPS Exchange Format');
 
-INSERT INTO metadata."MD_Format" (ID, "name", "specification") VALUES
-  ('GeoTIFF', 'GeoTIFF', 'GeoTIFF Coverage Encoding Profile'),
-  ('NetCDF',  'NetCDF',  'NetCDF Classic and 64-bit Offset Format'),
-  ('PNG',     'PNG',     'PNG (Portable Network Graphics) Specification'),
-  ('CSV',     'CSV',     'Common Format and MIME Type for Comma-Separated Values (CSV) Files'),
-  ('CSV-MF',  'CSV',     'OGC Moving Features Encoding Extension: Simple Comma-Separated
Values (CSV)'),
-  ('GPX',     'GPX',     'GPS Exchange Format');
+INSERT INTO metadata."MD_Format" (ID, "formatSpecificationCitation") VALUES
+  ('GeoTIFF', 'GeoTIFF'),
+  ('NetCDF',  'NetCDF'),
+  ('PNG',     'PNG'),
+  ('CSV',     'CSV'),
+  ('CSV-MF',  'CSV-MF'),
+  ('GPX',     'GPX');

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java?rev=1796286&r1=1796285&r2=1796286&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/sql/MetadataSourceTest.java
[UTF-8] Fri May 26 14:20:33 2017
@@ -54,7 +54,7 @@ public final strictfp class MetadataSour
         try (MetadataSource source = new MetadataSource(MetadataStandard.ISO_19115, ds, "metadata",
null)) {
             source.install();
             verifyFormats(source);
-//          testSearch(source);
+            testSearch(source);
         } finally {
             TestDatabase.drop(ds);
         }



Mime
View raw message