extralite 2.15 → 3.0.0

data/test/test_database.rb

@@ -302,6 +302,15 @@ class DatabaseTest < Minitest::Test
 
     r = @db.query_single_splat("select reverse('abcd')")
     assert_equal 'dcba', r
+
+    e = nil
+    begin
+      @db.execute("select load_extension('/extensions/foo')")
+    rescue => e
+    end
+
+    assert_kind_of Extralite::SQLError, e
+    assert_equal 'not authorized', e.message
   end
 
   def test_tables
@@ -341,7 +350,7 @@ class DatabaseTest < Minitest::Test
 
   def test_pragma
     assert_equal 'memory', @db.pragma('journal_mode')
-    assert_equal 2, @db.pragma('synchronous')
+    assert_equal 1, @db.pragma('synchronous')
 
     assert_equal 1, @db.pragma(:schema_version)
     assert_equal 0, @db.pragma(:recursive_triggers)
@@ -866,14 +875,17 @@ class DatabaseTest < Minitest::Test
     db = Extralite::Database.new(':memory:', gvl_release_threshold: 23)
     assert_equal 23, db.gvl_release_threshold
 
-    fn = Tempfile.new('extralite_test_database_initialize_options_wal').path
-    db = Extralite::Database.new(fn, wal: true)
+    fn = Tempfile.new('extralite_test_database_initialize_modern').path
+    db = Extralite::Database.new(fn)
     assert_equal 'wal', db.pragma(:journal_mode)
     assert_equal 1, db.pragma(:synchronous)
+    assert_equal 1, db.pragma(:foreign_keys)
 
-    fn = Tempfile.new('extralite_test_database_initialize_options_pragma').path
-    db = Extralite::Database.new(fn, pragma: { application_id: 42 })
-    assert_equal 42, db.pragma(:application_id)
+    fn = Tempfile.new('extralite_test_database_initialize_legacy').path
+    db = Extralite::Database.new(fn, legacy: true)
+    assert_equal 'delete', db.pragma(:journal_mode)
+    assert_equal 2, db.pragma(:synchronous)
+    assert_equal 0, db.pragma(:foreign_keys)
   end
 
   def test_database_inspect
@@ -1052,7 +1064,7 @@ class DatabaseTest < Minitest::Test
   def test_wal_checkpoint
     fn = Tempfile.new('extralite_test_wal_checkpoint').path
 
-    db = Extralite::Database.new(fn, wal: true)
+    db = Extralite::Database.new(fn)
 
     db.execute 'create table t (x, y, z)'
     rows = (1..1000).map { [rand, rand, rand] }
@@ -1121,12 +1133,27 @@ class DatabaseTest < Minitest::Test
     assert_nil result
     assert_equal [7, 8], @db.query_splat('SELECT x FROM t ORDER BY x')
   end
+
+  def test_quote
+    assert_equal '"abc', @db.quote('"abc')
+    assert_equal "''abc''def", @db.quote("'abc'def")
+
+    assert_equal "'abc'def", @db.query_single_splat("select '#{@db.quote("'abc'def")}'")
+  end
+
+  def test_cache_flush
+    assert_equal @db, @db.cache_flush
+  end
+
+  def test_release_memory
+    assert_equal @db, @db.release_memory
+  end
 end
 
 class ScenarioTest < Minitest::Test
   def setup
     @fn = Tempfile.new('extralite_scenario_test').path
-    @db = Extralite::Database.new(@fn)
+    @db = Extralite::Database.new(@fn, legacy: true)
     @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)')
@@ -1136,7 +1163,7 @@ class ScenarioTest < Minitest::Test
   def test_concurrent_transactions
     done = false
     t = Thread.new do
-      db = Extralite::Database.new(@fn)
+      db = Extralite::Database.new(@fn, legacy: true)
       db.query 'begin immediate'
       sleep 0.01 until done
 
@@ -1806,7 +1833,7 @@ class RactorTest < Minitest::Test
     assert_equal [10] * 10, buf
 
     final_check = Ractor.new(fn) do |rfn|
-      rdb = Extralite::Database.new(rfn, wal: true)
+      rdb = Extralite::Database.new(rfn)
       count = rdb.query_single_splat('select count(*) from stress_test')
       Ractor.yield count
     end

data/test/test_query.rb

@@ -27,7 +27,7 @@ class QueryTest < Minitest::Test
   def test_mode
     query = @db.prepare('select 1')
     assert_equal :hash, query.mode
-    
+
     query.mode = :splat
     assert_equal :splat, query.mode
 
