extralite 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd8cf56eff701ddf57586d6f7510d5959cdf81ff15e6a64c6ed8ff698f93b43b
-  data.tar.gz: 42000f8c83849577fd1672996969961357c5bbadb82d89d2168c74be7acfa303
+  metadata.gz: 53b2ae850ffcd04717090a536c2596c31976d73e31233dfad33a4db64fcbadfb
+  data.tar.gz: 611fa6336a8815347566b8b5559b2290a9a1dfa75943a6acca26c0c7b88f947b
 SHA512:
-  metadata.gz: 1159c965d8ce9bfade2c81de97b6ef311dcfdb84ce65eb85238aa6a23b29b786d31de2bb8f30f87a24a800b88d01475a7cb400b97245401d587bef365b140087
-  data.tar.gz: 74f975529a9efb7291524eaa4c285fadc6976377a607cd28e72cbd3010cbc9fd061264aabb9a5df1ce864f097ca330c9acd9dded62b8de7cc63c1217be88412a
+  metadata.gz: c6dc421bbd92ffb9c59c2c7a7d68865541e6f6ee52d73857c788485d84288efa85be605d4d1f510fce023d2cb292043d8142f8c953a01715066809d69482b0f3
+  data.tar.gz: 57116dce569018d2707424a89bdc63440eff4d3c1b9def37c8ab7f75a5083c12c718fd3f05b68455291e126f8077e05a3a6f52916c3627a324a85ce3f4b54eca

data/.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: ['2.7', '3.0', '3.1', '3.2', truffleruby]
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.2 2023-10-14
+
+- Set correct encoding for strings values in query results (#27)
+- Reset query after running it in Sequel adapter (#26)
+
 # 2.1 2023-07-11
 
 - Implement `Database#execute`, `Query#execute` for data-manipulation queries

data/Gemfile.lock

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

data/ext/extralite/common.c

@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include "extralite.h"
 
+rb_encoding *UTF8_ENCODING;
+
 static inline VALUE get_column_value(sqlite3_stmt *stmt, int col, int type) {
   switch (type) {
     case SQLITE_NULL:
@@ -10,7 +12,7 @@ static inline VALUE get_column_value(sqlite3_stmt *stmt, int col, int type) {
     case SQLITE_FLOAT:
       return DBL2NUM(sqlite3_column_double(stmt, col));
     case SQLITE_TEXT:
-      return rb_str_new_cstr((char *)sqlite3_column_text(stmt, col));
+      return rb_enc_str_new((char *)sqlite3_column_text(stmt, col), (long)sqlite3_column_bytes(stmt, col), UTF8_ENCODING);
     case SQLITE_BLOB:
       return rb_str_new((const char *)sqlite3_column_blob(stmt, col), (long)sqlite3_column_bytes(stmt, col));
     default:

data/ext/extralite/database.c

@@ -807,4 +807,6 @@ void Init_ExtraliteDatabase(void) {
 
   SYM_read_only = ID2SYM(rb_intern("read_only"));
   rb_gc_register_mark_object(SYM_read_only);
+
+  UTF8_ENCODING = rb_utf8_encoding();
 }

data/ext/extralite/extralite.h

@@ -3,6 +3,7 @@
 
 #include "ruby.h"
 #include "ruby/thread.h"
+#include "ruby/encoding.h"
 
 #ifdef EXTRALITE_NO_BUNDLE
 #include <sqlite3.h>
@@ -92,6 +93,8 @@ typedef struct {
 #define QUERY_MODE(default) (rb_block_given_p() ? QUERY_YIELD : default)
 #define MULTI_ROW_P(mode) (mode == QUERY_MULTI_ROW)
 
+extern rb_encoding *UTF8_ENCODING;
+
 VALUE safe_execute_multi(query_ctx *ctx);
 VALUE safe_query_ary(query_ctx *ctx);
 VALUE safe_query_changes(query_ctx *ctx);

data/lib/extralite/version.rb

@@ -1,4 +1,4 @@
 module Extralite
   # Extralite version
-  VERSION = '2.1'
+  VERSION = '2.2'
 end

data/lib/sequel/adapters/extralite.rb

@@ -212,7 +212,11 @@ module Sequel
           case type
           when :select
             query = conn.prepare(sql, args)
-            log_connection_yield(sql, conn, log_args){block.call(query.each, query.columns)}
+            begin
+              log_connection_yield(sql, conn, log_args){block.call(query.each, query.columns)}
+            ensure
+              query.reset
+            end
           when :insert
             log_connection_yield(sql, conn, log_args){conn.query(sql, args)}
             conn.last_insert_rowid

data/test/test_database.rb

@@ -387,6 +387,13 @@ end
     db = Extralite::Database.new(':memory:')
     assert_match /^\#\<Extralite::Database:0x[0-9a-f]+ :memory:\>$/, db.inspect
   end
+
+  def test_string_encoding
+    db = Extralite::Database.new(':memory:')
+    v = db.query_single_value("select 'foo'")
+    assert_equal 'foo', v
+    assert_equal 'UTF-8', v.encoding.name
+  end
 end
 
 class ScenarioTest < MiniTest::Test

data/test/test_iterator.rb

@@ -101,4 +101,17 @@ class IteratorTest < MiniTest::Test
     i = @query.each_ary
     assert_match /^\#\<Extralite::Iterator:0x[0-9a-f]+ ary\>$/, i.inspect
   end
+
+  def test_return_from_block_issue_26
+    db = Extralite::Database.new('/tmp/locked.db')
+
+    λ = ->(sql) {
+      db.prepare(sql).each { |r| r.each { |_, v| return v } }
+    }
+
+    20.times do |i|
+      λ.('DROP TABLE IF EXISTS `test1`')
+      λ.('CREATE TABLE `test1` (`_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT) STRICT')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-10-14 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:
@@ -136,7 +136,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
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Extra-lightweight SQLite3 wrapper for Ruby
 test_files: []