From d29cbd07151994e9dbace4fbad6a54da73c3b274 Mon Sep 17 00:00:00 2001
From: David Crossley <dcrossley@indexgeo.com.au>
Date: Wed, 6 Sep 2017 13:17:41 +1000
Subject: [PATCH] Adjust database name to match changed module name

---
 destroy-demo-db.sh                                     | 4 ++--
 destroy-test-db.sh                                     | 4 ++--
 src/main/java/org/folio/rest/impl/LoanPoliciesAPI.java | 2 +-
 src/main/java/org/folio/rest/impl/LoansAPI.java        | 2 +-
 src/main/java/org/folio/rest/impl/RequestsAPI.java     | 2 +-
 src/test/java/org/folio/rest/api/StorageTestSuite.java | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/destroy-demo-db.sh b/destroy-demo-db.sh
index 4e815167d..b90a6294b 100755
--- a/destroy-demo-db.sh
+++ b/destroy-demo-db.sh
@@ -8,9 +8,9 @@ executing_password=${5:-}
 
 cd database-setup
 
-./destroy-db.sh loan_demo demo_tenant_circulation_storage loan_demo_admin ${host} ${port} ${executing_user} ${executing_password}
+./destroy-db.sh loan_demo demo_tenant_mod_circulation_storage loan_demo_admin ${host} ${port} ${executing_user} ${executing_password}
 
 # Drop the tenant based role as well, because deactivation no longer calls the Tenant API
-./drop-role.sh demo_tenant_circulation_storage
+./drop-role.sh demo_tenant_mod_circulation_storage
 
 cd ..
diff --git a/destroy-test-db.sh b/destroy-test-db.sh
index 2c83eb9d4..5c5be5d3f 100755
--- a/destroy-test-db.sh
+++ b/destroy-test-db.sh
@@ -7,8 +7,8 @@ executing_password=${4:-}
 
 cd database-setup
 
-./destroy-db.sh loan_test test_tenant_circulation_storage loan_test_admin ${host} ${port} ${executing_user} ${executing_password}
+./destroy-db.sh loan_test test_tenant_mod_circulation_storage loan_test_admin ${host} ${port} ${executing_user} ${executing_password}
 
-./drop-role.sh test_tenant_circulation_storage
+./drop-role.sh test_tenant_mod_circulation_storage
 
 cd ..
diff --git a/src/main/java/org/folio/rest/impl/LoanPoliciesAPI.java b/src/main/java/org/folio/rest/impl/LoanPoliciesAPI.java
index dd3c51040..c92e3ae13 100644
--- a/src/main/java/org/folio/rest/impl/LoanPoliciesAPI.java
+++ b/src/main/java/org/folio/rest/impl/LoanPoliciesAPI.java
@@ -45,7 +45,7 @@ public void deleteLoanPolicyStorageLoanPolicies(
           vertxContext.owner(), TenantTool.calculateTenantId(tenantId));
 
         postgresClient.mutate(String.format("TRUNCATE TABLE %s_%s.%s",
-          tenantId, "circulation_storage", LOAN_POLICY_TABLE),
+          tenantId, "mod_circulation_storage", LOAN_POLICY_TABLE),
           reply -> {
             asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(
               LoanPolicyStorageResource.DeleteLoanPolicyStorageLoanPoliciesResponse
diff --git a/src/main/java/org/folio/rest/impl/LoansAPI.java b/src/main/java/org/folio/rest/impl/LoansAPI.java
index 986581185..29d59bc48 100644
--- a/src/main/java/org/folio/rest/impl/LoansAPI.java
+++ b/src/main/java/org/folio/rest/impl/LoansAPI.java
@@ -52,7 +52,7 @@ public void deleteLoanStorageLoans(
           vertxContext.owner(), TenantTool.calculateTenantId(tenantId));
 
         postgresClient.mutate(String.format("TRUNCATE TABLE %s_%s.loan",
-          tenantId, "circulation_storage"),
+          tenantId, "mod_circulation_storage"),
           reply -> {
             asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(
               LoanStorageResource.DeleteLoanStorageLoansResponse
diff --git a/src/main/java/org/folio/rest/impl/RequestsAPI.java b/src/main/java/org/folio/rest/impl/RequestsAPI.java
index 6ccaa2137..27bd61507 100644
--- a/src/main/java/org/folio/rest/impl/RequestsAPI.java
+++ b/src/main/java/org/folio/rest/impl/RequestsAPI.java
@@ -44,7 +44,7 @@ public void deleteRequestStorageRequests(
           vertxContext.owner(), TenantTool.calculateTenantId(tenantId));
 
         postgresClient.mutate(String.format("TRUNCATE TABLE %s_%s.%s",
-          tenantId, "circulation_storage", REQUEST_TABLE),
+          tenantId, "mod_circulation_storage", REQUEST_TABLE),
           reply -> {
             asyncResultHandler.handle(io.vertx.core.Future.succeededFuture(
               DeleteRequestStorageRequestsResponse.withNoContent()));
diff --git a/src/test/java/org/folio/rest/api/StorageTestSuite.java b/src/test/java/org/folio/rest/api/StorageTestSuite.java
index 562f71119..5a1fd44a0 100644
--- a/src/test/java/org/folio/rest/api/StorageTestSuite.java
+++ b/src/test/java/org/folio/rest/api/StorageTestSuite.java
@@ -167,7 +167,7 @@ private static ResultSet getRecordsWithUnmatchedIds(String tenantId,
 
     String sql = String.format("SELECT null FROM %s_%s.%s" +
         " WHERE CAST(_id AS VARCHAR(50)) != jsonb->>'id'",
-      tenantId, "circulation_storage", tableName);
+      tenantId, "mod_circulation_storage", tableName);
 
     dbClient.select(sql, result -> {
       if(result.succeeded()) {