From: Richard Millet <remillet@yahoo.com>
Date: Fri, 26 Dec 2014 08:42:24 +0000 (-0800)
Subject: NOJIRA: Newer hyperjaxb code caused column TENANTS_ACCOUNTSCOMMON_CSID to change... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8f41e557af02cf6d6a5abf6c534b409112d8a937;p=tmp%2Fjakarta-migration.git

NOJIRA: Newer hyperjaxb code caused column TENANTS_ACCOUNTSCOMMON_CSID to change to TENANTS_ACCOUNTS_COMMON_CSID
---

diff --git a/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/login.conf b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/login.conf
index 0892750f9..7648abca9 100644
--- a/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/login.conf
+++ b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/login.conf
@@ -6,8 +6,8 @@ CSpaceJBossDBLoginModule {
 	principalClass="org.collectionspace.authentication.CSpacePrincipal"
 	principalsQuery="select passwd from users where username=?"
 	rolesQuery="select r.rolename, 'Role' from roles as r, accounts_roles as ar where ar.user_id=? and ar.role_id=r.csid"
-	tenantsQueryWithDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTSCOMMON_CSID and at.tenant_id = t.id"
-	tenantsQueryNoDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTSCOMMON_CSID and at.tenant_id = t.id and NOT t.disabled"
+	tenantsQueryWithDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTS_COMMON_CSID and at.tenant_id = t.id"
+	tenantsQueryNoDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTS_COMMON_CSID and at.tenant_id = t.id and NOT t.disabled"
     maxRetrySeconds="5000"
     delayBetweenAttemptsMillis="200"
 	debug=true;
@@ -24,8 +24,8 @@ CSpaceJBossDBLoginModule {
 	principalClass="org.collectionspace.authentication.CSpacePrincipal"
 	principalsQuery="select passwd from users where username=?"
 	rolesQuery="select r.rolename, 'Role' from roles as r, accounts_roles as ar where ar.user_id=? and ar.role_id=r.csid"
-	tenantsQueryWithDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTSCOMMON_CSID and at.tenant_id = t.id"
-	tenantsQueryNoDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTSCOMMON_CSID and at.tenant_id = t.id and NOT t.disabled"
+	tenantsQueryWithDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTS_COMMON_CSID and at.tenant_id = t.id"
+	tenantsQueryNoDisabled="select t.id, t.name, 'Tenants' from accounts_common as a, accounts_tenants as at, tenants as t where a.userid=? and a.csid = at.TENANTS_ACCOUNTS_COMMON_CSID and at.tenant_id = t.id and NOT t.disabled"
     maxRetrySeconds="5000"
     delayBetweenAttemptsMillis="200"
 	debug=true;
diff --git a/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java b/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java
index e8c5b560e..674f75053 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java
@@ -645,11 +645,11 @@ public class AuthorizationCommon {
     		String insertAccountTenantSQL;
     		if (databaseProductType == DatabaseProductType.MYSQL) {
     			insertAccountTenantSQL =
-    					"INSERT INTO accounts_tenants (TENANTS_ACCOUNTSCOMMON_CSID,tenant_id) "
+    					"INSERT INTO accounts_tenants (TENANTS_ACCOUNTS_COMMON_CSID,tenant_id) "
     							+ " VALUES(?, ?)";
     		} else if (databaseProductType == DatabaseProductType.POSTGRESQL) {
     			insertAccountTenantSQL =
-    					"INSERT INTO accounts_tenants (HJID, TENANTS_ACCOUNTSCOMMON_CSID,tenant_id) "
+    					"INSERT INTO accounts_tenants (HJID, TENANTS_ACCOUNTS_COMMON_CSID,tenant_id) "
     							+ " VALUES(nextval('hibernate_sequence'), ?, ?)";
     		} else {
     			throw new Exception("Unrecognized database system.");