From 2183c220ada046993274ccdc6f1f86e9e8a3a5c6 Mon Sep 17 00:00:00 2001
From: Steven Soroka <ssoroka78@gmail.com>
Date: Fri, 16 May 2008 17:41:59 -0500
Subject: Make sure clone_structure can load the results of
dump_schema_information
SchemaStatements#dump_schema_information joins inserts with a single \n, but is later split on \n\n, and fails when trying to execute all the inserts as a single sql statement.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#201 state:resolved]
---
.../lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'activerecord/lib')
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index ac24e920fe..b57d0a3ef7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -302,7 +302,7 @@ module ActiveRecord
def dump_schema_information #:nodoc:
sm_table = ActiveRecord::Migrator.schema_migrations_table_name
migrated = select_values("SELECT version FROM #{sm_table}")
- migrated.map { |v| "INSERT INTO #{sm_table} (version) VALUES ('#{v}');" }.join("\n")
+ migrated.map { |v| "INSERT INTO #{sm_table} (version) VALUES ('#{v}');" }.join("\n\n")
end
# Should not be called normally, but this operation is non-destructive.
--
cgit v1.2.3
From c1c1d6c2ea72424dfae0b5ee1991d904dcf0f252 Mon Sep 17 00:00:00 2001
From: gbuesing <gbuesing@gmail.com>
Date: Sun, 18 May 2008 14:13:47 -0500
Subject: Adding documentation for time zone features
---
activerecord/lib/active_record/attribute_methods.rb | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'activerecord/lib')
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index c2604894a8..d753778d52 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -162,6 +162,8 @@ module ActiveRecord
evaluate_attribute_method attr_name, "def #{attr_name}; unserialize_attribute('#{attr_name}'); end"
end
+ # Defined for all datetime and timestamp attributes when time_zone_aware_attributes are enabled.
+ # This enhanced read method automatically converts the UTC time stored in the database to the time zone stored in Time.zone
def define_read_method_for_time_zone_conversion(attr_name)
method_body = <<-EOV
def #{attr_name}(reload = false)
@@ -183,6 +185,8 @@ module ActiveRecord
evaluate_attribute_method attr_name, "def #{attr_name}=(new_value);write_attribute('#{attr_name}', new_value);end", "#{attr_name}="
end
+ # Defined for all datetime and timestamp attributes when time_zone_aware_attributes are enabled.
+ # This enhanced write method will automatically convert the time passed to it to the zone stored in Time.zone.
def define_write_method_for_time_zone_conversion(attr_name)
method_body = <<-EOV
def #{attr_name}=(time)
--
cgit v1.2.3
From a34cc42a2c29928bcdc75b700343f978a9524e58 Mon Sep 17 00:00:00 2001
From: Nate Wiger <nate_wiger@playstation.sony.com>
Date: Mon, 19 May 2008 11:42:37 -0700
Subject: - Updated tzinfo to use Rational() instead of Rational.new! due to
"private method new!" in Ruby 1.9 - Added ^object_id$ as ignore pattern to
fixing "redefining object_id" issue in Ruby 1.9
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
activerecord/lib/active_record/associations/association_proxy.rb | 2 +-
activerecord/lib/active_record/named_scope.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'activerecord/lib')
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb
index 68503a3c40..ec16af3897 100644
--- a/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/activerecord/lib/active_record/associations/association_proxy.rb
@@ -49,7 +49,7 @@ module ActiveRecord
alias_method :proxy_respond_to?, :respond_to?
alias_method :proxy_extend, :extend
delegate :to_param, :to => :proxy_target
- instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_)/ }
+ instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
def initialize(owner, reflection)
@owner, @reflection = owner, reflection
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index d43ebefc3b..06edaed3d5 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -102,7 +102,7 @@ module ActiveRecord
class Scope
attr_reader :proxy_scope, :proxy_options
- [].methods.each { |m| delegate m, :to => :proxy_found unless m =~ /(^__|^nil\?|^send|class|extend|find|count|sum|average|maximum|minimum|paginate)/ }
+ [].methods.each { |m| delegate m, :to => :proxy_found unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|find|count|sum|average|maximum|minimum|paginate)/ }
delegate :scopes, :with_scope, :to => :proxy_scope
def initialize(proxy_scope, options, &block)
@@ -136,4 +136,4 @@ module ActiveRecord
end
end
end
-end
\ No newline at end of file
+end
--
cgit v1.2.3