Skip to content

Commit

Permalink
Update to 1.0.2
Browse files Browse the repository at this point in the history 
Fix adapter driver dependencies to ~> x.y.0
  • Loading branch information
@nicksieger
nicksieger committed Oct 20, 2010
1 parent 58ec92b commit a1d504c
Show file tree
Hide file tree
Showing 17 changed files with 124 additions and 90 deletions.
6 changes: 6 additions & 0 deletions History.txt
View file
@@ -1,3 +1,9 @@
== 1.0.2

- ACTIVERECORD_JDBC-134: Fix conflicting adapter/column superclasses
- ACTIVERECORD_JDBC-135: Fix regression on PG with boolean and :limit
- Slew of Derby fixes courtesy of Denis Odorcic

== 1.0.1

- Fix db:test:purge issue affecting all adapters in 1.0.0 due to
Expand Down
10 changes: 5 additions & 5 deletions activerecord-jdbc-adapter.gemspec
View file
Expand Up @@ -2,12 +2,12 @@

Gem::Specification.new do |s|
s.name = %q{activerecord-jdbc-adapter}
s.version = "1.0.1"
s.version = "1.0.2"
s.platform = Gem::Platform.new([nil, "java", nil])

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
s.date = %q{2010-10-14}
s.date = %q{2010-10-20}
s.description = %q{activerecord-jdbc-adapter is a database adapter for Rails' ActiveRecord
component that can be used with JRuby[http://www.jruby.org/]. It allows use of
virtually any JDBC-compliant database with your JRuby on Rails application.}
Expand All @@ -27,13 +27,13 @@ virtually any JDBC-compliant database with your JRuby on Rails application.}

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_development_dependency(%q<hoe>, [">= 2.6.1"])
s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
else
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
else
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
end
6 changes: 5 additions & 1 deletion adapters/derby/Rakefile
View file
Expand Up @@ -23,9 +23,13 @@ begin
p.summary = "Derby JDBC adapter for JRuby on Rails."
p.changes = "Updated to Derby version #{Jdbc::Derby::VERSION}."
p.description = "Install this gem to use Derby with JRuby on Rails."
driver = 'jdbc-derby'
version = Jdbc::Derby::VERSION
compat_version = "~> #{version.split(/\./)[0..1].join('.')}.0"
puts "#{p.name}: current #{driver} version #{version}, compat #{compat_version}"
p.extra_deps += [
['activerecord-jdbc-adapter', "= #{ArJdbc::Version::VERSION}"],
['jdbc-derby', ">= #{Jdbc::Derby::VERSION}"]]
[driver, compat_version]]
end
task :gemspec do
File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
Expand Down
22 changes: 11 additions & 11 deletions adapters/derby/activerecord-jdbcderby-adapter.gemspec
View file
Expand Up @@ -2,12 +2,12 @@

