Merge pull request #14 from maiste/fix/issue-13

Give ability to execute scripts

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
         run: opam exec -- dune build @install
 
       - name: Run tests
-        run: opam exec -- dune test
+        run: GITHUB_TESTS=true opam exec -- dune test
 
       - name: Format code
         run: opam exec -- dune build --auto-promote @fmt

dune

@@ -0,0 +1,5 @@
+(cram
+ (applies_to example)
+ (enabled_if
+  (= true %{env:GITHUB_TESTS=false}))
+ (deps %{bin:omigrate}))

example.t/run.t

@@ -16,7 +16,7 @@ Execute the sqlite migrations
 
 Verify the tables in the sqlite3 database
   $ sqlite3 test.db ".tables"
-  pets               schema_migrations
+  pets               schema_migrations  users            
 
 Check that we have everything in  the sqlite3 schema table
   $ omigrate ls -d "sqlite3:///$PWD/test.db" -s ./sqlite3 -vv

example.t/sqlite3/33_create_table.down.sql

@@ -1 +1,2 @@
 DROP TABLE IF EXISTS pets;
+DROP TABLE IF EXISTS users;

example.t/sqlite3/33_create_table.up.sql

@@ -1,3 +1,9 @@
 CREATE TABLE pets (
   name string NOT NULL DEFAULT "dog"
 );
+
+CREATE TABLE users (
+    name string NOT NULL DEFAULT "anonymous"
+);
+
+ALTER TABLE users ADD developer bool NOT NULL DEFAULT false;

lib/omigrate_drivers/sqlite_3.ml

@@ -58,6 +58,17 @@ module Db = struct
     bind t stmt values;
     exec_stmt t stmt
 
+  let exec_script t sql =
+    let rc = Sqlite3.exec t.db ~cb:(fun _ _ -> ()) sql in
+    match rc with
+    | Sqlite3.Rc.OK | Sqlite3.Rc.DONE -> ()
+    | err ->
+        let msg =
+          Printf.sprintf "Sqlite3 driver: [exec_stmt] [%s] %s"
+            (Sqlite3.Rc.to_string err) (Sqlite3.errmsg t.db)
+        in
+        failwith msg
+
   let query t stmt values =
     bind t stmt values;
     let results = ref [] in
@@ -119,8 +130,8 @@ module T = struct
           Logs_lwt.info (fun m -> m "Applying up migration %Ld" version)
         in
         let _ =
-          let stmt = Sqlite3.prepare t.Db.db migration.Omigrate.Migration.up in
-          Db.query t stmt []
+          let stmt = migration.Omigrate.Migration.up in
+          Db.exec_script t stmt
         in
         let* () =
           Logs_lwt.debug (fun m ->
@@ -157,10 +168,8 @@ module T = struct
           Logs_lwt.info (fun m -> m "Applying down migration %Ld" version)
         in
         let _ =
-          let stmt =
-            Sqlite3.prepare t.Db.db migration.Omigrate.Migration.down
-          in
-          Db.query t stmt []
+          let stmt = migration.Omigrate.Migration.down in
+          Db.exec_script t stmt
         in
         let* () =
           Logs_lwt.debug (fun m ->