diff options
| -rw-r--r-- | dune-project | 27 | ||||
| -rw-r--r-- | lib/dcl/sublanguage.ml | 2 | ||||
| -rw-r--r-- | lib/ddl/sublanguage.ml | 2 | ||||
| -rw-r--r-- | lib/dml/sublanguage.ml | 2 | ||||
| -rw-r--r-- | lib/drl/sublanguage.ml | 2 | ||||
| -rw-r--r-- | lib/icl/sublanguage.ml | 2 | ||||
| -rw-r--r-- | lib/scl/sublanguage.ml | 4 | ||||
| -rw-r--r-- | lib/sublanguage.ml | 11 | ||||
| -rw-r--r-- | lib/sublanguage_types.ml | 10 | ||||
| -rw-r--r-- | sakura.opam | 12 |
10 files changed, 51 insertions, 23 deletions
diff --git a/dune-project b/dune-project index 02bf004..068860b 100644 --- a/dune-project +++ b/dune-project @@ -19,11 +19,26 @@ (documentation https://url/to/documentation) (package - (name sakura) - (synopsis "A short synopsis") - (description "A longer description") - (depends ocaml dune) - (tags - (topics "to describe" your project))) + (name sakura) + (synopsis "A short synopsis") + (description "A longer description") + (depends + ocaml + dune + ppx_protocol_conv + ppx_protocol_conv_xml_light + sha + data-encoding + (ppx_inline_test :with-test) + ppx_deriving + ppx_sexp_conv + sexplib + lwt + lwt-exit + batteries + num + (odoc :with-doc)) + (tags + (topics "to describe" your project))) ; See the complete stanza docs at https://dune.readthedocs.io/en/stable/reference/dune-project/index.html diff --git a/lib/dcl/sublanguage.ml b/lib/dcl/sublanguage.ml index 9253374..eab5ecb 100644 --- a/lib/dcl/sublanguage.ml +++ b/lib/dcl/sublanguage.ml @@ -16,7 +16,7 @@ module Make (Storage : Management.Physical.S with type error = string) = struct let execute storage db ast = match Exec.execute storage db ast with - | Ok (db, msg) -> Ok (Sublanguage.Transition (db, msg)) + | Ok (db, msg) -> Ok (Sublanguage_types.Transition (db, msg)) | Error e -> Error e let sexp_of_error = Exec.sexp_of_error diff --git a/lib/ddl/sublanguage.ml b/lib/ddl/sublanguage.ml index 6b9f412..f5ff8f9 100644 --- a/lib/ddl/sublanguage.ml +++ b/lib/ddl/sublanguage.ml @@ -16,7 +16,7 @@ module Make (Storage : Management.Physical.S) = struct let execute storage db ast = match Exec.execute storage db ast with - | Ok (db, msg) -> Ok (Sublanguage.Transition (db, msg)) + | Ok (db, msg) -> Ok (Sublanguage_types.Transition (db, msg)) | Error e -> Error e let sexp_of_error = Exec.sexp_of_error diff --git a/lib/dml/sublanguage.ml b/lib/dml/sublanguage.ml index ed4206b..45b5a79 100644 --- a/lib/dml/sublanguage.ml +++ b/lib/dml/sublanguage.ml @@ -16,7 +16,7 @@ module Make (Storage : Management.Physical.S) = struct let execute storage db ast = match Exec.execute storage db ast with - | Ok db -> Ok (Sublanguage.Transition (db, "updated")) + | Ok db -> Ok (Sublanguage_types.Transition (db, "updated")) | Error e -> Error e let sexp_of_error = Exec.sexp_of_error diff --git a/lib/drl/sublanguage.ml b/lib/drl/sublanguage.ml index 3496f9c..29047c3 100644 --- a/lib/drl/sublanguage.ml +++ b/lib/drl/sublanguage.ml @@ -19,7 +19,7 @@ module Make (Storage : Management.Physical.S) = struct | Error msg -> Error (Exec.ParseError msg) | Ok () -> ( match Exec.execute storage db ast with - | Ok rel -> Ok (Sublanguage.Query rel) + | Ok rel -> Ok (Sublanguage_types.Query rel) | Error e -> Error e) let sexp_of_error = Exec.sexp_of_error diff --git a/lib/icl/sublanguage.ml b/lib/icl/sublanguage.ml index ab70165..fdf17b3 100644 --- a/lib/icl/sublanguage.ml +++ b/lib/icl/sublanguage.ml @@ -16,7 +16,7 @@ module Make (Storage : Management.Physical.S) = struct let execute storage db ast = match Exec.execute storage db ast with - | Ok (db, msg) -> Ok (Sublanguage.Transition (db, msg)) + | Ok (db, msg) -> Ok (Sublanguage_types.Transition (db, msg)) | Error e -> Error e let sexp_of_error = Exec.sexp_of_error diff --git a/lib/scl/sublanguage.ml b/lib/scl/sublanguage.ml index e361ff9..c931b0c 100644 --- a/lib/scl/sublanguage.ml +++ b/lib/scl/sublanguage.ml @@ -18,8 +18,8 @@ module Make (Storage : Management.Physical.S) = struct Exec.execute storage db ast |> Result.map (function | Executor.Batch { cursor_id; rows; has_more } -> - Sublanguage.Cursor { cursor_id; rows; has_more } - | Executor.Closed db -> Sublanguage.Transition (db, "cursor closed")) + Sublanguage_types.Cursor { cursor_id; rows; has_more } + | Executor.Closed db -> Sublanguage_types.Transition (db, "cursor closed")) let sexp_of_error = Exec.sexp_of_error end diff --git a/lib/sublanguage.ml b/lib/sublanguage.ml index 86d8cb4..25474af 100644 --- a/lib/sublanguage.ml +++ b/lib/sublanguage.ml @@ -1,8 +1,4 @@ -type cursor_result = { - cursor_id : string; - rows : Tuple.materialized list; - has_more : bool; -} +include Sublanguage_types (** Effect classification for sublanguage operations. Categorically: @@ -20,11 +16,6 @@ type cursor_result = { - ACL -> a functor restriction: narrows the admissible natural transformations based on authorization context *) -type result = - | Query of Relation.t - | Transition of Management.Database.t * string - | Cursor of cursor_result - module type S = sig include Configuration.CONFIGURABLE diff --git a/lib/sublanguage_types.ml b/lib/sublanguage_types.ml new file mode 100644 index 0000000..b4b6b29 --- /dev/null +++ b/lib/sublanguage_types.ml @@ -0,0 +1,10 @@ +type cursor_result = { + cursor_id : string; + rows : Tuple.materialized list; + has_more : bool; +} + +type result = + | Query of Relation.t + | Transition of Management.Database.t * string + | Cursor of cursor_result diff --git a/sakura.opam b/sakura.opam index b296c11..51fca63 100644 --- a/sakura.opam +++ b/sakura.opam @@ -12,6 +12,18 @@ bug-reports: "https://github.com/username/reponame/issues" depends: [ "ocaml" "dune" {>= "3.16"} + "ppx_protocol_conv" + "ppx_protocol_conv_xml_light" + "sha" + "data-encoding" + "ppx_inline_test" {with-test} + "ppx_deriving" + "ppx_sexp_conv" + "sexplib" + "lwt" + "lwt-exit" + "batteries" + "num" "odoc" {with-doc} ] build: [ |