Merge pull request #32 from AlgebraicJulia/catlab-v0.14

Upgrade to Catlab v0.14
AlgebraicJulia · Oct 12, 2022 · d93a4ba · d93a4ba
2 parents 2d4dea7 + 722362b
commit d93a4ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -13,8 +13,8 @@ LibPQ = "194296ae-ab2e-5f79-8cd4-7183a0a5a0d1"
 [compat]
 AlgebraicPetri = "0.6, 0.7"
 AutoHashEquals = "0.2.0"
-Catlab = "0.13"
-DataFrames = "0.21, 0.22, 1.0"
+Catlab = "0.14"
+DataFrames = "1.0"
 LibPQ = "1.4.0"
 julia = "1.0"
 

diff --git a/src/DB.jl b/src/DB.jl
@@ -2,7 +2,7 @@ module DB
   using Catlab: @present
   using Catlab.Present
   using Catlab.CategoricalAlgebra.CSets
-  using Catlab.CSetDataStructures: struct_acset
+  using Catlab.CSetDataStructures.DenseACSets: struct_acset
   export TheorySQL, generate_schema_sql, @present, get_fields, TypeToSQL, typeToSQL, @db_schema, AbstractSQL
 
   TypeToSQL = Dict("String" => "text",

diff --git a/src/Queries.jl b/src/Queries.jl
@@ -1,7 +1,7 @@
 module Queries
   using Catlab: @present
   using Catlab.Programs.RelationalPrograms
-  using Catlab.Programs.RelationalPrograms: TheoryTypedRelationDiagram, TheoryTypedNamedRelationDiagram, TypedNamedRelationDiagram, parse_relation_diagram
+  using Catlab.Programs.RelationalPrograms: TypedNamedRelationDiagram, parse_relation_diagram
   using Catlab.Graphics
   using Catlab.WiringDiagrams
   using Catlab.CategoricalAlgebra.CSets
@@ -17,7 +17,7 @@ module Queries
                             :(!=) => ("<>", [:first, :second]),
                            )
 
-  @present TheoryQuery <: TheoryTypedNamedRelationDiagram begin
+  @present TheoryQuery <: SchTypedNamedRelationDiagram begin
     Comparison::Ob
     comp_port1::Hom(Comparison, Port)
     comp_port2::Hom(Comparison, Port)