Merge branch '1366_DateTimeType@38_NPE_fix' of https://github.com/mir…

…onbalcerzak/liquibase into LB-623
liquibase · Mar 3, 2021 · 07b17ab · 07b17ab
2 parents 9b73abb + 2498b07
commit 07b17ab
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/datatype/core/DateTimeType.java b/liquibase-core/src/main/java/liquibase/datatype/core/DateTimeType.java
@@ -25,6 +25,8 @@ public class DateTimeType extends LiquibaseDataType {
 
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
+        String originalDefinition = StringUtil.trimToEmpty(getRawDefinition());
+
         if ((database instanceof DerbyDatabase) || (database instanceof FirebirdDatabase) || (database instanceof
             H2Database) || (database instanceof HsqlDatabase)) {
             return new DatabaseDataType(SQL_DATETYPE_TIMESTAMP);
@@ -35,14 +37,13 @@ public DatabaseDataType toDatabaseDataType(Database database) {
 		}
 
         if (database instanceof OracleDatabase) {
-            if (getRawDefinition().toUpperCase(Locale.US).contains("TIME ZONE")) {
+            if (originalDefinition.toUpperCase(Locale.US).contains("TIME ZONE")) {
                 // remove the last data type size that comes from column size
-                return new DatabaseDataType(getRawDefinition().replaceFirst("\\(\\d+\\)$", ""));
+                return new DatabaseDataType(originalDefinition.replaceFirst("\\(\\d+\\)$", ""));
             }
             return new DatabaseDataType(SQL_DATETYPE_TIMESTAMP, getParameters());
         }
 
-        String originalDefinition = StringUtil.trimToEmpty(getRawDefinition());
         if (database instanceof MSSQLDatabase) {
             Object[] parameters = getParameters();
             if (originalDefinition.matches("(?i)^\\[?smalldatetime.*")) {