active_record_inline_schema 0.5.9 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,14 @@
+0.6.0 / 2012-11-29
+
+* Breaking changes
+
+  * auto_upgrade!'s first argument is now a generic options hash - if you want to pass create table options, use options[:create_table]
+
+* Enhancements
+
+  * Add "gentle" mode where unrecognized columns and indexes are not dropped. Just pass :gentle => true to auto_upgrade!
+  * Better detect when a user specifies a non-standard primary key but doesn't actually specify any columns.
+
 0.5.9 / 2012-07-26
 
 * Bug fixes

data/lib/active_record_inline_schema/active_record_class_methods.rb

@@ -21,7 +21,7 @@ module ActiveRecordInlineSchema::ActiveRecordClassMethods
     inline_schema_config.add_ideal_index column_name, options
   end
 
-  def auto_upgrade!(create_table_options = nil)
-    inline_schema_config.apply create_table_options
+  def auto_upgrade!(options = {})
+    inline_schema_config.apply options
   end
 end

data/lib/active_record_inline_schema/config.rb

@@ -1,10 +1,6 @@
 require 'set'
 
 class ActiveRecordInlineSchema::Config
-  DEFAULT_CREATE_TABLE_OPTIONS = {
-    :mysql => 'ENGINE=InnoDB'
-  }
-
   attr_reader :model
   attr_reader :ideal_columns
   attr_reader :ideal_indexes
@@ -23,13 +19,15 @@ class ActiveRecordInlineSchema::Config
     ideal_indexes.add Index.new(self, column_name, options)
   end
 
-  def apply(create_table_options)
+  def apply(options)
     non_standard_primary_key = if (primary_key_column = find_ideal_column(model.primary_key))
       primary_key_column.type != :primary_key
+    elsif model.primary_key != 'id'
+      true
     end
-
+    
     if non_standard_primary_key
-      if postgresql? or sqlite?
+      if primary_key_column and (postgresql? or sqlite?)
         primary_key_column.options[:null] = false
       end
     else
@@ -43,10 +41,8 @@ class ActiveRecordInlineSchema::Config
 
     # Table doesn't exist, create it
     unless connection.table_exists? model.table_name
-      create_table_options ||= DEFAULT_CREATE_TABLE_OPTIONS[database_type]
-
       statements = []
-      statements << "CREATE TABLE #{model.quoted_table_name} (#{table_definition.to_sql}) #{create_table_options}"
+      statements << "CREATE TABLE #{model.quoted_table_name} (#{table_definition.to_sql}) #{options[:create_table]}"
 
       if non_standard_primary_key
         if postgresql?
@@ -69,10 +65,12 @@ class ActiveRecordInlineSchema::Config
     end
 
     # Remove fields from db no longer in schema
-    existing_column_names.reject do |existing_column_name|
-      find_ideal_column existing_column_name
-    end.each do |existing_column_name|
-      connection.remove_column model.table_name, existing_column_name
+    unless options[:gentle]
+      existing_column_names.reject do |existing_column_name|
+        find_ideal_column existing_column_name
+      end.each do |existing_column_name|
+        connection.remove_column model.table_name, existing_column_name
+      end
     end
 
     # Add fields to db new to schema
@@ -83,9 +81,11 @@ class ActiveRecordInlineSchema::Config
     end
 
     # Change attributes of existent columns
-    existing_columns_hash.each do |existing_column_name, existing_column|
-      next if existing_column_name.to_s == model.primary_key.to_s
-      ideal_column = find_ideal_column existing_column_name
+    existing_columns_hash.reject do |existing_column_name, existing_column|
+      existing_column_name.to_s == model.primary_key.to_s
+    end.each do |existing_column_name, existing_column|
+      next unless (ideal_column = find_ideal_column(existing_column_name))
+
       option_changes = {}
 
       # First, check if the field type changed
@@ -106,10 +106,12 @@ class ActiveRecordInlineSchema::Config
     end
 
     # Remove old index
-    existing_index_names.reject do |existing_index_name|
-      find_ideal_index existing_index_name
-    end.each do |existing_index_name|
-      connection.remove_index model.table_name, :name => existing_index_name
+    unless options[:gentle]
+      existing_index_names.reject do |existing_index_name|
+        find_ideal_index existing_index_name
+      end.each do |existing_index_name|
+        connection.remove_index model.table_name, :name => existing_index_name
+      end
     end
 
     # Add indexes

data/lib/active_record_inline_schema/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordInlineSchema
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

data/spec/shared_examples.rb

@@ -47,6 +47,43 @@ describe ActiveRecordInlineSchema do
     Pet6.columns_hash['yesno'].type.must_equal :boolean
   end
 
+  it "deletes unrecognized columns by default" do
+    Pet6.auto_upgrade!
+    ActiveRecord::Base.connection.add_column Pet6.table_name, 'foo', :string
+    Pet6.safe_reset_column_information
+    Pet6.column_names.must_include 'foo'
+    Pet6.auto_upgrade!
+    Pet6.column_names.wont_include 'foo'
+  end
+
+  it "deletes unrecognized columns by default" do
+    Pet6.auto_upgrade!
+    ActiveRecord::Base.connection.add_index Pet6.table_name, 'yesno', :name => 'testtest'
+    Pet6.safe_reset_column_information
+    Pet6.db_indexes.must_include 'testtest'
+    Pet6.auto_upgrade!
+    Pet6.db_indexes.wont_include 'testtest'
+  end
+
+  it "doesn't delete unrecognized columns in gentle mode" do
+    Pet6.auto_upgrade!
+    ActiveRecord::Base.connection.add_column Pet6.table_name, 'foo', :string
+    Pet6.safe_reset_column_information
+    Pet6.column_names.must_include 'foo'
+    Pet6.auto_upgrade! :gentle => true
+    Pet6.column_names.must_include 'foo'
+    Pet6.columns_hash['foo'].type.must_equal :string
+  end
+
+  it "doesn't delete unrecognized columns in gentle mode" do
+    Pet6.auto_upgrade!
+    ActiveRecord::Base.connection.add_index Pet6.table_name, 'yesno', :name => 'testtest'
+    Pet6.safe_reset_column_information
+    Pet6.db_indexes.must_include 'testtest'
+    Pet6.auto_upgrade! :gentle => true
+    Pet6.db_indexes.must_include 'testtest'
+  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

@@ -10,8 +10,6 @@ end
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'minitest/reporters'
-MiniTest::Unit.runner = MiniTest::SuiteRunner.new
-MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
 
 require 'active_record_inline_schema'
 

data/spec/sqlite3_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper.rb', __FILE__)
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:', :pool => 32)
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 # require 'logger'
 # ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new($stdout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_inline_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport