diff --git a/streamingpro-core/src/main/java/streaming/dsl/mmlib/SQLAlg.scala b/streamingpro-core/src/main/java/streaming/dsl/mmlib/SQLAlg.scala index 8f5faeaad..1334c51f7 100644 --- 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 index 0f9ecb8cd..eb235760e 100644 --- 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)