schema_plus 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2c43411e4ae250a4e15339b46e0e176194ec62
-  data.tar.gz: ec456a93a6e83999e083f7f2f0c4525d429516dc
+  metadata.gz: dceee81f9c7bd38bbbc3f07765b6cc0318d13efe
+  data.tar.gz: dbccc00e2a96548bd1a1aee0650dea2f07cbb791
 SHA512:
-  metadata.gz: 3f1a7064f366f8bd02bb1399b913928f0f4644ad48a89412d87a0847deb7d76eed6690e6c20f88d31c53651a21bfe101331a136b66994ab0c6e5fb2a26166cf5
-  data.tar.gz: 96f64a7d81ade052b0ca70fc1c3cda652c9de42cebb20fef3b80094807c5c543c30b95b98b0aa5dc8d3481958fbd274476a8a71df91d86db6e95c72df8eb804b
+  metadata.gz: 952c02e9cafdc50a2ae72221ec1f8a2011b9bc96541a85f02265100c9cfca51a3fc83dbde3d4a6bc11683aa440ff8ed7d8cc6b70829effca31d9cb4425d24b07
+  data.tar.gz: 01cd8a88036ce14e328b6754a51eb4b44f6ae2384e05b11ea01843033301cb0e2fab2cf32a1013e27b55e7a38bc2043f40c5fb519712acc534d9eb6a8351a446

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Change Log
 
+## 1.8.7
+
+* Bug fix: Postgres schema dump failed when using case_sensitive => false and operator_class together (#204).  Thanks to [@mikeauclair](https://github.com/mikeauclair)
+
+* Bug fix: With complex cyclic foreign key dependencies, schema dump would issue constraint before table definition (#203).  Thanks to [@konjoot](https://github.com/konjoot)
+
+
 ## 1.8.6
 
 * Bug fix: Don't drop column `array: true` for ActiveRecord 4.2. (#199)
@@ -119,7 +126,7 @@
 *   Add support for :deferrable => :initially_deferred (thanks to
     [@bhavinkamani](https://github.com/bhavinkamani))
 *   Works with PostGIS (thanks to [@pete](https://github.com/pete))
-*   Bug fix: Circular Reference/Stack Level Too Deep in Column#to_json. 
+*   Bug fix: Circular Reference/Stack Level Too Deep in Column#to_json.
     Thanks to [@robdimarco](https://github.com/robdimarco) for tracking down the problem
 *   Bug fix: More robust handling of foreign keys with schema namespaces
 
@@ -170,7 +177,7 @@
     by [@betelgeuse](https://github.com/betelgeuse)
 *   0.3.4 - Bug fix: regression causing :default => false to be ignored
 *   0.3.3 - Bug fix: properly handle boolean defaults in mysql
-*   0.3.2 - Bug fix: make sure rake db:schema:load initializes schema_plus 
+*   0.3.2 - Bug fix: make sure rake db:schema:load initializes schema_plus
 *   0.3.1 - Bug fix for PostgreSQL schema dump after change_column_default(...
     nil)
 *   0.3.0 - Add :default => expressions (Thanks to Luke Saunders).  support

data/MIT-LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2006 RedHill Consulting, Pty. Ltd.
-Copyright (c) 2009 Michal Lomnicki & Ronen Barzel 
+Copyright (c) 2009 Michal Lomnicki & Ronen Barzel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -258,7 +258,7 @@ resolves to:
     NOW()                 # PostgreSQL
     (DATETIME('now'))     # SQLite3
     invalid               # MySQL
-    
+
 If you are using Postgresql with a `json` column, the default value may be an unadorned hash.  A hash having just one key `:expr` or `:value` will be taken as schema_plus syntax; i.e, these two are equivalent:
 
 	t.json :fields, default: { field1: 'a', field2: 'b' }

data/gemfiles/Gemfile.base

@@ -4,5 +4,3 @@ gemspec :path => File.expand_path('..', __FILE__)
 platform :ruby do
     gem "byebug" if RUBY_VERSION > "2"
 end
-
-File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

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

@@ -65,7 +65,7 @@ module SchemaPlus
 
         ACTIONS = { :cascade => "CASCADE", :restrict => "RESTRICT", :set_null => "SET NULL", :set_default => "SET DEFAULT", :no_action => "NO ACTION" }.freeze
 
-        def initialize(from_table, to_table, options) 
+        def initialize(from_table, to_table, options)
           super
           @from_table = unquote(from_table)
           @to_table = unquote(to_table)

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

@@ -1,7 +1,7 @@
 module SchemaPlus
   module ActiveRecord
     module ConnectionAdapters
-      # 
+      #
       # SchemaPlus extends the IndexDefinition object to return information
       # about partial indexes and case sensitivity (i.e. Postgresql
       # support).
@@ -9,7 +9,7 @@ module SchemaPlus
         def self.included(base)  #:nodoc:
           base.alias_method_chain :initialize, :schema_plus
         end
-        
+
         attr_accessor :conditions
         attr_reader :expression
         attr_reader :kind

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

@@ -7,7 +7,7 @@ module SchemaPlus
       module MysqlAdapter
 
         #:enddoc:
-        
+
         def self.included(base)
           base.class_eval do
             alias_method_chain :tables, :schema_plus

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

@@ -218,8 +218,8 @@ module SchemaPlus
               opclass_name[oid.to_s] = opcname
             end
             operator_classes = {}
-            index_keys.zip(opclasses).each do |index_key, opclass|
-              operator_classes[columns[index_key]] = opclass_name[opclass]
+            column_names.zip(opclasses).each do |column_name, opclass|
+              operator_classes[column_name] = opclass_name[opclass]
             end
             operator_classes.delete_if{|k,v| v.nil?}
 

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

@@ -63,7 +63,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       raise unless e.message.match(/["']([^"']+)["'].*already exists/)
       name = $1
       existing = connection.indexes(table).find{|i| i.name == name}
-      attempted = ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table, columns, options.merge(:name => name)) 
+      attempted = ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table, columns, options.merge(:name => name))
       raise if attempted != existing
       ::ActiveRecord::Base.logger.warn "[schema_plus] Index name #{name.inspect}' on table #{table.inspect} already exists. Skipping."
     end

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

@@ -21,7 +21,7 @@ module SchemaPlus
       end
 
       # SchemaPlus includes an Sqlite3 implementation of the AbstractAdapter
-      # extensions.  
+      # extensions.
       module Sqlite3Adapter
 
         # :enddoc:

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

@@ -34,7 +34,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
   # SchemaPlus also supports creation of foreign key constraints analogously, using Migration::ClassMethods#add_foreign_key or TableDefinition#foreign_key or as part of the column definition, for example:
   #
   #    create_table :posts do |t|  # not DRY
-  #       t.integer :author_id    
+  #       t.integer :author_id
   #    end
   #    add_foreign_key :posts, :author_id, :references => :authors
   #
@@ -144,7 +144,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       sql
     end
 
-    # Define an index for the current 
+    # Define an index for the current
     if ::ActiveRecord::VERSION::MAJOR.to_i < 4
       def index(column_name, options={})
         @indexes << ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(self.name, column_name, options)

data/lib/schema_plus/active_record/db_default.rb

@@ -2,7 +2,7 @@ require 'singleton'
 
 module SchemaPlus
   module ActiveRecord
-    class DbDefault 
+    class DbDefault
       include Singleton
       def to_s
         'DEFAULT'

data/lib/schema_plus/active_record/foreign_keys.rb

@@ -9,7 +9,7 @@ module SchemaPlus::ActiveRecord
     # The <tt>:index</tt> option takes a hash of parameters to pass to ActiveRecord::Migration.add_index.  Thus
     #
     #    add_column('books', 'isbn', :string, :index => {:name => "ISBN-index", :unique => true })
-    # 
+    #
     # is equivalent to:
     #
     #    add_column('books', 'isbn', :string)
@@ -19,7 +19,7 @@ module SchemaPlus::ActiveRecord
     # In order to support multi-column indexes, an special parameter <tt>:with</tt> may be specified, which takes another column name or an array of column names to include in the index.  Thus
     #
     #    add_column('contacts', 'phone_number', :string, :index => { :with => [:country_code, :area_code], :unique => true })
-    # 
+    #
     # is equivalent to:
     #
     #    add_column('contacts', 'phone_number', :string)
@@ -111,7 +111,7 @@ module SchemaPlus::ActiveRecord
     #    add_column('widgets', 'color', :integer, :references => 'colors', :index => true)
     #
     # If you want to pass options to the index, you can explcitly pass
-    # index options, such as <tt>:index => :unique</tt>. 
+    # index options, such as <tt>:index => :unique</tt>.
     #
     # If you don't want an index to be created, specify
     # <tt>:index => nil</tt>.

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

@@ -23,7 +23,7 @@ module SchemaPlus
         end
 
         # seems like this is fixing a rails bug:
-        #   change_table foo, :bulk => true { |t| t.references :bar } 
+        #   change_table foo, :bulk => true { |t| t.references :bar }
         # results in an 'unknown method :add_reference_sql' (with mysql2)
         #
         # should track it down separately and submit a patch/fix to rails
@@ -66,7 +66,7 @@ module SchemaPlus
         def add_foreign_key(*args)
           record(:add_foreign_key, args)
         end
-        
+
         def invert_add_foreign_key(args)
           table_name, column_names, references_table_name, references_column_names, options = args
           [:remove_foreign_key, [table_name, column_names, references_table_name, references_column_names, (options||{}).merge(if_exists: true)]]

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -39,7 +39,7 @@ module SchemaPlus
 
       def break_fk_cycles #:nodoc:
         strongly_connected_components.select{|component| component.size > 1}.each do |tables|
-          table = tables.sort.first
+          table = tables.sort.last
           backref_fks = @inline_fks[table].select{|fk| tables.include?(fk.references_table_name)}
           @inline_fks[table] -= backref_fks
           @dump_dependencies[table] -= backref_fks.collect(&:references_table_name)
@@ -149,7 +149,7 @@ module SchemaPlus
           dump << " :name => #{index.name.inspect}"
           dump << ", :unique => true" if index.unique
           dump << ", :kind => \"#{index.kind}\"" unless index.kind.blank?
-          unless index.columns.blank? 
+          unless index.columns.blank?
             dump << ", :case_sensitive => false" unless index.case_sensitive?
             dump << ", :conditions => #{index.conditions.inspect}" unless index.conditions.blank?
             index_lengths = index.lengths.compact if index.lengths.is_a?(Array)

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.8.6"
+  VERSION = "1.8.7"
 end

data/spec/column_default_spec.rb

@@ -135,7 +135,7 @@ describe "Column definition" do
     end
   end
 
-  private 
+  private
 
   def define_test_column(type, *args)
     ActiveRecord::Migration.suppress_messages do

data/spec/column_spec.rb

@@ -5,7 +5,7 @@ describe "Column" do
   before(:all) do
       class User < ::ActiveRecord::Base ; end
   end
-    
+
   let(:migration) { ::ActiveRecord::Migration }
 
   context "JSON serialization" do
@@ -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/index_definition_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Index definition" do
 
   let(:migration) { ::ActiveRecord::Migration }
-  
+
   before(:all) do
     define_schema(:auto_create => false) do
       create_table :users, :force => true do |t|

data/spec/schema/auto_schema.rb

@@ -8,7 +8,7 @@ ActiveRecord::Schema.define do
   create_table :members, :force => true do |t|
     t.string :login
   end
-  
+
   create_table :comments, :force => true do |t|
     t.string :content
     t.integer :user

data/spec/schema_dumper_spec.rb

@@ -160,7 +160,7 @@ describe "Schema dump" do
       expect(dump_posts).to match(to_regexp(%q{t.index ["user_id"], :name => "custom_name"}))
     end
   end
-  
+
   it "should define unique index" do
     with_index Post, :user_id, :name => "posts_user_id_index", :unique => true do
       expect(dump_posts).to match(to_regexp(%q{t.index ["user_id"], :name => "posts_user_id_index", :unique => true}))
@@ -229,6 +229,12 @@ describe "Schema dump" do
       end
     end
 
+    it 'should dump proper operator_class with case_sensitive => false' do
+      with_index Post, :body, :operator_class => 'text_pattern_ops', :case_sensitive => false do
+        expect(dump_posts).to match(to_regexp(%q{t.index ["body"], :name => "index_posts_on_body", :case_sensitive => false, :operator_class => {"body" => "text_pattern_ops"}}))
+      end
+    end
+
     it "should dump unique: true with expression (Issue #142)" do
       with_index Post, :name => "posts_user_body_index", :unique => true, :expression => "BTRIM(LOWER(body))" do
         expect(dump_posts).to match(%r{#{to_regexp(%q{t.index :name => "posts_user_body_index", :unique => true, :expression => "btrim(lower(body))"})}$})
@@ -278,6 +284,97 @@ describe "Schema dump" do
       expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["commenter_id"\], "users", \["id"\]}m)
       expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["user_id"\], "users", \["id"\]}m)
     end
+
+    context 'with complicated schemas' do
+      before(:all) do
+
+        SchemaPlus.setup do |config|
+          config.foreign_keys.auto_create = false
+        end
+        ActiveRecord::Migration.suppress_messages do
+          ActiveRecord::Schema.define do
+            connection.tables.each do |table| drop_table table, :cascade => true end
+
+            create_table :period_types, force: true do |t|
+              t.string  :name
+            end
+
+            create_table :grade_systems, force: true do |t|
+              t.string   :name
+              t.integer  :school_id
+              t.integer  :parent_id
+              t.integer  :profile_id
+            end
+
+            create_table :schools, force: true do |t|
+              t.string   :name
+              t.integer  :default_grade_system_id
+            end
+
+            create_table :academic_years, force: true do |t|
+              t.string  :name
+              t.integer :school_id
+              t.integer :period_type_id
+            end
+
+            create_table :buildings, force: true do |t|
+              t.string   :name
+              t.integer  :school_id
+            end
+
+            create_table :publishing_houses, force: true do |t|
+              t.string   :name
+            end
+
+            create_table :profiles, force: true do |t|
+              t.integer  :school_id
+              t.integer  :publishing_house_id
+              t.integer  :building_id
+            end
+
+            create_table :class_units, force: true do |t|
+              t.string   :name
+              t.integer  :school_id
+              t.integer  :mentor_id
+              t.integer  :building_id
+            end
+          end
+        end
+
+        class ::AcademicYear < ActiveRecord::Base ; end
+        class ::Building < ActiveRecord::Base ; end
+        class ::ClassUnit < ActiveRecord::Base ; end
+        class ::GradeSystem < ActiveRecord::Base ; end
+        class ::Profile < ActiveRecord::Base ; end
+        class ::PublishingHouse < ActiveRecord::Base ; end
+        class ::PeriodType < ActiveRecord::Base ; end
+        class ::School < ActiveRecord::Base ; end
+
+        ActiveRecord::Base.connection.add_foreign_key(School.table_name, :default_grade_system_id, GradeSystem.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, :school_id, School.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, :parent_id, GradeSystem.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, :profile_id, Profile.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, :building_id, Building.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, :school_id, School.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(ClassUnit.table_name, :school_id, School.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(ClassUnit.table_name, :building_id, Building.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(ClassUnit.table_name, :mentor_id, Profile.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(Building.table_name, :school_id, School.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(AcademicYear.table_name, :school_id, School.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(AcademicYear.table_name, :period_type_id, PeriodType.table_name, :id)
+        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, :publishing_house_id, PublishingHouse.table_name, :id)
+      end
+
+      it "should not raise an error" do
+        expect { dump_schema }.to_not raise_error
+      end
+
+      it "should dump each constraint after both related tables were defined" do
+        expect(dump_schema.scan(%r{add_foreign_key}m).count).to eq 1
+        expect(dump_schema).to match(%r{create_table "schools".*add_foreign_key\s+"schools".*\["default_grade_system_id"\], "grade_systems", \["id"\]}m)
+        expect(dump_schema).to match(%r{create_table "grade_systems".*add_foreign_key\s+"schools".*\["default_grade_system_id"\], "grade_systems", \["id"\]}m)
+      end
+    end
   end
 
   context 'with enum', :postgresql => :only do
@@ -372,7 +469,7 @@ describe "Schema dump" do
   end
 
   def determine_foreign_key_name(model, columns, options)
-    name = options[:name] 
+    name = options[:name]
     name ||= model.foreign_keys.detect { |fk| fk.table_name == model.table_name.to_s && fk.column_names == Array(columns).collect(&:to_s) }.name
   end
 

data/spec/support/matchers/reference.rb

@@ -5,7 +5,7 @@ module SchemaPlusMatchers
       @column_names = @on_update = @on_delete = @deferrable = @name = @references_table_name = @references_column_names = nil
       unless expected.empty?
         @references_column_names = Array(expected).collect(&:to_s)
-        @references_table_name = @references_column_names.shift 
+        @references_table_name = @references_column_names.shift
       end
     end
 
@@ -13,8 +13,8 @@ module SchemaPlusMatchers
       @model = model
       if @references_table_name
         @result = @model.foreign_keys.select do |fk|
-          fk.references_table_name == @references_table_name && 
-            @references_column_names.empty? ? true : fk.references_column_names == @references_column_names 
+          fk.references_table_name == @references_table_name &&
+            @references_column_names.empty? ? true : fk.references_column_names == @references_column_names
         end
       else
         @result = @model.foreign_keys
@@ -28,7 +28,7 @@ module SchemaPlusMatchers
     end
 
     def failure_message(should_not = false)
-      target_column_names = @column_names.present? ? "(#{@column_names.join(', ')})" : "" 
+      target_column_names = @column_names.present? ? "(#{@column_names.join(', ')})" : ""
       destinantion_column_names = @references_table_name ? "#{@references_table_name}(#{@references_column_names.join(', ')})" : "anything"
       invert = should_not ? 'not' : ''
       msg = "Expected #{@model.table_name}#{target_column_names} to #{invert} reference #{destinantion_column_names}"
@@ -44,7 +44,7 @@ module SchemaPlusMatchers
     def failure_message_when_negated
       failure_message(true)
     end
-  
+
     def on(*column_names)
       @column_names = column_names.collect(&:to_s)
       self

data/spec/views_spec.rb

@@ -49,7 +49,7 @@ describe ActiveRecord do
     end
 
     it "should be included in schema dump in dependency order" do
-      expect(dump).to match(%r{create_table "items".*create_view "a_ones".*create_view "ab_ones"}m) 
+      expect(dump).to match(%r{create_table "items".*create_view "a_ones".*create_view "ab_ones"}m)
     end
 
     it "should not be included in schema if listed in ignore_tables" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord