Merge branch '10.0'

avniproject · Sep 27, 2024 · 2180311 · 2180311
2 parents e927a1a + d528996
commit 2180311
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -83,12 +83,12 @@ jobs:
 
       - run: wget -qO- https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/8.5.9/flyway-commandline-8.5.9-linux-x64.tar.gz | tar xvz && sudo ln -s `pwd`/flyway-8.5.9/flyway /usr/local/bin
 
-      - run: curl -L https://github.com/avniproject/avni-server/archive/master.zip >> ~/server.zip
+      - run: curl -L https://github.com/avniproject/avni-server/archive/$CIRCLE_BRANCH.zip >> ~/server.zip
 
       - run: |
           cd ~/
           unzip server.zip
-          mv avni-server-master avni-server
+          mv avni-server-$CIRCLE_BRANCH avni-server
           rm -rf server.zip
       - run: |
           pwd

diff --git a/src/main/java/org/avniproject/etl/domain/metadata/diff/AddIndex.java b/src/main/java/org/avniproject/etl/domain/metadata/diff/AddIndex.java
@@ -31,7 +31,9 @@ public String getSql() {
                 .append(tableName)
                 .append(QUOTE)
                 .append(OPEN_BRACKETS)
+                .append(QUOTE)
                 .append(columnName)
+                .append(QUOTE)
                 .append(CLOSE_BRACKETS)
                 .append(END_STATEMENT)
                 .toString();

diff --git a/src/main/java/org/avniproject/etl/repository/SchemaMetadataRepository.java b/src/main/java/org/avniproject/etl/repository/SchemaMetadataRepository.java
@@ -69,6 +69,7 @@ private TableMetadata getAddressTable() {
         tableMetadata.setName(addressTable.name(null));
         tableMetadata.setType(TableMetadata.Type.Address);
         tableMetadata.setColumnMetadataList(addressTable.columnMetadata());
+        addressTable.columns().stream().filter(Column::isIndexed).forEach(column -> tableMetadata.addIndexMetadata(column));
         return tableMetadata;
     }