extralite 1.25 → 1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6e8245385b707be08a300ff6bb089291cfa27500fd99f35698f3dc566147e0
-  data.tar.gz: 1bc49ffc376a8e8f17da33cda6afdd59299e9d6dac381ef2ff9c7ea8d3a92418
+  metadata.gz: a027328ec4af0d01bc81706f4f8e1ea08770a1341d8a36953882244b2d20ed88
+  data.tar.gz: 916fabb4a5328e93bcdcb8121b54aa3e958b87915e9b1c9027cccb44941837b9
 SHA512:
-  metadata.gz: 1e119afa5f07f499935cd83692cb86c22c548ed7f4e35b46735860349186e66c5b1cd1ca2b32cbc8aa41c1e9106c942d38958b145480b397d838a5d75d32985f
-  data.tar.gz: 28f0b76e7ed23e51b9f99f7a8756534163330f909668d7f2d1fa34bd1517ee37ccfdcffe18028fa51cbf427353f313256832daead4ed09a00742a4bd24236744
+  metadata.gz: fc4cd60e38d6e229d5d28ab6e28db3a16f7ddf1ffde53e3f5a97cacebe607158604421016bab34fa5bf96659ab4d0074fffb0f51712e4429d5529f59bbcdec0d
+  data.tar.gz: db9905c1c839a4135fe4c1156b3991f8cad5ac438b5c70091be34e8afee7563371e19afe45cd835cec2f83dd26fc92e5855bf7c53c6ee473728b80caabb3e5e1

data/.github/FUNDING.yml

@@ -1 +1 @@
-github: ciconia
+github: noteflakes

data/.yardopts

@@ -0,0 +1,8 @@
+-o ./_yardoc
+-m markdown -M redcarpet
+--verbose
+--protected
+--no-private
+--exclude sqlite3_constants.rb
+./lib
+./ext/extralite

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.27 2023-06-12
+
+- Fix execution of prepared statements in Sequel adapter (#23 @gschlager)
+- Update bundled sqlite code to version 3.42.0 (#22 @gschlager)
+
+# 1.26 2023-05-17
+
+- Improve documentation
+
 # 1.25 2023-03-10
 
 - Remove bundled sqlite3 source files from extralite.gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    extralite (1.25)
+    extralite (1.27)
 
 GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.0)
-    json (2.6.1)
+    json (2.6.3)
     minitest (5.15.0)
     rake (13.0.6)
     rake-compiler (1.1.6)

data/README.md

@@ -14,7 +14,7 @@ with an SQLite3 database, as well as prepared statements.
 Extralite comes in two flavors: the `extralite` gem which uses the
 system-installed sqlite3 library, and the `extralite-bundle` gem which bundles
 the latest version of SQLite
-([3.40.1](https://sqlite.org/releaselog/3_40_1.html)), offering access to the
+([3.42.0](https://sqlite.org/releaselog/3_42_0.html)), offering access to the
 latest features and enhancements.
 
 ## Features

data/ext/extralite/extconf.rb

@@ -56,6 +56,7 @@ else
     $CFLAGS << ' -DTAINTING_SUPPORT'
   end
   
+  # @!visibility private
   def asplode missing
     if RUBY_PLATFORM =~ /mingw|mswin/
       abort "#{missing} is missing. Install SQLite3 from " +

data/ext/extralite/prepared_statement.c

@@ -1,6 +1,12 @@
 #include <stdio.h>
 #include "extralite.h"
 
+/*
+ * Document-class: Extralite::PreparedStatement
+ *
+ * This class represents a prepared statement.
+ */
+
 VALUE cPreparedStatement;
 
 static size_t PreparedStatement_size(const void *ptr) {

data/lib/extralite/sqlite3_constants.rb

@@ -1,5 +1,4 @@
 module Extralite
-
   SQLITE_STATUS_MEMORY_USED           =  0
   SQLITE_STATUS_PAGECACHE_USED        =  1
   SQLITE_STATUS_PAGECACHE_OVERFLOW    =  2

data/lib/extralite/version.rb

@@ -1,3 +1,4 @@
 module Extralite
-  VERSION = '1.25'
+  # Extralite version
+  VERSION = '1.27'
 end

data/lib/extralite.rb

@@ -29,6 +29,7 @@ module Extralite
   class Database
     alias_method :execute, :query
 
+    # @!visibility private
     TABLES_SQL = <<~SQL
       SELECT name FROM sqlite_master
       WHERE type ='table'

data/lib/sequel/adapters/extralite.rb

@@ -7,22 +7,28 @@
 require 'extralite'
 require 'sequel/adapters/shared/sqlite'
 
+# @!visibility private
 module Sequel
+  # Extralite Sequel adapter
   module Extralite
+    # @!visibility private
     FALSE_VALUES = (%w'0 false f no n'.each(&:freeze) + [0]).freeze
 
     blob = Object.new
+    # @!visibility private
     def blob.call(s)
       Sequel::SQL::Blob.new(s.to_s)
     end
 
     boolean = Object.new
+    # @!visibility private
     def boolean.call(s)
       s = s.downcase if s.is_a?(String)
       !FALSE_VALUES.include?(s)
     end
 
     date = Object.new
+    # @!visibility private
     def date.call(s)
       case s
       when String
@@ -37,22 +43,26 @@ module Sequel
     end
 
     integer = Object.new
+    # @!visibility private
     def integer.call(s)
       s.to_i
     end
 
     float = Object.new
+    # @!visibility private
     def float.call(s)
       s.to_f
     end
 
     numeric = Object.new
+    # @!visibility private
     def numeric.call(s)
       s = s.to_s unless s.is_a?(String)
       BigDecimal(s) rescue s
     end
 
     time = Object.new
+    # @!visibility private
     def time.call(s)
       case s
       when String
@@ -82,19 +92,21 @@ module Sequel
     end
     SQLITE_TYPES.freeze
 
+    # @!visibility private
     USE_EXTENDED_RESULT_CODES = false
-    
+
+    # Database adapter for Sequel
     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
@@ -119,14 +131,14 @@ module Sequel
         # 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
 
@@ -135,7 +147,7 @@ module Sequel
         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)
@@ -145,7 +157,7 @@ module Sequel
       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.
@@ -156,11 +168,13 @@ module Sequel
           super
         end
       end
-      
+
+      # @!visibility private
       def execute_insert(sql, opts=OPTS)
         _execute(:insert, sql, opts)
       end
-      
+
+      # @!visibility private
       def freeze
         @conversion_procs.freeze
         super
@@ -181,13 +195,13 @@ module Sequel
       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)
@@ -212,7 +226,7 @@ module Sequel
           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.
@@ -223,7 +237,7 @@ module Sequel
         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
@@ -267,9 +281,9 @@ module Sequel
           log_sql << ")"
         end
         if block
-          log_connection_yield(log_sql, conn, args){cps.execute(ps_args, &block)}
+          log_connection_yield(log_sql, conn, args){cps.query(ps_args, &block)}
         else
-          log_connection_yield(log_sql, conn, args){cps.execute!(ps_args){|r|}}
+          log_connection_yield(log_sql, conn, args){cps.query(ps_args){|r|}}
           case type
           when :insert
             conn.last_insert_rowid
@@ -278,7 +292,7 @@ module Sequel
           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
@@ -297,15 +311,17 @@ module Sequel
         end
       end
     end
-    
+
+    # Dataset adapter for Sequel
     class Dataset < Sequel::Dataset
       include ::Sequel::SQLite::DatasetMethods
 
+      # @!visibility private
       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)
@@ -313,19 +329,22 @@ module Sequel
           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
-      
+
+      # @!visibility private
       BindArgumentMethods = prepared_statements_module(:bind, ArgumentMapper)
+      # @!visibility private
       PreparedStatementMethods = prepared_statements_module(:prepare, BindArgumentMethods)
 
+      # @!visibility private
       def fetch_rows(sql, &block)
         execute(sql, &block)
         # execute(sql) do |result|
@@ -350,9 +369,9 @@ module Sequel
         #   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

data/test/test_sequel.rb

@@ -4,21 +4,43 @@ require_relative 'helper'
 require 'sequel'
 
 class SequelExtraliteTest < MiniTest::Test
-  def test_sequel
-    db = Sequel.connect('extralite::memory:')
-    db.create_table :items do
+  def setup
+    @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 = @db[:items]
     items.insert(name: 'abc', price: 123)
     items.insert(name: 'def', price: 456)
     items.insert(name: 'ghi', price: 789)
+  end
+
+  def teardown
+    @db.disconnect
+  end
+
+  def test_sequel
+    items = @db[:items]
 
     assert_equal 3, items.count
     assert_equal (123+456+789) / 3, items.avg(:price)
   end
+
+  def test_prepared_statement
+    items = @db[:items]
+    prepared_query = items.where(name: :$name).prepare(:select, :select_by_name)
+    prepared_insert = items.prepare(:insert, :insert_with_name_and_price, name: :$name, price: :$price)
+
+    assert_equal prepared_query.call(name: 'def'), [{ id: 2, name: 'def', price: 456 }]
+    assert_equal @db.call(:select_by_name, name: 'def'), [{ id: 2, name: 'def', price: 456 }]
+
+    id = prepared_insert.call(name: 'jkl', price: 444)
+    assert_equal items[id: id], { id: id, name: 'jkl', price: 444 }
+
+    id = @db.call(:insert_with_name_and_price, name: 'mno', price: 555)
+    assert_equal items[id: id], { id: id, name: 'mno', price: 555 }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: '1.25'
+  version: '1.27'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -91,6 +91,7 @@ files:
 - ".github/FUNDING.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock