From 0bd11857ef47d9c8228d9c1d8268a7a35768966b Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 27 Sep 2005 23:37:57 +0000 Subject: Ticket 2256 - Recognize PostgreSQL NOW() default as equivalent to CURRENT_TIMESTAMP/CURRENT_DATE git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2378 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_record/connection_adapters/postgresql_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb') diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 037f5f6869..cee3483e35 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -369,7 +369,7 @@ module ActiveRecord return value if value =~ /^[0-9]+(\.[0-9]*)?/ # Date / Time magic values - return Time.now.to_s if value =~ /^\('now'::text\)::(date|timestamp)/ + return Time.now.to_s if value =~ /^now\(\)|^\('now'::text\)::(date|timestamp)/i # Fixed dates / times return $1 if value =~ /^'(.+)'::(date|timestamp)/ -- cgit v1.2.3