activerecord-mysql-unsigned 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb8f5f38a9a5fd9b1b15e1368f3c7958b2c8719a
-  data.tar.gz: fdb22adc25e2d8da3752f01e92faf34064e9badd
+  metadata.gz: 28887c8744010284c741bf409074d986e2e04092
+  data.tar.gz: 054d6bc7e97203547459bc040f05d362f14083db
 SHA512:
-  metadata.gz: 0652a2d5af79c1ffd3a466240f2d6e5cd357c3997bab5279314632c6e5313f6c70dd6e79f4027a2383882e3b9c80fe1c706a6aa1d394beb2492c53ca38939c2f
-  data.tar.gz: 5bebff108fcc8bbdf786e8e71e8549ce1b5251ab0c19418a22616c54c48397a7e974fed08f54856c754ec332832b891900da6dc03814bd6c25a5228e71c23450
+  metadata.gz: 3f47eeeea032def664defb3990a04c78cb181e1b3a813999d12d3a0f8320f3d52c11c31d94978f3deb87beef30129d39aa0950e78b2051119574ff5edd911c7a
+  data.tar.gz: 3ecd003fd8ce4dbd6158dffe52129d54622e950752c009dbedd094005ccdf8f3dbdfbef38f34ca57ed358ba3777dfd61b7101825f832be401bf8cc81963c8654

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1
+env:
+  - "AR_VERSION=3.2.21"
+  - "AR_VERSION=4.0.12"
+  - "AR_VERSION=4.1.8"
+  - "AR_VERSION=4.2.0.beta4"

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem "activerecord", "~> #{ENV['AR_VERSION']}" if ENV['AR_VERSION']
+
 # Specify your gem's dependencies in activerecord-mysql-unsigned.gemspec
 gemspec

data/README.md

@@ -7,7 +7,7 @@ Add unsigned option to integer type for ActiveRecord's MySQL2 adapter.
 ## Support version
 
 ```
-4.2 > ActiveRecord::VERSION >= 3.2
+5.0 > ActiveRecord::VERSION >= 3.2
 ```
 
 ## 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", "~> 3.0.0"
   spec.add_development_dependency "database_cleaner"
-  spec.add_runtime_dependency "activesupport", ">= 3.2", "< 4.2"
-  spec.add_runtime_dependency "activerecord", ">= 3.2", "< 4.2"
+  spec.add_runtime_dependency "activesupport", ">= 3.2", "< 5.0"
+  spec.add_runtime_dependency "activerecord", ">= 3.2", "< 5.0"
   spec.add_runtime_dependency "mysql2"
 end

data/lib/activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_creation.rb

@@ -0,0 +1,47 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractAdapter
+      class SchemaCreation # :nodoc:
+        def initialize(conn)
+          @conn = conn
+        end
+
+        private
+
+        def column_options(o)
+          column_options = {}
+          column_options[:null] = o.null unless o.null.nil?
+          column_options[:default] = o.default unless o.default.nil?
+          column_options[:column] = o
+          column_options[:first] = o.first
+          column_options[:after] = o.after
+          column_options
+        end
+
+        def quote_column_name(name)
+          @conn.quote_column_name name
+        end
+
+        def add_column_options!(sql, options)
+          sql << " DEFAULT #{quote_value(options[:default], options[:column])}" if options_include_default?(options)
+          # must explicitly check for :null to allow change_column to work on migrations
+          if options[:null] == false
+            sql << " NOT NULL"
+          end
+          if options[:auto_increment] == true
+            sql << " AUTO_INCREMENT"
+          end
+          sql
+        end
+
+        def quote_value(value, column)
+          @conn.quote(value, column)
+        end
+
+        def options_include_default?(options)
+          options.include?(:default) && !(options[:null] == false && options[:default].nil?)
+        end
+      end
+    end
+  end
+end

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

@@ -3,49 +3,25 @@ require 'active_record/connection_adapters/abstract/schema_definitions'
 module ActiveRecord
   module ConnectionAdapters
     class ColumnDefinition
