schema_plus 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f00387f0bf66660aab6b1f709a62fce866066d56
-  data.tar.gz: 5ade39b8c3bc992972ee8abbebfd875a5184da5a
+  metadata.gz: c0fa513513788b541ef9a1f0f9bc50ca6f3360e5
+  data.tar.gz: 26caef3cbcf5b870bd4484e903d57d33ff999b15
 SHA512:
-  metadata.gz: 4108531c8c1eba2925ceca04f2e40d859f53cbd9c8f32a45630cd4f29435cc593378ea18bbb188cf5bc7f1344ebe840802987b5909bbea63f7ac877bf889b765
-  data.tar.gz: 70f615c970117764694a12739e2fa461a88775fff9e9d969106558cb4c71e994e6a8dd6be8386a31b42d7e4ebf7b277b3bb3b42487d2c79fb3027506cb825032
+  metadata.gz: cd84595cfdb830f928a4f06bb6dc13960ca144121b5f4dd88d29415a540807f36e0b7d5abe1f5f34d34e2421b482755ec42a0111a4a5ed67f072836fb6f4f881
+  data.tar.gz: 1d7350d3629ae83ace5180dd907c6dbf76fe6b33ffc31d3196888530bfe3fb5e89a4cb1545df110ab67457a552c58ccd1365f579dc1fe8865fcda96ff80480cb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Change Log
 
+## 1.8.2
+
+* Bug fix when using t.references in change_table (#194).  Thanks to [@boone](https://github.com/boone)
+
 ## 1.8.1
 
 * Bug fix for AR 4.2, spurious add_foreign_key statements at the top of schema dump.  Thanks to [@tovodeverett](https://github.com/tovodeverett) for doing better testing than me!

data/README.md

@@ -1,5 +1,11 @@
+> ## This is the README for schema_plus 1.8.x
+> which supports Rails 3.2, 4.0, 4.1, and 4.2.  Ongoing development towards schema_plus 2.0 takes place in the [master branch](https://github.com/SchemaPlus/schema_plus/tree/master), supporting only Rails >= 4.2
+
+---
+
 # SchemaPlus
 
+
 SchemaPlus is an ActiveRecord extension that provides enhanced capabilities
 for schema definition and querying, including: enhanced and more DRY index
 capabilities, support and automation for foreign key constraints, and support

data/lib/schema_plus/active_record/column_options_handler.rb

@@ -2,17 +2,19 @@ module SchemaPlus::ActiveRecord
   module ColumnOptionsHandler
     def schema_plus_normalize_column_options(options)
       # replace some shortcuts with full versions
-      case options[:index]
-      when true then options[:index] = {}
-      when :unique then options[:index] = { :unique => true }
-      when Hash
-        if options[:index][:length].is_a? Hash
-          normalize = if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r >= "4.2".to_r
-                        :stringify_keys!
-                      else
-                        :symbolize_keys!
-                      end
-          options[:index][:length].send normalize
+      [:index, :_index].each do |key|
+        case options[key]
+        when true then options[key] = {}
+        when :unique then options[key] = { :unique => true }
+        when Hash
+          if options[key][:length].is_a? Hash
+            normalize = if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r >= "4.2".to_r
+                          :stringify_keys!
+                        else
+                          :symbolize_keys!
+                        end
+            options[key][:length].send normalize
+          end
         end
       end
     end

data/lib/schema_plus/active_record/connection_adapters/schema_statements.rb

@@ -54,8 +54,8 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     end
 
     def add_index_options_with_schema_plus(table_name, column_name, options = {})
-      columns = options.delete(:with) { |_| [] }
-      add_index_options_without_schema_plus(table_name, Array(column_name).concat(Array(columns).map(&:to_s)), options)
+      with_columns = options.delete(:with) { |_| [] }
+      add_index_options_without_schema_plus(table_name, Array(column_name).concat(Array(with_columns).map(&:to_s)), options)
     end
 
     def self.add_index_exception_handler(connection, table, columns, options, e) #:nodoc:

data/lib/schema_plus/active_record/migration/command_recorder.rb

@@ -40,7 +40,7 @@ module SchemaPlus
             index_options = options.delete(:index)
             add_column(table_name, "#{ref_name}_id", :integer, options)
             add_column(table_name, "#{ref_name}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
-            add_index(table_name, polymorphic ? %w[id type].map{ |t| "#{ref_name}_#{t}" } : "#{ref_name}_id", index_options.is_a?(Hash) ? index_options : nil) if index_options
+            add_index(table_name, polymorphic ? %w[id type].map{ |t| "#{ref_name}_#{t}" } : "#{ref_name}_id", index_options.is_a?(Hash) ? index_options : {}) if index_options
           end
 
           self

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
 end

data/spec/column_spec.rb

@@ -32,7 +32,7 @@ describe "Column" do
 
     context "if not unique" do
 
-      before (:each) do 
+      before(:each) do 
         create_table(User, :login => { :index => true})
         @login = User.columns.find{|column| column.name == "login"}
       end
@@ -48,7 +48,7 @@ describe "Column" do
     end
 
     context "if unique single column" do
-      before (:each) do 
+      before(:each) do 
         create_table(User, :login => { :index => :unique})
         @login = User.columns.find{|column| column.name == "login"}
       end
@@ -64,7 +64,7 @@ describe "Column" do
 
     context "if unique multicolumn" do
 
-      before (:each) do 
+      before(:each) do 
         create_table(User, :first => {}, :middle => {}, :last => { :index => {:with => [:first, :middle], :unique => true}})
         @first = User.columns.find{|column| column.name == "first"}
         @middle = User.columns.find{|column| column.name == "middle"}

data/spec/migration_spec.rb

@@ -482,6 +482,16 @@ describe ActiveRecord::Migration do
         expect(@model).to reference(:users, :id).on(:user_id)
       end
 
+      it "should accept index shorthand when using :references"+suffix, :sqlite3 => :skip do
+        with_fk_config(:auto_index => false) do
+          change_table(@model, :bulk => bulk) do |t|
+            t.references :user, :index => true
+          end
+        end
+        expect(@model).to have_index.on(:user_id)
+      end
+
+
       it "should create a foreign key constraint using :belongs_to"+suffix, :sqlite3 => :skip do
         change_table(@model, :bulk => bulk) do |t|
           t.belongs_to :user

data/spec/named_schemas_spec.rb

@@ -188,7 +188,7 @@ describe "with multiple schemas" do
       end
     end
 
-    around (:each) do |example|
+    around(:each) do |example|
       begin
         connection.execute "SET search_path to '$user','public','postgis'"
         example.run

data/spec/schema_dumper_spec.rb

@@ -259,7 +259,7 @@ describe "Schema dump" do
   end
 
   context "with cyclic foreign key constraints", :sqlite3 => :skip do
-    before (:all) do
+    before(:all) do
       ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :commenter_id, User.table_name, :id)
       ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :post_id, Post.table_name, :id)
       ActiveRecord::Base.connection.add_foreign_key(Post.table_name, :first_comment_id, Comment.table_name, :id)

data/spec/views_spec.rb

@@ -19,7 +19,7 @@ describe ActiveRecord do
 
   context "views" do
 
-    around (:each) do |example|
+    around(:each) do |example|
       define_schema_and_data
       example.run
       drop_definitions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord