extralite 1.3 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9cad52b4d9e4807384a8e1b3f9b9ab521c539cbc705bcf475fb24f8e3aa462c
-  data.tar.gz: '04792f9ce5e23c21509a7de369152501972e4a20167988f12211aa6d23b901a3'
+  metadata.gz: cf088c359bb74b23020c8cb290cb6c65d06cedd885e4421c3e81f3c21a31ca33
+  data.tar.gz: a14199c2f5d07068a1a57eb0b24119964aa7a9960f23e6cb58bac39fe535dbfa
 SHA512:
-  metadata.gz: 1e8fac21c746aa4fe8ebd8b09f12bf8c4fb71f2f888af948f90b83ae26fdebbaec67c9e1d5d4c7fda93e22152631579e6aa6cf37d8d6352492dd6ff9e5a1d255
-  data.tar.gz: 9a9df25229c0939df53f047426bd7df56359e81e187b0ba0ffd98ff1e8c5fd676ac828ebba01aae66524391166968b12b46ebea625775b1414f018ff5f161b08
+  metadata.gz: '009ccdd0998a39df02718feeecf981eb03dbf55d0dd6b2d0b8bcfb66754a0ec8fcc2ee9e4e9a2b421a63ed6fa89ae29f7c748ca370d32dae2199a01e50febabc'
+  data.tar.gz: e0fc9eb0f8a69dd2017c4d821430a861535fecc2c51e937c58d471098cc0c815867f514a357e2a0572eb848e02e97fac9454116b3cac2ff21abb0e479241552e

data/.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: [2.6, 2.7, 3.0]
+        ruby: [2.6, 2.7, '3.0']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}
@@ -16,15 +16,10 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v1
-    - uses: actions/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install
-    - name: Show Linux kernel version
-      run: uname -r
+        bundler-cache: true # 'bundle install' and cache
     - name: Compile C-extension
       run: bundle exec rake compile
     - name: Run tests

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.7 2021-12-13
+
+- Add extralite Sequel adapter
+- Add support for binding hash parameters
+
+## 1.6 2021-12-13
+
+- Release GVL while fetching rows
+
+## 1.5 2021-12-13
+
+- Release GVL while preparing statements
+- Use `sqlite3_prepare_v2` instead of deprecated `sqlite_prepare`
+
+## 1.4 2021-08-25
+
+- Fix possible segfault in cleanup_stmt
+
 ## 1.3 2021-08-17
 
 - Pin error classes (for better compatibility with `GC.compact`)

data/Gemfile.lock

@@ -1,24 +1,17 @@
 PATH
   remote: .
   specs:
-    extralite (1.3)
+    extralite (1.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ansi (1.5.0)
     ast (2.4.2)
-    builder (3.2.4)
     coderay (1.1.3)
     docile (1.4.0)
     json (2.5.1)
     method_source (1.0.0)
     minitest (5.14.4)
-    minitest-reporters (1.4.2)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
@@ -43,6 +36,7 @@ GEM
     rubocop-ast (1.5.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
+    sequel (5.51.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -56,10 +50,10 @@ PLATFORMS
 DEPENDENCIES
   extralite!
   minitest (= 5.14.4)
-  minitest-reporters (= 1.4.2)
   pry (= 0.13.1)
   rake-compiler (= 1.1.1)
   rubocop (= 0.85.1)
+  sequel (= 5.51.0)
   simplecov (= 0.17.1)
 
 BUNDLED WITH

data/README.md

@@ -6,22 +6,29 @@
 
 ## What is Extralite?
 
-Extralite is an extra-lightweight (less than 400 lines of C-code) SQLite3 wrapper for
-Ruby. It provides a single class with a minimal set of methods to interact with
-an SQLite3 database.
+Extralite is an extra-lightweight (less than 430 lines of C-code) SQLite3
+wrapper for Ruby. It provides a single class with a minimal set of methods to
+interact with an SQLite3 database.
 
 ## Features
 
-- A variety of methods for different data access patterns: row as hash, row as
-  array, single single row, single column, single value.
+- A variety of methods for different data access patterns: rows as hashes, rows
+  as arrays, single row, single column, single value.
+- Super fast - [up to 12.5x faster](#performance) than the
+  [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) gem (see also
+  [comparison](#why-not-just-use-the-sqlite3-gem).)
+- Improved [concurrency](#what-about-concurrency) for multithreaded apps: the
+  Ruby GVL is released while preparing SQL statements and while iterating over
+  results.
 - Iterate over records with a block, or collect records into an array.
 - Parameter binding.
-- Correctly execute strings with multiple semicolon-separated queries (handy for
-  creating/modifying schemas).
+- Automatically execute SQL strings containing multiple semicolon-separated
+  queries (handy for creating/modifying schemas).
 - Get last insert rowid.
 - Get number of rows changed by last query.
 - Load extensions (loading of extensions is autmatically enabled. You can find
   some useful extensions here: https://github.com/nalgeon/sqlean.)
+- Includes a [Sequel adapter](#usage-with-sequel) (an ActiveRecord)
 
 ## Usage
 
@@ -60,6 +67,11 @@ db.query_single_value("select 'foo'") #=> "foo"
 # parameter binding (works for all query_xxx methods)
 db.query_hash('select ? as foo, ? as bar', 1, 2) #=> [{ :foo => 1, :bar => 2 }]
 
+# parameter binding of named parameters
+db.query('select * from foo where bar = :bar', bar: 42)
+db.query('select * from foo where bar = :bar', 'bar' => 42)
+db.query('select * from foo where bar = :bar', ':bar' => 42)
+
 # get last insert rowid
 rowid = db.last_insert_id
 
@@ -77,23 +89,74 @@ db.close
 db.closed? #=> true
 ```
 
+## Usage with Sequel
+
+Extralite includes an adapter for
+[Sequel](https://github.com/jeremyevans/sequel). To use the Extralite adapter,
+just use the `extralite` scheme instead of `sqlite`:
+
+```ruby
+DB = Sequel.connect('extralite:blog.db')
+articles = DB[:articles]
+p articles.to_a
+```
+
+(Make sure you include `extralite` as a dependency in your `Gemfile`.)
+
 ## Why not just use the sqlite3 gem?
 
-The sqlite3-ruby gem is a popular, solid, well-maintained project, used by
-thousands of developers. I've been doing a lot of work with SQLite3 lately, and
-wanted to have a simpler API that gives me query results in a variety of ways.
-Thus extralite was born.
+The [sqlite3-ruby](https://github.com/sparklemotion/sqlite3-ruby) gem is a
+popular, solid, well-maintained project, used by thousands of developers. I've
+been doing a lot of work with SQLite3 databases lately, and wanted to have a
+simpler API that gives me query results in a variety of ways. Thus extralite was
+born.
+
+Extralite is quite a bit [faster](#performance) than sqlite3-ruby and is also
+[thread-friendly](#what-about-concurrency). On the other hand, Extralite does
+not have support for defining custom functions, aggregates and collations. If
+you're using those features, you'll need to stick with sqlite3-ruby.
+
+Here's a table summarizing the differences between the two gems:
+
+| |sqlite3-ruby|Extralite|
+|-|-|-|
+|API design|multiple classes|single class|
+|Query results|row as hash, row as array, single row, single value|row as hash, row as array, __single column__, single row, single value|
+|execute multiple statements|separate API (#execute_batch)|integrated|
+|custom functions in Ruby|yes|no|
+|custom collations|yes|no|
+|custom aggregate functions|yes|no|
+|Multithread friendly|no|[yes](#what-about-concurrency)|
+|Code size|~2650LoC|~500LoC|
+|Performance|1x|1.5x to 12.5x (see [below](#performance))|
 
 ## What about concurrency?
 
-Extralite currently does not release the GVL. This means that even if queries
-are executed on a separate thread, no other Ruby threads will be scheduled while
-SQLite3 is busy fetching the next record.
+Extralite releases the GVL while making blocking calls to the sqlite3 library,
+that is while preparing SQL statements and fetching rows. Releasing the GVL
+allows other threads to run while the sqlite3 library is busy compiling SQL into
+bytecode, or fetching the next row. This does not seem to hurt Extralite's
+performance:
+
+## Performance
+
+A benchmark script is
+[included](https://github.com/digital-fabric/extralite/blob/main/test/perf.rb),
+creating a table of various row counts, then fetching the entire table using
+either `sqlite3` or `extralite`. This benchmark shows Extralite to be up to 12.5
+times faster than `sqlite3` when fetching a large number of rows. Here are the
+results (using the `sqlite3` gem performance as baseline):
+
+|Row count|sqlite3-ruby (baseline)|Extralite (relative - rounded)|
+|-:|-:|-:|
+|10|1x|1.5x|
+|1K|1x|7x|
+|100K|1x|12.5x|
 
-In the future Extralite might be changed to release the GVL each time
-`sqlite3_step` is called.
+(If you're interested in checking this yourself, just run the script and let me
+know if your results are different.)
 
-## Can I use it with an ORM like ActiveRecord or Sequel?
+## Contributing
 
-Not yet, but you are welcome to contribute adapters for those projects. I will
-be releasing my own not-an-ORM tool in the near future.
+Contributions in the form of issues, PRs or comments will be greatly
+appreciated!

data/Rakefile

@@ -12,7 +12,7 @@ task :recompile => [:clean, :compile]
 
 task :default => [:compile, :test]
 task :test do
-  exec 'ruby test/test_database.rb'
+  exec 'ruby test/run.rb'
 end
 
 CLEAN.include "**/*.o", "**/*.so", "**/*.so.*", "**/*.a", "**/*.bundle", "**/*.jar", "pkg", "tmp"

data/ext/extralite/extralite.c

@@ -1,11 +1,15 @@
 #include <stdio.h>
 #include "ruby.h"
+#include "ruby/thread.h"
 #include <sqlite3.h>
 
 VALUE cError;
 VALUE cSQLError;
 VALUE cBusyError;
+
+ID ID_KEYS;
 ID ID_STRIP;
+ID ID_TO_S;
 
 typedef struct Database_t {
   sqlite3 *sqlite3_db;
@@ -108,8 +112,35 @@ inline VALUE get_column_value(sqlite3_stmt *stmt, int col, int type) {
   return Qnil;
 }
 
+static void bind_parameter_value(sqlite3_stmt *stmt, int pos, VALUE value);
+
+static inline void bind_hash_parameter_values(sqlite3_stmt *stmt, VALUE hash) {
+  VALUE keys = rb_funcall(hash, ID_KEYS, 0);
+  int len = RARRAY_LEN(keys);
+  for (int i = 0; i < len; i++) {
+    VALUE k = RARRAY_AREF(keys, i);
+    VALUE v = rb_hash_aref(hash, k);
+
+    switch (TYPE(k)) {
+      case T_FIXNUM:
+        bind_parameter_value(stmt, NUM2INT(k), v);
+        return;
+      case T_SYMBOL:
+        k = rb_funcall(k, ID_TO_S, 0);
+      case T_STRING:
+        if(RSTRING_PTR(k)[0] != ':') k = rb_str_plus(rb_str_new2(":"), k);
+        int pos = sqlite3_bind_parameter_index(stmt, StringValuePtr(k));
+        bind_parameter_value(stmt, pos, v);
+        return;
+      default:
+      rb_raise(cError, "Cannot bind hash key value idx %d", i);
+    }
+  }
+  RB_GC_GUARD(keys);
+}
+
 static inline void bind_parameter_value(sqlite3_stmt *stmt, int pos, VALUE value) {
-  switch (TYPE(value)) { 
+  switch (TYPE(value)) {
     case T_NIL:
       sqlite3_bind_null(stmt, pos);
       return;
@@ -128,6 +159,9 @@ static inline void bind_parameter_value(sqlite3_stmt *stmt, int pos, VALUE value
     case T_STRING:
       sqlite3_bind_text(stmt, pos, RSTRING_PTR(value), RSTRING_LEN(value), SQLITE_TRANSIENT);
       return;
+    case T_HASH:
+      bind_hash_parameter_values(stmt, value);
+      return;
     default:
       rb_raise(cError, "Cannot bind parameter at position %d", pos);
   }
@@ -143,7 +177,7 @@ static inline void bind_all_parameters(sqlite3_stmt *stmt, int argc, VALUE *argv
 
 static inline VALUE get_column_names(sqlite3_stmt *stmt, int column_count) {
   VALUE arr = rb_ary_new2(column_count);
-  for (int i = 0; i < column_count; i++) { 
+  for (int i = 0; i < column_count; i++) {
     VALUE name = ID2SYM(rb_intern(sqlite3_column_name(stmt, i)));
     rb_ary_push(arr, name);
   }
@@ -168,36 +202,80 @@ static inline VALUE row_to_ary(sqlite3_stmt *stmt, int column_count) {
   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);
+struct multi_stmt_ctx {
+  sqlite3 *db;
+  sqlite3_stmt **stmt;
+  const char *str;
+  int len;
+  int rc;
+};
+
+void *prepare_multi_stmt_without_gvl(void *ptr) {
+  struct multi_stmt_ctx *ctx = (struct multi_stmt_ctx *)ptr;
+  const char *rest = NULL;
+  const char *str = ctx->str;
+  const char *end = ctx->str + ctx->len;
   while (1) {
-    int rc = sqlite3_prepare(db, ptr, end - ptr, stmt, &rest);
-    if (rc) {
-      sqlite3_finalize(*stmt);
-      rb_raise(cSQLError, "%s", sqlite3_errmsg(db));
+    ctx->rc = sqlite3_prepare_v2(ctx->db, str, end - str, ctx->stmt, &rest);
+    if (ctx->rc) {
+      sqlite3_finalize(*ctx->stmt);
+      return NULL;
     }
 
-    if (rest == end) return;
-    
+    if (rest == end) return NULL;
+
     // perform current query, but discard its results
-    rc = sqlite3_step(*stmt);
-    sqlite3_finalize(*stmt);
-    switch (rc) {
+    ctx->rc = sqlite3_step(*ctx->stmt);
+    sqlite3_finalize(*ctx->stmt);
+    switch (ctx->rc) {
     case SQLITE_BUSY:
-      rb_raise(cBusyError, "Database is busy");
     case SQLITE_ERROR:
-      rb_raise(cSQLError, "%s", sqlite3_errmsg(db));
+    case SQLITE_MISUSE:
+      return NULL;
     }
-    ptr = rest;
+    str = rest;
   }
+  return NULL;
 }
 
-inline int stmt_iterate(sqlite3_stmt *stmt, sqlite3 *db) {
+/*
+This function prepares a statement from an SQL string containing one or more SQL
+statements. It will release the GVL while the statements are being prepared and
+executed. All statements excluding the last one are executed. The last statement
+is not executed, but instead handed back to the caller for looping over results.
+*/
+inline void prepare_multi_stmt(sqlite3 *db, sqlite3_stmt **stmt, VALUE sql) {
+  struct multi_stmt_ctx ctx = {db, stmt, RSTRING_PTR(sql), RSTRING_LEN(sql), 0};
+  rb_thread_call_without_gvl(prepare_multi_stmt_without_gvl, (void *)&ctx, RUBY_UBF_IO, 0);
+  RB_GC_GUARD(sql);
+
+  switch (ctx.rc) {
+  case 0:
+    return;
+  case SQLITE_BUSY:
+    rb_raise(cBusyError, "Database is busy");
+  case SQLITE_ERROR:
+    rb_raise(cSQLError, "%s", sqlite3_errmsg(db));
+  default:
+    rb_raise(cError, "Invalid return code for prepare_multi_stmt_without_gvl: %d (please open an issue on https://github.com/digital-fabric/extralite)", ctx.rc);
+  }
+}
+
+struct step_ctx {
+  sqlite3_stmt *stmt;
   int rc;
-  rc = sqlite3_step(stmt);
-  switch (rc) {
+};
+
+void *stmt_iterate_without_gvl(void *ptr) {
+  struct step_ctx *ctx = (struct step_ctx *)ptr;
+  ctx->rc = sqlite3_step(ctx->stmt);
+  return NULL;
+}
+
+inline int stmt_iterate(sqlite3_stmt *stmt, sqlite3 *db) {
+  struct step_ctx ctx = {stmt, 0};
+  rb_thread_call_without_gvl(stmt_iterate_without_gvl, (void *)&ctx, RUBY_UBF_IO, 0);
+  switch (ctx.rc) {
     case SQLITE_ROW:
       return 1;
     case SQLITE_DONE:
@@ -207,7 +285,7 @@ inline int stmt_iterate(sqlite3_stmt *stmt, sqlite3 *db) {
     case SQLITE_ERROR:
       rb_raise(cSQLError, "%s", sqlite3_errmsg(db));
     default:
-      rb_raise(cError, "Invalid return code for sqlite3_step: %d", rc);
+      rb_raise(cError, "Invalid return code for sqlite3_step: %d (please open an issue on https://github.com/digital-fabric/extralite)", ctx.rc);
   }
 
   return 0;
@@ -222,7 +300,7 @@ typedef struct query_ctx {
 
 VALUE cleanup_stmt(VALUE arg) {
   query_ctx *ctx = (query_ctx *)arg;
-  sqlite3_finalize(ctx->stmt);
+  if (ctx->stmt) sqlite3_finalize(ctx->stmt);
   return Qnil;
 }
 
@@ -292,7 +370,7 @@ VALUE safe_query_ary(VALUE arg) {
     row = row_to_ary(ctx->stmt, column_count);
     if (yield_to_block) rb_yield(row); else rb_ary_push(result, row);
   }
-  
+
   RB_GC_GUARD(row);
   RB_GC_GUARD(result);
   return result;
@@ -453,14 +531,14 @@ void Init_Extralite() {
   rb_define_method(cDatabase, "initialize", Database_initialize, 1);
   rb_define_method(cDatabase, "close", Database_close, 0);
   rb_define_method(cDatabase, "closed?", Database_closed_p, 0);
-  
+
   rb_define_method(cDatabase, "query", Database_query_hash, -1);
   rb_define_method(cDatabase, "query_hash", Database_query_hash, -1);
   rb_define_method(cDatabase, "query_ary", Database_query_ary, -1);
   rb_define_method(cDatabase, "query_single_row", Database_query_single_row, -1);
   rb_define_method(cDatabase, "query_single_column", Database_query_single_column, -1);
   rb_define_method(cDatabase, "query_single_value", Database_query_single_value, -1);
-  
+
   rb_define_method(cDatabase, "last_insert_rowid", Database_last_insert_rowid, 0);
   rb_define_method(cDatabase, "changes", Database_changes, 0);
   rb_define_method(cDatabase, "filename", Database_filename, -1);
@@ -474,5 +552,7 @@ void Init_Extralite() {
   rb_gc_register_mark_object(cSQLError);
   rb_gc_register_mark_object(cBusyError);
 
-  ID_STRIP = rb_intern("strip");
+  ID_KEYS   = rb_intern("keys");
+  ID_STRIP  = rb_intern("strip");
+  ID_TO_S   = rb_intern("to_s");
 }

data/extralite.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency  'rake-compiler',        '1.1.1'
   s.add_development_dependency  'minitest',             '5.14.4'
-  s.add_development_dependency  'minitest-reporters',   '1.4.2'
   s.add_development_dependency  'simplecov',            '0.17.1'
   s.add_development_dependency  'rubocop',              '0.85.1'
   s.add_development_dependency  'pry',                  '0.13.1'
+  s.add_development_dependency  'sequel',               '5.51.0'
 end

data/lib/extralite/version.rb

@@ -1,3 +1,3 @@
 module Extralite
-  VERSION = '1.3'
+  VERSION = '1.7'
 end

data/lib/sequel/adapters/extralite.rb

@@ -0,0 +1,376 @@
+# frozen-string-literal: true
+
+require 'extralite'
+require 'sequel/adapters/shared/sqlite'
+
+module Sequel
+  module Extralite
+    FALSE_VALUES = (%w'0 false f no n'.each(&:freeze) + [0]).freeze
+
+    blob = Object.new
+    def blob.call(s)
+      Sequel::SQL::Blob.new(s.to_s)
+    end
+
+    boolean = Object.new
+    def boolean.call(s)
+      s = s.downcase if s.is_a?(String)
+      !FALSE_VALUES.include?(s)
+    end
+
+    date = Object.new
+    def date.call(s)
+      case s
+      when String
+        Sequel.string_to_date(s)
+      when Integer
+        Date.jd(s)
+      when Float
+        Date.jd(s.to_i)
+      else
+        raise Sequel::Error, "unhandled type when converting to date: #{s.inspect} (#{s.class.inspect})"
+      end
+    end
+
+    integer = Object.new
+    def integer.call(s)
+      s.to_i
+    end
+
+    float = Object.new
+    def float.call(s)
+      s.to_f
+    end
+
+    numeric = Object.new
+    def numeric.call(s)
+      s = s.to_s unless s.is_a?(String)
+      BigDecimal(s) rescue s
+    end
+
+    time = Object.new
+    def time.call(s)
+      case s
+      when String
+        Sequel.string_to_time(s)
+      when Integer
+        Sequel::SQLTime.create(s/3600, (s % 3600)/60, s % 60)
+      when Float
+        s, f = s.divmod(1)
+        Sequel::SQLTime.create(s/3600, (s % 3600)/60, s % 60, (f*1000000).round)
+      else
+        raise Sequel::Error, "unhandled type when converting to date: #{s.inspect} (#{s.class.inspect})"
+      end
+    end
+
+    # Hash with string keys and callable values for converting SQLite types.
+    SQLITE_TYPES = {}
+    {
+      %w'date' => date,
+      %w'time' => time,
+      %w'bit bool boolean' => boolean,
+      %w'integer smallint mediumint int bigint' => integer,
+      %w'numeric decimal money' => numeric,
+      %w'float double real dec fixed' + ['double precision'] => float,
+      %w'blob' => blob
+    }.each do |k,v|
+      k.each{|n| SQLITE_TYPES[n] = v}
+    end
+    SQLITE_TYPES.freeze
+
+    USE_EXTENDED_RESULT_CODES = false
+    
+    class Database < Sequel::Database
+      include ::Sequel::SQLite::DatabaseMethods
+      
+      set_adapter_scheme :extralite
+      
+      # Mimic the file:// uri, by having 2 preceding slashes specify a relative
+      # path, and 3 preceding slashes specify an absolute path.
+      def self.uri_to_options(uri) # :nodoc:
+        { :database => (uri.host.nil? && uri.path == '/') ? nil : "#{uri.host}#{uri.path}" }
+      end
+      
+      private_class_method :uri_to_options
+
+      # The conversion procs to use for this database
+      attr_reader :conversion_procs
+
+      # Connect to the database. Since SQLite is a file based database,
+      # available options are limited:
+      #
+      # :database :: database name (filename or ':memory:' or file: URI)
+      # :readonly :: open database in read-only mode; useful for reading
+      #              static data that you do not want to modify
+      # :timeout :: how long to wait for the database to be available if it
+      #             is locked, given in milliseconds (default is 5000)
+      def connect(server)
+        opts = server_opts(server)
+        opts[:database] = ':memory:' if blank_object?(opts[:database])
+        # sqlite3_opts = {}
+        # sqlite3_opts[:readonly] = typecast_value_boolean(opts[:readonly]) if opts.has_key?(:readonly)
+        db = ::Extralite::Database.new(opts[:database].to_s)#, sqlite3_opts)
+        # db.busy_timeout(typecast_value_integer(opts.fetch(:timeout, 5000)))
+
+        # if USE_EXTENDED_RESULT_CODES
+        #   db.extended_result_codes = true
+        # end
+        
+        connection_pragmas.each{|s| log_connection_yield(s, db){db.query(s)}}
+        
+        # class << db
+        #   attr_reader :prepared_statements
+        # end
+        # db.instance_variable_set(:@prepared_statements, {})
+        
+        db
+      end
+
+      # Disconnect given connections from the database.
+      def disconnect_connection(c)
+        # c.prepared_statements.each_value{|v| v.first.close}
+        c.close
+      end
+      
+      # Run the given SQL with the given arguments and yield each row.
+      def execute(sql, opts=OPTS, &block)
+        _execute(:select, sql, opts, &block)
+      end
+
+      # Run the given SQL with the given arguments and return the number of changed rows.
+      def execute_dui(sql, opts=OPTS)
+        _execute(:update, sql, opts)
+      end
+      
+      # Drop any prepared statements on the connection when executing DDL.  This is because
+      # prepared statements lock the table in such a way that you can't drop or alter the
+      # table while a prepared statement that references it still exists.
+      # def execute_ddl(sql, opts=OPTS)
+      #   synchronize(opts[:server]) do |conn|
+      #     conn.prepared_statements.values.each{|cps, s| cps.close}
+      #     conn.prepared_statements.clear
+      #     super
+      #   end
+      # end
+      
+      def execute_insert(sql, opts=OPTS)
+        _execute(:insert, sql, opts)
+      end
+      
+      def freeze
+        @conversion_procs.freeze
+        super
+      end
+
+      # Handle Integer and Float arguments, since SQLite can store timestamps as integers and floats.
+      def to_application_timestamp(s)
+        case s
+        when String
+          super
+        when Integer
+          super(Time.at(s).to_s)
+        when Float
+          super(DateTime.jd(s).to_s)
+        else
+          raise Sequel::Error, "unhandled type when converting to : #{s.inspect} (#{s.class.inspect})"
+        end
+      end
+
+      private
+      
+      def adapter_initialize
+        @conversion_procs = SQLITE_TYPES.dup
+        @conversion_procs['datetime'] = @conversion_procs['timestamp'] = method(:to_application_timestamp)
+        set_integer_booleans
+      end
+      
+      # Yield an available connection. Rescue any Extralite::Error and turn
+      # them into DatabaseErrors.
+      def _execute(type, sql, opts, &block)
+        begin
+          synchronize(opts[:server]) do |conn|
+            # return execute_prepared_statement(conn, type, sql, opts, &block) if sql.is_a?(Symbol)
+            log_args = opts[:arguments]
+            args = {}
+            opts.fetch(:arguments, OPTS).each{|k, v| args[k] = prepared_statement_argument(v) }
+            case type
+            when :select
+              log_connection_yield(sql, conn, log_args){conn.query(sql, args, &block)}
+            when :insert
+              log_connection_yield(sql, conn, log_args){conn.query(sql, args)}
+              conn.last_insert_rowid
+            when :update
+              log_connection_yield(sql, conn, log_args){conn.query(sql, args)}
+              conn.changes
+            end
+          end
+        rescue ::Extralite::Error => e
+          raise_error(e)
+        end
+      end
+      
+      # The SQLite adapter does not need the pool to convert exceptions.
+      # Also, force the max connections to 1 if a memory database is being
+      # used, as otherwise each connection gets a separate database.
+      def connection_pool_default_options
+        o = super.dup
+        # Default to only a single connection if a memory database is used,
+        # because otherwise each connection will get a separate database
+        o[:max_connections] = 1 if @opts[:database] == ':memory:' || blank_object?(@opts[:database])
+        o
+      end
+      
+      def prepared_statement_argument(arg)
+        case arg
+        when Date, DateTime, Time
+          literal(arg)[1...-1]
+        when SQL::Blob
+          arg.to_blob
+        when true, false
+          if integer_booleans
+            arg ? 1 : 0
+          else
+            literal(arg)[1...-1]
+          end
+        else
+          arg
+        end
+      end
+
+      # Execute a prepared statement on the database using the given name.
+      def execute_prepared_statement(conn, type, name, opts, &block)
+        ps = prepared_statement(name)
+        sql = ps.prepared_sql
+        args = opts[:arguments]
+        ps_args = {}
+        args.each{|k, v| ps_args[k] = prepared_statement_argument(v)}
+        if cpsa = conn.prepared_statements[name]
+          cps, cps_sql = cpsa
+          if cps_sql != sql
+            cps.close
+            cps = nil
+          end
+        end
+        unless cps
+          cps = log_connection_yield("PREPARE #{name}: #{sql}", conn){conn.prepare(sql)}
+          conn.prepared_statements[name] = [cps, sql]
+        end
+        log_sql = String.new
+        log_sql << "EXECUTE #{name}"
+        if ps.log_sql
+          log_sql << " ("
+          log_sql << sql
+          log_sql << ")"
+        end
+        if block
+          log_connection_yield(log_sql, conn, args){cps.execute(ps_args, &block)}
+        else
+          log_connection_yield(log_sql, conn, args){cps.execute!(ps_args){|r|}}
+          case type
+          when :insert
+            conn.last_insert_rowid
+          when :update
+            conn.changes
+          end
+        end
+      end
+      
+      # # SQLite3 raises ArgumentError in addition to SQLite3::Exception in
+      # # some cases, such as operations on a closed database.
+      def database_error_classes
+        #[Extralite::Error, ArgumentError]
+        [::Extralite::Error]
+      end
+
+      def dataset_class_default
+        Dataset
+      end
+
+      if USE_EXTENDED_RESULT_CODES
+        # Support SQLite exception codes if ruby-sqlite3 supports them.
+        def sqlite_error_code(exception)
+          exception.code if exception.respond_to?(:code)
+        end
+      end
+    end
+    
+    class Dataset < Sequel::Dataset
+      include ::Sequel::SQLite::DatasetMethods
+
+      module ArgumentMapper
+        include Sequel::Dataset::ArgumentMapper
+        
+        protected
+        
+        # Return a hash with the same values as the given hash,
+        # but with the keys converted to strings.
+        def map_to_prepared_args(hash)
+          args = {}
+          hash.each{|k,v| args[k.to_s.gsub('.', '__')] = v}
+          args
+        end
+        
+        private
+        
+        # SQLite uses a : before the name of the argument for named
+        # arguments.
+        def prepared_arg(k)
+          LiteralString.new("#{prepared_arg_placeholder}#{k.to_s.gsub('.', '__')}")
+        end
+      end
+      
+      BindArgumentMethods = prepared_statements_module(:bind, ArgumentMapper)
+      PreparedStatementMethods = prepared_statements_module(:prepare, BindArgumentMethods)
+
+      def fetch_rows(sql, &block)
+        execute(sql, &block)
+        # execute(sql) do |result|
+        #   cps = db.conversion_procs
+        #   type_procs = result.types.map{|t| cps[base_type_name(t)]}
+        #   j = -1
+        #   cols = result.columns.map{|c| [output_identifier(c), type_procs[(j+=1)]]}
+        #   self.columns = cols.map(&:first)
+        #   max = cols.length
+        #   result.each do |values|
+        #     row = {}
+        #     i = -1
+        #     while (i += 1) < max
+        #       name, type_proc = cols[i]
+        #       v = values[i]
+        #       if type_proc && v
+        #         v = type_proc.call(v)
+        #       end
+        #       row[name] = v
+        #     end
+        #     yield row
+        #   end
+        # end
+      end
+      
+      private
+      
+      # The base type name for a given type, without any parenthetical part.
+      def base_type_name(t)
+        (t =~ /^(.*?)\(/ ? $1 : t).downcase if t
+      end
+
+      # Quote the string using the adapter class method.
+      def literal_string_append(sql, v)
+        sql << "'" << v.gsub(/'/, "''") << "'"
+      end
+
+      def bound_variable_modules
+        [BindArgumentMethods]
+      end
+
+      def prepared_statement_modules
+        [PreparedStatementMethods]
+      end
+
+      # SQLite uses a : before the name of the argument as a placeholder.
+      def prepared_arg_placeholder
+        ':'
+      end
+    end
+  end
+end

data/test/helper.rb

@@ -3,8 +3,3 @@
 require 'bundler/setup'
 require 'extralite'
 require 'minitest/autorun'
-require 'minitest/reporters'
-
-Minitest::Reporters.use! [
-  Minitest::Reporters::SpecReporter.new
-]

data/test/perf.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'sqlite3'
+  gem 'extralite', path: '..'
+  gem 'benchmark-ips'
+end
+
+require 'benchmark/ips'
+require 'fileutils'
+
+DB_PATH = '/tmp/extralite_sqlite3_perf.db'
+
+def prepare_database(count)
+  FileUtils.rm(DB_PATH) rescue nil
+  db = Extralite::Database.new(DB_PATH)
+  db.query('create table foo ( a integer primary key, b text )')
+  db.query('begin')
+  count.times { db.query('insert into foo (b) values (?)', "hello#{rand(1000)}" )}
+  db.query('commit')
+end
+
+def sqlite3_run(count)
+  db = SQLite3::Database.new(DB_PATH, :results_as_hash => true)
+  results = db.execute('select * from foo')
+  raise unless results.size == count
+end
+
+def extralite_run(count)
+  db = Extralite::Database.new(DB_PATH)
+  results = db.query('select * from foo')
+  raise unless results.size == count
+end
+
+[10, 1000, 100000].each do |c|
+  puts; puts; puts "Record count: #{c}"
+
+  prepare_database(c)
+
+  Benchmark.ips do |x|
+    x.config(:time => 3, :warmup => 1)
+
+    x.report("sqlite3") { sqlite3_run(c) }
+    x.report("extralite") { extralite_run(c) }
+
+    x.compare!
+  end
+end

data/test/run.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir.glob("#{__dir__}/test_*.rb").each do |path|
+  require(path)
+end

data/test/test_database.rb

@@ -4,7 +4,7 @@ require_relative 'helper'
 
 class DatabaseTest < MiniTest::Test
   def setup
-    @db = Extralite::Database.new('/tmp/extralite.db')
+    @db = Extralite::Database.new(':memory:')
     @db.query('create table if not exists t (x,y,z)')
     @db.query('delete from t')
     @db.query('insert into t values (1, 2, 3)')
@@ -55,7 +55,7 @@ class DatabaseTest < MiniTest::Test
   def test_query_single_column
     r = @db.query_single_column('select y from t')
     assert_equal [2, 5], r
-  
+
     r = @db.query_single_column('select y from t where x = 2')
     assert_equal [], r
 end
@@ -82,6 +82,17 @@ end
     assert_equal [1, 4, 'a', 'd'], @db.query_single_column('select x from t order by x')
   end
 
+  def test_multiple_statements_with_error
+    error = nil
+    begin
+      @db.query("insert into t values foo; insert into t values ('d', 'e', 'f');")
+    rescue => error
+    end
+
+    assert_kind_of Extralite::SQLError, error
+    assert_equal 'near "foo": syntax error', error.message
+  end
+
   def test_empty_sql
     r = @db.query(' ')
     assert_nil r
@@ -97,7 +108,101 @@ end
 
     assert_equal @db, @db.close
     assert_equal true, @db.closed?
-    
+
     assert_raises(Extralite::Error) { @db.query_single_value('select 42') }
   end
+
+  def test_parameter_binding_simple
+    r = @db.query('select x, y, z from t where x = ?', 1)
+    assert_equal [{ x: 1, y: 2, z: 3 }], r
+
+    r = @db.query('select x, y, z from t where z = ?', 6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+  end
+
+  def test_parameter_binding_with_index
+    r = @db.query('select x, y, z from t where x = ?2', 0, 1)
+    assert_equal [{ x: 1, y: 2, z: 3 }], r
+
+    r = @db.query('select x, y, z from t where z = ?3', 3, 4, 6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+  end
+
+  def test_parameter_binding_with_name
+    r = @db.query('select x, y, z from t where x = :x', x: 1, y: 2)
+    assert_equal [{ x: 1, y: 2, z: 3 }], r
+
+    r = @db.query('select x, y, z from t where z = :zzz', 'zzz' => 6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+
+    r = @db.query('select x, y, z from t where z = :bazzz', ':bazzz' => 6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+  end
+end
+
+class ScenarioTest < MiniTest::Test
+  def setup
+    @db = Extralite::Database.new('/tmp/extralite.db')
+    @db.query('create table if not exists t (x,y,z)')
+    @db.query('delete from t')
+    @db.query('insert into t values (1, 2, 3)')
+    @db.query('insert into t values (4, 5, 6)')
+  end
+
+  def test_concurrent_transactions
+    done = false
+    t = Thread.new do
+      db = Extralite::Database.new('/tmp/extralite.db')
+      db.query 'begin immediate'
+      sleep 0.01 until done
+
+      while true
+        begin
+          db.query 'commit'
+          break
+        rescue Extralite::BusyError
+          sleep 0.01
+        end
+      end
+    end
+
+    sleep 0.1
+    @db.query 'begin deferred'
+    result = @db.query_single_column('select x from t')
+    assert_equal [1, 4], result
+
+    assert_raises(Extralite::BusyError) do
+      @db.query('insert into t values (7, 8, 9)')
+    end
+
+    done = true
+    sleep 0.1
+
+    assert_raises(Extralite::BusyError) do
+      @db.query('insert into t values (7, 8, 9)')
+    end
+
+    assert_equal true, @db.transaction_active?
+
+    # the thing to do in this case is to commit the read transaction, allowing
+    # the other thread to commit its write transaction, and then we can
+    # "upgrade" to a write transaction
+
+    @db.query('commit')
+
+    while true
+      begin
+        @db.query('begin immediate')
+        break
+      rescue Extralite::BusyError
+        sleep 0.1
+      end
+    end
+
+    @db.query('insert into t values (7, 8, 9)')
+    @db.query('commit')
+
+    result = @db.query_single_column('select x from t')
+    assert_equal [1, 4, 7], result
+  end
 end

data/test/test_sequel.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'sequel'
+
+class SequelExtraliteTest < MiniTest::Test
+  def test_sequel
+    db = Sequel.connect('extralite::memory:')
+    db.create_table :items do
+      primary_key :id
+      String :name, unique: true, null: false
+      Float :price, null: false
+    end
+
+    items = db[:items]
+
+    items.insert(name: 'abc', price: 123)
+    items.insert(name: 'def', price: 456)
+    items.insert(name: 'ghi', price: 789)
+
+    assert_equal 3, items.count
+    assert_equal (123+456+789) / 3, items.avg(:price)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.7'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,61 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.14.4
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.85.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.85.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.85.1
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.85.1
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 5.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 5.51.0
 description: 
 email: sharon@noteflakes.com
 executables: []
@@ -117,8 +117,12 @@ files:
 - extralite.gemspec
 - lib/extralite.rb
 - lib/extralite/version.rb
+- lib/sequel/adapters/extralite.rb
 - test/helper.rb
+- test/perf.rb
+- test/run.rb
 - test/test_database.rb
+- test/test_sequel.rb
 homepage: https://github.com/digital-fabric/extralite
 licenses:
 - MIT