#124 | Enclose all schemaName place-holder's within double-quotes

avniproject · Feb 28, 2025 · 15a0327 · 15a0327
1 parent e26e08e
commit 15a0327
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/src/main/java/org/avniproject/etl/repository/sync/MediaAnalysisTableRegenerateAction.java b/src/main/java/org/avniproject/etl/repository/sync/MediaAnalysisTableRegenerateAction.java
@@ -31,7 +31,7 @@ public class MediaAnalysisTableRegenerateAction {
     public static final String ADHOC_MOBILE_DB_BACKUP_PATTERN = "Adhoc|MobileDbBackup";
     public static final String UUID_V4_PATTERN = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}";
     public static final String STRING_CONST_SEPARATOR = "/";
-    public static final String TRUNCATE_MEDIA_ANALYSIS_TABLE_SQL = "delete from <schemaName>.<mediaAnalysisTable> where uuid is not null;";
+    public static final String TRUNCATE_MEDIA_ANALYSIS_TABLE_SQL = "delete from \"<schemaName>\".<mediaAnalysisTable> where uuid is not null;";
     public static final String SCHEMA_NAME = "schemaName";
     public static final String MEDIA_ANALYSIS_TABLE = "mediaAnalysisTable";
     public static final int INT_CONSTANT_ZERO = 0;

diff --git a/src/main/resources/sql/api/countMedia.sql.st b/src/main/resources/sql/api/countMedia.sql.st
@@ -1,9 +1,9 @@
 SELECT count(*)
-FROM <schemaName>.media media
-         <if(request.addresses)>JOIN <schemaName>.address address ON address.id = media.address_id<endif>
+FROM "<schemaName>".media media
+         <if(request.addresses)>JOIN "<schemaName>".address address ON address.id = media.address_id<endif>
          <if(joinTablesAndColumns)>
            <joinTablesAndColumns:{joinTableAndColumn |
-           RIGHT JOIN <schemaName>.<joinTableAndColumn.tableName> <joinTableAndColumn.tableName> ON media.entity_id = <joinTableAndColumn.tableName>.id
+           RIGHT JOIN "<schemaName>".<joinTableAndColumn.tableName> <joinTableAndColumn.tableName> ON media.entity_id = <joinTableAndColumn.tableName>.id
            <if(joinTableAndColumn.exactSearch)>
              AND <joinTableAndColumn.tableName>."<joinTableAndColumn.columnName>"
                <if(joinTableAndColumn.columnValues)>

diff --git a/src/main/resources/sql/etl/deleteInvalidExits.sql.st b/src/main/resources/sql/etl/deleteInvalidExits.sql.st
@@ -1,4 +1,4 @@
-delete from <schemaName>.<exitTableName>
-using <schemaName>.<primaryTableName>
-where <schemaName>.<exitTableName>.id = <schemaName>.<primaryTableName>.id
-and <schemaName>.<primaryTableName>.program_exit_date_time is null;
+delete from "<schemaName>".<exitTableName>
+using "<schemaName>".<primaryTableName>
+where "<schemaName>".<exitTableName>.id = "<schemaName>".<primaryTableName>.id
+and "<schemaName>".<primaryTableName>.program_exit_date_time is null;
diff --git a/src/main/resources/sql/etl/deleteUncancelledEncounters.sql.st b/src/main/resources/sql/etl/deleteUncancelledEncounters.sql.st
@@ -1,4 +1,4 @@
-delete from <schemaName>.<encounterCancelTableName>
-using <schemaName>.<primaryTableName>
-where <schemaName>.<encounterCancelTableName>.id = <schemaName>.<primaryTableName>.id
-and <schemaName>.<primaryTableName>.cancel_date_time is null;
+delete from "<schemaName>".<encounterCancelTableName>
+using "<schemaName>".<primaryTableName>
+where "<schemaName>".<encounterCancelTableName>.id = "<schemaName>".<primaryTableName>.id
+and "<schemaName>".<primaryTableName>.cancel_date_time is null;
diff --git a/src/main/resources/sql/etl/media.sql.st b/src/main/resources/sql/etl/media.sql.st
@@ -1,4 +1,4 @@
-insert into <schemaName>.<tableName> (entity_id, uuid, is_voided, created_by_id, last_modified_by_id, created_date_time,
+insert into "<schemaName>".<tableName> (entity_id, uuid, is_voided, created_by_id, last_modified_by_id, created_date_time,
                                   last_modified_date_time,organisation_id,
                                   address_id, image_url, sync_parameter_key1, sync_parameter_value1,
                                   sync_parameter_key2,
@@ -37,7 +37,7 @@ select entity.id,
        <else>
             null
        <endif>
-from <schemaName>.<fromTableName> entity
-    inner join <schemaName>.<subjectTableName> subject on entity.<individualId> = subject.id
+from "<schemaName>".<fromTableName> entity
+    inner join "<schemaName>".<subjectTableName> subject on entity.<individualId> = subject.id
 where entity.last_modified_date_time > '<startTime>'
   and entity.last_modified_date_time \<= '<endTime>';
diff --git a/src/main/resources/sql/etl/mediaAnalysis.sql.st b/src/main/resources/sql/etl/mediaAnalysis.sql.st
@@ -1,3 +1,3 @@
-insert into <schemaName>.<mediaAnalysisTable> (uuid, image_url,
+insert into "<schemaName>".<mediaAnalysisTable> (uuid, image_url,
  is_valid_url, is_present_in_storage, is_thumbnail_generated, is_having_duplicates)
 VALUES (?, ?, ?, ?, ?, ?);
diff --git a/src/main/resources/sql/etl/syncTelemetry.sql.st b/src/main/resources/sql/etl/syncTelemetry.sql.st
@@ -1,4 +1,4 @@
-INSERT INTO <schemaName>.<tableName> (id, uuid, user_id, organisation_id, created_by_id,
+INSERT INTO "<schemaName>".<tableName> (id, uuid, user_id, organisation_id, created_by_id,
     last_modified_by_id, created_date_time, last_modified_date_time, sync_status,
    sync_start_time, sync_end_time, device_name, android_version, app_version, device_info, sync_source)
 

diff --git a/src/main/resources/sql/etl/user.sql.st b/src/main/resources/sql/etl/user.sql.st
@@ -1,4 +1,4 @@
-INSERT INTO <schemaName>.<tableName> (id, uuid, username, organisation_id, created_by_id,
+INSERT INTO "<schemaName>".<tableName> (id, uuid, username, organisation_id, created_by_id,
     last_modified_by_id, created_date_time, last_modified_date_time, catchment_id,
    email, phone_number, name, is_voided)
 SELECT entity.id,