extralite 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa0672decf076e478bfd52359196baecbcf837e00cec91c7f9cf963b103af68
-  data.tar.gz: e54364225b96fc355a8198eab73c7a27848a672e04479a7eed06f724991ae238
+  metadata.gz: 89b99ba7c6d26fc887574bf943f8e07f4c27f0c058a99723be73d7b64a90b3d5
+  data.tar.gz: 41c9bc62b91d78d0507d58b6a3e150608aae813b7b929410f23b0389a8b8c98f
 SHA512:
-  metadata.gz: 9606a7e0154d61adc29150161a44018638f7e05a3c17f4f8e8b992e166ad0cd46705cb4eab2e9e6f7cc7f4d9eece8406e468822ff8a84116ff6f58cc493a89dd
-  data.tar.gz: fa5e4e1425187986ec097990f84ae103428645f94caaa41471305b414c78f15fb9522311b4eb50d40bc91c715f9e20e1c2fac18c0fd02892b41e75994602691d
+  metadata.gz: 6c29b92468cdf3a2fe9f65088c579a901ff981b11c68d8dc32c99508c4ab7fae5a8d9a348e2310dcf18b0980edac9f3503889de76e097c6d27c6c3fb20480245
+  data.tar.gz: 49c703000e9285cff90dadd0d64f40690d96a6f6c59305021dca0561d41aff6fedcc64a4918ce16337acbb7537fd91c73f2b1d65953cdff8be591773844c3465

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6 2021-05-25
+
+- Add more specific errors: `SQLError`, `BusyError`
+
 ## 0.5 2021-05-25
 
 - Implement `Database#query_single_row`

data/Gemfile.lock

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

data/README.md

@@ -11,6 +11,7 @@ class with a minimal set of methods to interact with an SQLite3 database.
 - Parameter binding.
 - Get last insert rowid.
 - Get number of rows changed by last query.
+- Load extensions.
 
 ### Usage
 
@@ -35,7 +36,7 @@ db.query_ary('select 1, 2, 3') { |r| p r }
 # [1, 2, 3]
 
 # get a single row as a hash
-db.query_single_column("select 1 as foo") #=> { :foo => 1 }
+db.query_single_row("select 1 as foo") #=> { :foo => 1 }
 
 # get single column query results as array of values
 db.query_single_column('select 42') #=> [42]

data/ext/extralite/extralite.c

@@ -3,6 +3,8 @@
 #include "../sqlite3/sqlite3.h"
 
 VALUE cError;
+VALUE cSQLError;
+VALUE cBusyError;
 ID ID_STRIP;
 
 typedef struct Database_t {
@@ -145,7 +147,7 @@ inline void prepare_multi_stmt(sqlite3 *db, sqlite3_stmt **stmt, VALUE sql) {
     int rc = sqlite3_prepare(db, ptr, end - ptr, stmt, &rest);
     if (rc) {
       sqlite3_finalize(*stmt);
-      rb_raise(cError, "%s", sqlite3_errmsg(db));
+      rb_raise(cSQLError, "%s", sqlite3_errmsg(db));
     }
 
     if (rest == end) return;
@@ -155,9 +157,9 @@ inline void prepare_multi_stmt(sqlite3 *db, sqlite3_stmt **stmt, VALUE sql) {
     sqlite3_finalize(*stmt);
     switch (rc) {
     case SQLITE_BUSY:
-      rb_raise(cError, "Database is busy");
+      rb_raise(cBusyError, "Database is busy");
     case SQLITE_ERROR:
-      rb_raise(cError, "%s", sqlite3_errmsg(db));
+      rb_raise(cSQLError, "%s", sqlite3_errmsg(db));
     }
     ptr = rest;
   }
@@ -199,10 +201,10 @@ step:
       break;
     case SQLITE_BUSY:
       sqlite3_finalize(stmt);
-      rb_raise(cError, "Database is busy");
+      rb_raise(cBusyError, "Database is busy");
     case SQLITE_ERROR:
       sqlite3_finalize(stmt);
-      rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
+      rb_raise(cSQLError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
       sqlite3_finalize(stmt);
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
@@ -247,10 +249,10 @@ step:
       break;
     case SQLITE_BUSY:
       sqlite3_finalize(stmt);
-      rb_raise(cError, "Database is busy");
+      rb_raise(cBusyError, "Database is busy");
     case SQLITE_ERROR:
       sqlite3_finalize(stmt);
-      rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
+      rb_raise(cSQLError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
       sqlite3_finalize(stmt);
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
@@ -289,9 +291,9 @@ VALUE Database_query_single_row(int argc, VALUE *argv, VALUE self) {
     case SQLITE_DONE:
       break;
     case SQLITE_BUSY:
-      rb_raise(cError, "Database is busy");
+      rb_raise(cBusyError, "Database is busy");
     case SQLITE_ERROR:
-      rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
+      rb_raise(cSQLError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
   }
@@ -337,10 +339,10 @@ step:
       break;
     case SQLITE_BUSY:
       sqlite3_finalize(stmt);
-      rb_raise(cError, "Database is busy");
+      rb_raise(cBusyError, "Database is busy");
     case SQLITE_ERROR:
       sqlite3_finalize(stmt);
-      rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
+      rb_raise(cSQLError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
       sqlite3_finalize(stmt);
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
@@ -380,9 +382,9 @@ VALUE Database_query_single_value(int argc, VALUE *argv, VALUE self) {
     case SQLITE_DONE:
       break;
     case SQLITE_BUSY:
-      rb_raise(cError, "Database is busy");
+      rb_raise(cBusyError, "Database is busy");
     case SQLITE_ERROR:
-      rb_raise(cError, "%s", sqlite3_errmsg(db->sqlite3_db));
+      rb_raise(cSQLError, "%s", sqlite3_errmsg(db->sqlite3_db));
     default:
       rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
   }
@@ -461,5 +463,8 @@ void Init_Extralite() {
   rb_define_method(cDatabase, "load_extension", Database_load_extension, 1);
 
   cError = rb_define_class_under(mExtralite, "Error", rb_eRuntimeError);
+  cSQLError = rb_define_class_under(mExtralite, "SQLError", cError);
+  cBusyError = rb_define_class_under(mExtralite, "BusyError", cError);
+
   ID_STRIP = rb_intern("strip");
 }

data/lib/extralite/version.rb

@@ -1,3 +1,3 @@
 module Extralite
-  VERSION = '0.5'
+  VERSION = '0.6'
 end

data/test/test_database.rb

@@ -24,6 +24,10 @@ class DatabaseTest < MiniTest::Test
     assert_equal [], r
   end
 
+  def test_invalid_query
+    assert_raises(Extralite::SQLError) { @db.query('blah') }
+  end
+
   def test_query_hash
     r = @db.query_hash('select * from t')
     assert_equal [{x: 1, y: 2, z: 3}, {x: 4, y: 5, z: 6}], r

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Sharon Rosner