rename some sql files

opencadc · Dec 13, 2023 · ff3281f · ff3281f
1 parent 0f194e8
commit ff3281f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cadc-inventory-db/src/main/java/org/opencadc/inventory/db/version/InitDatabase.java b/cadc-inventory-db/src/main/java/org/opencadc/inventory/db/version/InitDatabase.java
@@ -3,7 +3,7 @@
 *******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 **************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 *
-*  (c) 2020.                            (c) 2020.
+*  (c) 2023.                            (c) 2023.
 *  Government of Canada                 Gouvernement du Canada
 *  National Research Council            Conseil national de recherches
 *  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -92,13 +92,13 @@ public class InitDatabase extends ca.nrc.cadc.db.version.InitDatabase {
         "inventory.DeletedStorageLocationEvent.sql",
         "inventory.StorageLocationEvent.sql",
         "inventory.HarvestState.sql",
-        "inventory.KeyPair.sql",
-        "inventory.permissions.sql"
+        "generic.PreauthKeyPair.sql",
+        "generic.permissions.sql"
     };
 
     static String[] UPGRADE_SQL = new String[] {
-        "inventory.KeyPair.sql",
-        "inventory.permissions.sql"
+        "generic.PreauthKeyPair.sql",
+        "generic.permissions.sql"
     };
 
     public InitDatabase(DataSource ds, String database, String schema) { 

diff --git a/cadc-inventory-db/src/main/java/org/opencadc/vospace/db/InitDatabaseVOS.java b/cadc-inventory-db/src/main/java/org/opencadc/vospace/db/InitDatabaseVOS.java
@@ -88,13 +88,13 @@ public class InitDatabaseVOS extends ca.nrc.cadc.db.version.InitDatabase {
         "vos.ModelVersion.sql",
         "vos.Node.sql",
         "vos.DeletedNodeEvent.sql",
-        "inventory.KeyPair.sql",
-        "inventory.permissions.sql"
+        "generic.PreauthKeyPair.sql",
+        "generic.permissions.sql"
     };
 
     static String[] UPGRADE_SQL = new String[] {
-        "inventory.KeyPair.sql",
-        "inventory.permissions.sql"
+        "generic.PreauthKeyPair.sql",
+        "generic.permissions.sql"
     };
 
     public InitDatabaseVOS(DataSource ds, String database, String schema) { 

diff --git a/.../src/main/resources/inventory.KeyPair.sql → ...main/resources/generic.PreauthKeyPair.sql b/.../src/main/resources/inventory.KeyPair.sql → ...main/resources/generic.PreauthKeyPair.sql
diff --git a/.../main/resources/inventory.permissions.sql → ...rc/main/resources/generic.permissions.sql b/.../main/resources/inventory.permissions.sql → ...rc/main/resources/generic.permissions.sql