rails-bigint-pk 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc794aae7fc04ee85d379ac5433c4b2f37fa8cb3
-  data.tar.gz: f9bf0242a1c54f6ff5b8c98831dce75d6ee51c20
+  metadata.gz: 36f312ba8a2d027d656428d951776d19cfa558b2
+  data.tar.gz: 6170eacf81c9e50fa0bced8a4f3af2c266ea1197
 SHA512:
-  metadata.gz: 203ac729e7904234a26259da6a85974237a5d59609dab04dc6e6fd6ede45c0b842dff3a35c053e79854826ccb3b3aef6db6695c298111cffb7d0517dde51b8e8
-  data.tar.gz: e5514062891c3099206de073d7a45b9d2bb2eeede579744bfc6108592b97f3894337d8493b18f94f3de301264aeb0197a60a00976b3dc7d931da89acc240e5c2
+  metadata.gz: 5069efd0eacefd9158538aa17a553a1ddf6334ecf46bfeef283e5e71449c729a38cbbe21304bfeecccf9b2be8ce38f6b42eed3abfd6b2f117dcdf44e44ef20ce
+  data.tar.gz: 08e4ef35607b17997e538e3bf23e537902c115f76d4e2da79d2c5646de873b0fc70c79fe9c3f1d32f13b3b367ecdbe204e57e78225f40eda6c1b5cf31696d99b

data/Changelog

@@ -1,3 +1,11 @@
+## 1.1.0	(20 May 2014)
+
+Improvement:
+	- Rails 4.1 support:
+	  Changes corresponding to changes in Rails 4.1 to support MySQL 5.7.3
+	  Thanks, @Bishop!
+
+
 ## 1.0.0	(21 April 2014)
 
 New Features:

data/Readme.md

@@ -15,13 +15,13 @@ recommended to run the test suite against your version of rails and activerecord
 
 #### Rails 4
 
-rails-bigint-pk supports Rails 4.  To install, you can either
+rails-bigint-pk supports Rails 4 and 4.1. To install, you can either
 download releases from Rubygems by adding the following to your
 `Gemfile`:
 
-  `gem 'rails-bigint-pk', '~>1.0.0'`
+  `gem 'rails-bigint-pk', '~>1.1.0'`
 
-... or you can install the newest code directly from git:
+... or, if you enjoy being on the bleeding edge, you can install the newest code directly from git:
 
   `gem 'rails-bigint-pk', github: 'caboteria/rails-bigint-pk'`
 

data/lib/bigint_pk.rb

@@ -39,8 +39,7 @@ module BigintPk
     end
 
     if ca.const_defined? :AbstractMysqlAdapter
-      ca::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES[:primary_key] = 
-        'bigint(20) DEFAULT NULL auto_increment PRIMARY KEY'
+      ca::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES[:primary_key].gsub! /int\(11\)/, 'bigint(20)'
     end
   end
 
@@ -83,7 +82,7 @@ module BigintPk
       c.execute %Q{
         ALTER TABLE #{c.quote_table_name table_name}
         MODIFY COLUMN #{c.quote_column_name key_name}
-        bigint(20) DEFAULT NULL #{'auto_increment' if is_primary_key}
+        bigint(20) #{is_primary_key ? 'auto_increment' : 'DEFAULT NULL'}
       }.gsub(/\s+/, ' ').strip
     when 'SQLite'
       # noop; sqlite always has 64bit pkeys

data/lib/bigint_pk/version.rb

@@ -1,3 +1,3 @@
 module BigintPk
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/rails-bigint-pk.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "activerecord", '~> 4.0.0'
-  s.add_runtime_dependency "railties", '~> 4.0.0'
+  s.add_runtime_dependency "activerecord", '>= 4.0', '< 4.2'
+  s.add_runtime_dependency "railties", '>= 4.0', '< 4.2'
 
   s.add_development_dependency "rspec", '~> 2.14'
   s.add_development_dependency "travis-lint", '~> 1.7'
-  s.add_development_dependency "rails", '~> 4.0'
+  s.add_development_dependency "rails", '~> 4.1'
   s.add_development_dependency "mysql2", '~> 0.3'
   s.add_development_dependency "mysql", '~> 2.8'
   s.add_development_dependency "pg", '~> 0.11'

data/spec/fixtures/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.0.4'
+gem 'rails', '4.1.1'
 
 gem 'pg', '~> 0.11'
 gem 'mysql', '~> 2.8.1'

data/spec/migration_spec.rb

@@ -31,6 +31,7 @@ describe 'ChangeKeysToBigint' do
 
     stub_const('Rails', double('Rails'))
     Rails.stub_chain 'application.eager_load!'
+    Rails.stub(env: double('test', to_s: 'test', :'test?' => true, :'production?' => false, :'development?' => false))
 
     ActiveRecord::Base.stub( subclasses: [ Team, Player, Coach ], connection: connection)
     ActiveRecord::Base.stub_chain('connection_pool.with_connection') do |&prok|
@@ -71,9 +72,9 @@ describe 'ChangeKeysToBigint' do
     it 'migrates primary keys' do
       ChangeKeysToBigint.migrate :up
       expect( queries ).to include(
-        'ALTER TABLE `teams` MODIFY COLUMN `id` bigint(20) DEFAULT NULL auto_increment',
-        'ALTER TABLE `players` MODIFY COLUMN `id` bigint(20) DEFAULT NULL auto_increment',
-        'ALTER TABLE `coaches` MODIFY COLUMN `id` bigint(20) DEFAULT NULL auto_increment'
+        'ALTER TABLE `teams` MODIFY COLUMN `id` bigint(20) auto_increment',
+        'ALTER TABLE `players` MODIFY COLUMN `id` bigint(20) auto_increment',
+        'ALTER TABLE `coaches` MODIFY COLUMN `id` bigint(20) auto_increment'
       )
     end
 

data/spec/monkey_patch/connection_adapters_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 require 'active_record/connection_adapters/postgresql_adapter'
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
+MYSQL_DEFAULT_PK = ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES[:primary_key]
+PG_DEFAULT_PK = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:primary_key]
+
 describe BigintPk do
   describe '::setup' do
     def reset_connection_adapters!
@@ -41,7 +44,7 @@ describe BigintPk do
         expect(
           ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::
             NATIVE_DATABASE_TYPES[:primary_key]
-        ).to eq 'bigint(20) DEFAULT NULL auto_increment PRIMARY KEY'
+        ).to match /bigint\(20\) (DEFAULT NULL )?auto_increment PRIMARY KEY/
       end
 
       def self.it_makes_references_default_to_64bit
@@ -144,14 +147,14 @@ describe BigintPk do
         expect(
           ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::
             NATIVE_DATABASE_TYPES[:primary_key]
-        ).to eq 'serial primary key'
+        ).to eq PG_DEFAULT_PK
       end
 
       it 'does not alter the default primary key for either mysql adapters' do
         expect(
           ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::
             NATIVE_DATABASE_TYPES[:primary_key]
-        ).to eq 'int(11) DEFAULT NULL auto_increment PRIMARY KEY'
+        ).to eq MYSQL_DEFAULT_PK
       end
     end
   end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rails-bigint-pk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - David J. Hamilton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -297,3 +309,4 @@ test_files:
 - spec/support/logging.rb
 - spec/support/rails.rb
 - spec/support/rspec.rb
+has_rdoc: