activerecord-mysql-awesome 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9d3de13790545a2190a85fb7821c32d6c301b03
-  data.tar.gz: 91241e834c5079dd00ac97a24fa66f47324ca159
+  metadata.gz: a21a0f151f532f79298ad0c6dff3cc8fc2de50fb
+  data.tar.gz: e7b5019e83e9574918d428ccc5e9d8c60be43a13
 SHA512:
-  metadata.gz: b0d28575ed05697be4e981e11813663fe6259d1cc7bcabb2bdeb5b99ca9336ad07964717091c6c55eb13f6b1f5b9a93ece087beb8fedbdae51d1b325be189777
-  data.tar.gz: 87c10585a3c76084d660354c8f4f9a0bc6a5fcd454f1cdd1dccbdfc12c6536b4adda6d3617745b3dda84d666ecc6fbf94d11696a640126ca64a5dc0e4d918db4
+  metadata.gz: 71f8063d4621ac388c7edca128674cd53cf5e45ccb8452678700d520a1b1c45262d21533ad62ba1dbb9df1fd16ab5178b4b8422840e32160675f0ad20a1077d9
+  data.tar.gz: 6f0153a9989ba7b6106416f8d962f7ecfac29d28c0fd796aacf9a499ba4311eb60ee8f8d3b4b277fa905f966a3ba586f546179d74b739993e7308d6b98bd7a9e

data/lib/activerecord-mysql-awesome/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -3,27 +3,94 @@ require 'active_record/connection_adapters/abstract_mysql_adapter'
 module ActiveRecord
   module Mysql
     module Awesome
-      def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
-        return "#{type_to_sql(type, limit, precision, scale)} unsigned" if unsigned && type != :primary_key
-        case type.to_s
-        when 'integer'
-          case limit
-          when nil, 4, 11; 'int'  # compatibility with MySQL default
-          else
-            super(type, limit, precision, scale)
+      class ChangeColumnDefinition < Struct.new(:column, :name) #:nodoc:
+      end
+
+      class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
+        attr_accessor :auto_increment, :unsigned, :charset, :collation
+      end
+
+      class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
+        def initialize(types, name, temporary, options, as = nil)
+          super(types, name, temporary, options)
+          @as = as
+        end
+
+        def primary_key(name, type = :primary_key, options = {})
+          options[:auto_increment] ||= type == :bigint
+          super
+        end
+
+        def new_column_definition(name, type, options) # :nodoc:
+          column = super
+          column.auto_increment = options[:auto_increment]
+          column.unsigned  = options[:unsigned]
+          column.charset   = options[:charset]
+          column.collation = options[:collation]
+          column
+        end
+
+        private
+
+        def create_column_definition(name, type)
+          ColumnDefinition.new(name, type)
+        end
+      end
+
+      module SchemaCreation
+        def visit_AddColumn(o)
+          add_column_position!("ADD #{accept(o)}", column_options(o))
+        end
+
+        private
+
+        def visit_ColumnDefinition(o)
+          o.sql_type = type_to_sql(o.type.to_sym, o.limit, o.precision, o.scale, o.unsigned)
+          column_sql = "#{quote_column_name(o.name)} #{o.sql_type}"
+          add_column_options!(column_sql, column_options(o)) unless o.type == :primary_key
+          column_sql
+        end
+
+        def visit_ChangeColumnDefinition(o)
+          change_column_sql = "CHANGE #{quote_column_name(o.name)} #{accept(o.column)}"
+          add_column_position!(change_column_sql, column_options(o.column))
+        end
+
+        def column_options(o)
+          column_options = super
+          column_options[:first] = o.first
+          column_options[:after] = o.after
+          column_options[:auto_increment] = o.auto_increment
+          column_options[:primary_key] = o.primary_key
+          column_options[:charset]   = o.charset
+          column_options[:collation] = o.collation
+          column_options
+        end
+
+        def add_column_options!(sql, options)
+          if options[:charset]
+            sql << " CHARACTER SET #{options[:charset]}"
           end
-        when 'primary_key'
-          "#{type_to_sql(:integer, limit, precision, scale, unsigned)} auto_increment PRIMARY KEY"
-        when 'datetime', 'time'
-          return super(type, limit, precision, scale) unless precision
+          if options[:collation]
+            sql << " COLLATE #{options[:collation]}"
+          end
+          if options[:primary_key] == true
+            sql << " PRIMARY KEY"
+          end
+          super
+        end
 
-          native_type = native_database_types[type.to_sym][:name]
-          case precision
-          when 0..6; "#{native_type}(#{precision})"
-          else raise(ActiveRecordError, "No #{native_type} type has precision of #{precision}. The allowed range of precision is from 0 to 6")
+        def add_column_position!(sql, options)
+          if options[:first]
+            sql << " FIRST"
+          elsif options[:after]
+            sql << " AFTER #{quote_column_name(options[:after])}"
           end
-        else
-          super(type, limit, precision, scale)
+          sql
+        end
+
+        def type_to_sql(type, limit, precision, scale, unsigned = false)
+          @conn.type_to_sql(type.to_sym, limit, precision, scale, unsigned)
         end
       end
 
@@ -128,110 +195,30 @@ module ActiveRecord
           include TimeValueWithPrecision
         end
       end
-    end
-  end
-
-  module ConnectionAdapters
-    class AbstractMysqlAdapter < AbstractAdapter
-      prepend Mysql::Awesome
-
-      class Column < ConnectionAdapters::Column # :nodoc:
-        prepend Mysql::Awesome::Column
-      end
 
-      class ChangeColumnDefinition < Struct.new(:column, :name) #:nodoc:
-      end
+      public
 
-      class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
-        attr_accessor :auto_increment, :unsigned, :charset, :collation
-      end
-
-      class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
-        def initialize(types, name, temporary, options, as = nil)
-          super(types, name, temporary, options)
-          @as = as
-        end
-
-        def primary_key(name, type = :primary_key, options = {})
-          options[:auto_increment] ||= type == :bigint
-          super
-        end
-
-        def new_column_definition(name, type, options) # :nodoc:
-          column = super
-          column.auto_increment = options[:auto_increment]
-          column.unsigned  = options[:unsigned]
-          column.charset   = options[:charset]
-          column.collation = options[:collation]
-          column
-        end
-
-        private
-
-        def create_column_definition(name, type)
-          ColumnDefinition.new(name, type)
-        end
-      end
-
-      class SchemaCreation < AbstractAdapter::SchemaCreation
-        def visit_AddColumn(o)
-          add_column_position!("ADD #{accept(o)}", column_options(o))
-        end
-
-        private
-
-        def visit_ColumnDefinition(o)
-          sql_type = type_to_sql(o.type.to_sym, o.limit, o.precision, o.scale, o.unsigned)
-          column_sql = "#{quote_column_name(o.name)} #{sql_type}"
-          add_column_options!(column_sql, column_options(o)) unless o.type == :primary_key
-          column_sql
-        end
-
-        def visit_ChangeColumnDefinition(o)
-          change_column_sql = "CHANGE #{quote_column_name(o.name)} #{accept(o.column)}"
-          add_column_position!(change_column_sql, column_options(o.column))
-        end
-
-        def column_options(o)
-          column_options = super
-          column_options[:first] = o.first
-          column_options[:after] = o.after
-          column_options[:auto_increment] = o.auto_increment
-          column_options[:primary_key] = o.primary_key
-          column_options[:charset]   = o.charset
-          column_options[:collation] = o.collation
-          column_options
-        end
-
-        def add_column_options!(sql, options)
-          if options[:charset]
-            sql << " CHARACTER SET #{options[:charset]}"
-          end
-          if options[:collation]
-            sql << " COLLATE #{options[:collation]}"
-          end
-          if options[:primary_key] == true
-            sql << " PRIMARY KEY"
+      def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+        return "#{type_to_sql(type, limit, precision, scale)} unsigned" if unsigned && type != :primary_key
+        case type.to_s
+        when 'integer'
+          case limit
+          when nil, 4, 11; 'int'  # compatibility with MySQL default
+          else
+            super(type, limit, precision, scale)
           end
-          super
-        end
+        when 'primary_key'
+          "#{type_to_sql(:integer, limit, precision, scale, unsigned)} auto_increment PRIMARY KEY"
+        when 'datetime', 'time'
+          return super(type, limit, precision, scale) unless precision
 
-        def add_column_position!(sql, options)
-          if options[:first]
-            sql << " FIRST"
-          elsif options[:after]
-            sql << " AFTER #{quote_column_name(options[:after])}"
+          native_type = native_database_types[type.to_sym][:name]
+          case precision
+          when 0..6; "#{native_type}(#{precision})"
+          else raise(ActiveRecordError, "No #{native_type} type has precision of #{precision}. The allowed range of precision is from 0 to 6")
           end
-          sql
-        end
-
-        def type_to_sql(type, limit, precision, scale, unsigned = false)
-          @conn.type_to_sql(type.to_sym, limit, precision, scale, unsigned)
-        end
-
-        def quote_value(value, column)
-          column.sql_type ||= type_to_sql(column.type, column.limit, column.precision, column.scale, column.unsigned)
-          super
+        else
+          super(type, limit, precision, scale)
         end
       end
 
@@ -265,7 +252,7 @@ module ActiveRecord
       end
 
       def migration_keys
-        super + [:unsigned, :collation]
+        super | [:unsigned, :collation]
       end
 
       def table_options(table_name)
@@ -314,13 +301,14 @@ module ActiveRecord
         schema_creation.accept(ChangeColumnDefinition.new(cd, column.name))
       end
 
-      alias configure_connection_without_awesome configure_connection
+      private
+
       def configure_connection
         _config = @config
         if [':default', :default].include?(@config[:strict])
           @config = @config.deep_merge(variables: { sql_mode: :default })
         end
-        configure_connection_without_awesome
+        super
       ensure
         @config = _config
       end
@@ -330,4 +318,18 @@ module ActiveRecord
       end
     end
   end
+
+  module ConnectionAdapters
+    class AbstractMysqlAdapter < AbstractAdapter
+      prepend Mysql::Awesome
+
+      class Column < ConnectionAdapters::Column # :nodoc:
+        prepend Mysql::Awesome::Column
+      end
+
+      class SchemaCreation < AbstractAdapter::SchemaCreation
+        prepend Mysql::Awesome::SchemaCreation
+      end
+    end
+  end
 end

data/lib/activerecord/mysql/awesome/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Mysql
     module Awesome
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-awesome
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryuta Kamizono
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler