active_record_inline_schema 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.6 / 2012-06-22
+
+* Enhancements
+
+  * Support non-autoincrementing integer primary keys in MySQL
+
 0.5.5 / 2012-06-20
 
 * Enhancements

data/Gemfile

@@ -7,11 +7,11 @@ gem 'minitest'
 gem 'minitest-reporters'
 
 platforms :ruby do
-  # if RUBY_VERSION >= '1.9'
-  #   gem 'debugger'
-  # else
-  #   gem 'ruby-debug19'
-  # end
+  if RUBY_VERSION >= '1.9'
+    gem 'debugger'
+  else
+    gem 'ruby-debug19'
+  end
   # gem 'mysql2', '~>0.2'
   gem 'mysql2', '>=0.3'
   gem 'sqlite3'

data/lib/active_record_inline_schema/config.rb

@@ -61,9 +61,8 @@ class ActiveRecordInlineSchema::Config
         end
       elsif mysql?
         if non_standard_primary_key
-          # only string keys are supported
-          create_sql.sub! %r{#{connection.quote_column_name(model.primary_key)} varchar\(255\)([^,\)]*)}, "#{connection.quote_column_name(model.primary_key)} varchar(255)\\1 PRIMARY KEY"
-          create_sql.sub! 'DEFAULT NULLPRIMARY KEY', 'PRIMARY KEY'
+          k = connection.quote_column_name(model.primary_key)
+          create_sql.sub! /#{k} *([^\)]+)(?:[^,]+),/, "#{k} \\1) PRIMARY KEY,"
         end
         connection.execute create_sql
       end

data/lib/active_record_inline_schema/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordInlineSchema
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/spec/models.rb

@@ -80,6 +80,13 @@ class AutomobileMakeModelYearVariant < ActiveRecord::Base
   add_index :make_model_year_name
 end
 
+class Pet2 < ActiveRecord::Base
+  include SpecHelper
+  self.primary_key = "id"
+  col :id, :type => :integer
+  col :name
+end
+
 case ENV['DB_ADAPTER']
 when 'mysql'
   class CustomMysql < ActiveRecord::Base

data/spec/shared_examples.rb

@@ -5,6 +5,22 @@ describe ActiveRecordInlineSchema do
     end
   end
 
+  it "properly registers non-incrementing integer primary keys" do
+    Pet2.auto_upgrade!
+    e = if sqlite?
+      ActiveRecord::StatementInvalid
+    else
+      ActiveRecord::RecordNotUnique
+    end
+    lambda do
+      2.times do
+        p = Pet2.new
+        p.id = 1
+        p.save!
+      end
+    end.must_raise(e)
+  end
+
   it 'has #key,col,property,attribute inside model' do
     (!!ActiveRecord::Base.connection.table_exists?(Post.table_name)).must_equal false
     (!!ActiveRecord::Base.connection.table_exists?(Category.table_name)).must_equal false

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'active_record_inline_schema'
 
 require 'logger'
 ActiveRecord::Base.logger = Logger.new($stderr)
-ActiveRecord::Base.logger.level = Logger::DEBUG
+ActiveRecord::Base.logger.level = Logger::INFO
 
 module SpecHelper
   def self.included(base)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_inline_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport