NOJIRA: Newer hyperjaxb code caused column TENANTS_ACCOUNTSCOMMON_CSID to change...

diff --git a/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/login.conf b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/login.conf
index 0892750f998b9d6cade713c186f82e465ca7e73c..7648abca92fc5c703fc6ddf72a17d2b6c5b50ce2 100644 (file)
--- 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 e8c5b560e31b1cac7668529a95a11a32de749096..674f750535fde8780b9fb02577ccef2a136202a6 100644 (file)
--- 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.");