-      def unsigned=(value)
-        @unsigned = value
-      end
-
-      def unsigned
-        @unsigned
-      end
-
-      def auto_increment=(value)
-        @auto_increment = value
-      end
-
-      def auto_increment
-        @auto_increment
-      end
+      attr_accessor :unsigned, :first, :after
 
       def sql_type
-        base.type_to_sql(type.to_sym, limit, precision, scale, unsigned, auto_increment) rescue type
+        base.type_to_sql(type.to_sym, limit, precision, scale, unsigned) rescue type
       end
     end
 
     class TableDefinition
+      def primary_key(name, type = :primary_key, options = {})
+        column(name, type, options.merge(primary_key: true).reverse_merge(unsigned: true))
+      end
 
+      alias_method :column_without_unsigned, :column
       def column(name, type, options = {})
-        name = name.to_s
-        type = type.to_sym
-
-        column = self[name] || new_column_definition(@base, name, type)
-
-        limit = options.fetch(:limit) do
-          native[type][:limit] if native[type].is_a?(Hash)
-        end
-
-        column.limit          = limit
-        column.unsigned       = options[:unsigned]
-        column.auto_increment = options[:auto_increment]
-        column.precision      = options[:precision]
-        column.scale          = options[:scale]
-        column.default        = options[:default]
-        column.null           = options[:null]
+        column_without_unsigned(name, type, options)
+        column = self[name]
+        column.unsigned = options[:unsigned]
         self
       end
-
     end
   end
 end

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

@@ -1,70 +1,48 @@
-require 'active_record/connection_adapters/abstract_mysql_adapter'
+require 'activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract_mysql_adapter'
 
 module ActiveRecord
   module ConnectionAdapters
     class AbstractMysqlAdapter < AbstractAdapter
 
-      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, auto_increment = false)
-        case type.to_s
-        when 'integer'
-          case limit
-          when 1
-            'tinyint' + (unsigned ? ' unsigned' : '') + (auto_increment ? ' AUTO_INCREMENT' : '')
-          when 2
-            'smallint' + (unsigned ? ' unsigned' : '') + (auto_increment ? ' AUTO_INCREMENT' : '')
-          when 3
-            'mediumint' + (unsigned ? ' unsigned' : '') + (auto_increment ? ' AUTO_INCREMENT' : '')
-          when nil, 4, 11 # compatibility with MySQL default
-            if unsigned
-              'int(10) unsigned' + (auto_increment ? ' AUTO_INCREMENT' : '')
-            else
-              'int(10)'
-            end
-          when 5..8
-            'bigint' + (unsigned ? ' unsigned' : '') + (auto_increment ? ' AUTO_INCREMENT' : '')
-          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}")
+      class TableDefinition
+        def initialize(base)
+          @base = base
+        end
+
+        def new_column_definition(name, type, options) # :nodoc:
+          column = create_column_definition name, type
+          limit = options.fetch(:limit) do
+            native[type][:limit] if native[type].is_a?(Hash)
           end
-        else
-          super
+
+          column.limit       = limit
+          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
         end
-      end
 
-      def add_column_sql(table_name, column_name, type, options = {})
-        add_column_sql = "ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale], options[:unsigned], options[:auto_increment])}"
-        add_column_options!(add_column_sql, options)
-        add_column_position!(add_column_sql, options)
-        add_column_sql
-      end
+        private
 
-      def change_column_sql(table_name, column_name, type, options = {})
-        column = column_for(table_name, column_name)
+        def create_column_definition(name, type)
+          ColumnDefinition.new @base, name, type
+        end
 
-        unless type.to_sym == :primary_key
-          unless options_include_default?(options)
-            options[:default] = column.default
-          end
-          unless options.has_key?(:null)
-            options[:null] = column.null
-          end
+        def native
+          @base.native_database_types
         end
+      end
+
+      def schema_creation
+        SchemaCreation.new self
+      end
 
-        change_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale], options[:unsigned], options[:auto_increment])}"
-        add_column_options!(change_column_sql, options)
-        add_column_position!(change_column_sql, options)
-        change_column_sql
+      def create_table_definition(name, temporary, options)
+        TableDefinition.new self
       end
 
     end

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

@@ -3,38 +3,20 @@ require 'active_record/connection_adapters/abstract/schema_definitions'
 module ActiveRecord
   module ConnectionAdapters
     class ColumnDefinition
-
-      def unsigned=(value)
-        @unsigned = value
-      end
-
-      def unsigned
-        @unsigned
-      end
-
+      attr_accessor :unsigned
     end
 
     class TableDefinition
+      def primary_key(name, type = :primary_key, options = {})
+        column(name, type, options.merge(primary_key: true).reverse_merge(unsigned: true))
+      end
 
+      alias_method :new_column_definition_without_unsigned, :new_column_definition
       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 = new_column_definition_without_unsigned(name, type, options)
+        column.unsigned = options[:unsigned]
         column
       end
-
     end
   end
 end

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

@@ -4,83 +4,110 @@ module ActiveRecord
   module ConnectionAdapters
     class AbstractMysqlAdapter < AbstractAdapter
  
-      NATIVE_DATABASE_TYPES.merge!(
-        :primary_key => "int(10) unsigned DEFAULT NULL auto_increment PRIMARY KEY"
-      )
+      class ChangeColumnDefinition < Struct.new(:column, :type, :options) #:nodoc:
+      end
 
-      # Maps logical Rails types to MySQL-specific data types.
-      def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
-        # return earlier, only need overwrite method when unsigned option == true
-        return super unless unsigned
+      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)) unless o.type.to_sym == :primary_key
+          add_column_position!(sql, column_options(o))
+        end
 
-        case type.to_s
-        when 'decimal'
-          # copy from rails core
-          # https://github.com/rails/rails/blob/600aaf4234c80064201ee34ddabed216b91559db/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
-          native = native_database_types[type.to_sym]
-          column_type_sql = (native.is_a?(Hash) ? native[:name] : native).dup
-
-          scale ||= native[:scale]
-
-          if precision ||= native[:precision]
-            if scale
-              column_type_sql << "(#{precision},#{scale}) unsigned"
-            else
-              column_type_sql << "(#{precision}) unsigned"
-            end
-          elsif scale
-            raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale is specified"
-          end
-          
-        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}")
+        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.merge(column: column)) unless o.type.to_sym == :primary_key
+          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.type.to_sym == :primary_key
+          column_sql
+        end
+
+        def column_options(o)
+          column_options = super
+          column_options[:first] = o.first
+          column_options[:after] = o.after
+          column_options
+        end
+
+        def add_column_position!(sql, options)
+          if options[:first]
+            sql << " FIRST"
+          elsif options[:after]
+            sql << " AFTER #{quote_column_name(options[:after])}"
           end
+        end
+
+        def type_to_sql(type, limit, precision, scale, unsigned = false)
+          @conn.type_to_sql type.to_sym, limit, precision, scale, unsigned
+        end
+      end
+
+      class Column < ConnectionAdapters::Column # :nodoc:
+        def unsigned?
+          sql_type =~ /unsigned/i
+        end
+      end
+
+      def prepare_column_options(column, types) # :nodoc:
+        spec = super
+        spec[:unsigned] = 'true' if column.unsigned?
+        spec
+      end
+
+      def migration_keys
+        super + [:unsigned]
+      end
+
+      alias_method :type_to_sql_without_unsigned, :type_to_sql
+      def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+        case type.to_s
         when 'integer'
           case limit
