From d7b2d80e3cb9568a8c264b696dd4eefac911e492 Mon Sep 17 00:00:00 2001
From: himeshr <himeshl@samanvayfoundation.org>
Date: Tue, 27 Aug 2024 15:26:04 +0530
Subject: [PATCH 1/2] avniproject/avni-server#775 | Index address table id
 columns

---
 .../java/org/avniproject/etl/domain/metadata/diff/AddIndex.java | 2 ++
 .../avniproject/etl/repository/SchemaMetadataRepository.java    | 1 +
 2 files changed, 3 insertions(+)

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
index bb12024..5b3882c 100644
--- 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
index da5a2f4..fbe3ecc 100644
--- 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;
     }
 

From d5289966313c157bc1e366cfaf7eaf71df234852 Mon Sep 17 00:00:00 2001
From: vedfordev <vedforworks@gmail.com>
Date: Thu, 26 Sep 2024 17:13:13 +0530
Subject: [PATCH 2/2] avniproject/avni-product#1650 | set up circle branch to
 overcome circle ci test failure

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d87b0aa..9f4a629 100644
--- 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