[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] mlib: compatibility with Sequel 5.x
From: |
Eric Wong |
Subject: |
[PATCH 1/4] mlib: compatibility with Sequel 5.x |
Date: |
Tue, 30 Jan 2018 09:17:09 +0000 |
Apparently some degree of thread-safety is being enforced;
not sure I agree, but oh well...
---
lib/dtas/mlib.rb | 15 ++++++---------
test/test_mlib.rb | 4 ++--
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/lib/dtas/mlib.rb b/lib/dtas/mlib.rb
index 24393d5..e217b59 100644
--- a/lib/dtas/mlib.rb
+++ b/lib/dtas/mlib.rb
@@ -37,16 +37,13 @@ class DTAS::Mlib # :nodoc:
def initialize(db)
if String === db
+ require 'sequel'
+ opts = { single_threaded: true }
db = "sqlite://#{db}" unless db.include?('://')
- require 'sequel/no_core_ext'
- db = Sequel.connect(db, single_threaded: true)
- end
- if db.class.to_s.downcase.include?('sqlite')
- db.transaction_mode = :immediate
- db.synchronous = :off
- db.case_sensitive_like = false
- else
- warn 'non-SQLite databases may not work in the future'
+ opts[:transaction_mode] = :immediate
+ opts[:synchronous] = :off
+ opts[:case_sensitive_like] = false # only for 'search'
+ db = Sequel.connect(db, opts)
end
@db = db
@pwd = nil
diff --git a/test/test_mlib.rb b/test/test_mlib.rb
index a5c446f..0241314 100644
--- a/test/test_mlib.rb
+++ b/test/test_mlib.rb
@@ -4,7 +4,7 @@
require_relative 'helper'
begin
require 'dtas/mlib'
- require 'sequel/no_core_ext'
+ require 'sequel'
require 'sqlite3'
rescue LoadError => err
warn "skipping mlib test: #{err.message}"
@@ -13,7 +13,7 @@
class TestMlib < Testcase
def setup
- @db = Sequel.sqlite(':memory:')
+ @db = Sequel.sqlite(':memory:', case_sensitive_like: false)
end
def test_migrate
--
EW