Update interface

psrenergy · Dec 6, 2023 · d0bb131 · d0bb131
1 parent be854e3
commit d0bb131
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/sql_interface.jl b/src/sql_interface.jl
@@ -3,13 +3,12 @@ const SQLInterface = OpenSQL.SQLInterface
 function create_study(
     ::SQLInterface;
     data_path::AbstractString = pwd(),
-    schema::AbstractString = "schema",
+    schema_path::AbstractString = joinpath(pwd(), "psrclasses.sql"),
     study_collection::String = "PSRStudy",
     kwargs...,
 )
     path_db = joinpath(data_path, "psrclasses.sqlite")
-    path_schema = joinpath(data_path, "$(schema).sql")
-    db = OpenSQL.create_empty_db(path_db, path_schema)
+    db = OpenSQL.create_empty_db(path_db, schema_path)
     OpenSQL.create_element!(db, study_collection; kwargs...)
     return db
 end

diff --git a/test/OpenSQL/create_case.jl b/test/OpenSQL/create_case.jl
@@ -7,7 +7,7 @@ function create_case_1()
     db = PSRI.create_study(
         PSRI.SQLInterface();
         data_path = case_path,
-        schema = "toy_schema",
+        schema_path = joinpath(case_path, "toy_schema.sql"),
         study_collection = "Configuration",
         id = "Toy Case",
         value1 = 1.0,
@@ -169,7 +169,7 @@ function create_case_relations()
     db = PSRI.create_study(
         PSRI.SQLInterface();
         data_path = case_path,
-        schema = "toy_schema",
+        schema_path = joinpath(case_path, "toy_schema.sql"),
         study_collection = "Configuration",
         id = "Toy Case",
         value1 = 1.0,
@@ -243,12 +243,12 @@ function create_case_relations()
         "sometype2",
     ) == ["Cost 2"]
 
-    # @test PSRI.get_vector_related(
-    #     db,
-    #     "Plant",
-    #     "Plant 2",
-    #     "sometype"
-    # ) == ["Cost 1"]
+    @test PSRI.get_vector_related(
+        db,
+        "Plant",
+        "Plant 2",
+        "sometype",
+    ) == ["Cost 1"]
 
     PSRI.OpenSQL.close(db)
 

diff --git a/test/OpenSQL/time_series.jl b/test/OpenSQL/time_series.jl
@@ -7,7 +7,7 @@ function test_time_series()
     db = PSRI.create_study(
         PSRI.SQLInterface();
         data_path = case_path,
-        schema = "simple_schema",
+        schema_path = joinpath(case_path, "simple_schema.sql"),
         study_collection = "Study",
         id = "Toy Case",
     )
@@ -120,7 +120,7 @@ function test_time_series_2()
     db = PSRI.create_study(
         PSRI.SQLInterface();
         data_path = case_path,
-        schema = "simple_schema",
+        schema_path = joinpath(case_path, "simple_schema.sql"),
         study_collection = "Study",
         id = "Toy Case",
     )