Fix Postgres Application listing (#16600)

* Fix Postgres Application listing * Fix Listing
open-metadata · Jun 11, 2024 · 77dfe1f · 77dfe1f
1 parent a3524e1
commit 77dfe1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/bootstrap/sql/migrations/native/1.4.2/mysql/schemaChanges.sql b/bootstrap/sql/migrations/native/1.4.2/mysql/schemaChanges.sql
@@ -1 +1,2 @@
-ALTER TABLE ingestion_pipeline_entity ADD COLUMN appType VARCHAR(256) GENERATED ALWAYS AS (json ->> '$.sourceConfig.config.appConfig.type') STORED NULL;
+ALTER TABLE ingestion_pipeline_entity ADD COLUMN appType VARCHAR(256) GENERATED ALWAYS AS (json ->> '$.sourceConfig.config.appConfig.type') STORED NULL;
+ALTER TABLE ingestion_pipeline_entity ADD COLUMN pipelineType VARCHAR(256) GENERATED ALWAYS AS (json ->> '$.pipelineType') STORED NULL;
diff --git a/bootstrap/sql/migrations/native/1.4.2/postgres/schemaChanges.sql b/bootstrap/sql/migrations/native/1.4.2/postgres/schemaChanges.sql
@@ -1 +1,2 @@
-ALTER TABLE ingestion_pipeline_entity ADD COLUMN appType VARCHAR(256) GENERATED ALWAYS AS (json -> 'sourceConfig' -> 'config' -> 'appConfig' ->> 'type') STORED NULL;
+ALTER TABLE ingestion_pipeline_entity ADD COLUMN appType VARCHAR(256) GENERATED ALWAYS AS (json -> 'sourceConfig' -> 'config' -> 'appConfig' ->> 'type') STORED NULL;
+ALTER TABLE ingestion_pipeline_entity ADD COLUMN pipelineType VARCHAR(256) GENERATED ALWAYS AS (json ->> 'pipelineType') STORED NULL;
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ListFilter.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ListFilter.java
@@ -178,14 +178,7 @@ public String getApplicationTypeCondition() {
     if (applicationType == null) {
       return "";
     }
-    if (Boolean.TRUE.equals(DatasourceConfig.getInstance().isMySQL())) {
-      return String.format(
-          "(JSON_UNQUOTE(JSON_EXTRACT(ingestion_pipeline_entity.json, '$.sourceConfig.config.appConfig.type')) = '%s')",
-          applicationType);
-    }
-    return String.format(
-        "(ingestion_pipeline_entity.json ->> '{sourceConfig,config,appConfig,type}' = '%s')",
-        applicationType);
+    return String.format("(appType = '%s')", applicationType);
   }
 
   private String getTestCaseCondition() {
@@ -279,15 +272,13 @@ private String getPipelineTypePrefixCondition(String tableName, String pipelineT
     String inCondition = getInConditionFromString(pipelineType);
     if (Boolean.TRUE.equals(DatasourceConfig.getInstance().isMySQL())) {
       return tableName == null
-          ? String.format(
-              "JSON_UNQUOTE(JSON_EXTRACT(ingestion_pipeline_entity.json, '$.pipelineType')) IN (%s)",
-              inCondition)
+          ? String.format("pipelineType IN (%s)", inCondition)
           : String.format(
               "%s.JSON_UNQUOTE(JSON_EXTRACT(ingestion_pipeline_entity.json, '$.pipelineType')) IN (%s)",
               tableName, inCondition);
     }
     return tableName == null
-        ? String.format("ingestion_pipeline_entity.json->>'pipelineType' IN (%s)", inCondition)
+        ? String.format("pipelineType IN (%s)", inCondition)
         : String.format("%s.json->>'pipelineType' IN (%s)", tableName, inCondition);
   }