fix: moves the selection of schema name inside method 'get_full_schem…

…a_type' Signed-off-by: zongz <[email protected]>
kcl-lang · Nov 24, 2023 · 60c5750 · 60c5750
1 parent 1b692b6
commit 60c5750
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/kclvm/api/src/service/service_impl.rs b/kclvm/api/src/service/service_impl.rs
@@ -246,11 +246,7 @@ impl KclvmServiceImpl {
 
         let exec_args = kclvm_runner::ExecProgramArgs::from_str(args_json.as_str());
         for (_k, schema_ty) in get_full_schema_type(
-            if args.schema_name.is_empty() {
-                None
-            } else {
-                Some(&args.schema_name)
-            },
+            Some(&args.schema_name),
             CompilationOptions {
                 k_files: exec_args.clone().k_filename_list,
                 loader_opts: Some(exec_args.get_load_program_options()),

diff --git a/kclvm/query/src/query.rs b/kclvm/query/src/query.rs
@@ -172,7 +172,7 @@ pub fn get_full_schema_type(
                 // Schema name filter
                 match schema_name {
                     Some(schema_name) => {
-                        if schema_name == name {
+                        if schema_name.is_empty() || schema_name == name {
                             result.insert(name.to_string(), schema_ty);
                         }
                     }