active_record_inline_schema 0.5.6 → 0.5.7

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.7 / 2012-06-22
+
+* Bug fix
+
+  * In MySQL, properly create non-standard primary keys for one-column tables.
+
 0.5.6 / 2012-06-22
 
 * 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

@@ -62,7 +62,7 @@ class ActiveRecordInlineSchema::Config
       elsif mysql?
         if non_standard_primary_key
           k = connection.quote_column_name(model.primary_key)
-          create_sql.sub! /#{k} *([^\)]+)(?:[^,]+),/, "#{k} \\1) 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.6"
+  VERSION = "0.5.7"
 end

data/spec/models.rb

@@ -87,6 +87,22 @@ class Pet2 < ActiveRecord::Base
   col :name
 end
 
+class Pet3 < ActiveRecord::Base
+  include SpecHelper
+end
+
+class Pet4 < ActiveRecord::Base
+  include SpecHelper
+  self.primary_key = "name"
+  col :name
+end
+
+class Pet5 < ActiveRecord::Base
+  include SpecHelper
+  self.primary_key = "id"
+  col :id, :type => :integer
+end
+
 case ENV['DB_ADAPTER']
 when 'mysql'
   class CustomMysql < ActiveRecord::Base

data/spec/shared_examples.rb

@@ -5,20 +5,41 @@ 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!
+  describe :regressions do
+    def assert_unique(model, column_name, v)
+      e = if sqlite?
+        ActiveRecord::StatementInvalid
+      else
+        ActiveRecord::RecordNotUnique
       end
-    end.must_raise(e)
+      lambda do
+        2.times do
+          p = model.new
+          p.send "#{column_name}=", v
+          p.save!
+        end
+      end.must_raise(e)
+    end
+
+    it "properly creates tables with only one column, an auto-increment primary key" do
+      Pet3.auto_upgrade!
+      assert_unique Pet3, :id, 1
+    end
+
+    it "properly creates with only one column, a string primary key" do
+      Pet4.auto_upgrade!
+      assert_unique Pet4, :name, 'Jerry'
+    end
+
+    it "properly creates with only one column, a non-auto-increment integer primary key" do
+      Pet5.auto_upgrade!
+      assert_unique Pet5, :id, 1
+    end
+
+    it "properly registers non-incrementing integer primary keys" do
+      Pet2.auto_upgrade!
+      assert_unique Pet2, :id, 1
+    end
   end
 
   it 'has #key,col,property,attribute inside model' do

data/spec/spec_helper.rb

@@ -15,9 +15,9 @@ MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
 
 require 'active_record_inline_schema'
 
-require 'logger'
-ActiveRecord::Base.logger = Logger.new($stderr)
-ActiveRecord::Base.logger.level = Logger::INFO
+# require 'logger'
+# ActiveRecord::Base.logger = Logger.new($stderr)
+# ActiveRecord::Base.logger.level = Logger::DEBUG
 
 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.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport