From: Eric Wong <e@80x24.org> To: dtas-all@nongnu.org Subject: [PATCH 1/4] mlib: compatibility with Sequel 5.x Date: Tue, 30 Jan 2018 09:17:09 +0000 [thread overview] Message-ID: <20180130091712.21755-2-e@80x24.org> (raw) In-Reply-To: <20180130091712.21755-1-e@80x24.org> 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
next prev parent reply other threads:[~2018-01-30 9:17 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-30 9:17 [PATCH 0/4] mlib: misc updates Eric Wong 2018-01-30 9:17 ` Eric Wong [this message] 2018-01-30 9:17 ` [PATCH 2/4] mlib: remove redundant tag massaging and encoding Eric Wong 2018-01-30 9:17 ` [PATCH 3/4] mlib: use flock to get around SQLite busy errors Eric Wong 2018-01-30 9:17 ` [PATCH 4/4] mlib: ignore files with nil times Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://80x24.org/dtas/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180130091712.21755-2-e@80x24.org \ --to=e@80x24.org \ --cc=dtas-all@nongnu.org \ --subject='Re: [PATCH 1/4] mlib: compatibility with Sequel 5.x' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: ../../dtas.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).