-          when 1
-            'tinyint unsigned'
-          when 2
-            'smallint unsigned'
-          when 3
-            'mediumint unsigned'
-          when nil, 4, 11 # compatibility with MySQL default
-            'int(10) unsigned'
-          when 5..8
-            'bigint unsigned'
-          else raise(ActiveRecordError, "No integer type has byte size #{limit}")
+          when nil, 4, 11; 'int'  # compatibility with MySQL default
+          else
+            type_to_sql_without_unsigned(type, limit, precision, scale)
+          end.tap do |sql_type|
+            sql_type << ' unsigned' if unsigned
           end
+        when 'float', 'decimal'
+          type_to_sql_without_unsigned(type, limit, precision, scale).tap do |sql_type|
+            sql_type << ' unsigned' if unsigned
+          end
+        when 'primary_key'
+          "#{type_to_sql(:integer, limit, precision, scale, unsigned)} auto_increment PRIMARY KEY"
         else
-          super
+          type_to_sql_without_unsigned(type, limit, precision, scale)
         end
       end
 
       def add_column_sql(table_name, column_name, type, options = {})
-        add_column_sql = "ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale], options[:unsigned])}"
-        add_column_options!(add_column_sql, options)
-        add_column_position!(add_column_sql, options)
-        add_column_sql
+        td = create_table_definition table_name, options[:temporary], options[:options]
+        cd = td.new_column_definition(column_name, type, options)
+        schema_creation.visit_AddColumn cd
       end
 
       def change_column_sql(table_name, column_name, type, options = {})
         column = column_for(table_name, column_name)
 
-        unless type.to_sym == :primary_key
-          unless options_include_default?(options)
-            options[:default] = column.default
-          end
-          unless options.has_key?(:null)
-            options[:null] = column.null
-          end
+        unless options_include_default?(options)
+          options[:default] = column.default
+        end
+
+        unless options.has_key?(:null)
+          options[:null] = column.null
         end
 
-        change_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale], options[:unsigned])}"
-        add_column_options!(change_column_sql, options)
-        add_column_position!(change_column_sql, options)
-        change_column_sql
+        options[:name] = column.name
+        schema_creation.visit_ChangeColumnDefinition ChangeColumnDefinition.new column, type, options
       end
 
     end

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

@@ -1,21 +1,10 @@
-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
+if ActiveRecord::VERSION::MAJOR == 4
   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'
 elsif ActiveRecord::VERSION::MAJOR == 3
   require 'activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_definitions'
-  require 'activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_statements'
+  require 'activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_creation'
   require 'activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract_mysql_adapter'
-  require 'activerecord-mysql-unsigned/active_record/v3/connection_adapters/mysql2_adapter'
 else
   raise "activerecord-mysql-unsigned supprts ActiveRecord::VERSION::MAJOR >= 3"
 end

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Mysql
     module Unsigned
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
     end
   end
 end

data/spec/bigint_primary_key_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe "primary_key" do
+  it "should be bigint with limit: 8" do
+    pkcol = Goods.columns_hash[Goods.primary_key]
+
+    expect(pkcol.unsigned?).to be_truthy
+    expect(pkcol.limit).to be 8 if ActiveRecord::VERSION::MAJOR == 4
+  end
+end

data/spec/support/migrations.rb

@@ -17,7 +17,7 @@ ActiveRecord::Migration.verbose = true
 # create goods table
 class CreateGoodsTable < ActiveRecord::Migration
   def self.change
-    create_table :goods, force: true do |t|
+    create_table :goods, force: true, limit: 8 do |t|
       t.string  :name, null: false
       t.boolean :deleted, default: false
     end

data/spec/unsigned_spec.rb

@@ -30,7 +30,7 @@ describe "INT/Decimal column" do
   it "not allowed minus value of unsigned int" do
     @user.unsigned_int = -2147483648
 
-    if ActiveRecord::VERSION::MAJOR == 4
+    if strict_mode?
       begin
         @user.save
         expect(true).to be_falsey # should not be reached here
@@ -46,10 +46,10 @@ describe "INT/Decimal column" do
 
   it "unsigned column has 'unsigned' attribute" do
     signed_int_col = User.columns[2]
-    expect(signed_int_col.unsigned).to be_falsey
+    expect(signed_int_col.unsigned?).to be_falsey
 
     unsigned_int_col = User.columns[3]
-    expect(unsigned_int_col.unsigned).to be_truthy
+    expect(unsigned_int_col.unsigned?).to be_truthy
   end
 
   it "allowed minus value of signed decimal" do
@@ -61,7 +61,7 @@ describe "INT/Decimal column" do
   it "not allowed minus value of unsigned decimal" do
     @user.unsigned_decimal = -10
 
-    if ActiveRecord::VERSION::MAJOR == 4
+    if strict_mode?
       begin
         @user.save
         expect(true).to be_falsey # should not be reached here
@@ -71,7 +71,13 @@ describe "INT/Decimal column" do
     else
       @user.save
       @user.reload
-      expect(@user.unsigned_int).to be 0 # saved 0
+      expect(@user.unsigned_decimal).to eq BigDecimal("0.00") # saved 0.00
     end
   end
+
+  private
+
+  def strict_mode?
+    /STRICT_(?:TRANS|ALL)_TABLES/ =~ ActiveRecord::Base.connection.select_value("SELECT @@SESSION.sql_mode")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-unsigned
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yo_waka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -135,25 +135,16 @@ files:
 - Rakefile
 - activerecord-mysql-unsigned.gemspec
 - lib/activerecord-mysql-unsigned.rb
+- lib/activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_creation.rb
 - lib/activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_definitions.rb
-- lib/activerecord-mysql-unsigned/active_record/v3/connection_adapters/abstract/schema_statements.rb
 - 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
 - spec/after_option_spec.rb
+- spec/bigint_primary_key_spec.rb
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/migrations.rb
@@ -180,12 +171,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Add unsigned option to integer type for ActiveRecord's MySQL2 adapter
 test_files:
 - spec/after_option_spec.rb
+- spec/bigint_primary_key_spec.rb
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/migrations.rb

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

@@ -1,35 +0,0 @@
-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, auto_increment = 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/v3/connection_adapters/mysql2_adapter.rb

@@ -1,22 +0,0 @@
-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)
-          if sql_type.present?
-            @unsigned = sql_type.include? "unsigned"
-          else
-            @unsigned = false
-          end
-          super(name, default, sql_type, null, collation)
-        end
-      end
-
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-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/connection_adapters/abstract/schema_statements.rb

@@ -1,35 +0,0 @@
-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/connection_adapters/abstract_adapter.rb

@@ -1,28 +0,0 @@
-require 'active_record/connection_adapters/abstract_adapter'
-
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-
-      class 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_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
-
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-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/active_record/v4_1/connection_adapters/abstract/schema_definitions.rb

@@ -1,40 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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

@@ -1,98 +0,0 @@
-require 'forwardable'
-require 'active_record/connection_adapters/abstract_mysql_adapter'
-
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractMysqlAdapter < AbstractAdapter
-
-      class SchemaCreation < AbstractAdapter::SchemaCreation
-        extend Forwardable
-        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_position!(
-            add_column_options!(sql, column_options(o)),
-            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.merge(column: column))
-          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_delegator :@conn, :type_to_sql, :type_to_sql
-      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)
-        # return earlier, only need overwrite method when unsigned option == true
-        return super unless unsigned
-
-
-        case type.to_s
-        when 'decimal'
-          # copy from rails core
-          # https://github.com/rails/rails/blob/600aaf4234c80064201ee34ddabed216b91559db/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
-          native = native_database_types[type.to_sym]
-          column_type_sql = (native.is_a?(Hash) ? native[:name] : native).dup
-
-          scale ||= native[:scale]
-
-          if precision ||= native[:precision]
-            if scale
-              column_type_sql << "(#{precision},#{scale}) unsigned"
-            else
-              column_type_sql << "(#{precision}) unsigned"
-            end
-          elsif scale
-            raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale is specified"
-          end
-        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
-        else
-          super
-        end
-      end
-
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-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