activerecord-mysql-unsigned 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e070aed8bcab2b5e3cfe9a0270c7d35533a0a8e
-  data.tar.gz: 037d6c038e805d059b798bb34c75cdc9ed0bb0de
+  metadata.gz: d6986cc447a7c7abec51a46bcf834c5b5e775a17
+  data.tar.gz: a3936fb361b69df48c1d147cbcd61c657e346105
 SHA512:
-  metadata.gz: aa65c448724bbb17df657f1ce3ce31fabc9f286713f2219ea9984929a7985de91ab5c5b6a414fd28d6d8d326a4d44dad0df892254040547b7e23f9b5d20d9897
-  data.tar.gz: 2ddb43e93e4f37168828dd43867854a9edc77a5bcbc1aff4d226e81b986588d3fd9df46cc29a9efba2adf90314b43b58ec167ccb459884ce4d4acd0e867b3f90
+  metadata.gz: 16b5249d0028891abc806b1f292df3f86c06f734c51c9d815f5a25fa97b5fc4e02bfa41db5830ed77cd21a30633394f42c29d805bf672ffa6021f993e8e93a68
+  data.tar.gz: a74d7a96a632d0bdf5a3e0dc4daefc9aa42fc9ce9dc2af87ecdf208e1aa96428d89bcdb389f1dedd52735c87fa91f6eceacee2f3ea530d95b6c94a01d1d9357f

data/README.md

@@ -5,7 +5,7 @@ Add unsigned option to integer type for ActiveRecord's MySQL2 adapter.
 ## Support version
 
 ```
-ActiveRecord::VERSION >= 3.2 # include v4.0!
+ActiveRecord::VERSION >= 3.2 # include v4.0, and v4.1!
 ```
 
 ## Installation

data/activerecord-mysql-unsigned.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "database_cleaner"
-  spec.add_runtime_dependency "activesupport", ">= 3.2"
-  spec.add_runtime_dependency "activerecord", ">= 3.2"
+  spec.add_runtime_dependency "activesupport", ">= 3.2", "<= 4.1"
+  spec.add_runtime_dependency "activerecord", ">= 3.2", "<= 4.1"
   spec.add_runtime_dependency "mysql2"
 end

data/lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract/schema_dumper.rb

@@ -0,0 +1,36 @@
+require 'active_record/connection_adapters/abstract/schema_dumper'
+
+module ActiveRecord
+  module ConnectionAdapters # :nodoc:
+
+    module ColumnDumper
+
+      def prepare_column_options(column, types)
+        spec = {}
+        #binding.pry if column.name.include?("ip")
+        spec[:name]      = column.name.inspect
+
+        # AR has an optimization which handles zero-scale decimals as integers. This
+        # code ensures that the dumper still dumps the column as a decimal.
+        spec[:type]      = if column.type == :integer && /^(numeric|decimal)/ =~ column.sql_type
+                             'decimal'
+                           else
+                             column.type.to_s
+                           end
+        spec[:limit]     = column.limit.inspect if column.limit != types[column.type][:limit] && spec[:type] != 'decimal'
+        spec[:precision] = column.precision.inspect if column.precision
+        spec[:scale]     = column.scale.inspect if column.scale
+        spec[:null]      = 'false' unless column.null
+        spec[:unsigned]  = 'true' if column.unsigned
+        spec[:default]   = default_string(column.default) if column.has_default?
+        spec
+      end
+      # Lists the valid migration options
+      def migration_keys
+        [:name, :limit, :precision, :unsigned, :scale, :default, :null]
+      end
+
+    end
+
+  end
+end

data/lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_definitions.rb

