Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updating Gemfile to latest versions of libraries:

* updating deprecated require 'rake/rdoctask' with 'rdoc/task'
* preparing to remove deprecated ActiveRecord set_table_name with self.table_name=
  • Loading branch information...
commit a1a183e43d556f705b30a886626daa94e913c00d 1 parent b500ebe
@zdennis authored
Showing with 39 additions and 26 deletions.
  1. +1 −1  Gemfile
  2. +30 −23 Gemfile.lock
  3. +1 −1  Rakefile
  4. +7 −1 test/schema/version.rb
View
2  Gemfile
@@ -11,7 +11,7 @@ group :test do
# Database Adapters
platforms :ruby do
gem "mysql", "~> 2.8.1"
- gem "mysql2", "~> 0.2.4"
+ gem "mysql2", "~> 0.3.0"
gem "pg", "~> 0.9"
gem "sqlite3-ruby", "~> 1.3.1"
end
View
53 Gemfile.lock
@@ -1,44 +1,51 @@
GEM
remote: http://rubygems.org/
specs:
- activemodel (3.2.0)
- activesupport (= 3.2.0)
+ activemodel (3.2.7)
+ activesupport (= 3.2.7)
builder (~> 3.0.0)
- activerecord (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
- arel (~> 3.0.0)
+ activerecord (3.2.7)
+ activemodel (= 3.2.7)
+ activesupport (= 3.2.7)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activerecord-jdbc-adapter (1.1.1)
- activerecord-jdbcmysql-adapter (1.1.1)
- activerecord-jdbc-adapter (= 1.1.1)
+ activerecord-jdbc-adapter (1.2.2)
+ activerecord-jdbcmysql-adapter (1.2.2)
+ activerecord-jdbc-adapter (~> 1.2.2)
jdbc-mysql (~> 5.1.0)
- activesupport (3.2.0)
+ activesupport (3.2.7)
i18n (~> 0.6)
multi_json (~> 1.0)
archive-tar-minitar (0.5.2)
- arel (3.0.0)
+ arel (3.0.2)
builder (3.0.0)
- chronic (0.3.0)
- columnize (0.3.2)
+ chronic (0.7.0)
+ columnize (0.3.6)
delorean (0.2.1)
chronic
factory_girl (1.3.3)
git (1.2.5)
i18n (0.6.0)
jdbc-mysql (5.1.13)
- jeweler (1.5.2)
- bundler (~> 1.0.0)
+ jeweler (1.8.4)
+ bundler (~> 1.0)
git (>= 1.2.5)
rake
- linecache (0.43)
+ rdoc
+ json (1.7.4)
+ json (1.7.4-java)
+ linecache (0.46)
+ rbx-require-relative (> 0.0.4)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
- multi_json (1.0.4)
+ multi_json (1.3.6)
mysql (2.8.1)
- mysql2 (0.2.7)
- pg (0.11.0)
- rake (0.8.7)
+ mysql2 (0.3.11)
+ pg (0.14.0)
+ rake (0.9.2.2)
+ rbx-require-relative (0.0.9)
+ rdoc (3.12)
+ json (~> 1.4)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
@@ -55,10 +62,10 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- sqlite3 (1.3.5)
+ sqlite3 (1.3.6)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
- tzinfo (0.3.31)
+ tzinfo (0.3.33)
PLATFORMS
java
@@ -72,7 +79,7 @@ DEPENDENCIES
jdbc-mysql
jeweler (>= 1.4.0)
mysql (~> 2.8.1)
- mysql2 (~> 0.2.4)
+ mysql2 (~> 0.3.0)
pg (~> 0.9)
rake
ruby-debug (= 0.10.4)
View
2  Rakefile
@@ -63,7 +63,7 @@ rescue LoadError
end
end
-require 'rake/rdoctask'
+require 'rdoc/task'
Rake::RDocTask.new do |rdoc|
version = File.exist?('VERSION') ? File.read('VERSION') : ""
View
8 test/schema/version.rb
@@ -1,4 +1,10 @@
class SchemaInfo < ActiveRecord::Base
- set_table_name 'schema_info'
+ if respond_to?(:table_name=)
+ self.table_name = 'schema_info'
+ else
+ # this is becoming deprecated in ActiveRecord but not all adapters supported it
+ # at this time
+ set_table_name 'schema_info'
+ end
VERSION = 12
end
Please sign in to comment.
Something went wrong with that request. Please try again.