activerecord-mysql2-adapter-patch 5.1.4 → 6.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95d1e157dec066675446a293b0ecb6ec8a5368143a7266b4eb789cfb9d30e8e
-  data.tar.gz: c4de7c524b1e42e06aa44fa87bcbd8fa3aeb26b0c4d5696613b0d3c2983aa22f
+  metadata.gz: 5e065a634213af40b0697588e4284a998e82a748272030f99dc44bb664b779e5
+  data.tar.gz: 4b4bf1b0e02da1ae82116ebe240b712e5fbff8b53fbda257943230470201b20b
 SHA512:
-  metadata.gz: 755bd921f59c02db3ee8c6f4806983d0923a6af119206c2dcfce9be2d2214584f9a19b788332daca4f205182cd9460da10fa84f365264e79d8827526d4c3d100
-  data.tar.gz: 7b44323c8202c123b1f8bed6f012ab32c06de35019a0a9e4d8d516e1c0bb0228f2b089082b1d69b742c6751fd810fe58046f32ad1932ca3ad84259d1582ac883
+  metadata.gz: 4d31e26644f4ea86826cc135da68e80aba4ee2449dd581ee2ebda1c8d0ec3478eaa811428aaa0fbc382ad5ee5e1bf15ae0daa7d5c4cce798538601df6fa32a63
+  data.tar.gz: c645053b20217490df7b0f4552e2a502d8adb4f29d8622ce781434ef5f7a47c6215aebde0ef36df522a179e30f507247e3801b0231488ea9341839bf71bbf333

data/activerecord-mysql2-adapter-patch.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'activerecord-mysql2-adapter-patch'
-  s.version     = '5.1.4'
+  s.version     = '6.0.2.2'
   s.licenses    = ['MIT']
   s.summary     = 'ActiveRecord Mysql2 Adapater batch for datetime on update'
   s.description = 'Fixes schema.rb for datetime fields that use on update'

data/lib/activerecord-mysql2-adapter-patch.rb

@@ -4,14 +4,26 @@ require 'active_record'
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
 class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
-  def new_column_from_field(table_name, field) # :nodoc:
+  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"
+    default, default_function = field[:Default], nil
+
+    if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(default)
+      default, default_function = nil, default
       default_function += ' ' + field[:Extra] if field[:Extra] != ''
-    else
-      default, default_function = field[:Default], nil
+    elsif type_metadata.extra == "DEFAULT_GENERATED"
+      default = +"(#{default})" unless default.start_with?("(")
+      default, default_function = nil, default
     end
-    new_column(field[:Field], default, type_metadata, field[:Null] == "YES", table_name, default_function, field[:Collation], comment: field[:Comment].presence)
+
+    MySQL::Column.new(
+      field[:Field],
+      default,
+      type_metadata,
+      field[:Null] == "YES",
+      default_function,
+      collation: field[:Collation],
+      comment: field[:Comment].presence
+    )
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql2-adapter-patch
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 6.0.2.2
 platform: ruby
 authors:
 - Doug Youch