Gem::Specification.new do |s|
s.name = %q{activerecord-jdbcderby-adapter}
s.version = "1.0.1"
s.version = "1.0.2"
s.platform = Gem::Platform.new([nil, "java", nil])

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
s.date = %q{2010-10-14}
s.date = %q{2010-10-20}
s.description = %q{Install this gem to use Derby with JRuby on Rails.}
s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
s.extra_rdoc_files = ["Manifest.txt", "README.txt", "LICENSE.txt"]
Expand All @@ -24,20 +24,20 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_runtime_dependency(%q<jdbc-derby>, [">= 10.6.2.1"])
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_runtime_dependency(%q<jdbc-derby>, ["~> 10.6.0"])
s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_development_dependency(%q<hoe>, [">= 2.6.1"])
s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-derby>, [">= 10.6.2.1"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-derby>, ["~> 10.6.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-derby>, [">= 10.6.2.1"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-derby>, ["~> 10.6.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
end
6 changes: 5 additions & 1 deletion adapters/h2/Rakefile
View file
Expand Up @@ -23,9 +23,13 @@ begin
p.summary = "H2 JDBC adapter for JRuby on Rails."
p.changes = "Updated to H2 version #{Jdbc::H2::VERSION}."
p.description = "Install this gem to use H2 with JRuby on Rails."
driver = 'jdbc-h2'
version = Jdbc::H2::VERSION
compat_version = "~> #{version.split(/\./)[0..1].join('.')}.0"
puts "#{p.name}: current #{driver} version #{version}, compat #{compat_version}"
p.extra_deps += [
['activerecord-jdbc-adapter', "= #{ArJdbc::Version::VERSION}"],
['jdbc-h2', ">= #{Jdbc::H2::VERSION}"]]
[driver, compat_version]]
end
task :gemspec do
File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
Expand Down
22 changes: 11 additions & 11 deletions adapters/h2/activerecord-jdbch2-adapter.gemspec
View file
Expand Up @@ -2,12 +2,12 @@

Gem::Specification.new do |s|
s.name = %q{activerecord-jdbch2-adapter}
s.version = "1.0.1"
s.version = "1.0.2"
s.platform = Gem::Platform.new([nil, "java", nil])

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
s.date = %q{2010-10-14}
s.date = %q{2010-10-20}
s.description = %q{Install this gem to use H2 with JRuby on Rails.}
s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
s.extra_rdoc_files = ["Manifest.txt", "README.txt", "LICENSE.txt"]
Expand All @@ -24,20 +24,20 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_runtime_dependency(%q<jdbc-h2>, [">= 1.1.107"])
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_runtime_dependency(%q<jdbc-h2>, ["~> 1.1.0"])
s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_development_dependency(%q<hoe>, [">= 2.6.1"])
s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-h2>, [">= 1.1.107"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-h2>, ["~> 1.1.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-h2>, [">= 1.1.107"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-h2>, ["~> 1.1.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
end
6 changes: 5 additions & 1 deletion adapters/hsqldb/Rakefile
View file
Expand Up @@ -23,9 +23,13 @@ begin
p.summary = "HSQLDB JDBC adapter for JRuby on Rails."
p.changes = "Updated to HSQLDB version #{Jdbc::HSQLDB::VERSION}."
p.description = "Install this gem to use HSQLDB with JRuby on Rails."
driver = 'jdbc-hsqldb'
version = Jdbc::HSQLDB::VERSION
compat_version = "~> #{version.split(/\./)[0..1].join('.')}.0"
puts "#{p.name}: current #{driver} version #{version}, compat #{compat_version}"
p.extra_deps += [
['activerecord-jdbc-adapter', "= #{ArJdbc::Version::VERSION}"],
['jdbc-hsqldb', ">= #{Jdbc::HSQLDB::VERSION}"]]
[driver, compat_version]]
end
task :gemspec do
File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
Expand Down
22 changes: 11 additions & 11 deletions adapters/hsqldb/activerecord-jdbchsqldb-adapter.gemspec
View file
Expand Up @@ -2,12 +2,12 @@

Gem::Specification.new do |s|
s.name = %q{activerecord-jdbchsqldb-adapter}
s.version = "1.0.1"
s.version = "1.0.2"
s.platform = Gem::Platform.new([nil, "java", nil])

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
s.date = %q{2010-10-14}
s.date = %q{2010-10-20}
s.description = %q{Install this gem to use HSQLDB with JRuby on Rails.}
s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
s.extra_rdoc_files = ["Manifest.txt", "README.txt", "LICENSE.txt"]
Expand All @@ -24,20 +24,20 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_runtime_dependency(%q<jdbc-hsqldb>, [">= 1.8.1.3"])
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_runtime_dependency(%q<jdbc-hsqldb>, ["~> 1.8.0"])
s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_development_dependency(%q<hoe>, [">= 2.6.1"])
s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-hsqldb>, [">= 1.8.1.3"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-hsqldb>, ["~> 1.8.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-hsqldb>, [">= 1.8.1.3"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-hsqldb>, ["~> 1.8.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
end
6 changes: 5 additions & 1 deletion adapters/mssql/Rakefile
View file
Expand Up @@ -22,9 +22,13 @@ begin
p.email = "nick@nicksieger.com, ola.bini@gmail.com"
p.summary = "MS-SQL JDBC adapter for JRuby on Rails."
p.description = "Install this gem to use MS-SQL with JRuby on Rails."
driver = 'jdbc-jtds'
version = Jdbc::JTDS::VERSION
compat_version = "~> #{version.split(/\./)[0..1].join('.')}.0"
puts "#{p.name}: current #{driver} version #{version}, compat #{compat_version}"
p.extra_deps += [
['activerecord-jdbc-adapter', "= #{ArJdbc::Version::VERSION}"],
['jdbc-jtds', ">= #{Jdbc::JTDS::VERSION}"]]
[driver, compat_version]]
end
task :gemspec do
File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
Expand Down
22 changes: 11 additions & 11 deletions adapters/mssql/activerecord-jdbcmssql-adapter.gemspec
View file
Expand Up @@ -2,12 +2,12 @@

Gem::Specification.new do |s|
s.name = %q{activerecord-jdbcmssql-adapter}
s.version = "1.0.1"
s.version = "1.0.2"
s.platform = Gem::Platform.new([nil, "java", nil])

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
s.date = %q{2010-10-14}
s.date = %q{2010-10-20}
s.description = %q{Install this gem to use MS-SQL with JRuby on Rails.}
s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
s.extra_rdoc_files = ["Manifest.txt", "README.txt", "LICENSE.txt"]
Expand All @@ -24,20 +24,20 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_runtime_dependency(%q<jdbc-jtds>, [">= 1.2.5"])
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_runtime_dependency(%q<jdbc-jtds>, ["~> 1.2.0"])
s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_development_dependency(%q<hoe>, [">= 2.6.1"])
s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-jtds>, [">= 1.2.5"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-jtds>, ["~> 1.2.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-jtds>, [">= 1.2.5"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-jtds>, ["~> 1.2.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
end
6 changes: 5 additions & 1 deletion adapters/mysql/Rakefile
View file
Expand Up @@ -23,9 +23,13 @@ begin
p.summary = "MySQL JDBC adapter for JRuby on Rails."
p.changes = "Updated to MySQL version #{Jdbc::MySQL::VERSION}."
p.description = "Install this gem to use MySQL with JRuby on Rails."
driver = 'jdbc-mysql'
version = Jdbc::MySQL::VERSION
compat_version = "~> #{version.split(/\./)[0..1].join('.')}.0"
puts "#{p.name}: current #{driver} version #{version}, compat #{compat_version}"
p.extra_deps += [
['activerecord-jdbc-adapter', "= #{ArJdbc::Version::VERSION}"],
['jdbc-mysql', ">= #{Jdbc::MySQL::VERSION}"]]
[driver, compat_version]]
end
task :gemspec do
File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
Expand Down
22 changes: 11 additions & 11 deletions adapters/mysql/activerecord-jdbcmysql-adapter.gemspec
View file
Expand Up @@ -2,12 +2,12 @@

Gem::Specification.new do |s|
s.name = %q{activerecord-jdbcmysql-adapter}
s.version = "1.0.1"
s.version = "1.0.2"
s.platform = Gem::Platform.new([nil, "java", nil])

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
s.date = %q{2010-10-14}
s.date = %q{2010-10-20}
s.description = %q{Install this gem to use MySQL with JRuby on Rails.}
s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
s.extra_rdoc_files = ["Manifest.txt", "README.txt", "LICENSE.txt"]
Expand All @@ -24,20 +24,20 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_runtime_dependency(%q<jdbc-mysql>, [">= 5.0.4"])
s.add_runtime_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_runtime_dependency(%q<jdbc-mysql>, ["~> 5.0.0"])
s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_development_dependency(%q<hoe>, [">= 2.6.1"])
s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-mysql>, [">= 5.0.4"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-mysql>, ["~> 5.0.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
else
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.1"])
s.add_dependency(%q<jdbc-mysql>, [">= 5.0.4"])
s.add_dependency(%q<activerecord-jdbc-adapter>, ["= 1.0.2"])
s.add_dependency(%q<jdbc-mysql>, ["~> 5.0.0"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
s.add_dependency(%q<hoe>, [">= 2.6.2"])
end
end
6 changes: 5 additions & 1 deletion adapters/postgresql/Rakefile
View file
Expand Up @@ -23,9 +23,13 @@ begin
p.summary = "Postgres JDBC adapter for JRuby on Rails."
p.changes = "Updated to postgres version #{Jdbc::Postgres::VERSION}."
p.description = "Install this gem to use Postgres with JRuby on Rails."
driver = 'jdbc-postgres'
version = Jdbc::Postgres::VERSION
compat_version = "~> #{version.split(/\./)[0..1].join('.')}.0"
puts "#{p.name}: current #{driver} version #{version}, compat #{compat_version}"
p.extra_deps += [
['activerecord-jdbc-adapter', "= #{ArJdbc::Version::VERSION}"],
['jdbc-postgres', ">= #{Jdbc::Postgres::VERSION}"]]
[driver, compat_version]]
end
task :gemspec do
File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
Expand Down

0 comments on commit a1d504c

Please sign in to comment.