@@ -554,7 +554,7 @@ class QueryTest < Minitest::Test
   def test_query_execute_with_mixed_params
     @db.execute 'delete from t'
     q = @db.prepare('insert into t values (?, ?, ?)')
-    
+
     q.execute(1, [2], 3)
     q.execute([4, 5], 6)
     q.execute([7], 8, [9])
@@ -1014,7 +1014,7 @@ class QueryTransformTest < Minitest::Test
 
     @q1 = @db.prepare_splat('select c from t where a = ?')
     @q2 = @db.prepare_splat('select c from t order by a')
-    
+
     @q3 = @db.prepare('select * from t where a = ?')
     @q4 = @db.prepare('select * from t order by a')
 
@@ -1038,8 +1038,7 @@ class QueryTransformTest < Minitest::Test
   end
 
   def test_transform_hash
-    q = @q5.transform { |h| MyModel.new(h) }
-    assert_equal @q5, q
+    @q5.transform = ->(h) { MyModel.new(h) }
 
     o = @q5.bind(1).next
     assert_kind_of MyModel, o
@@ -1054,7 +1053,7 @@ class QueryTransformTest < Minitest::Test
       [{ a: 4, b: 5 }]
     ], @q5.batch_query([[1], [4]]).map { |a| a.map(&:values) }
 
-    @q6.transform { |h| MyModel.new(h) }
+    @q6.transform = ->(h) { MyModel.new(h) }
     assert_equal [
       { a: 1, b: 2 },
       { a: 4, b: 5 }
@@ -1070,8 +1069,7 @@ class QueryTransformTest < Minitest::Test
 
   def test_transform_array
     @q5.mode = :array
-    q = @q5.transform { |h| MyModel.new(h) }
-    assert_equal @q5, q
+    @q5.transform = ->(h) { MyModel.new(h) }
 
     o = @q5.bind(1).next
     assert_kind_of MyModel, o
@@ -1087,7 +1085,7 @@ class QueryTransformTest < Minitest::Test
     ], @q5.batch_query([[1], [4]]).map { |a| a.map(&:values) }
 
     @q6.mode = :array
-    @q6.transform { |h| MyModel.new(h) }
+    @q6.transform = ->(h) { MyModel.new(h) }
     assert_equal [
       [1, 2],
       [4, 5]
@@ -1102,8 +1100,7 @@ class QueryTransformTest < Minitest::Test
   end
 
   def test_transform_splat_single_column
-    q = @q1.transform { |c| JSON.parse(c, symbolize_names: true) }
-    assert_equal @q1, q
+    @q1.transform = ->(c) { JSON.parse(c, symbolize_names: true) }
 
     assert_equal({ foo: 42, bar: 43 }, @q1.bind(1).next)
     assert_equal({ foo: 45, bar: 46 }, @q1.bind(4).next)
@@ -1113,7 +1110,7 @@ class QueryTransformTest < Minitest::Test
       [{ foo: 45, bar: 46 }]
     ], @q1.batch_query([[1], [4]])
 
-    @q2.transform { |c| JSON.parse(c, symbolize_names: true) }
+    @q2.transform = ->(c) { JSON.parse(c, symbolize_names: true) }
     assert_equal [
       { foo: 42, bar: 43 },
       { foo: 45, bar: 46 }
@@ -1129,8 +1126,7 @@ class QueryTransformTest < Minitest::Test
 
   def test_transform_splat_multi_column
     @q3.mode = :splat
-    q = @q3.transform { |a, b, c| { a: a, b: b, c: JSON.parse(c, symbolize_names: true) } }
-    assert_equal @q3, q
+    @q3.transform = ->(a, b, c) { { a: a, b: b, c: JSON.parse(c, symbolize_names: true) } }
 
     assert_equal({ a: 1, b: 2, c: { foo: 42, bar: 43 }}, @q3.bind(1).next)
     assert_equal({ a: 4, b: 5, c: { foo: 45, bar: 46 }}, @q3.bind(4).next)
@@ -1141,7 +1137,7 @@ class QueryTransformTest < Minitest::Test
     ], @q3.batch_query([[1], [4]])
 
     @q4.mode = :splat
-    @q4.transform { |a, b, c| { a: a, b: b, c: JSON.parse(c, symbolize_names: true) } }
+    @q4.transform = ->(a, b, c) { { a: a, b: b, c: JSON.parse(c, symbolize_names: true) } }
     assert_equal [
       { a: 1, b: 2, c: { foo: 42, bar: 43 }},
       { a: 4, b: 5, c: { foo: 45, bar: 46 }}