resolved priorities for Datatypes and ModifyDatatype generator

liquibase · May 30, 2024 · 7948b0a · 7948b0a
1 parent db96d6f
commit 7948b0a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 11 deletions.
diff --git a/src/main/java/liquibase/ext/bigquery/datatype/core/BignumericDataTypeBigQuery.java b/src/main/java/liquibase/ext/bigquery/datatype/core/BignumericDataTypeBigQuery.java
@@ -12,7 +12,7 @@
         name = "bignumeric",
         minParameters = 0,
         maxParameters = 0,
-        priority = 1
+        priority = LiquibaseDataType.PRIORITY_DATABASE
 )
 public class BignumericDataTypeBigQuery extends LiquibaseDataType {
 

diff --git a/src/main/java/liquibase/ext/bigquery/datatype/core/BoolDataTypeBigQuery.java b/src/main/java/liquibase/ext/bigquery/datatype/core/BoolDataTypeBigQuery.java
@@ -14,7 +14,7 @@
         name = "boolean",
         minParameters = 0,
         maxParameters = 0,
-        priority = BIGQUERY_PRIORITY_DATABASE
+        priority = LiquibaseDataType.PRIORITY_DATABASE
 )
 public class BoolDataTypeBigQuery extends LiquibaseDataType {
     public BoolDataTypeBigQuery() {

diff --git a/src/main/java/liquibase/ext/bigquery/datatype/core/Float64DataTypeBigQuery.java b/src/main/java/liquibase/ext/bigquery/datatype/core/Float64DataTypeBigQuery.java
@@ -13,7 +13,7 @@
         name = "float64",
         minParameters = 0,
         maxParameters = 0,
-        priority = BIGQUERY_PRIORITY_DATABASE
+        priority = LiquibaseDataType.PRIORITY_DATABASE
 )
 public class Float64DataTypeBigQuery extends LiquibaseDataType {
     public Float64DataTypeBigQuery() {

diff --git a/src/main/java/liquibase/ext/bigquery/datatype/core/GeographyDataTypeBigQuery.java b/src/main/java/liquibase/ext/bigquery/datatype/core/GeographyDataTypeBigQuery.java
@@ -14,7 +14,7 @@
         name = "geography",
         minParameters = 0,
         maxParameters = 0,
-        priority = BIGQUERY_PRIORITY_DATABASE
+        priority = LiquibaseDataType.PRIORITY_DATABASE
 )
 public class GeographyDataTypeBigQuery extends LiquibaseDataType {
     public GeographyDataTypeBigQuery() {

diff --git a/src/main/java/liquibase/ext/bigquery/datatype/core/Int64DataTypeBigQuery.java b/src/main/java/liquibase/ext/bigquery/datatype/core/Int64DataTypeBigQuery.java
@@ -14,7 +14,7 @@
         name = "int64",
         minParameters = 0,
         maxParameters = 0,
-        priority = 1
+        priority = LiquibaseDataType.PRIORITY_DATABASE
 )
 public class Int64DataTypeBigQuery extends LiquibaseDataType {
     public Int64DataTypeBigQuery() {

diff --git a/...datatype/core/NumberDataTypeBigQuery.java → ...atatype/core/NumericDataTypeBigQuery.java b/...datatype/core/NumberDataTypeBigQuery.java → ...atatype/core/NumericDataTypeBigQuery.java
@@ -12,10 +12,10 @@
         name = "numeric",
         minParameters = 0,
         maxParameters = 0,
-        priority = 1
+        priority = LiquibaseDataType.PRIORITY_DATABASE
 )
-public class NumberDataTypeBigQuery extends LiquibaseDataType {
-    public NumberDataTypeBigQuery() {
+public class NumericDataTypeBigQuery extends LiquibaseDataType {
+    public NumericDataTypeBigQuery() {
     }
 
     public boolean supports(Database database) {

diff --git a/src/main/java/liquibase/ext/bigquery/datatype/core/StringDataTypeBigQuery.java b/src/main/java/liquibase/ext/bigquery/datatype/core/StringDataTypeBigQuery.java
@@ -7,14 +7,14 @@
 import liquibase.datatype.core.VarcharType;
 import liquibase.ext.bigquery.database.BigqueryDatabase;
 
-import static liquibase.ext.bigquery.database.BigqueryDatabase.BIGQUERY_PRIORITY_DATABASE;
+import liquibase.datatype.LiquibaseDataType;
 
 
 @DataTypeInfo(
         name = "string",
         minParameters = 0,
         maxParameters = 0,
-        priority = BIGQUERY_PRIORITY_DATABASE,
+        priority = LiquibaseDataType.PRIORITY_DATABASE,
         aliases = { "varchar", "clob", "java.lang.String" }
 )
 public class StringDataTypeBigQuery extends VarcharType {

diff --git a/src/main/java/liquibase/ext/bigquery/sqlgenerator/BigQueryModifyDataTypeGenerator.java b/src/main/java/liquibase/ext/bigquery/sqlgenerator/BigQueryModifyDataTypeGenerator.java
@@ -5,6 +5,7 @@
 import liquibase.ext.bigquery.database.BigqueryDatabase;
 import liquibase.sql.Sql;
 import liquibase.sql.UnparsedSql;
+import liquibase.sqlgenerator.SqlGenerator;
 import liquibase.sqlgenerator.SqlGeneratorChain;
 import liquibase.sqlgenerator.core.ModifyDataTypeGenerator;
 import liquibase.statement.core.ModifyDataTypeStatement;
@@ -16,6 +17,11 @@ public boolean supports(ModifyDataTypeStatement statement, Database database) {
         return database instanceof BigqueryDatabase;
     }
 
+    @Override
+    public int getPriority() {
+        return SqlGenerator.PRIORITY_DATABASE;
+    }
+
     @Override
     public Sql[] generateSql(ModifyDataTypeStatement statement, Database database, SqlGeneratorChain sqlGeneratorChain) {
         String alterTable;

diff --git a/src/main/resources/META-INF/services/liquibase.datatype.LiquibaseDataType b/src/main/resources/META-INF/services/liquibase.datatype.LiquibaseDataType
@@ -3,5 +3,5 @@ liquibase.ext.bigquery.datatype.core.GeographyDataTypeBigQuery
 liquibase.ext.bigquery.datatype.core.Float64DataTypeBigQuery
 liquibase.ext.bigquery.datatype.core.BoolDataTypeBigQuery
 liquibase.ext.bigquery.datatype.core.Int64DataTypeBigQuery
-liquibase.ext.bigquery.datatype.core.NumberDataTypeBigQuery
+liquibase.ext.bigquery.datatype.core.NumericDataTypeBigQuery
 liquibase.ext.bigquery.datatype.core.BignumericDataTypeBigQuery