extralite 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edc158d606131bab091a3a9053a00a540728e53b12aa6165ec69f3611d5c449a
-  data.tar.gz: 826223da4bcd18ff70bc5d6f81c08c2ae8aa486387cd2277d0275268a1917853
+  metadata.gz: 8063960fd539fc0384882cf017572baefe79b9e29591d03c790951c6fad4fac0
+  data.tar.gz: 9f1c5be233721502dd0b97ffef2d195912ec029eccee977b16ca67b567299f04
 SHA512:
-  metadata.gz: c5fa113e40bf4ed2f4b2d89267386cd901e7346462ae080a8ba9771c0b8da2d95ce0473e584031210c02b4b3e9785d607afb8886da1c8d75fcadb9bb5022181d
-  data.tar.gz: df5a8b1025cd8278b5a929415bd62581d79b9769cd57f0353b3163fdb5d3f81a2c9ccd23901a4dade805e58add9436671e728aaead945ffed8239cb4dc619e17
+  metadata.gz: b674b89217ff2231d7c48f7d93917c29e84bbcb8b240216854a87b85d0c4ca5588fe821d0e6db406df04adc5c0b29aca4e24335349084e45a7d98449119a981f
+  data.tar.gz: 3f33b7ef708052e51033e2ca38f2323c8b78f95eecda2c328fba506762831e260ae03a66ff5944e4b961b22906aa42740ebdeaad1ff233f1141daded682a6d47

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.2 2021-05-24
+## 0.3 2021-05-24
+
+- Add support for running multiple statements
+
+## 0.2 2021-05-23
 
 - Implement `Database#transaction_active?`
 - Add tests

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    extralite (0.2.1)
+    extralite (0.3)
 
 GEM
   remote: https://rubygems.org/

data/ext/extralite/extralite.c

@@ -123,6 +123,32 @@ static inline VALUE row_to_hash(sqlite3_stmt *stmt, int column_count, VALUE colu
   return row;
 }
 
+inline void prepare_multi_stmt(sqlite3 *db, sqlite3_stmt **stmt, VALUE sql) {
+  const char *rest = 0;
+  const char *ptr = RSTRING_PTR(sql);
+  const char *end = ptr + RSTRING_LEN(sql);
+  while (1) {
+    int rc = sqlite3_prepare(db, ptr, end - ptr, stmt, &rest);
+    if (rc) {
+      sqlite3_finalize(*stmt);
+      rb_raise(cError, "%s", sqlite3_errmsg(db));
+    }
+
+    if (rest == end) return;
+    
+    // perform current query, but discard its results
+    rc = sqlite3_step(*stmt);
+    sqlite3_finalize(*stmt);
+    switch (rc) {
+    case SQLITE_BUSY:
+      rb_raise(cError, "Database is busy");
+    case SQLITE_ERROR:
+      rb_raise(cError, "%s", sqlite3_errmsg(db));
+    }
+    ptr = rest;
+  }
+}
+
 VALUE Database_query_hash(int argc, VALUE *argv, VALUE self) {
   int rc;
   sqlite3_stmt* stmt;
@@ -138,13 +164,7 @@ VALUE Database_query_hash(int argc, VALUE *argv, VALUE self) {
   sql = argv[0];
   GetDatabase(self, db);
 
-  rc = sqlite3_prepare(db->sqlite3_db, RSTRING_PTR(sql), RSTRING_LEN(sql), &stmt, 0);
-  if (rc) {
-    sqlite3_finalize(stmt);
-    rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
-    return Qnil;
-  }
-
+  prepare_multi_stmt(db->sqlite3_db, &stmt, sql);
   bind_all_parameters(stmt, argc, argv);
   column_count = sqlite3_column_count(stmt);
   column_names = get_column_names(stmt, column_count);
@@ -202,14 +222,7 @@ VALUE Database_query_ary(int argc, VALUE *argv, VALUE self) {
   sql = argv[0];
   GetDatabase(self, db);
 
-  rc = sqlite3_prepare(db->sqlite3_db, RSTRING_PTR(sql), RSTRING_LEN(sql), &stmt, 0);
-  if (rc) {
-    fprintf(stderr, "Failed to prepare statement: %s\n", sqlite3_errmsg(db->sqlite3_db));
-    sqlite3_finalize(stmt);
-    // TODO: raise error
-    return Qfalse;
-  }
-
+  prepare_multi_stmt(db->sqlite3_db, &stmt, sql);
   bind_all_parameters(stmt, argc, argv);
   column_count = sqlite3_column_count(stmt);
 
@@ -225,10 +238,13 @@ step:
     case SQLITE_DONE:
       break;
     case SQLITE_BUSY:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "Database is busy");
     case SQLITE_ERROR:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
   }
   sqlite3_finalize(stmt);
@@ -251,14 +267,7 @@ VALUE Database_query_single_column(int argc, VALUE *argv, VALUE self) {
   sql = argv[0];
   GetDatabase(self, db);
 
-  rc = sqlite3_prepare(db->sqlite3_db, RSTRING_PTR(sql), RSTRING_LEN(sql), &stmt, 0);
-  if (rc) {
-    fprintf(stderr, "Failed to prepare statement: %s\n", sqlite3_errmsg(db->sqlite3_db));
-    sqlite3_finalize(stmt);
-    // TODO: raise error
-    return Qfalse;
-  }
-
+  prepare_multi_stmt(db->sqlite3_db, &stmt, sql);
   bind_all_parameters(stmt, argc, argv);
   column_count = sqlite3_column_count(stmt);
   if (column_count != 1)
@@ -268,6 +277,7 @@ VALUE Database_query_single_column(int argc, VALUE *argv, VALUE self) {
   if (!yield_to_block) result = rb_ary_new();
 step:
   rc = sqlite3_step(stmt);
+  printf("rc=%d\n", rc);
   switch (rc) {
     case SQLITE_ROW:
       value = get_column_value(stmt, 0, sqlite3_column_type(stmt, 0));
@@ -276,10 +286,13 @@ step:
     case SQLITE_DONE:
       break;
     case SQLITE_BUSY:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "Database is busy");
     case SQLITE_ERROR:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
+      sqlite3_finalize(stmt);
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
   }
 
@@ -301,14 +314,7 @@ VALUE Database_query_single_value(int argc, VALUE *argv, VALUE self) {
   sql = argv[0];
   GetDatabase(self, db);
 
-  rc = sqlite3_prepare(db->sqlite3_db, RSTRING_PTR(sql), RSTRING_LEN(sql), &stmt, 0);
-  if (rc) {
-    fprintf(stderr, "Failed to prepare statement: %s\n", sqlite3_errmsg(db->sqlite3_db));
-    sqlite3_finalize(stmt);
-    // TODO: raise error
-    return Qfalse;
-  }
-
+  prepare_multi_stmt(db->sqlite3_db, &stmt, sql);
   bind_all_parameters(stmt, argc, argv);
   column_count = sqlite3_column_count(stmt);
   if (column_count != 1)

data/lib/extralite/version.rb

@@ -1,3 +1,3 @@
 module Extralite
-  VERSION = '0.2.1'
+  VERSION = '0.3'
 end

data/test/test_database.rb

@@ -48,4 +48,10 @@ class DatabaseTest < MiniTest::Test
     @db.query('rollback')
     assert_equal false, @db.transaction_active?
   end
+
+  def test_multiple_statements
+    @db.query("insert into t values ('a', 'b', 'c'); insert into t values ('d', 'e', 'f');")
+
+    assert_equal [1, 4, 'a', 'd'], @db.query_single_column('select x from t order by x')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler