diff --git a/Rakefile b/Rakefile index 400cdce9..fc1d56d8 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,7 @@ namespace :display do end task :default => ["display:notice"] -ADAPTERS = %w(mysql mysql2 jdbcmysql jdbcpostgresql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis) +ADAPTERS = %w(mysql2 jdbcmysql jdbcpostgresql postgresql sqlite3 seamless_database_pool mysql2spatial spatialite postgis) ADAPTERS.each do |adapter| namespace :test do desc "Runs #{adapter} database tests." diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile index d9c91a49..3ccb7fda 100644 --- a/gemfiles/3.1.gemfile +++ b/gemfiles/3.1.gemfile @@ -1,4 +1,3 @@ platforms :ruby do - gem 'mysql', '>= 2.8.1' gem 'activerecord', '~> 3.1.0' end diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile index 5c174a30..49a57f74 100644 --- a/gemfiles/3.2.gemfile +++ b/gemfiles/3.2.gemfile @@ -1,4 +1,3 @@ platforms :ruby do - gem 'mysql', '>= 2.8.1' gem 'activerecord', '~> 3.2.0' end diff --git a/gemfiles/4.0.gemfile b/gemfiles/4.0.gemfile index 5047a057..a3c1dc10 100644 --- a/gemfiles/4.0.gemfile +++ b/gemfiles/4.0.gemfile @@ -1,4 +1,3 @@ platforms :ruby do - gem 'mysql', '~> 2.9' gem 'activerecord', '~> 4.0' end diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile index f9a5099d..900ff6f3 100644 --- a/gemfiles/4.1.gemfile +++ b/gemfiles/4.1.gemfile @@ -1,4 +1,3 @@ platforms :ruby do - gem 'mysql', '~> 2.9' gem 'activerecord', '~> 4.1' end diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index 285ba9e2..f4d681db 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -1,4 +1,3 @@ platforms :ruby do - gem 'mysql', '~> 2.9' gem 'activerecord', '~> 4.2' end diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile index d85e5feb..1c1b7902 100644 --- a/gemfiles/5.0.gemfile +++ b/gemfiles/5.0.gemfile @@ -1,4 +1,3 @@ platforms :ruby do - gem 'mysql', '~> 2.9' gem 'activerecord', '~> 5.0.0.beta1' end diff --git a/test/adapters/mysql.rb b/test/adapters/mysql.rb deleted file mode 100644 index 59777b68..00000000 --- a/test/adapters/mysql.rb +++ /dev/null @@ -1 +0,0 @@ -ENV["ARE_DB"] = "mysql" \ No newline at end of file diff --git a/test/adapters/mysqlspatial.rb b/test/adapters/mysqlspatial.rb deleted file mode 100644 index 03316d1d..00000000 --- a/test/adapters/mysqlspatial.rb +++ /dev/null @@ -1 +0,0 @@ -ENV["ARE_DB"] = "mysqlspatial" \ No newline at end of file diff --git a/test/database.yml.sample b/test/database.yml.sample index 1ba33c60..6bdcc9ef 100644 --- a/test/database.yml.sample +++ b/test/database.yml.sample @@ -5,17 +5,10 @@ common: &common host: localhost database: activerecord_import_test -mysql: &mysql - <<: *common - adapter: mysql - mysql2: &mysql2 <<: *common adapter: mysql2 -mysqlspatial: - <<: *mysql - mysql2spatial: <<: *mysql2 diff --git a/test/travis/build.sh b/test/travis/build.sh index 1d693ed9..d3db5c6c 100755 --- a/test/travis/build.sh +++ b/test/travis/build.sh @@ -12,10 +12,8 @@ for activerecord_version in "3.1" "3.2" "4.0" "4.1" "4.2" "5.0" ; do bundle update activerecord - run bundle exec rake test:mysql # Run tests for mysql run bundle exec rake test:mysql2 # Run tests for mysql2 run bundle exec rake test:mysql2spatial # Run tests for mysql2spatial - run bundle exec rake test:mysqlspatial # Run tests for mysqlspatial run bundle exec rake test:postgis # Run tests for postgis run bundle exec rake test:postgresql # Run tests for postgresql run bundle exec rake test:seamless_database_pool # Run tests for seamless_database_pool diff --git a/test/travis/database.yml b/test/travis/database.yml index ca9a77c3..1b1f72b9 100644 --- a/test/travis/database.yml +++ b/test/travis/database.yml @@ -5,17 +5,10 @@ common: &common host: localhost database: activerecord_import_test -mysql: &mysql - <<: *common - adapter: mysql - mysql2: &mysql2 <<: *common adapter: mysql2 -mysqlspatial: - <<: *mysql - mysql2spatial: <<: *mysql2