From 11a8651141ea4713453a9b1e8b0b010d572b884b Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Fri, 22 Aug 2014 14:37:44 -0600 Subject: [PATCH] remove support for in-memory-tests we haven't supported sqlite in forever Change-Id: I0e76662d971b24929ca56d36e0344b3d1fa34c14 Reviewed-on: https://gerrit.instructure.com/39820 Tested-by: Jenkins Reviewed-by: Jacob Fugal Product-Review: Cody Cutrer QA-Review: Cody Cutrer --- config/database.yml.example | 6 ------ config/initializers/in-memory-test.rb | 11 ----------- 2 files changed, 17 deletions(-) delete mode 100644 config/initializers/in-memory-test.rb diff --git a/config/database.yml.example b/config/database.yml.example index afce55a6eb2..5d633a6ef83 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -7,12 +7,6 @@ test: username: canvas timeout: 5000 -test-in-memory: - adapter: sqlite3 - encoding: utf8 - database: ':memory:' - pool: 1 - development: adapter: postgresql encoding: utf8 diff --git a/config/initializers/in-memory-test.rb b/config/initializers/in-memory-test.rb deleted file mode 100644 index c2b298fbe24..00000000000 --- a/config/initializers/in-memory-test.rb +++ /dev/null @@ -1,11 +0,0 @@ -def in_memory_database? - Rails.env.test? and - ENV["IN_MEMORY_DB"] and - Rails::Configuration.new.database_configuration.has_key?('test-in-memory') and - Rails::Configuration.new.database_configuration['test-in-memory']['database'] == ':memory:' -end - -if in_memory_database? - ActiveRecord::Base.establish_connection(Rails::Configuration.new.database_configuration['test-in-memory']) - load "#{Rails.root}/db/schema.rb" -end