Skip to content
This repository has been archived by the owner on Jan 11, 2018. It is now read-only.

Bugfix for DelayedBuilder using sqlite3 adapter. [Fixes #159] #160

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions Gemfile
Expand Up @@ -67,11 +67,14 @@ group :test do
gem "ruby-debug", "0.10.4" if RUBY_VERSION < '1.9'
gem "extlib", "0.9.15"
gem "sqlite3-ruby", "~> 1.3.2"
gem "delayed_job", "2.1.2"
# If running on ruby 1.9 with psych:
# https://github.com/collectiveidea/delayed_job/issues/199
# gem "delayed_job", "3.0.0"
# gem "delayed_job_active_record", "0.3.1"
if RUBY_VERSION < '1.9'
gem "delayed_job", "2.1.2"
else
# If running on ruby 1.9 with psych:
# https://github.com/collectiveidea/delayed_job/issues/199
gem "delayed_job", "3.0.0"
gem "delayed_job_active_record", "0.3.1"
end
gem "activerecord", "3.0.3"
gem "i18n", "0.5.0"
gem "rr", "1.0.2"
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock.ruby18
Expand Up @@ -12,7 +12,7 @@ GEM
tzinfo (~> 0.3.23)
activesupport (3.0.3)
addressable (2.2.2)
ansi (1.4.1)
ansi (1.4.2)
arel (2.0.10)
bcat (0.5.2)
rack (< 1.2)
Expand All @@ -24,7 +24,7 @@ GEM
columnize (0.3.6)
contest (0.1.2)
crack (0.3.1)
daemons (1.1.5)
daemons (1.1.8)
data_objects (0.10.2)
addressable (~> 2.1)
delayed_job (2.1.2)
Expand Down Expand Up @@ -66,10 +66,10 @@ GEM
crack (>= 0.1.1)
i18n (0.5.0)
json (1.4.6)
json_pure (1.6.3)
json_pure (1.6.5)
linecache (0.46)
rbx-require-relative (> 0.0.4)
mail (2.3.0)
mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand All @@ -88,7 +88,7 @@ GEM
rack (>= 1.0)
rake (0.8.7)
randexp (0.1.6)
rbx-require-relative (0.0.5)
rbx-require-relative (0.0.9)
redgreen (1.2.2)
rr (1.0.2)
ruby-debug (0.10.4)
Expand Down
16 changes: 9 additions & 7 deletions Gemfile.lock.ruby19
Expand Up @@ -12,7 +12,7 @@ GEM
tzinfo (~> 0.3.23)
activesupport (3.0.3)
addressable (2.2.2)
ansi (1.4.1)
ansi (1.4.2)
arel (2.0.10)
bcat (0.5.2)
rack (< 1.2)
Expand All @@ -23,12 +23,13 @@ GEM
bunny (0.6.0)
contest (0.1.2)
crack (0.3.1)
daemons (1.1.5)
data_objects (0.10.7)
addressable (~> 2.1)
delayed_job (2.1.2)
delayed_job (3.0.0)
activesupport (~> 3.0)
daemons
delayed_job_active_record (0.3.1)
activerecord (> 2.1.0)
delayed_job (~> 3.0.0)
dm-aggregates (1.0.2)
dm-core (~> 1.0.2)
dm-core (1.0.2)
Expand Down Expand Up @@ -65,8 +66,8 @@ GEM
crack (>= 0.1.1)
i18n (0.5.0)
json (1.4.6)
json_pure (1.6.3)
mail (2.3.0)
json_pure (1.6.5)
mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand Down Expand Up @@ -122,7 +123,8 @@ DEPENDENCIES
broach (= 0.2.1)
bunny (= 0.6.0)
contest (= 0.1.2)
delayed_job (= 2.1.2)
delayed_job (= 3.0.0)
delayed_job_active_record (= 0.3.1)
dm-aggregates (= 1.0.2)
dm-core (= 1.0.2)
dm-migrations (= 1.0.2)
Expand Down
3 changes: 3 additions & 0 deletions init.rb
Expand Up @@ -8,6 +8,9 @@

require "integrity"

# Uncomment if using DelayedBuilder with sqlite3 adapter.
# require 'sqlite3' # Bugfix for: undefined method `busy_timeout=' for class `SQLite3::Database'

# Uncomment as appropriate for the notifier you want to use
# = Email
# require "integrity/notifier/email"
Expand Down
1 change: 1 addition & 0 deletions test/helper.rb
Expand Up @@ -3,6 +3,7 @@
require "extlib"
require "dm-sweatshop"
require "contest"
require 'sqlite3' # Bugfix for: undefined method `busy_timeout=' for class `SQLite3::Database'

require "integrity"
require "fixtures"
Expand Down