Prosoft Git

keycloak-aplcache

KEYCLOAK-3734 Unify master changelog of DB2 and other databases

11/14/2016 10:57:57 AM
Hynek Mlnarik

Hynek Mlnarik

Commit: 223041b

Tree: b65d241

Parents: 6c64494

Changes

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java 5(+2 -3)

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java 3(+1 -2)

model/jpa/src/main/resources/META-INF/db2-jpa-changelog-master.xml 40(+0 -40)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml 6(+6 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final-db2.xml 6(+5 -1)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml 6(+6 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1-db2.xml 6(+5 -1)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml 6(+6 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1-db2.xml 6(+5 -1)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml 6(+6 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0-db2.xml 6(+5 -1)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml 11(+11 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0-db2.xml 9(+8 -1)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.1.xml 6(+6 -0)

model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.1-db2.xml 6(+5 -1)

model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml 6(+6 -0)

Details

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java 5(+2 -3) 

diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java
index 3bd2643..438d76b 100644
--- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java
+++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java
@@ -22,7 +22,6 @@ import liquibase.changelog.ChangeSet;
 import liquibase.changelog.DatabaseChangeLog;
 import liquibase.database.Database;
 import liquibase.database.DatabaseFactory;
-import liquibase.database.core.DB2Database;
 import liquibase.database.jvm.JdbcConnection;
 import liquibase.exception.LiquibaseException;
 import liquibase.logging.LogFactory;
@@ -129,7 +128,7 @@ public class DefaultLiquibaseConnectionProvider implements LiquibaseConnectionPr
             database.setDefaultSchemaName(defaultSchema);
         }
 
-        String changelog = (database instanceof DB2Database) ? LiquibaseJpaUpdaterProvider.DB2_CHANGELOG :  LiquibaseJpaUpdaterProvider.CHANGELOG;
+        String changelog = LiquibaseJpaUpdaterProvider.CHANGELOG;
         ResourceAccessor resourceAccessor = new ClassLoaderResourceAccessor(getClass().getClassLoader());
 
         logger.debugf("Using changelog file %s and changelogTableName %s", changelog, database.getDatabaseChangeLogTableName());
@@ -154,7 +153,7 @@ public class DefaultLiquibaseConnectionProvider implements LiquibaseConnectionPr
 
     private static class LogWrapper extends LogFactory {
 
-        private liquibase.logging.Logger logger = new liquibase.logging.Logger() {
+        private static final liquibase.logging.Logger logger = new liquibase.logging.Logger() {
             @Override
             public void setName(String name) {
             }

model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java 3(+1 -2) 

diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java
index 48c41fd..8e50205 100755
--- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java
+++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java
@@ -55,7 +55,6 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
     private static final Logger logger = Logger.getLogger(LiquibaseJpaUpdaterProvider.class);
 
     public static final String CHANGELOG = "META-INF/jpa-changelog-master.xml";
-    public static final String DB2_CHANGELOG = "META-INF/db2-jpa-changelog-master.xml";
 
     private final KeycloakSession session;
 
@@ -99,7 +98,7 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
                     updateChangeSet(liquibase, liquibase.getChangeLogFile(), exportWriter);
                 }
             }
-        } catch (Exception e) {
+        } catch (LiquibaseException | IOException e) {
             throw new RuntimeException("Failed to update database", e);
         } finally {
             ThreadLocalSessionContext.removeCurrentSession();

model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml 6(+6 -0) 

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml
index a113601..7869f1e 100644
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.0.0.Final.xml
@@ -18,6 +18,12 @@
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
     <changeSet author="sthorger@redhat.com" id="1.0.0.Final">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN"> 
+            <not>
+                <dbms type="db2" />
+            </not>
+        </preConditions>
+
         <createTable tableName="APPLICATION_DEFAULT_ROLES">
             <column name="APPLICATION_ID" type="VARCHAR(36)">
                 <constraints nullable="false"/>

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml 6(+6 -0) 

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml
index de34d28..4e07267 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml
@@ -18,6 +18,12 @@
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
     <changeSet author="psilva@redhat.com" id="1.2.0.Beta1">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <dbms type="db2" />
+            </not>
+        </preConditions>
+
         <delete tableName="CLIENT_SESSION_ROLE"/>
         <delete tableName="CLIENT_SESSION_NOTE"/>
         <delete tableName="CLIENT_SESSION"/>

model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml 6(+6 -0) 

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml
index 3a7c6ba..5c9b676 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.2.0.CR1.xml
@@ -18,6 +18,12 @@
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
     <changeSet author="bburke@redhat.com" id="1.2.0.RC1">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <dbms type="db2" />
+            </not>
+        </preConditions>
+
         <delete tableName="CLIENT_SESSION_ROLE"/>
         <delete tableName="CLIENT_SESSION_NOTE"/>
         <delete tableName="CLIENT_SESSION"/>

model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml 6(+6 -0) 

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml
index 1b47050..a8bfc97 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.4.0.xml
@@ -18,6 +18,12 @@
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
     <changeSet author="bburke@redhat.com" id="1.4.0">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <dbms type="db2" />
+            </not>
+        </preConditions>
+
         <delete tableName="CLIENT_SESSION_AUTH_STATUS"/>
         <delete tableName="CLIENT_SESSION_ROLE"/>
         <delete tableName="CLIENT_SESSION_PROT_MAPPER"/>

model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml 11(+11 -0) 

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml
index 79ba2fc..5ebd8d4 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.8.0.xml
@@ -18,6 +18,11 @@
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
     <changeSet author="mposolda@redhat.com" id="1.8.0">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <dbms type="db2" />
+            </not>
+        </preConditions>
 
         <addColumn tableName="IDENTITY_PROVIDER">
             <column name="POST_BROKER_LOGIN_FLOW_ID" type="VARCHAR(36)">
@@ -130,6 +135,12 @@
     </changeSet>
 
     <changeSet id="1.8.0-2" author="keycloak">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <dbms type="db2" />
+            </not>
+        </preConditions>
+
         <dropDefaultValue tableName="CREDENTIAL" columnName="ALGORITHM" columnDataType="VARCHAR(36)"/>
 
         <update tableName="CREDENTIAL">

model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.1.xml 6(+6 -0) 

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.1.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.1.xml
index f801ddc..c083bc9 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.1.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-1.9.1.xml
@@ -18,6 +18,12 @@
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
     <changeSet author="keycloak" id="1.9.1">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <dbms type="db2" />
+            </not>
+        </preConditions>
+
         <modifyDataType tableName="REALM" columnName="PRIVATE_KEY" newDataType="VARCHAR(4000)"/>
         <modifyDataType tableName="REALM" columnName="PUBLIC_KEY" newDataType="VARCHAR(4000)"/>
         <modifyDataType tableName="REALM" columnName="CERTIFICATE" newDataType="VARCHAR(4000)"/>

model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml 6(+6 -0) 

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
index 8990fc4..dc16e0d 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
@@ -18,19 +18,25 @@
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.2.xsd">
     <include file="META-INF/jpa-changelog-1.0.0.Final.xml"/>
+    <include file="META-INF/jpa-changelog-1.0.0.Final-db2.xml"/>
     <include file="META-INF/jpa-changelog-1.1.0.Beta1.xml"/>
     <include file="META-INF/jpa-changelog-1.1.0.Final.xml"/>
     <include file="META-INF/jpa-changelog-1.2.0.Beta1.xml"/>
+    <include file="META-INF/jpa-changelog-1.2.0.Beta1-db2.xml"/>
     <include file="META-INF/jpa-changelog-1.2.0.CR1.xml"/>
+    <include file="META-INF/jpa-changelog-1.2.0.CR1-db2.xml"/>
     <include file="META-INF/jpa-changelog-1.2.0.Final.xml"/>
     <include file="META-INF/jpa-changelog-1.3.0.xml"/>
     <include file="META-INF/jpa-changelog-1.4.0.xml"/>
+    <include file="META-INF/jpa-changelog-1.4.0-db2.xml"/>
     <include file="META-INF/jpa-changelog-1.5.0.xml"/>
     <include file="META-INF/jpa-changelog-1.6.1.xml"/>
     <include file="META-INF/jpa-changelog-1.7.0.xml"/>
     <include file="META-INF/jpa-changelog-1.8.0.xml"/>
+    <include file="META-INF/jpa-changelog-1.8.0-db2.xml"/>
     <include file="META-INF/jpa-changelog-1.9.0.xml"/>
     <include file="META-INF/jpa-changelog-1.9.1.xml"/>
+    <include file="META-INF/jpa-changelog-1.9.1-db2.xml"/>
     <include file="META-INF/jpa-changelog-1.9.2.xml"/>
 
     <include file="META-INF/jpa-changelog-authz-master.xml"/>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github