KEYCLOAK-1403 Update liquibase to newest version. Fix Sybase

keycloak · Jun 12, 2015 · 112ebf7 · 112ebf7
1 parent 5993d40
commit 112ebf7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.3.0.Beta1.xml b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.3.0.Beta1.xml
@@ -48,8 +48,12 @@
             <column name="FLOW_ID" type="VARCHAR(36)"/>
             <column name="REQUIREMENT" type="INT"/>
             <column name="PRIORITY" type="INT"/>
-            <column name="USER_SETUP_ALLOWED" type="BOOLEAN" defaultValueBoolean="false"/>
-            <column name="AUTHENTICATOR_FLOW" type="BOOLEAN" defaultValueBoolean="false"/>
+            <column name="USER_SETUP_ALLOWED" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+            <column name="AUTHENTICATOR_FLOW" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
         </createTable>
         <createTable tableName="AUTHENTICATOR_CONFIG">
             <column name="AUTHENTICATOR_ID" type="VARCHAR(36)">
@@ -111,7 +115,9 @@
             <column name="AUTH_USER_ID" type="VARCHAR(36)"/>
         </addColumn>
         <addColumn tableName="IDENTITY_PROVIDER">
-            <column name="TRUST_EMAIL" type="BOOLEAN" defaultValueBoolean="false"/>
+            <column name="TRUST_EMAIL" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
             <column name="UPDATE_PROFILE_FIRST_LGN_MD" type="VARCHAR(255)" defaultValue="on">
                 <constraints nullable="false"/>
             </column>
@@ -128,7 +134,7 @@
         <dropColumn tableName="IDENTITY_PROVIDER" columnName="UPDATE_PROFILE_FIRST_LOGIN"/>
 
         <addColumn tableName="USER_REQUIRED_ACTION">
-            <column name="REQUIRED_ACTION" type="VARCHAR(36)">
+            <column name="REQUIRED_ACTION" type="VARCHAR(255)" defaultValue="">
                 <constraints nullable="false"/>
             </column>
         </addColumn>
@@ -170,5 +176,12 @@
 
         <dropDefaultValue tableName="REALM" columnName="PASSWORD_CRED_GRANT_ALLOWED" />
         <dropColumn tableName="REALM" columnName="PASSWORD_CRED_GRANT_ALLOWED"/>
+
+        <!-- Sybase specific hacks -->
+        <modifySql dbms="sybase">
+            <replace replace="DROP PRIMARY KEY" with="DROP CONSTRAINT CONSTRAINT_2" />
+            <regExpReplace replace=".*(SET DEFAULT NULL)" with="SELECT 1" />
+        </modifySql>
+
     </changeSet>
 </databaseChangeLog>
diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
         <sun.xsom.version>20140925</sun.xsom.version>
         <javax.mail.version>1.4.5</javax.mail.version>
         <infinispan.version>6.0.2.Final</infinispan.version>
-        <liquibase.version>3.3.2</liquibase.version>
+        <liquibase.version>3.3.5</liquibase.version>
         <jetty9.version>9.1.0.v20131115</jetty9.version>
         <osgi.version>4.2.0</osgi.version>
         <pax.web.version>3.1.2</pax.web.version>