extralite-bundle 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f104866a906d2b93a6e2fb15a99b9a5d09d56fc26aa9513ad47ac182d3b9a51d
-  data.tar.gz: b70593c8fabb649e3f6dfc0e28d5e06549a5db97ffd8d6f15fbaea42e9bf15ca
+  metadata.gz: d6366e2122d0ba28606033c9bb0b546946f60b822f4c002d0449aa6822e4ee3a
+  data.tar.gz: 21d410d22a27abf3ab8b23ca6d6da1422c9a0642eebba0c79de13a1d489b4123
 SHA512:
-  metadata.gz: 4d7827b598eff9274e0c41c0b612ade662e85b1062b57c40487932e2cd2264933752daa706646011af6648f60db1fae7274da778f06cd4a6002ef6dbf1af40dc
-  data.tar.gz: da03ac31c8632cf7beb04d06d00c210acd69333f10f9d2f8df6f05e0a70465fdf4c98cca1e990aef448b797185c77861851b4c374f7545b0c069c97d6129c92f
+  metadata.gz: 60d0af3f487d4c91989046928aef667ec26bb869e4345d6587c74fbb16c6690d0a721b4c6769d5f3f9cd207a3aa6c86e86d3f86fc07428c4df1614d67b93c2ba
+  data.tar.gz: c1c862e8eba40affb7c36d129292cbf554be2460918f6ddc143bad241d0de3d5dbefa1f7cca42746802646acd4b166fec90d8ce6de04bf350d214fbd87e92143

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-bundle
 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:
@@ -138,7 +138,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
@@ -158,7 +158,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 with bundled SQLite3
 test_files: []