extralite 1.10 → 1.13

data/extralite.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"]
   s.extensions = ["ext/extralite/extconf.rb"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 2.7'
 
   s.add_development_dependency  'rake-compiler',        '1.1.6'
   s.add_development_dependency  'minitest',             '5.15.0'

data/lib/extralite/version.rb

@@ -1,3 +1,3 @@
 module Extralite
-  VERSION = '1.10'
+  VERSION = '1.13'
 end

data/test/helper.rb

@@ -3,3 +3,5 @@
 require 'bundler/setup'
 require 'extralite'
 require 'minitest/autorun'
+
+puts "sqlite3 version: #{Extralite.sqlite3_version}"

data/test/perf_hash.rb

@@ -4,8 +4,8 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'sqlite3'
   gem 'extralite', path: '..'
+  gem 'sqlite3'
   gem 'benchmark-ips'
 end
 

data/test/perf_prepared.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'extralite', path: '..'
+  gem 'sqlite3'
+  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_prepare
+  db = SQLite3::Database.new(DB_PATH, :results_as_hash => true)
+  db.prepare('select * from foo')
+end
+
+def sqlite3_run(stmt, count)
+  # db = SQLite3::Database.new(DB_PATH, :results_as_hash => true)
+  results = stmt.execute.to_a
+  raise unless results.size == count
+end
+
+def extralite_prepare
+  db = Extralite::Database.new(DB_PATH)
+  db.prepare('select * from foo')
+end
+
+def extralite_run(stmt, count)
+  # db = Extralite::Database.new(DB_PATH)
+  results = stmt.query
+  raise unless results.size == count
+end
+
+[10, 1000, 100000].each do |c|
+  puts; puts; puts "Record count: #{c}"
+
+  prepare_database(c)
+
+  sqlite3_stmt = sqlite3_prepare
+  extralite_stmt = extralite_prepare
+
+  Benchmark.ips do |x|
+    x.config(:time => 3, :warmup => 1)
+
+    x.report("sqlite3")   { sqlite3_run(sqlite3_stmt, c) }
+    x.report("extralite") { extralite_run(extralite_stmt, c) }
+
+    x.compare!
+  end
+end

data/test/test_database.rb

@@ -163,6 +163,20 @@ end
     r = @db.query_single_value('select null')
     assert_nil r
   end
+
+
+
+  def test_extension_loading
+    case RUBY_PLATFORM
+    when /linux/
+      @db.load_extension(File.join(__dir__, 'extensions/text.so'))
+    when /darwin/
+      @db.load_extension(File.join(__dir__, 'extensions/text.dylib'))
+    end
+    
+    r = @db.query_single_value("select reverse('abcd')")
+    assert_equal 'dcba', r
+  end
 end
 
 class ScenarioTest < MiniTest::Test

data/test/test_extralite.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class ExtraliteTest < MiniTest::Test
+  SQLITE3_C_PATH = File.expand_path('../ext/extralite/sqlite3.c', __dir__)
+  SQLITE_VERSION_DEFINE_REGEXP = /#define SQLITE_VERSION\s+"([\d\.]+)"/m.freeze
+
+  def test_sqlite3_version
+    version = IO.read(SQLITE3_C_PATH).match(SQLITE_VERSION_DEFINE_REGEXP)[1]
+
+    assert_equal version, Extralite.sqlite3_version
+  end
+end

data/test/test_prepared_statement.rb

@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class PreparedStatementTest < MiniTest::Test
+  def setup
+    @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)')
+    @db.query('insert into t values (4, 5, 6)')
+
+    @stmt = @db.prepare('select * from t where x = ?')
+  end
+
+  # def test_foo
+  #   stmt = @db.prepare('select 1')
+  #   assert_equal 1, stmt.query_single_value
+  # end
+
+  def test_prepared_statement_props
+    assert_kind_of Extralite::PreparedStatement, @stmt
+    assert_equal @db, @stmt.database
+    assert_equal @db, @stmt.db
+    assert_equal 'select * from t where x = ?', @stmt.sql
+  end
+
+  def test_prepared_statement_query
+    assert_equal [{ x: 1, y: 2, z: 3 }], @stmt.query(1)
+
+    buf = []
+    @stmt.query(1) { |r| buf << r }
+    assert_equal [{ x: 1, y: 2, z: 3 }], buf
+  end
+
+  def test_prepared_statement_with_invalid_sql
+    assert_raises(Extralite::SQLError) { @db.prepare('blah') }
+  end
+
+  def test_prepared_statement_query_hash
+    r = @stmt.query_hash(4)
+    assert_equal [{x: 4, y: 5, z: 6}], r
+
+    r = @stmt.query_hash(5)
+    assert_equal [], r
+  end
+
+  def test_prepared_statement_query_ary
+    r = @stmt.query_ary(1)
+    assert_equal [[1, 2, 3]], r
+
+    r = @stmt.query_ary(2)
+    assert_equal [], r
+  end
+
+  def test_prepared_statement_query_single_row
+    r = @stmt.query_single_row(4)
+    assert_equal({ x: 4, y: 5, z: 6 }, r)
+
+    r = @stmt.query_single_row(5)
+    assert_nil r
+  end
+
+  def test_prepared_statement_query_single_column
+    stmt = 
+    r = @db.prepare('select y from t').query_single_column
+    assert_equal [2, 5], r
+
+    r = @db.prepare('select y from t where x = 2').query_single_column
+    assert_equal [], r
+end
+
+  def test_prepared_statement_query_single_value
+    r = @db.prepare('select z from t order by Z desc limit 1').query_single_value
+    assert_equal 6, r
+
+    r = @db.prepare('select z from t where x = 2').query_single_value
+    assert_nil r
+  end
+
+  def test_prepared_statement_multiple_statements
+    assert_raises(Extralite::Error) {
+      @db.prepare("insert into t values ('a', 'b', 'c'); insert into t values ('d', 'e', 'f');")
+    }
+  end
+
+  def test_prepared_statement_multiple_statements_with_bad_sql
+    error = nil
+    begin
+      stmt =@db.prepare("insert into t values foo; insert into t values ('d', 'e', 'f');")
+      stmt.query
+    rescue => error
+    end
+
+    assert_kind_of Extralite::SQLError, error
+    assert_equal 'near "foo": syntax error', error.message
+  end
+
+  def test_prepared_statement_repeated_execution_missing_param
+    r = @stmt.query_hash(4)
+    assert_equal [{x: 4, y: 5, z: 6}], r
+
+    r = @stmt.query_hash
+    assert_equal [], r
+  end
+
+  def test_prepared_statement_empty_sql
+    assert_raises(Extralite::Error) { @db.prepare(' ') }
+
+    r = @db.prepare('select 1 as foo;  ').query
+    assert_equal [{ foo: 1 }], r
+  end
+
+  def test_prepared_statement_parameter_binding_simple
+    r = @db.prepare('select x, y, z from t where x = ?').query(1)
+    assert_equal [{ x: 1, y: 2, z: 3 }], r
+
+    r = @db.prepare('select x, y, z from t where z = ?').query(6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+  end
+
+  def test_prepared_statement_parameter_binding_with_index
+    r = @db.prepare('select x, y, z from t where x = ?2').query(0, 1)
+    assert_equal [{ x: 1, y: 2, z: 3 }], r
+
+    r = @db.prepare('select x, y, z from t where z = ?3').query(3, 4, 6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+  end
+
+  def test_prepared_statement_parameter_binding_with_name
+    r = @db.prepare('select x, y, z from t where x = :x').query(x: 1, y: 2)
+    assert_equal [{ x: 1, y: 2, z: 3 }], r
+
+    r = @db.prepare('select x, y, z from t where z = :zzz').query('zzz' => 6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+
+    r = @db.prepare('select x, y, z from t where z = :bazzz').query(':bazzz' => 6)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+  end
+
+  def test_prepared_statement_parameter_binding_with_index_key
+    r = @db.prepare('select x, y, z from t where z = ?').query(1 => 3)
+    assert_equal [{ x: 1, y: 2, z: 3 }], r
+
+    r = @db.prepare('select x, y, z from t where x = ?2').query(1 => 42, 2 => 4)
+    assert_equal [{ x: 4, y: 5, z: 6 }], r
+  end
+
+  def test_prepared_statement_value_casting
+    r = @db.prepare("select 'abc'").query_single_value
+    assert_equal 'abc', r
+
+    r = @db.prepare('select 123').query_single_value
+    assert_equal 123, r
+
+    r = @db.prepare('select 12.34').query_single_value
+    assert_equal 12.34, r
+
+    r = @db.prepare('select zeroblob(4)').query_single_value
+    assert_equal "\x00\x00\x00\x00", r
+
+    r = @db.prepare('select null').query_single_value
+    assert_nil r
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: '1.10'
+  version: '1.13'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -80,7 +80,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.51.0
-description: 
+description:
 email: sharon@noteflakes.com
 executables: []
 extensions:
@@ -98,18 +98,29 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- bin/update_sqlite_source
+- ext/extralite/common.c
+- ext/extralite/database.c
 - ext/extralite/extconf.rb
-- ext/extralite/extralite.c
+- ext/extralite/extralite.h
 - ext/extralite/extralite_ext.c
+- ext/extralite/prepared_statement.c
+- ext/extralite/sqlite3.c
+- ext/extralite/sqlite3.h
 - extralite.gemspec
 - lib/extralite.rb
 - lib/extralite/version.rb
 - lib/sequel/adapters/extralite.rb
+- test/extensions/text.dylib
+- test/extensions/text.so
 - test/helper.rb
 - test/perf_ary.rb
 - test/perf_hash.rb
+- test/perf_prepared.rb
 - test/run.rb
 - test/test_database.rb
+- test/test_extralite.rb
+- test/test_prepared_statement.rb
 - test/test_sequel.rb
 homepage: https://github.com/digital-fabric/extralite
 licenses:
@@ -119,7 +130,7 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/extralite
   homepage_uri: https://github.com/digital-fabric/extralite
   changelog_uri: https://github.com/digital-fabric/extralite/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - extralite
@@ -131,15 +142,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Extra-lightweight SQLite3 wrapper for Ruby
 test_files: []