From 54819ad064512cdff4a74c9b10bed86daefeb775 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Mon, 4 Jul 2011 15:05:16 +0200 Subject: Update to ActiveRecord 3.0.9 --- .gitignore | 2 ++ activerecord-3.0.3-postgres-fix.patch | 12 -------- activerecord-disabled-failing-timestamp-test.patch | 33 ---------------------- activerecord-tests-fix.patch | 4 +-- rubygem-activerecord.spec | 29 +++++++++---------- sources | 4 +-- 6 files changed, 19 insertions(+), 65 deletions(-) delete mode 100644 activerecord-3.0.3-postgres-fix.patch delete mode 100644 activerecord-disabled-failing-timestamp-test.patch diff --git a/.gitignore b/.gitignore index 490e5a5..ba0c61c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ activerecord-2.3.8.gem /activerecord-3.0.3.gem /activerecord-tests.tgz /activerecord-3.0.5.gem +/activerecord-3.0.9-tests.tgz +/activerecord-3.0.9.gem diff --git a/activerecord-3.0.3-postgres-fix.patch b/activerecord-3.0.3-postgres-fix.patch deleted file mode 100644 index a911e12..0000000 --- a/activerecord-3.0.3-postgres-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/active_record/connection_adapters/postgresql_adapter.rb.orig 2011-01-18 00:45:58.997405001 -0500 -+++ lib/active_record/connection_adapters/postgresql_adapter.rb 2011-01-18 00:47:17.553405015 -0500 -@@ -362,6 +362,9 @@ module ActiveRecord - - # Quotes column names for use in SQL queries. - def quote_column_name(name) #:nodoc: -+ unless PGconn.respond_to?(:quote_ident) -+ raise 'Your PostgreSQL connection does not support quote_ident. Try upgrading pg.' -+ end - PGconn.quote_ident(name.to_s) - end - diff --git a/activerecord-disabled-failing-timestamp-test.patch b/activerecord-disabled-failing-timestamp-test.patch deleted file mode 100644 index fb669d9..0000000 --- a/activerecord-disabled-failing-timestamp-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9523bf7be9138692341b860d8fc96d26012b36d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Mon, 28 Mar 2011 14:14:46 +0200 -Subject: [PATCH] Disabled failing timestamp test. - ---- - activerecord/test/cases/timestamp_test.rb | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb -index 2bc68fe..3a4a431 100644 ---- a/activerecord/test/cases/timestamp_test.rb -+++ b/activerecord/test/cases/timestamp_test.rb -@@ -21,11 +21,11 @@ class TimestampTest < ActiveRecord::TestCase - assert_not_equal @previously_updated_at, @developer.updated_at - end - -- def test_saving_a_unchanged_record_doesnt_update_its_timestamp -- @developer.save! -- -- assert_equal @previously_updated_at, @developer.updated_at -- end -+# def test_saving_a_unchanged_record_doesnt_update_its_timestamp -+# @developer.save! -+# -+# assert_equal @previously_updated_at, @developer.updated_at -+# end - - def test_touching_a_record_updates_its_timestamp - previous_salary = @developer.salary --- -1.7.4.1 - diff --git a/activerecord-tests-fix.patch b/activerecord-tests-fix.patch index 38cb39d..45546c1 100644 --- a/activerecord-tests-fix.patch +++ b/activerecord-tests-fix.patch @@ -4,5 +4,5 @@ -require File.expand_path('../../../../load_paths', __FILE__) +require 'rubygems' - lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib") - $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) + require 'config' + diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec index ac12655..42261c3 100644 --- a/rubygem-activerecord.spec +++ b/rubygem-activerecord.spec @@ -1,14 +1,15 @@ # Generated from activerecord-1.15.5.gem by gem2rpm -*- rpm-spec -*- -%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%define gemname activerecord -%define geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global gemname activerecord -%define rubyabi 1.8 +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} + +%global rubyabi 1.8 Summary: Implements the ActiveRecord pattern for ORM Name: rubygem-%{gemname} Epoch: 1 -Version: 3.0.5 +Version: 3.0.9 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -22,9 +23,9 @@ Source1: http://github.com/rails/rails/raw/v%{version}/%{gemname}/Rakefile # You may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activerecord/ -# git checkout v3.0.5 -# tar czvf activerecord-tests.tgz test/ -Source2: activerecord-tests.tgz +# git checkout v3.0.9 +# tar czvf activerecord-3.0.9-tests.tgz test/ +Source2: activerecord-3.0.9-tests.tgz # Remove a task which breaks the Rakefile due to the gemspec # not being present in the gem @@ -34,12 +35,6 @@ Patch0: activerecord-rakefile-fix.patch # dependency on a file in the greater rails proj Patch1: activerecord-tests-fix.patch -# patch1 https://rails.lighthouseapp.com/projects/8994/tickets/3210-rails-postgres-issue -Patch3: activerecord-3.0.3-postgres-fix.patch - -# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6636-activerecord-305testcasestimestamp_testrb-fails -Patch4: activerecord-disabled-failing-timestamp-test.patch - Requires: ruby(abi) = %{rubyabi} Requires: rubygems Requires: rubygem(activesupport) = %{version} @@ -52,6 +47,7 @@ BuildRequires: rubygem(rake) BuildRequires: rubygem(activesupport) = %{version} BuildRequires: rubygem(activemodel) = %{version} BuildRequires: rubygem(sqlite3) +BuildRequires: rubygem(erubis) BuildRequires: rubygem(mocha) BuildRequires: rubygem(i18n) BuildRequires: rubygem(arel) @@ -84,8 +80,6 @@ tar xzvf %{SOURCE2} -C .%{geminstdir} pushd ./%{geminstdir} %patch0 -p0 %patch1 -p0 -%patch3 -p0 -%patch4 -p2 popd # Remove backup files @@ -144,6 +138,9 @@ rake test_sqlite3 --trace %{gemdir}/specifications/%{gemname}-%{version}.gemspec %changelog +* Mon Jul 04 2011 Vít Ondruch - 1:3.0.9-1 +- Update to ActiveRecord 3.0.9 + * Fri Mar 25 2011 Vít Ondruch - 1:3.0.5-1 - Updated to ActiveRecord 3.0.5 diff --git a/sources b/sources index e003f4c..11bdcd5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c54d3895d262b6c84df1f0aaaf80c6bd activerecord-3.0.5.gem -791096d1452dd2bfe120bc3bec2501b2 activerecord-tests.tgz +41455801046146b5d2e34b6839004377 activerecord-3.0.9-tests.tgz +106b50d22d413e4b4d844e38a3bf9349 activerecord-3.0.9.gem -- cgit