Generated indexes are not including "desc"

DAT-3773
liquibase · Jan 3, 2020 · 897a3ca · 897a3ca
1 parent edba083
commit 897a3ca
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 12 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/change/ColumnConfig.java b/liquibase-core/src/main/java/liquibase/change/ColumnConfig.java
@@ -15,10 +15,7 @@
 import liquibase.structure.core.PrimaryKey;
 import liquibase.structure.core.Table;
 import liquibase.structure.core.UniqueConstraint;
-import liquibase.util.ISODateFormat;
-import liquibase.util.ObjectUtil;
-import liquibase.util.StringUtils;
-import liquibase.util.NowAndTodayUtil;
+import liquibase.util.*;
 
 import java.math.BigInteger;
 import java.text.NumberFormat;
@@ -71,8 +68,8 @@ public class ColumnConfig extends AbstractLiquibaseSerializable {
      */
     public ColumnConfig(Column columnSnapshot) {
         setName(columnSnapshot.getName());
-        setComputed(((columnSnapshot.getComputed() != null) && columnSnapshot.getComputed()) ? Boolean.TRUE : null);
-        setDescending(((columnSnapshot.getDescending() != null) && columnSnapshot.getDescending()) ? Boolean.TRUE : null);
+        setComputed(BooleanUtils.isTrue(columnSnapshot.getComputed()) ? Boolean.TRUE : null);
+        setDescending(BooleanUtils.isTrue(columnSnapshot.getDescending()) ? Boolean.TRUE : null);
         if (columnSnapshot.getType() != null) {
             setType(columnSnapshot.getType().toString());
         }

diff --git a/liquibase-core/src/main/java/liquibase/diff/DiffResult.java b/liquibase-core/src/main/java/liquibase/diff/DiffResult.java
@@ -9,6 +9,7 @@
 import liquibase.structure.core.Catalog;
 import liquibase.structure.core.Column;
 import liquibase.structure.core.Schema;
+import liquibase.util.BooleanUtils;
 
 import java.io.IOException;
 import java.util.*;
@@ -95,7 +96,7 @@ public <T extends DatabaseObject> T getMissingObject(T example, CompareControl.S
     }
 
     public void addMissingObject(DatabaseObject obj) {
-        if ((obj instanceof Column) && (((Column) obj).getComputed() != null) && ((Column) obj).getComputed()) {
+        if ((obj instanceof Column) && (BooleanUtils.isTrue(((Column) obj).getComputed()) || BooleanUtils.isTrue(((Column) obj).getDescending()))) {
             return; //not really missing, it's a virtual column
         }
         missingObjects.add(obj);
@@ -197,4 +198,4 @@ public boolean areEqual() throws DatabaseException, IOException {
     public Set<Class<? extends DatabaseObject>> getComparedTypes() {
         return compareControl.getComparedTypes();
     }
-}
+}
diff --git a/liquibase-core/src/main/java/liquibase/diff/compare/core/ColumnComparator.java b/liquibase-core/src/main/java/liquibase/diff/compare/core/ColumnComparator.java
@@ -35,6 +35,9 @@ public String[] hash(DatabaseObject databaseObject, Database accordingTo, Databa
         if (BooleanUtils.isTrue(column.getComputed())) {
             hash += ":computed";
         }
+        if (BooleanUtils.isTrue(column.getDescending())) {
+            hash += ":descending";
+        }
         return new String[] {hash.toLowerCase(Locale.US)};
     }
 
@@ -60,6 +63,10 @@ public boolean isSameObject(DatabaseObject databaseObject1, DatabaseObject datab
             return false;
         }
 
+        if (BooleanUtils.isTrue(thisColumn.getDescending()) != BooleanUtils.isTrue(otherColumn.getDescending())) {
+            return false;
+        }
+
         return true;
     }
 

diff --git a/...e/src/main/java/liquibase/diff/output/changelog/core/UnexpectedColumnChangeGenerator.java b/...e/src/main/java/liquibase/diff/output/changelog/core/UnexpectedColumnChangeGenerator.java
@@ -11,6 +11,7 @@
 import liquibase.diff.output.changelog.UnexpectedObjectChangeGenerator;
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.core.*;
+import liquibase.util.BooleanUtils;
 
 public class UnexpectedColumnChangeGenerator extends AbstractChangeGenerator implements UnexpectedObjectChangeGenerator {
     @Override
@@ -42,7 +43,7 @@ public Change[] fixUnexpected(DatabaseObject unexpectedObject, DiffOutputControl
 //            continue;
 //        }
 
-        if ((column.getComputed() != null) && column.getComputed()) { //not really a column to drop, probably part of an index or something
+        if (BooleanUtils.isTrue(column.getComputed()) || BooleanUtils.isTrue(column.getDescending()) ) { //not really a column to drop, probably part of an index or something
             return null;
         }
         if (column.getRelation() instanceof View) {

diff --git a/liquibase-core/src/main/java/liquibase/serializer/core/yaml/YamlSnapshotSerializer.java b/liquibase-core/src/main/java/liquibase/serializer/core/yaml/YamlSnapshotSerializer.java
@@ -12,6 +12,8 @@
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.DatabaseObjectCollection;
 import liquibase.structure.DatabaseObjectComparator;
+import liquibase.structure.core.Column;
+import liquibase.util.BooleanUtils;
 import liquibase.util.ISODateFormat;
 import liquibase.util.StringUtils;
 import org.yaml.snakeyaml.nodes.Node;
@@ -53,7 +55,10 @@ public void write(DatabaseSnapshot snapshot, OutputStream out) throws IOExceptio
     @Override
     protected Object toMap(final LiquibaseSerializable object) {
         if (object instanceof DatabaseObject) {
-            if (alreadySerializingObject) {
+            if (object instanceof Column && (BooleanUtils.isTrue(((Column) object).getDescending()) || BooleanUtils.isTrue(((Column) object).getComputed()))) {
+                //not really a "real" column that has a snapshot to reference, just serialize it
+                return super.toMap(object);
+            } else if (alreadySerializingObject) {
                 String snapshotId = ((DatabaseObject) object).getSnapshotId();
                 if (snapshotId == null) {
                     String name = ((DatabaseObject) object).getName();

diff --git a/liquibase-core/src/main/java/liquibase/snapshot/DatabaseSnapshot.java b/liquibase-core/src/main/java/liquibase/snapshot/DatabaseSnapshot.java
@@ -20,6 +20,7 @@
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.DatabaseObjectCollection;
 import liquibase.structure.core.*;
+import liquibase.util.BooleanUtils;
 import liquibase.util.ISODateFormat;
 import liquibase.util.ObjectUtil;
 import liquibase.util.StringUtils;
@@ -356,7 +357,7 @@ private void includeNestedObjects(DatabaseObject object) throws DatabaseExceptio
                 if ((fieldValue != null) && !((Collection) fieldValue).isEmpty()) {
                     final Column column = (Column) ((Collection) fieldValue).iterator().next();
                     String columnName = column.getName();
-                    if ((column.getDescending() != null && column.getDescending()) || columnName.endsWith(" ASC") || columnName.endsWith(" DESC") || columnName.endsWith(" RANDOM")) {
+                    if (BooleanUtils.isTrue(column.getDescending()) || columnName.endsWith(" ASC") || columnName.endsWith(" DESC") || columnName.endsWith(" RANDOM")) {
                         continue;
                     }
                 }

diff --git a/liquibase-core/src/main/java/liquibase/snapshot/jvm/ColumnSnapshotGenerator.java b/liquibase-core/src/main/java/liquibase/snapshot/jvm/ColumnSnapshotGenerator.java
@@ -21,6 +21,7 @@
 import liquibase.statement.core.RawSqlStatement;
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.core.*;
+import liquibase.util.BooleanUtils;
 import liquibase.util.SqlUtil;
 import liquibase.util.StringUtils;
 
@@ -51,7 +52,7 @@ public ColumnSnapshotGenerator() {
 
     @Override
     protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot snapshot) throws DatabaseException {
-        if ((((Column) example).getComputed() != null) && ((Column) example).getComputed()) {
+        if (BooleanUtils.isTrue(((Column) example).getComputed()) || BooleanUtils.isTrue(((Column) example).getDescending())) {
             return example;
         }
         Database database = snapshot.getDatabase();

diff --git a/liquibase-core/src/main/java/liquibase/structure/core/Column.java b/liquibase-core/src/main/java/liquibase/structure/core/Column.java
@@ -8,11 +8,13 @@
 import liquibase.serializer.AbstractLiquibaseSerializable;
 import liquibase.structure.AbstractDatabaseObject;
 import liquibase.structure.DatabaseObject;
+import liquibase.util.BooleanUtils;
 import liquibase.util.StringUtils;
 
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 public class Column extends AbstractDatabaseObject {
 
@@ -456,5 +458,15 @@ public void load(ParsedNode parsedNode, ResourceAccessor resourceAccessor) throw
             this.generationType = parsedNode.getChildValue(null, "generationType", String.class);
         }
     }
+
+    @Override
+    public Set<String> getSerializableFields() {
+        final Set<String> fields = super.getSerializableFields();
+        //if this is a computed or indexed column, don't have the serializer try to traverse down to the relation since it may not be a "real" object with an objectId
+        if (BooleanUtils.isTrue(getDescending()) || BooleanUtils.isTrue(getComputed())) {
+            fields.remove("relation");
+        }
+        return fields;
+    }
 }