@@ -0,0 +1,40 @@
+require 'active_record/connection_adapters/abstract/schema_definitions'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class ColumnDefinition
+
+      def unsigned=(value)
+        @unsigned = value
+      end
+
+      def unsigned
+        @unsigned
+      end
+
+    end
+
+    class TableDefinition
+
+      def new_column_definition(name, type, options)
+        column = create_column_definition name, type
+        limit = options.fetch(:limit) do
+          native[type][:limit] if native[type].is_a?(Hash)
+        end
+
+        column.limit       = limit
+        column.array       = options[:array] if column.respond_to?(:array)
+        column.precision   = options[:precision]
+        column.scale       = options[:scale]
+        column.unsigned    = options[:unsigned]
+        column.default     = options[:default]
+        column.null        = options[:null]
+        column.first       = options[:first]
+        column.after       = options[:after]
+        column.primary_key = type == :primary_key || options[:primary_key]
+        column
+      end
+
+    end
+  end
+end

data/lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_dumper.rb

@@ -0,0 +1,35 @@
+require 'active_record/connection_adapters/abstract/schema_dumper'
+
+module ActiveRecord
+  module ConnectionAdapters # :nodoc:
+    module ColumnDumper
+
+      def prepare_column_options(column, types)
+        spec = {}
+        #binding.pry if column.name.include?("ip")
+        spec[:name]      = column.name.inspect
+
+        # AR has an optimization which handles zero-scale decimals as integers. This
+        # code ensures that the dumper still dumps the column as a decimal.
+        spec[:type]      = if column.type == :integer && /^(numeric|decimal)/ =~ column.sql_type
+                             'decimal'
+                           else
+                             column.type.to_s
+                           end
+        spec[:limit]     = column.limit.inspect if column.limit != types[column.type][:limit] && spec[:type] != 'decimal'
+        spec[:precision] = column.precision.inspect if column.precision
+        spec[:scale]     = column.scale.inspect if column.scale
+        spec[:null]      = 'false' unless column.null
+        spec[:unsigned]  = 'true' if column.unsigned
+        spec[:default]   = default_string(column.default) if column.has_default?
+        spec
+      end
+
+      # Lists the valid migration options
+      def migration_keys
+        [:name, :limit, :precision, :unsigned, :scale, :default, :null]
+      end
+
+    end
+  end
+end

data/lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_statements.rb

@@ -0,0 +1,35 @@
+require 'active_record/connection_adapters/abstract/schema_statements'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SchemaStatements
+
+      def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = nil)
+        if native = native_database_types[type.to_sym]
+          column_type_sql = (native.is_a?(Hash) ? native[:name] : native).dup
+
+          if type == :decimal
+            scale ||= native[:scale]
+
+            if precision ||= native[:precision]
+              if scale
+                column_type_sql << "(#{precision},#{scale})"
+              else
+                column_type_sql << "(#{precision})"
+              end
+            elsif scale
+              raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale is specified"
+            end
+          elsif (type != :primary_key) && (limit ||= native.is_a?(Hash) && native[:limit])
+            column_type_sql << "(#{limit})"
+          end
+
+          column_type_sql
+        else
+          type
+        end
+      end
+
+    end
+  end
+end

data/lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract_mysql_adapter.rb

