extralite-bundle 1.14 → 1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707b5791f03fe03812e63a1e46ff61ab7c0113558cadcff9d23b6cc4c30489ac
-  data.tar.gz: d2d9539f7cba8b25c2aea0ed2d3263c5f77cc83f037bf3580afe6cef2d755a8b
+  metadata.gz: b476307d5717c18c6c94107a9f34458f3aa6b5b8060313220f320e7ec223dd3e
+  data.tar.gz: 7198ba58a8bd3daf29f01a63191f6d5dfbf5aada9b32aa293d70fb191792c6a9
 SHA512:
-  metadata.gz: 12b635439146811bd212ec0c1efc2e0ddd772e125799eb5f94b505357d6ad2d933bd4e4e1a8e6e21e63f938a27880673e2d66db8c71597d22df9abb22643823a
-  data.tar.gz: 986f47ea415902b9dd1c1a1728328384d50748d1fdb7cbfa290439a44aad4489bb40bd0719055115e4e0d77a0df871e75fab2f5186a1930474c69860403331ea
+  metadata.gz: 0a35a6895ed144c529e2b3c7c911177028268c5da1fc945dbc2ee645a95d350b7445935667be23a537d85bde5b943216c2f988d02c2cf819cbce2e501c286964
+  data.tar.gz: '091a1b6a0e7430228dc9b2e2ebdc0bf6e0d47aded534acfe547326fc0d85987d079852bfe30e7d2e365d72bfef5bf6592f0564a9b1bb82e818396d45ffc76f89'

data/.github/workflows/test.yml

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

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.16 2022-10-04
+
+- Fix `Database#pragma` to always return array of records
+
+## 1.15 2022-10-01
+
+- Add `Database#pragma` method
+- Add `Database#tables` method
+
 ## 1.14 2022-02-28
 
 - Introduce `extralite-bundle` gem for bundling SQLite, use system lib by

data/Gemfile.lock

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

data/README.md

@@ -38,6 +38,8 @@ latest features and enhancements.
 - A variety of methods for different data access patterns: rows as hashes, rows
   as arrays, single row, single column, single value.
 - Prepared statements.
+- Use system-installed sqlite3, or the [bundled latest version of
+  SQLite3](#installing-the-extralite-sqlite3-bundle).
 - 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).)
@@ -63,7 +65,7 @@ gem 'extralite'
 
 You can also run `gem install extralite` if you just want to check it out.
 
-## Installing the Extralite-SQLite3 bundle
+### Installing the Extralite-SQLite3 bundle
 
 If you don't have sqlite3 installed on your system, do not want to use the
 system-installed version of SQLite3, or would like to use the latest version of
@@ -136,6 +138,14 @@ number_of_rows_affected = db.changes
 # get db filename
 db.filename #=> "/tmp/my.db"
 
+# get list of tables
+db.tables #=> ['foo', 'bar']
+
+# get and set pragmas
+db.pragma(:journal_mode) #=> 'delete'
+db.pragma(journal_mode: 'wal')
+db.pragma(:journal_mode) #=> 'wal'
+
 # load an extension
 db.load_extension('/path/to/extension.so')
 
@@ -175,7 +185,7 @@ Here's a table summarizing the differences between the two gems:
 
 | |sqlite3-ruby|Extralite|
 |-|-|-|
-|SQLite3 dependency|depends on OS-installed libsqlite3|bundles latest version of SQLite3|
+|SQLite3 dependency|depends on OS-installed libsqlite3|Use either system sqlite3 or [bundled latest version of SQLite3](#installing-the-extralite-sqlite3-bundle)|
 |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|

data/Rakefile

@@ -36,7 +36,7 @@ task :release do
   `gem build extralite-bundle.gemspec`
 
   puts "Pushing extralite #{version}..."
-  # `gem push extralite-#{version}.gem`
+  `gem push extralite-#{version}.gem`
 
   puts "Pushing extralite-bundle #{version}..."
   `gem push extralite-bundle-#{version}.gem`

data/ext/extralite/common.c

@@ -31,7 +31,7 @@ void bind_hash_parameter_values(sqlite3_stmt *stmt, VALUE hash) {
 
     switch (TYPE(k)) {
       case T_FIXNUM:
-        bind_parameter_value(stmt, NUM2INT(k), v);
+        bind_parameter_value(stmt, FIX2INT(k), v);
         break;
       case T_SYMBOL:
         k = rb_funcall(k, ID_TO_S, 0);
@@ -345,3 +345,7 @@ VALUE safe_query_single_value(query_ctx *ctx) {
   RB_GC_GUARD(value);
   return value;
 }
+
+VALUE safe_query_columns(query_ctx *ctx) {
+  return get_column_names(ctx->stmt, sqlite3_column_count(ctx->stmt));
+}

data/ext/extralite/database.c

@@ -263,6 +263,15 @@ VALUE Database_query_single_value(int argc, VALUE *argv, VALUE self) {
   return Database_perform_query(argc, argv, self, safe_query_single_value);
 }
 
+/* call-seq:
+ *   db.columns(sql) -> columns
+ *
+ * Returns the column names for the given query, without running it.
+ */
+VALUE Database_columns(VALUE self, VALUE sql) {
+  return Database_perform_query(1, &sql, self, safe_query_columns);
+}
+
 /* call-seq:
  *   db.last_insert_rowid -> int
  *
@@ -272,7 +281,7 @@ VALUE Database_last_insert_rowid(VALUE self) {
   Database_t *db;
   GetOpenDatabase(self, db);
 
-  return INT2NUM(sqlite3_last_insert_rowid(db->sqlite3_db));
+  return INT2FIX(sqlite3_last_insert_rowid(db->sqlite3_db));
 }
 
 /* call-seq:
@@ -284,7 +293,7 @@ VALUE Database_changes(VALUE self) {
   Database_t *db;
   GetOpenDatabase(self, db);
 
-  return INT2NUM(sqlite3_changes(db->sqlite3_db));
+  return INT2FIX(sqlite3_changes(db->sqlite3_db));
 }
 
 /* call-seq:
@@ -362,6 +371,7 @@ void Init_ExtraliteDatabase() {
   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, "columns", Database_columns, 1);
 
   rb_define_method(cDatabase, "last_insert_rowid", Database_last_insert_rowid, 0);
   rb_define_method(cDatabase, "changes", Database_changes, 0);

data/ext/extralite/extralite.h

@@ -53,6 +53,7 @@ VALUE safe_query_hash(query_ctx *ctx);
 VALUE safe_query_single_column(query_ctx *ctx);
 VALUE safe_query_single_row(query_ctx *ctx);
 VALUE safe_query_single_value(query_ctx *ctx);
+VALUE safe_query_columns(query_ctx *ctx);
 
 void prepare_single_stmt(sqlite3 *db, sqlite3_stmt **stmt, VALUE sql);
 void prepare_multi_stmt(sqlite3 *db, sqlite3_stmt **stmt, VALUE sql);

data/ext/extralite/prepared_statement.c

@@ -63,6 +63,9 @@ static inline VALUE PreparedStatement_perform_query(int argc, VALUE *argv, VALUE
   PreparedStatement_t *stmt;
   GetPreparedStatement(self, stmt);
 
+  if (!stmt->stmt)
+    rb_raise(cError, "Prepared statement is closed");
+
   sqlite3_reset(stmt->stmt);
   sqlite3_clear_bindings(stmt->stmt);
   bind_all_parameters(stmt->stmt, argc, argv);
@@ -218,6 +221,43 @@ VALUE PreparedStatement_sql(VALUE self) {
   return stmt->sql;
 }
 
+/* call-seq:
+ *   stmt.columns -> columns
+ *
+ * Returns the column names for the prepared statement without running it.
+ */
+VALUE PreparedStatement_columns(VALUE self) {
+  return PreparedStatement_perform_query(0, NULL, self, safe_query_columns);
+}
+
+/* call-seq:
+ *   stmt.close -> stmt
+ *
+ * Closes the prepared statement. Running a closed prepared statement will raise
+ * an error.
+ */
+VALUE PreparedStatement_close(VALUE self) {
+  PreparedStatement_t *stmt;
+  GetPreparedStatement(self, stmt);
+  if (stmt->stmt) {
+    sqlite3_finalize(stmt->stmt);
+    stmt->stmt = NULL;
+  }
+  return self;
+}
+
+/* call-seq:
+ *   stmt.closed? -> closed
+ *
+ * Returns true if the prepared statement is closed.
+ */
+VALUE PreparedStatement_closed_p(VALUE self) {
+  PreparedStatement_t *stmt;
+  GetPreparedStatement(self, stmt);
+
+  return stmt->stmt ? Qfalse : Qtrue;
+}
+
 void Init_ExtralitePreparedStatement() {
   VALUE mExtralite = rb_define_module("Extralite");
 
@@ -235,4 +275,9 @@ void Init_ExtralitePreparedStatement() {
   rb_define_method(cPreparedStatement, "query_single_row", PreparedStatement_query_single_row, -1);
   rb_define_method(cPreparedStatement, "query_single_column", PreparedStatement_query_single_column, -1);
   rb_define_method(cPreparedStatement, "query_single_value", PreparedStatement_query_single_value, -1);
+
+  rb_define_method(cPreparedStatement, "columns", PreparedStatement_columns, 0);
+
+  rb_define_method(cPreparedStatement, "close", PreparedStatement_close, 0);
+  rb_define_method(cPreparedStatement, "closed?", PreparedStatement_closed_p, 0);
 }

data/lib/extralite/version.rb

@@ -1,3 +1,3 @@
 module Extralite
-  VERSION = '1.14'
+  VERSION = '1.16'
 end

data/lib/extralite.rb

@@ -17,5 +17,29 @@ module Extralite
 
   # An SQLite database
   class Database
+    alias_method :execute, :query
+
+    TABLES_SQL = <<~SQL
+      SELECT name FROM sqlite_schema
+      WHERE type ='table'
+        AND name NOT LIKE 'sqlite_%';
+    SQL
+
+    def tables
+      query_single_column(TABLES_SQL)
+    end
+
+    def pragma(value)
+      value.is_a?(Hash) ? pragma_set(value) : pragma_get(value)
+    end
+
+    def pragma_set(values)
+      sql = values.inject(+'') { |s, (k, v)| s += "pragma #{k}=#{v}; " }
+      query(sql)
+    end
+
+    def pragma_get(key)
+      query("pragma #{key}")
+    end
   end
-end
+end

data/lib/sequel/adapters/extralite.rb

@@ -122,17 +122,17 @@ module Sequel
         
         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, {})
+        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.prepared_statements.each_value{|v| v.first.close }
         c.close
       end
       
@@ -149,13 +149,13 @@ module Sequel
       # 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_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)
@@ -193,7 +193,7 @@ module Sequel
       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)
+            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) }

data/test/test_database.rb

@@ -68,6 +68,11 @@ end
     assert_nil r
   end
 
+  def test_columns
+    r = @db.columns('select x, z from t')
+    assert_equal [:x, :z], r
+  end
+
   def test_transaction_active?
     assert_equal false, @db.transaction_active?
     @db.query('begin')
@@ -177,6 +182,31 @@ end
     r = @db.query_single_value("select reverse('abcd')")
     assert_equal 'dcba', r
   end
+
+  def test_tables
+    assert_equal ['t'], @db.tables
+
+    @db.query('create table foo (bar text)')
+    assert_equal ['t', 'foo'], @db.tables
+
+    @db.query('drop table t')
+    assert_equal ['foo'], @db.tables
+
+    @db.query('drop table foo')
+    assert_equal [], @db.tables
+  end
+
+  def test_pragma
+    assert_equal [{journal_mode: 'memory'}], @db.pragma('journal_mode')
+    assert_equal [{synchronous: 2}], @db.pragma('synchronous')
+
+    assert_equal [{schema_version: 1}], @db.pragma(:schema_version)
+    assert_equal [{recursive_triggers: 0}], @db.pragma(:recursive_triggers)
+
+    assert_equal [], @db.pragma(schema_version: 33, recursive_triggers: 1)
+    assert_equal [{schema_version: 33}], @db.pragma(:schema_version)
+    assert_equal [{recursive_triggers: 1}], @db.pragma(:recursive_triggers)
+  end
 end
 
 class ScenarioTest < MiniTest::Test

data/test/test_prepared_statement.rb

@@ -162,4 +162,23 @@ end
     r = @db.prepare('select null').query_single_value
     assert_nil r
   end
+
+  def test_prepared_statement_columns
+    r = @db.prepare("select 'abc' as a, 'def' as b").columns
+    assert_equal [:a, :b], r
+  end
+
+  def test_prepared_statement_close
+    p = @db.prepare("select 'abc'")
+
+    assert_equal false, p.closed?
+
+    p.close
+    assert_equal true, p.closed?
+
+    p.close
+    assert_equal true, p.closed?
+
+    assert_raises { p.query_single_value }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extralite-bundle
 version: !ruby/object:Gem::Version
-  version: '1.14'
+  version: '1.16'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-10-04 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:
@@ -134,7 +134,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
@@ -153,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Extra-lightweight SQLite3 wrapper for Ruby with bundled SQLite3
 test_files: []