diff options
author | Nikolay Kondratyev <nkondratyev@yandex.ru> | 2018-07-03 12:17:40 +0500 |
---|---|---|
committer | Nikolay Kondratyev <nkondratyev@yandex.ru> | 2018-07-04 10:45:02 +0500 |
commit | 64078e088650124b6c37ce6a3c352ad2dc4f072c (patch) | |
tree | b339e7f98bd2b4d9e9523eb84b08f2c39f9ef82f /activerecord/lib/active_record | |
parent | 90e2739d8680878b40224d68b366917b9c582ba5 (diff) | |
download | rails-64078e088650124b6c37ce6a3c352ad2dc4f072c.tar.gz rails-64078e088650124b6c37ce6a3c352ad2dc4f072c.tar.bz2 rails-64078e088650124b6c37ce6a3c352ad2dc4f072c.zip |
Fix default value for mysql time types with specified precision
The TIME, DATETIME, and TIMESTAMP types [have supported](https://mariadb.com/kb/en/library/microseconds-in-mariadb/)
a fractional seconds precision from 0 to 6.
Default values from time columns with specified precision is read
as `current_timestamp(n)` from information schema.
rake `db:schema:dump` produces `schema.rb` **without** default values for time columns with the specified precision:
t.datetime "last_message_at", precision: 6, null: false
rake `db:schema:dump` produces `schema.rb` **with** default values for time columns with the specified precision:
t.datetime "last_message_at", precision: 6, default: -> { "current_timestamp(6)" }, null: false
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb index ce50590651..2087938d7c 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb @@ -80,8 +80,8 @@ module ActiveRecord def new_column_from_field(table_name, field) type_metadata = fetch_type_metadata(field[:Type], field[:Extra]) - if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\(\))?\z/i.match?(field[:Default]) - default, default_function = nil, "CURRENT_TIMESTAMP" + if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(field[:Default]) + default, default_function = nil, field[:Default] else default, default_function = field[:Default], nil end |