#1757 (#1760)

byzer-org · Jun 8, 2022 · 69b6f09 · 69b6f09
1 parent fa41dee
commit 69b6f09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/streamingpro-core/src/main/java/streaming/dsl/mmlib/SQLAlg.scala b/streamingpro-core/src/main/java/streaming/dsl/mmlib/SQLAlg.scala
@@ -52,7 +52,7 @@ trait SQLAlg extends Serializable {
   def skipOriginalDFName: Boolean = true
   def skipResultDFName: Boolean = true
 
-  def skipDynamicEvaluation: Boolean = false
+  def skipDynamicEvaluation: Boolean = true
 
   def modelType: ModelType = UndefinedType
 

diff --git a/streamingpro-core/src/main/java/tech/mlsql/dsl/adaptor/LoadAdaptor.scala b/streamingpro-core/src/main/java/tech/mlsql/dsl/adaptor/LoadAdaptor.scala
@@ -101,7 +101,7 @@ class LoadProcessing(scriptSQLExecListener: ScriptSQLExecListener,
     if (tempDS.isDefined ) {
       // DataSource who is not MLSQLSourceConfig or if it's MLSQLSourceConfig then  skipDynamicEvaluation is false
       // should evaluate the v with dynamic expression
-      if (!tempDS.isInstanceOf[MLSQLSourceConfig] || !tempDS.asInstanceOf[MLSQLSourceConfig].skipDynamicEvaluation) {
+      if (tempDS.isInstanceOf[MLSQLSourceConfig] && !tempDS.asInstanceOf[MLSQLSourceConfig].skipDynamicEvaluation) {
         option = _option.map { case (k, v) =>
           val newV = Templates2.dynamicEvaluateExpression(v, ScriptSQLExec.context().execListener.env().toMap)
           (k, newV)