From 2e29038ecd8d4ee42a7543fe3d2882d06c509ae2 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Tue, 1 Aug 2023 15:50:08 +0200
Subject: [PATCH] (db) Fix broken insert statement, move file storage defaults
 to a separate file.

---
 .../resources/sql/current/13-file-storage.sql | 25 -------------------
 .../14-file-storage-default-values.sql        | 24 ++++++++++++++++++
 2 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 code/common/db/src/main/resources/sql/current/14-file-storage-default-values.sql

diff --git a/code/common/db/src/main/resources/sql/current/13-file-storage.sql b/code/common/db/src/main/resources/sql/current/13-file-storage.sql
index 4c4be35d..b2063fc8 100644
--- a/code/common/db/src/main/resources/sql/current/13-file-storage.sql
+++ b/code/common/db/src/main/resources/sql/current/13-file-storage.sql
@@ -41,28 +41,3 @@ AS SELECT
     BASE.ID AS BASE_ID
 FROM FILE_STORAGE STORAGE
 INNER JOIN FILE_STORAGE_BASE BASE ON STORAGE.BASE_ID=BASE.ID;
-
-INSERT INTO FILE_STORAGE_BASE(NAME, PATH, TYPE, PERMIT_TEMP)
-VALUES
-('Index Storage', '/vol', 'SSD_FAST', false),
-('Data Storage', '/samples', 'SLOW', false);
-
-INSERT INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
-SELECT ID, 'iw', "Index Staging Area", 'INDEX_STAGING'
-FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
-
-INSERT INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
-SELECT ID, 'ir', "Index Live Area", 'INDEX_LIVE'
-FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
-
-INSERT INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
-SELECT ID, 'lw', "Lexicon Staging Area", 'LEXICON_STAGING'
-FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
-
-INSERT INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
-SELECT ID, 'lr', "Lexicon Live Area", 'LEXICON_LIVE'
-FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
-
-INSERT INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
-SELECT ID, 'ss', "Search Sets", 'SEARCH_SETS'
-FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
\ No newline at end of file
diff --git a/code/common/db/src/main/resources/sql/current/14-file-storage-default-values.sql b/code/common/db/src/main/resources/sql/current/14-file-storage-default-values.sql
new file mode 100644
index 00000000..e82d5901
--- /dev/null
+++ b/code/common/db/src/main/resources/sql/current/14-file-storage-default-values.sql
@@ -0,0 +1,24 @@
+INSERT IGNORE INTO FILE_STORAGE_BASE(NAME, PATH, TYPE, PERMIT_TEMP)
+VALUES
+('Index Storage', '/vol', 'SSD_INDEX', false),
+('Data Storage', '/samples', 'SLOW', false);
+
+INSERT IGNORE INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
+SELECT ID, 'iw', "Index Staging Area", 'INDEX_STAGING'
+FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
+
+INSERT IGNORE INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
+SELECT ID, 'ir', "Index Live Area", 'INDEX_LIVE'
+FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
+
+INSERT IGNORE INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
+SELECT ID, 'lw', "Lexicon Staging Area", 'LEXICON_STAGING'
+FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
+
+INSERT IGNORE INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
+SELECT ID, 'lr', "Lexicon Live Area", 'LEXICON_LIVE'
+FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
+
+INSERT IGNORE INTO FILE_STORAGE(BASE_ID, PATH, DESCRIPTION, TYPE)
+SELECT ID, 'ss', "Search Sets", 'SEARCH_SETS'
+FROM FILE_STORAGE_BASE WHERE NAME='IndexData';
\ No newline at end of file