Skip to content

Commit 4e5b701

Browse files
committed
Try to pull out sqlite/mysql
1 parent fc3c772 commit 4e5b701

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

Gemfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ gem "standard"
140140

141141
# Databases
142142

143-
if defined? JRUBY_VERSION
144-
gem "jdbc-sqlite3"
145-
gem "jdbc-mysql"
146-
else
147-
gem "sqlite3", "~>1.3.13"
148-
# AR won't work with the latest mysql2, apparently
149-
# See https://stackoverflow.com/questions/49407254/gemloaderror-cant-activate-mysql2-0-5-0-3-18-already-activated-mysq
150-
gem "mysql2", "< 0.5.0", require: false
151-
end
143+
# if defined? JRUBY_VERSION
144+
# gem "jdbc-sqlite3"
145+
# gem "jdbc-mysql"
146+
# else
147+
# gem "sqlite3", "~>1.3.13"
148+
# # AR won't work with the latest mysql2, apparently
149+
# # See https://stackoverflow.com/questions/49407254/gemloaderror-cant-activate-mysql2-0-5-0-3-18-already-activated-mysq
150+
# gem "mysql2", "< 0.5.0", require: false
151+
# end
152152

153153
# JS and CSS
154154
gem "sass-rails", "~> 5.0"

Gemfile.lock

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ GEM
213213
mini_mime (1.1.2)
214214
minitest (5.18.0)
215215
multi_json (1.15.0)
216-
mysql2 (0.4.10)
217216
nestive (0.6.0)
218217
rails (>= 3.0.0)
219218
net-imap (0.3.4)
@@ -385,7 +384,6 @@ GEM
385384
actionpack (>= 5.2)
386385
activesupport (>= 5.2)
387386
sprockets (>= 3.0.0)
388-
sqlite3 (1.3.13)
389387
standard (1.25.3)
390388
language_server-protocol (~> 3.17.0.2)
391389
rubocop (~> 1.48.1)
@@ -466,7 +464,6 @@ DEPENDENCIES
466464
loofah (>= 2.3.1)
467465
mail_form (~> 1.7)
468466
middle_english_dictionary!
469-
mysql2 (< 0.5.0)
470467
nestive (= 0.6.0)
471468
nio4r (= 2.5.2)
472469
nokogiri (>= 1.10.10)
@@ -493,7 +490,6 @@ DEPENDENCIES
493490
simplecov
494491
solr_cloud-connection (>= 0.6.0)
495492
sprockets (~> 3.7.2)
496-
sqlite3 (~> 1.3.13)
497493
standard
498494
traject
499495
ttl_memoizeable

0 commit comments

Comments
 (0)