From 5f653127cd7d1db925d1622c49123b2cdc6be71b Mon Sep 17 00:00:00 2001 From: rahul342 Date: Sat, 9 Dec 2023 17:24:04 +0530 Subject: [PATCH] Remove repeated logic causing duplication like COLLATE statements --- .../mysql2rgeo/schema_creation.rb | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb b/lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb index c35bae7..6af076e 100644 --- a/lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb +++ b/lib/active_record/connection_adapters/mysql2rgeo/schema_creation.rb @@ -7,36 +7,13 @@ class SchemaCreation < MySQL::SchemaCreation # :nodoc: private def add_column_options!(sql, options) - # By default, TIMESTAMP columns are NOT NULL, cannot contain NULL values, - # and assigning NULL assigns the current timestamp. To permit a TIMESTAMP - # column to contain NULL, explicitly declare it with the NULL attribute. - # See https://dev.mysql.com/doc/refman/en/timestamp-initialization.html - if /\Atimestamp\b/.match?(options[:column].sql_type) && !options[:primary_key] - sql << " NULL" unless options[:null] == false || options_include_default?(options) - end - if options[:srid] sql << " /*!80003 SRID #{options[:srid]} */" end - if charset = options[:charset] - sql << " CHARACTER SET #{charset}" - end - - if collation = options[:collation] - sql << " COLLATE #{collation}" - end - - if as = options[:as] - sql << " AS (#{as})" - if options[:stored] - sql << (mariadb? ? " PERSISTENT" : " STORED") - end - end - - add_sql_comment!(super, options[:comment]) + super end end end end -end \ No newline at end of file +end