Re-worked SMALLINT fix

liquibase · Mar 23, 2020 · 08ca6f9 · 08ca6f9
1 parent 55bfaa0
commit 08ca6f9
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/datatype/core/SmallIntType.java b/liquibase-core/src/main/java/liquibase/datatype/core/SmallIntType.java
@@ -47,21 +47,20 @@ public DatabaseDataType toDatabaseDataType(Database database) {
 
         if (database instanceof PostgresDatabase)
         {
-            if (! isAutoIncrement()) {
-                return new DatabaseDataType("SMALLINT"); //always smallint regardless of parameters passed
-            }
-            int majorVersion = 9;
-            try {
-                majorVersion = database.getDatabaseMajorVersion();
-            } catch (DatabaseException e) {
-                // ignore
-            }
-            if (majorVersion < 10) {
-                return new DatabaseDataType("SMALLSERIAL");
+            if (isAutoIncrement()) {
+                int majorVersion = 9;
+                try {
+                    majorVersion = database.getDatabaseMajorVersion();
+                } catch (DatabaseException e) {
+                    // ignore
+                }
+                if (majorVersion < 10) {
+                    return new DatabaseDataType("SMALLSERIAL");
+                }
             }
+            return new DatabaseDataType("SMALLINT"); //always smallint regardless of parameters passed
         }
 
-
         return super.toDatabaseDataType(database);
     }