aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-06 22:12:39 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-06 22:12:39 -0200
commit00292443afad7edfca29c7aedef2ab77364fb9b8 (patch)
tree85eb19d61dad03ffe06ae4b3cd4b025c2d7912da /activerecord/lib/active_record/connection_adapters
parent43c284297b7487a794d0fe1ea1ffd507b0c45991 (diff)
downloadrails-00292443afad7edfca29c7aedef2ab77364fb9b8.tar.gz
rails-00292443afad7edfca29c7aedef2ab77364fb9b8.tar.bz2
rails-00292443afad7edfca29c7aedef2ab77364fb9b8.zip
Use CURRENT_TIMESTAMP since it has apparently better cross db support
LOCALTIMESTAMP is not support by sqlite3, and travis was giving us these errors: https://travis-ci.org/rails/rails/jobs/3535241/#L570
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb2
1 files changed, 1 insertions, 1 deletions
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 a470e8de07..1586e84a25 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -490,7 +490,7 @@ module ActiveRecord
sm_table = ActiveRecord::Migrator.schema_migrations_table_name
ActiveRecord::SchemaMigration.order('version').map { |sm|
- "INSERT INTO #{sm_table} (version, migrated_at, fingerprint, name) VALUES ('#{sm.version}',LOCALTIMESTAMP,'#{sm.fingerprint}','#{sm.name}');"
+ "INSERT INTO #{sm_table} (version, migrated_at, fingerprint, name) VALUES ('#{sm.version}',CURRENT_TIMESTAMP,'#{sm.fingerprint}','#{sm.name}');"
}.join("\n\n")
end