diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-07-09 04:06:06 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-07-09 04:06:45 +0900 |
| commit | 0d54a51065950a3d7f496ff5422bb78fa24de854 (patch) | |
| tree | 8ea651adfa139552946537f841d351ec87f8fd78 /activerecord/lib/active_record/connection_adapters | |
| parent | 50a9ca665d51cd3298af8b3c1dabf20ad5ce77da (diff) | |
| parent | 64078e088650124b6c37ce6a3c352ad2dc4f072c (diff) | |
| download | rails-0d54a51065950a3d7f496ff5422bb78fa24de854.tar.gz rails-0d54a51065950a3d7f496ff5422bb78fa24de854.tar.bz2 rails-0d54a51065950a3d7f496ff5422bb78fa24de854.zip | |
Merge pull request #33280 from nkondratyev/fix/mysql-time-default-values
Fix default value for mysql time types with specified precision
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -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 |