@@ -0,0 +1,83 @@
+require 'active_record/connection_adapters/abstract_mysql_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter < AbstractAdapter
+ 
+      class SchemaCreation < AbstractAdapter::SchemaCreation
+
+        def visit_AddColumn(o)
+          sql_type = type_to_sql(o.type.to_sym, o.limit, o.precision, o.scale, o.unsigned)
+          sql = "ADD #{quote_column_name(o.name)} #{sql_type}"
+          add_column_options!(sql, column_options(o))
+        end
+
+        def visit_ChangeColumnDefinition(o)
+          column = o.column
+          options = o.options
+          sql_type = type_to_sql(o.type, options[:limit], options[:precision], options[:scale], options[:unsigned])
+          change_column_sql = "CHANGE #{quote_column_name(column.name)} #{quote_column_name(options[:name])} #{sql_type}"
+          add_column_options!(change_column_sql, options)
+          add_column_position!(change_column_sql, options)
+        end
+
+        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.primary_key?
+          column_sql
+        end
+
+        def type_to_sql(type, limit, precision, scale, unsigned)
+          @conn.type_to_sql type.to_sym, limit, precision, scale, unsigned
+        end
+      end
+
+      NATIVE_DATABASE_TYPES.merge!(
+        :primary_key => "int(10) unsigned DEFAULT NULL auto_increment PRIMARY KEY"
+      )
+
+      # Maps logical Rails types to MySQL-specific data types.
+      def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+        case type.to_s
+        when 'binary'
+          case limit
+          when 0..0xfff;           "varbinary(#{limit})"
+          when nil;                "blob"
+          when 0x1000..0xffffffff; "blob(#{limit})"
+          else raise(ActiveRecordError, "No binary type has character length #{limit}")
+          end
+        when 'integer'
+          case limit
+          when 1
+            'tinyint' + (unsigned ? ' unsigned' : '')
+          when 2
+            'smallint' + (unsigned ? ' unsigned' : '')
+          when 3
+            'mediumint' + (unsigned ? ' unsigned' : '')
+          when nil, 4, 11 # compatibility with MySQL default
+            if unsigned
+              'int(10) unsigned'
+            else
+              'int(10)'
+            end
+          when 5..8
+            'bigint' + (unsigned ? ' unsigned' : '')
+          else raise(ActiveRecordError, "No integer type has byte size #{limit}")
+          end
+        when 'text'
+          case limit
+          when 0..0xff;               'tinytext'
+          when nil, 0x100..0xffff;    'text'
+          when 0x10000..0xffffff;     'mediumtext'
+          when 0x1000000..0xffffffff; 'longtext'
+          else raise(ActiveRecordError, "No text type has character length #{limit}")
+          end
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

data/lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/mysql2_adapter.rb

@@ -0,0 +1,22 @@
+require 'active_record/connection_adapters/mysql2_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class Mysql2Adapter < AbstractMysqlAdapter
+
+      class Column < AbstractMysqlAdapter::Column
+        attr_reader :unsigned
+
+        def initialize(name, default, sql_type = nil, null = true, collation = nil, strict = false, extra = "")
+          if sql_type.present?
+            @unsigned = sql_type.include? "unsigned"
+          else
+            @unsigned = false
+          end
+          super(name, default, sql_type, null, collation, strict, extra)
+        end
+      end
+
+    end
+  end
+end

data/lib/activerecord-mysql-unsigned/base.rb

@@ -1,6 +1,13 @@
-if ActiveRecord::VERSION::MAJOR == 4
+if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 1
+  require 'activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_definitions'
+  require 'activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_statements'
+  require 'activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_dumper'
+  require 'activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract_mysql_adapter'
+  require 'activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/mysql2_adapter'
+elsif ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0
   require 'activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract/schema_definitions'
   require 'activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract/schema_statements'
+  require 'activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract/schema_dumper'
   require 'activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract_adapter'
   require 'activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract_mysql_adapter'
   require 'activerecord-mysql-unsigned/active_record/v4/connection_adapters/mysql2_adapter'

data/lib/activerecord-mysql-unsigned/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Mysql
     module Unsigned
-      VERSION = "0.0.3"
+      VERSION = "0.1.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-unsigned
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - yo_waka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +93,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +103,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -128,10 +140,16 @@ files:
 - lib/activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract_mysql_adapter.rb
 - lib/activerecord-mysql-unsigned/active_record/v3/connection_adapters/mysql2_adapter.rb
 - lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract/schema_definitions.rb
+- lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract/schema_dumper.rb
 - lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract/schema_statements.rb
 - lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract_adapter.rb
 - lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract_mysql_adapter.rb
 - lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/mysql2_adapter.rb
+- lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_definitions.rb
+- lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_dumper.rb
+- lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract/schema_statements.rb
+- lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract_mysql_adapter.rb
+- lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/mysql2_adapter.rb
 - lib/activerecord-mysql-unsigned/base.rb
 - lib/activerecord-mysql-unsigned/railtie.rb
 - lib/activerecord-mysql-unsigned/version.rb