Preserve supplied oracle temp schema in SqlRenderService

Author: watilde

src/main/java/org/ohdsi/webapi/service/SqlRenderService.java

@@ -36,7 +36,9 @@ public TranslatedStatement translateSQLFromSourceStatement(SourceStatement sourc
         if (sourceStatement == null) {
             return new TranslatedStatement();
         }
-        sourceStatement.setOracleTempSchema(TEMP_DATABASE_SCHEMA_PLACEHOLDER);
+        if (StringUtils.isBlank(sourceStatement.getOracleTempSchema())) {
+            sourceStatement.setOracleTempSchema(TEMP_DATABASE_SCHEMA_PLACEHOLDER);
+        }
         return translatedStatement(sourceStatement);
     }
 

src/test/java/org/ohdsi/webapi/service/SqlRenderServiceTest.java

@@ -39,6 +39,17 @@ public void translateSQLFromSourceStatement() {
         assertEquals(TEMP_DATABASE_SCHEMA_PLACEHOLDER, sourceStatementCaptor.getValue().getOracleTempSchema());
     }
 
+    @Test
+    public void translateSQLFromSourceStatement_keepsProvidedOracleTempSchema() {
+
+        SourceStatement statement = createSourceStatement(TEST_SQL, "oracle");
+        statement.setOracleTempSchema("custom_schema");
+        sqlRenderService.translateSQLFromSourceStatement(statement);
+
+        verify(sqlRenderService).translatedStatement(sourceStatementCaptor.capture());
+        assertEquals("custom_schema", sourceStatementCaptor.getValue().getOracleTempSchema());
+    }
+
     @Test
     public void translateSQL_sourceStatementIsNull() {
         assertEquals(new TranslatedStatement(), SqlRenderService.translateSQL(null));
@@ -71,4 +82,4 @@ private SourceStatement createSourceStatement(String testExpression, String dial
         statement.getParameters().putAll(Collections.emptyMap());
         return statement;
     }
-}
+}