Run tests of gixsql in CI with the new preprocessor

.github/workflows/workflow.yml

@@ -61,7 +61,7 @@ jobs:
 
       - run: opam pin add . -y --no-action
 
-      - run: opam depext -y superbol-studio-oss superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib superbol_preprocs superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_indent_old cobol_preproc cobol_data cobol_typeck cobol_unit ez_toml ezr_toml sql_ast sql_parser
+      - run: opam depext -y superbol-studio-oss superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib superbol_preprocs superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_indent_old cobol_preproc cobol_data cobol_typeck cobol_unit ez_toml ezr_toml sql_preproc sql_ast sql_parser
 #        if: steps.cache-opam.outputs.cache-hit != 'true'
 
       - run: opam install -y opam/*.opam --deps-only --with-test
@@ -91,9 +91,17 @@ jobs:
         if: matrix.skip_test  != 'true'
         run: make dev-deps
 
+      - name: install nix
+        if: matrix.skip_test != 'true'
+        uses: cachix/install-nix-action@v27
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
       - name: run test suite
         run: make test
         if: matrix.skip_test  != 'true'
+        env:
+          SUPERBOL_PP: "${{ github.workspace }}/_build/install/default/bin/superbol-free"
 
       - name: show test result on failure
         if: failure()

.github/workflows/workflow.yml.drom-tpl

@@ -84,9 +84,17 @@ jobs:
 
       # Use fields.github-workflow-after-build to add something here
 !(github-workflow-after-build)
+      - name: install nix
+        if: matrix.skip_test != 'true'
+        uses: cachix/install-nix-action@v27
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
       - name: run test suite
         run: make test
         if: matrix.skip_test  != 'true'
+        env:
+          SUPERBOL_PP: "${{ github.workspace }}/_build/install/default/bin/superbol-free"
 
       - name: show test result on failure
         if: failure()

.gitmodules

@@ -9,3 +9,6 @@
 	path = import/superbol-vscode-debug
 	url = https://github.com/OCamlPro/superbol-vscode-debug.git
 	branch = superbol-vscode-debug
+[submodule "import/gixsql"]
+	path = import/gixsql
+	url = https://github.com/OCamlPro/gixsql.git

Makefile.drom-tpl

@@ -88,6 +88,7 @@ test:
 	./scripts/before.sh test
 	${DUNE} build ${DUNE_ARGS} ${DUNE_CROSS_ARGS} @runtest
 	${MAKE} test-syntax
+	./scripts/test-gixsql.sh
 	./scripts/after.sh test
 
 clean:

drom.toml

@@ -228,6 +228,10 @@ dir = "src/vendor/ez_toml"
 dir = "src/lsp/ezr_toml"
 # edit 'src/lsp/ezr_toml/package.toml' for package-specific options
 
+[[package]]
+dir = "src/lsp/sql_preproc"
+# edit 'src/lsp/ezr_toml/package.toml' for package-specific options
+
 [[package]]
 dir = "src/lsp/sql_ast"
 # edit 'src/lsp/sql_ast/package.toml' for package-specific options

opam/cobol_typeck.opam

@@ -47,6 +47,8 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
+  "superbol_preprocs" {= version}
+  "sql_ast" {= version}
   "cobol_unit" {= version}
   "cobol_ptree" {= version}
   "cobol_parser" {= version}

opam/osx/cobol_typeck-osx.opam

@@ -49,6 +49,8 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
+  "superbol_preprocs-osx" {= version}
+  "sql_ast-osx" {= version}
   "cobol_unit-osx" {= version}
   "cobol_ptree-osx" {= version}
   "cobol_parser-osx" {= version}

opam/osx/sql_preproc-osx.opam

@@ -0,0 +1,60 @@
+# This file was generated by `drom` from `drom.toml`.
+# Do not modify, or add to the `skip` field of `drom.toml`.
+opam-version: "2.0"
+name: "sql_preproc"
+version: "0.1.4"
+license: "MIT"
+synopsis: "SuperBOL Studio OSS Project"
+description: "SuperBOL Studio OSS is a new platform for COBOL"
+authors: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Boris Eng <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+maintainer: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Boris Eng <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+homepage: "https://ocamlpro.github.io/superbol-studio-oss"
+doc: "https://ocamlpro.github.io/superbol-studio-oss/sphinx"
+bug-reports: "https://github.com/ocamlpro/superbol-studio-oss/issues"
+dev-repo: "git+https://github.com/ocamlpro/superbol-studio-oss.git"
+tags: "org:ocamlpro"
+build: [
+  ["dune" "subst"] {dev}
+  ["sh" "-c" "./scripts/before.sh build '%{name}%'"]
+  [
+    "dune"
+    "build"
+    "-p"
+    "sql_preproc"
+    "-x"
+    "osx"
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["sh" "-c" "./scripts/after.sh build '%{name}%'"]
+]
+install: [
+  ["sh" "-c" "./scripts/before.sh install '%{name}%'"]
+]
+depends: [
+  "ocaml" {>= "4.14.0"}
+  "dune" {>= "2.8.0"}
+  "superbol_preprocs-osx" {= version}
+  "ppx_deriving-osx" {>= "5.2.1"}
+  "ez_file-osx" {>= "0.3"}
+  "cobol_unit-osx" {= version}
+  "cobol_typeck-osx" {= version}
+  "cobol_indent-osx" {= version}
+  "odoc" {with-doc}
+]
+# Content of `opam-trailer` field:

opam/osx/superbol_free_lib-osx.opam

@@ -51,6 +51,7 @@ depends: [
   "dune" {>= "2.8.0"}
   "vscode-json-osx" {= version}
   "superbol_preprocs-osx" {= version}
+  "sql_preproc-osx" {= version}
   "lwt-osx" {>= "5"}
   "ez_toml-osx" {= version}
   "ez_file-osx" {>= "0.3"}

opam/sql_preproc.opam

@@ -0,0 +1,58 @@
+# This file was generated by `drom` from `drom.toml`.
+# Do not modify, or add to the `skip` field of `drom.toml`.
+opam-version: "2.0"
+name: "sql_preproc"
+version: "0.1.4"
+license: "MIT"
+synopsis: "SuperBOL Studio OSS Project"
+description: "SuperBOL Studio OSS is a new platform for COBOL"
+authors: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Boris Eng <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+maintainer: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Boris Eng <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+homepage: "https://ocamlpro.github.io/superbol-studio-oss"
+doc: "https://ocamlpro.github.io/superbol-studio-oss/sphinx"
+bug-reports: "https://github.com/ocamlpro/superbol-studio-oss/issues"
+dev-repo: "git+https://github.com/ocamlpro/superbol-studio-oss.git"
+tags: "org:ocamlpro"
+build: [
+  ["dune" "subst"] {dev}
+  ["sh" "-c" "./scripts/before.sh build '%{name}%'"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["sh" "-c" "./scripts/after.sh build '%{name}%'"]
+]
+install: [
+  ["sh" "-c" "./scripts/before.sh install '%{name}%'"]
+]
+depends: [
+  "ocaml" {>= "4.14.0"}
+  "dune" {>= "2.8.0"}
+  "superbol_preprocs" {= version}
+  "ppx_deriving" {>= "5.2.1"}
+  "ez_file" {>= "0.3"}
+  "cobol_unit" {= version}
+  "cobol_typeck" {= version}
+  "cobol_indent" {= version}
+  "odoc" {with-doc}
+]
+# Content of `opam-trailer` field:

opam/superbol_free_lib.opam

@@ -49,6 +49,7 @@ depends: [
   "dune" {>= "2.8.0"}
   "vscode-json" {= version}
   "superbol_preprocs" {= version}
+  "sql_preproc" {= version}
   "lwt" {>= "5"}
   "ez_toml" {= version}
   "ez_file" {>= "0.3"}

opam/windows/cobol_typeck-windows.opam

@@ -49,6 +49,8 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
+  "superbol_preprocs-windows" {= version}
+  "sql_ast-windows" {= version}
   "cobol_unit-windows" {= version}
   "cobol_ptree-windows" {= version}
   "cobol_parser-windows" {= version}

opam/windows/sql_preproc-windows.opam

@@ -0,0 +1,60 @@
+# This file was generated by `drom` from `drom.toml`.
+# Do not modify, or add to the `skip` field of `drom.toml`.
+opam-version: "2.0"
+name: "sql_preproc"
+version: "0.1.4"
+license: "MIT"
+synopsis: "SuperBOL Studio OSS Project"
+description: "SuperBOL Studio OSS is a new platform for COBOL"
+authors: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Boris Eng <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+maintainer: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Boris Eng <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+homepage: "https://ocamlpro.github.io/superbol-studio-oss"
+doc: "https://ocamlpro.github.io/superbol-studio-oss/sphinx"
+bug-reports: "https://github.com/ocamlpro/superbol-studio-oss/issues"
+dev-repo: "git+https://github.com/ocamlpro/superbol-studio-oss.git"
+tags: "org:ocamlpro"
+build: [
+  ["dune" "subst"] {dev}
+  ["sh" "-c" "./scripts/before.sh build '%{name}%'"]
+  [
+    "dune"
+    "build"
+    "-p"
+    "sql_preproc"
+    "-x"
+    "windows"
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["sh" "-c" "./scripts/after.sh build '%{name}%'"]
+]
+install: [
+  ["sh" "-c" "./scripts/before.sh install '%{name}%'"]
+]
+depends: [
+  "ocaml" {>= "4.14.0"}
+  "dune" {>= "2.8.0"}
+  "superbol_preprocs-windows" {= version}
+  "ppx_deriving-windows" {>= "5.2.1"}
+  "ez_file-windows" {>= "0.3"}
+  "cobol_unit-windows" {= version}
+  "cobol_typeck-windows" {= version}
+  "cobol_indent-windows" {= version}
+  "odoc" {with-doc}
+]
+# Content of `opam-trailer` field:

opam/windows/superbol_free_lib-windows.opam

@@ -51,6 +51,7 @@ depends: [
   "dune" {>= "2.8.0"}
   "vscode-json-windows" {= version}
   "superbol_preprocs-windows" {= version}
+  "sql_preproc-windows" {= version}
   "lwt-windows" {>= "5"}
   "ez_toml-windows" {= version}
   "ez_file-windows" {>= "0.3"}