Merge pull request #115 from OHDSI/fix-insert-into-empty-table-withou…

…t-concepts fix: insert with empty values in case of empty concepts
OHDSI · Mar 26, 2020 · 45e0bf6 · 45e0bf6
2 parents f3e4a26 + 185adc3
commit 45e0bf6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/org/ohdsi/circe/cohortdefinition/CohortExpressionQueryBuilder.java b/src/main/java/org/ohdsi/circe/cohortdefinition/CohortExpressionQueryBuilder.java
@@ -171,10 +171,11 @@ public String getCodesetQuery(ConceptSet[] conceptSets) {
         String conceptSetInsert = String.format("SELECT %d as codeset_id, c.concept_id FROM (%s) C", cs.id, conceptExpressionQuery);
         codesetInserts.add(conceptSetInsert);
       }
+        codesetQuery = StringUtils.replace(codesetQuery, "@codesetInserts", "INSERT INTO #Codesets (codeset_id, concept_id)\n"
+                + StringUtils.join(codesetInserts, " UNION ALL \n")) + ";";
+    } else {
+        codesetQuery = StringUtils.replace(CODESET_QUERY_TEMPLATE, "@codesetInserts", StringUtils.EMPTY);
     }
-
-    codesetQuery = StringUtils.replace(codesetQuery, "@codesetInserts", "INSERT INTO #Codesets (codeset_id, concept_id)\n"
-            + StringUtils.join(codesetInserts, " UNION ALL \n")) + ";";
     return codesetQuery;
   }