schema_plus 1.1.2 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 57e14aaa2266c620a64f9807c8eda09e72d7f87a
+  data.tar.gz: a2a284774dd0bd02b0ff0c21421a79278e93813b
+SHA512:
+  metadata.gz: 51859b083b8f9e245733efad553563b7dd53d569705f70b8fe371c95987b90775b6efde32f033dea70232d629345c6128e5aaf1d5f7b8b1494036286f3c12f4e
+  data.tar.gz: 9818a2241a8d90f4c5898af00ddb37a34c33011518b70c771533fec90ef63d9d8042ce9ab8850bfd59db45658813f1d118ac4f529396c40336c3be90ead10813

data/.rspec

@@ -1,3 +1,2 @@
 --colour
---format documentation
 --tty

data/.travis.yml

@@ -1,11 +1,17 @@
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 gemfile:
   - gemfiles/rails-3.2/Gemfile.postgresql
   - gemfiles/rails-3.2/Gemfile.sqlite3
   - gemfiles/rails-3.2/Gemfile.mysql
   - gemfiles/rails-3.2/Gemfile.mysql2
+  - gemfiles/rails-4.0/Gemfile.postgresql
+  - gemfiles/rails-4.0/Gemfile.sqlite3
+  - gemfiles/rails-4.0/Gemfile.mysql2
+  - gemfiles/rails-edge/Gemfile.postgresql
+  - gemfiles/rails-edge/Gemfile.sqlite3
+  - gemfiles/rails-edge/Gemfile.mysql2
 before_script:
   - rake create_databases
 after_script:
@@ -15,3 +21,8 @@ notifications:
   recipients:
     - michal.lomnicki@gmail.com
     - ronen@barzel.org
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/rails-edge/Gemfile.postgresql
+    - gemfile: gemfiles/rails-edge/Gemfile.sqlite3
+    - gemfile: gemfiles/rails-edge/Gemfile.mysql2

data/README.md

@@ -9,19 +9,23 @@ For added rails DRYness see also the gems
 [schema_associations](http://rubygems.org/gems/schema_associations) and
 [schema_validations](http://rubygems.org/gems/schema_validations)
 
-[<img src="https://secure.travis-ci.org/lomba/schema_plus.png"/>](http://travis-ci.org/lomba/schema_plus)[<img src="https://gemnasium.com/lomba/schema_plus.png" alt="Dependency Status" />](https://gemnasium.com/lomba/schema_plus)
+[![Gem Version](https://badge.fury.io/rb/schema_plus.png)](http://badge.fury.io/rb/schema_plus)
+[![Build Status](https://secure.travis-ci.org/lomba/schema_plus.png)](http://travis-ci.org/lomba/schema_plus)
+[![Dependency Status](https://gemnasium.com/lomba/schema_plus.png)](https://gemnasium.com/lomba/schema_plus)
 
 ## Compatibility
 
 SchemaPlus supports all combinations of:
-*   rails 3.2 (up through 3.2.12)
-*   PostgreSQL, MySQL (using mysql or mysql2 gem), or SQLite3 (using sqlite3
-    3.7.7 which has foreign key support)
-*   MRI ruby 1.9.2 or 1.9.3
 
+*   Rails 3.2 or Rails 4
+*   PostgreSQL, MySQL (using mysql2 gem; mysql gem only supported with Rails
+    3.2), or SQLite3 (using sqlite3 >= 3.7.7 which has foreign key support)
+*   MRI Ruby 1.9.3 or 2.0.0
 
-Note: As of version 1.0.0, SchemaPlus no longer supports rails 2.3, 3.0 and
-3.1 and ruby 1.8.7.  The last version to support them was 0.4.1.
+
+Note: As of version 1.0.0, SchemaPlus no longer supports Rails 2.3, 3.0 and
+3.1, and also no longer supports MRI Ruby 1.8.7; the last version
+to support them was 0.4.1.  As of version 1.2.0, SchemaPlus no longer supports MRI Ruby 1.9.2
 
 ## Installation
 
@@ -40,8 +44,8 @@ Here some examples that show off the high points.  For full details see the
 
 ### Indexes
 
-With standard rails migrations, you specify indexes separately from the table
-definition:
+With standard Rails 3 migrations, you specify indexes separately from the
+table definition:
 
     # Standard Rails approach...
     create_table :parts do |t|
@@ -87,7 +91,7 @@ which is equivalent to
 
     t.string :product_code,   index: { unique: true }
 
-If you're using Postgresql, SchemaPlus provides support for conditions,
+If you're using PostgreSQL, SchemaPlus provides support for conditions,
 expressions, index methods, and case-insensitive indexes:
 
     t.string :last_name,  index: { conditions: 'deleted_at IS NULL' }
@@ -168,6 +172,15 @@ list of foreign key constraints defined for a given table, and
 that reference a given table.  See
 SchemaPlus::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.
 
+#### Foreign Key Issues
+
+Foreign keys can cause issues for Rails utilities that delete or load data
+because referential integrity imposes a sequencing requirement that those
+utilities may not take into consideration.  Monkey-patching may be required
+to address some of these issues.  The Wiki article [Making yaml_db work with
+foreign key constraints in PostgreSQL](https://github.com/lomba/schema_plus/wiki/Making-yaml_db-work-with-foreign-key-constraints-in-PostgreSQL)
+has some information that may be of assistance in resolving these issues.
+
 ### Tables
 
 SchemaPlus extends rails' `drop_table` method to accept these options:
@@ -277,6 +290,10 @@ of foreign key constraints, you can re-enable it:
 
 ## Release notes:
 
+### 1.2.0
+*   Now works with rails 4, due to efforts of [@tovodeverett](https://github.com/tovodeverett)
+*   Test against MRI ruby 2.0.0, no longer test against 1.9.2
+
 ### 1.1.2
 *   Now works with rails 3.2.13 (fixed railtie initialization)
 

data/gemfiles/rails-4.0/Gemfile.base

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec :path => File.expand_path('../../..', __FILE__)
+gem "rails", "~> 4.0.0"

data/gemfiles/rails-4.0/Gemfile.mysql2

@@ -0,0 +1,4 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+gem "mysql2"

data/gemfiles/rails-4.0/Gemfile.postgresql

@@ -0,0 +1,4 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+gem "pg"

data/gemfiles/rails-4.0/Gemfile.sqlite3

@@ -0,0 +1,4 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+gem "sqlite3"

data/gemfiles/rails-edge/Gemfile.base

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec :path => File.expand_path('../../..', __FILE__)
+gem "rails", ">= 4.0.0", :github => "rails/rails"

data/gemfiles/rails-edge/Gemfile.mysql2

@@ -0,0 +1,4 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+gem "mysql2"

data/gemfiles/rails-edge/Gemfile.postgresql

@@ -0,0 +1,4 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+gem "pg"

data/gemfiles/rails-edge/Gemfile.sqlite3

@@ -0,0 +1,4 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+gem "sqlite3"

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

@@ -31,7 +31,6 @@ module SchemaPlus
                       # for this.
           adapter_module = SchemaPlus::ActiveRecord::ConnectionAdapters.const_get(adapter)
           self.class.send(:include, adapter_module) unless self.class.include?(adapter_module)
-          self.post_initialize if self.respond_to? :post_initialize
           extend(SchemaPlus::ActiveRecord::ForeignKeys)
         end
 
@@ -171,6 +170,28 @@ module SchemaPlus
         # return a DATETIME object for the current time.
         def sql_for_function(function_name) raise "Internal Error: Connection adapter didn't override abstract function"; end
 
+
+        if ::ActiveRecord::VERSION::MAJOR.to_i >= 4
+          module SchemaCreation
+            def self.included(base) #:nodoc:
+              base.alias_method_chain :visit_TableDefinition, :schema_plus
+            end
+
+            def visit_TableDefinition_with_schema_plus(o) #:nodoc:
+              create_sql = visit_TableDefinition_without_schema_plus(o)
+              last_chunk = ") #{o.options}"
+
+              unless create_sql.end_with?(last_chunk)
+                raise "Internal Error: Can't find '#{last_chunk}' at end of '#{create_sql}' - Rails internals have changed!"
+              end
+
+              unless o.foreign_keys.empty?
+                create_sql[create_sql.size - last_chunk.size, 0] = ', ' + o.foreign_keys.map(&:to_sql) * ', '
+              end
+              create_sql
+            end
+          end
+        end
       end
     end
   end

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

@@ -15,6 +15,12 @@ module SchemaPlus
             alias_method_chain :rename_table, :schema_plus
             alias_method_chain :exec_stmt, :schema_plus rescue nil # only defined for mysql not mysql2
           end
+
+          if ::ActiveRecord::VERSION::MAJOR.to_i >= 4
+            base.class_eval do
+              include ::ActiveRecord::ConnectionAdapters::SchemaStatements::AddIndex
+            end
+          end
         end
 
         def tables_with_schema_plus(name=nil, *args)

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

@@ -49,7 +49,9 @@ module SchemaPlus
 
         def self.included(base) #:nodoc:
           base.class_eval do
-            remove_method :indexes
+            if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+              remove_method :indexes
+            end
             alias_method_chain :rename_table, :schema_plus
             alias_method_chain :exec_cache, :schema_plus
           end
@@ -95,7 +97,15 @@ module SchemaPlus
             option_strings = Hash[column_names.map {|name| [name, '']}]
             option_strings = add_index_sort_order(option_strings, column_names, options)
 
-            quoted_column_names = column_names.map { |e| (options[:case_sensitive] == false && e.to_s !~ /_id$/ ? "LOWER(#{quote_column_name(e)})" : quote_column_name(e)) + option_strings[e] }
+            if options[:case_sensitive] == false
+              caseable_columns = columns(table_name).select { |col| [:string, :text].include?(col.type) }.map(&:name)
+              quoted_column_names = column_names.map do |col_name|
+                (caseable_columns.include?(col_name.to_s) ? "LOWER(#{quote_column_name(col_name)})" : quote_column_name(col_name)) + option_strings[col_name]
+              end
+            else
+              quoted_column_names = column_names.map { |col_name| quote_column_name(col_name) + option_strings[col_name] }
+            end
+
             expression = "(#{quoted_column_names.join(', ')})"
             expression = "USING #{kind} #{expression}" if kind
 
@@ -150,8 +160,11 @@ module SchemaPlus
             # case-insensitive index
             if expression
               rexp_lower = %r{\blower\(\(?([^)]+)(\)::text)?\)}
-              if expression.match /^(#{rexp_lower}(, )?)+$/
-                column_names = expression.scan(rexp_lower).map(&:first)
+              if expression.match /\A#{rexp_lower}(?:, #{rexp_lower})*\z/
+                case_insensitive_columns = expression.scan(rexp_lower).map(&:first)
+                column_names = index_keys.map do |index_key|
+                  index_key == '0' ? case_insensitive_columns.shift : columns[index_key]
+                end
                 case_sensitive = false
               end
             end

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

@@ -4,7 +4,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def self.included(base) #:nodoc:
       base.class_eval do
         alias_method_chain :create_table, :schema_plus
-        alias_method_chain :add_index, :schema_plus
+        include AddIndex
       end
     end
 
@@ -25,38 +25,26 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       # override rails' :force to cascade
       drop_table(table, if_exists: true, cascade: true) if options.delete(:force)
 
-      indexes = []
+      if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+        indexes = []
+      end
       create_table_without_schema_plus(table, options) do |table_definition|
         table_definition.schema_plus_config = SchemaPlus.config.merge(config_options)
-        table_definition.name = table
+        if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+          table_definition.name = table
+        end
         yield table_definition if block_given?
-        indexes = table_definition.indexes
+        if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+          indexes = table_definition.indexes
+        end
       end
-      indexes.each do |index|
-        add_index(table, index.columns, index.opts)
+      if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+        indexes.each do |index|
+          add_index(table, index.columns, index.opts)
+        end
       end
     end
 
-    ##
-    # :method: add_index
-    #
-    # SchemaPlus modifies SchemaStatements::add_index so that it ignores
-    # errors raised about add an index that already exists -- i.e. that has
-    # the same index name, same columns, and same options -- and writes a
-    # warning to the log. Some combinations of rails & DB adapter versions
-    # would log such a warning, others would raise an error; with
-    # SchemaPlus all versions log the warning and do not raise the error.
-    #
-    # (This avoids collisions between SchemaPlus's auto index behavior and
-    # legacy explicit add_index statements, for platforms that would raise
-    # an error.)
-    #
-    def add_index_with_schema_plus(table, columns, options={})
-      add_index_without_schema_plus(table, columns, options)
-    rescue => e
-      SchemaStatements.add_index_exception_handler(self, table, columns, options, e)
-    end
-
     def self.add_index_exception_handler(connection, table, columns, options, e) #:nodoc:
       raise unless e.message.match(/["']([^"']+)["'].*already exists/)
       name = $1
@@ -66,5 +54,32 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       ::ActiveRecord::Base.logger.warn "[schema_plus] Index name #{name.inspect}' on table #{table.inspect} already exists. Skipping."
     end
 
+    module AddIndex
+      def self.included(base) #:nodoc:
+        base.class_eval do
+          alias_method_chain :add_index, :schema_plus
+        end
+      end
+
+      ##
+      # :method: add_index
+      #
+      # SchemaPlus modifies SchemaStatements::add_index so that it ignores
+      # errors raised about add an index that already exists -- i.e. that has
+      # the same index name, same columns, and same options -- and writes a
+      # warning to the log. Some combinations of rails & DB adapter versions
+      # would log such a warning, others would raise an error; with
+      # SchemaPlus all versions log the warning and do not raise the error.
+      #
+      # (This avoids collisions between SchemaPlus's auto index behavior and
+      # legacy explicit add_index statements, for platforms that would raise
+      # an error.)
+      #
+      def add_index_with_schema_plus(table, columns, options={})
+        add_index_without_schema_plus(table, columns, options)
+      rescue => e
+        SchemaStatements.add_index_exception_handler(self, table, columns, options, e)
+      end
+    end
   end
 end

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

@@ -21,7 +21,16 @@ module SchemaPlus
             alias_method_chain :indexes, :schema_plus
             alias_method_chain :rename_table, :schema_plus
           end
-          ::ActiveRecord::ConnectionAdapters::SQLiteColumn.send(:include, SQLiteColumn) unless ::ActiveRecord::ConnectionAdapters::SQLiteColumn.include?(SQLiteColumn)
+          if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+            ::ActiveRecord::ConnectionAdapters::SQLiteColumn.send(:include, SQLiteColumn) unless ::ActiveRecord::ConnectionAdapters::SQLiteColumn.include?(SQLiteColumn)
+          else
+            ::ActiveRecord::ConnectionAdapters::SQLite3Column.send(:include, SQLiteColumn) unless ::ActiveRecord::ConnectionAdapters::SQLite3Column.include?(SQLiteColumn)
+          end
+        end
+
+        def initialize(*args)
+          super
+          execute('PRAGMA FOREIGN_KEYS = ON')
         end
 
         def indexes_with_schema_plus(table_name, name = nil)
@@ -71,10 +80,6 @@ module SchemaPlus
 
         protected
 
-        def post_initialize
-          execute('PRAGMA FOREIGN_KEYS = 1')
-        end
-
         def get_foreign_keys(table_name = nil, name = nil)
           results = execute(<<-SQL, name)
             SELECT name, sql FROM sqlite_master

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

@@ -67,30 +67,43 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     include SchemaPlus::ActiveRecord::ColumnOptionsHandler
 
     attr_accessor :schema_plus_config #:nodoc:
+    attr_reader :foreign_keys #:nodoc:
 
     def self.included(base) #:nodoc:
       base.class_eval do
-        attr_accessor :name
-        attr_accessor :indexes
         alias_method_chain :initialize, :schema_plus
         alias_method_chain :column, :schema_plus
         alias_method_chain :references, :schema_plus
         alias_method_chain :belongs_to, :schema_plus
         alias_method_chain :primary_key, :schema_plus
-        alias_method_chain :to_sql, :schema_plus
+
+        if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+          attr_accessor :name
+          attr_accessor :indexes
+          alias_method_chain :to_sql, :schema_plus
+        end
       end
     end
-        
+
     def initialize_with_schema_plus(*args) #:nodoc:
       initialize_without_schema_plus(*args)
       @foreign_keys = []
-      @indexes = []
+      if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+        @indexes = []
+      end
     end
 
-    def primary_key_with_schema_plus(name, options = {}) #:nodoc:
-      column(name, :primary_key, options)
+    if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+      def primary_key_with_schema_plus(name, options = {}) #:nodoc:
+        column(name, :primary_key, options)
+      end
+    else
+      def primary_key_with_schema_plus(name, type = :primary_key, options = {}) #:nodoc:
+        column(name, type, options.merge(:primary_key => true))
+      end
     end
 
+
     # need detect :polymorphic at this level, because rails strips it out
     # before calling #column (twice, once for _id and once for _type)
     def references_with_schema_plus(*args) #:nodoc:
@@ -122,8 +135,10 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     end
 
     # Define an index for the current 
-    def index(column_name, options={})
-      @indexes << ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(self.name, column_name, options)
+    if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+      def index(column_name, options={})
+        @indexes << ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(self.name, column_name, options)
+      end
     end
 
     def foreign_key(column_names, references_table_name, references_column_names, options = {})
@@ -165,7 +180,11 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     # Determines if an indexes is queued to be created.  Called from
     # ColumnOptionsHandler as part of checking whether to auto-create an index
     def index_exists?(_, column_name, options={})
-      @indexes.find{|index| index.table == self.name && index.columns == Array.wrap(column_name) && options.all?{|k, v| index.send(k) == v}}
+      if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+        @indexes.find{|index| index.table == self.name && index.columns == Array.wrap(column_name) && options.all?{|k, v| index.send(k) == v}}
+      else
+        @indexes.find {|index_column_name, index_options| Array.wrap(index_column_name) == Array.wrap(column_name) && options.all?{|k, v| index_options[k] == v} }
+      end
     end
 
 

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/lib/schema_plus.rb

@@ -124,6 +124,10 @@ module SchemaPlus
     ::ActiveRecord::ConnectionAdapters::IndexDefinition.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition)
     ::ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::SchemaStatements)
     ::ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::TableDefinition)
+
+    if ::ActiveRecord::VERSION::MAJOR.to_i >= 4
+      ::ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation)
+    end
   end
 
   def self.insert #:nodoc:

data/runspecs

@@ -5,8 +5,8 @@ require 'ostruct'
 require 'shellwords'
 require 'tempfile'
 
-RUBY_VERSIONS = %W[1.9.2 1.9.3]
-RAILS_VERSIONS = %W[3.2]
+RUBY_VERSIONS = %W[1.9.3 2.0.0]
+RAILS_VERSIONS = %W[3.2 4.0]
 DB_ADAPTERS = %W[postgresql mysql mysql2 sqlite3]
 
 o = OpenStruct.new
@@ -65,10 +65,21 @@ Combo = Struct.new(:ruby, :rails, :db_adapter)
 combos = o.ruby_versions.product(o.rails_versions, o.db_adapters).map{|product| Combo.new(*product)}.select {|combo|
     case
     when combo.rails >= "3.2" && combo.ruby <= "1.8.7" then false  # no longer happens, just keeping it as an example
+    when combo.rails >= "4" && combo.db_adapter == "mysql" then false
     else true
     end
 }
 
+def ruby_version_selector(ruby)
+    if @use_rvm ||= system("which -s rvm")
+        "rvm #{ruby} do"
+    else
+        @versions ||= `rbenv versions --bare`.split
+        version = @versions.select{|v| v.start_with? ruby}.last || abort("no ruby version '#{ruby}' installed in rbenv")
+        "RBENV_VERSION=#{version}"
+    end
+end
+
 
 GEMFILES_DIR = File.expand_path('../gemfiles', __FILE__)
 errs = []
@@ -88,7 +99,7 @@ combos.each_with_index do |combo, n|
               "bundle exec rake #{db_adapter}:spec"
           end
 
-    command = %Q{BUNDLE_GEMFILE="#{File.join(GEMFILES_DIR, "rails-#{rails}", "Gemfile.#{db_adapter}")}" rvm #{ruby} do #{cmd} #{Shellwords.join(ARGV)}}
+    command = %Q{BUNDLE_GEMFILE="#{File.join(GEMFILES_DIR, "rails-#{rails}", "Gemfile.#{db_adapter}")}" #{ruby_version_selector(ruby)} #{cmd} #{Shellwords.join(ARGV)}}
 
     puts "\n\n*** ruby version #{ruby} - rails version #{rails} - db adapter: #{db_adapter}  [#{n+1} of #{combos.size}]\n\n#{command}"
 

data/spec/foreign_key_spec.rb

@@ -29,6 +29,28 @@ describe "Foreign Key" do
 
   end
 
+  if ::ActiveRecord::VERSION::MAJOR.to_i >= 4
+    context "with modifications to SQL generated by upstream visit_TableDefinition" do
+      before(:each) do
+        ActiveRecord::Base.connection.class.const_get(:SchemaCreation).any_instance.stub :visit_TableDefinition_without_schema_plus => "this is unexpected"
+      end
+
+      it "raises an exception when attempting to create a table" do
+        expect {
+          define_schema(:auto_create => true) do
+            create_table :users, :force => true do |t|
+              t.string :login
+            end
+            create_table :comments, :force => true do |t|
+              t.integer :user_id
+              t.foreign_key :user_id, :users, :id
+            end
+          end
+        }.to raise_error(RuntimeError, /Internal Error: Can't find.*Rails internals have changed/)
+      end
+    end
+  end
+
   context "modification" do
 
     before(:all) do

data/spec/schema_dumper_spec.rb

@@ -22,6 +22,17 @@ describe "Schema dump" do
           t.integer :user_id
           t.integer :first_comment_id
           t.string :string_no_default
+          t.integer :short_id
+          t.string :str_short
+          t.integer :integer_col
+          t.float :float_col
+          t.decimal :decimal_col
+          t.datetime :datetime_col
+          t.timestamp :timestamp_col
+          t.time :time_col
+          t.date :date_col
+          t.binary :binary_col
+          t.boolean :boolean_col
         end
 
         create_table :comments, :force => true do |t|
@@ -80,19 +91,19 @@ describe "Schema dump" do
     if SchemaPlusHelpers.postgresql?
       it "should dump the default hash expr as now()" do
         with_additional_column Post, :posted_at, :datetime, :default => :now do
-          dump_posts.should match(to_regexp(%q{t.datetime "posted_at", :default => \{ :expr => "now()" \}}))
+          dump_posts.should match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"now\(\)"\s*\}})
         end
       end
 
       it "should dump the default hash expr as CURRENT_TIMESTAMP" do
         with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
-          dump_posts.should match(%r{t.datetime "posted_at",\s*:default => '2001-09-28 00:00:00'})
+          dump_posts.should match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*'2001-09-28 00:00:00'})
         end
       end
 
       it "can dump a complex default expression" do
         with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
-          dump_posts.should match(%r{t.string\s+"name", :default => { :expr => "\\"substring\\"\(\(random\(\)\)::text, 3, 6\)" }})
+          dump_posts.should match(%r{t\.string\s+"name",\s*(?:default:|:default =>)\s*{\s*(?:expr:|:expr =>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
         end
       end
     end
@@ -100,19 +111,19 @@ describe "Schema dump" do
     if SchemaPlusHelpers.sqlite3?
       it "should dump the default hash expr as now" do
         with_additional_column Post, :posted_at, :datetime, :default => :now do
-          dump_posts.should match(to_regexp(%q{t.datetime "posted_at", :default => \{ :expr => "(DATETIME('now'))" \}}))
+          dump_posts.should match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
         end
       end
 
       it "should dump the default hash expr string as now" do
         with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
-          dump_posts.should match(to_regexp(%q{t.datetime "posted_at", :default => \{ :expr => "(DATETIME('now'))" \}}))
+          dump_posts.should match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
         end
       end
 
       it "should dump the default value normally" do
         with_additional_column Post, :posted_at, :string, :default => "now" do
-          dump_posts.should match(%r{t.string  "posted_at",\s*:default => "now"})
+          dump_posts.should match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
         end
       end
     end
@@ -123,7 +134,7 @@ describe "Schema dump" do
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
     end
-    dump_posts.should match(%r{t.string\s+"string_no_default"\s*$})
+    dump_posts.should match(%r{t\.string\s+"string_no_default"\s*$})
   end
 
   it "should include foreign_key options" do
@@ -168,6 +179,21 @@ describe "Schema dump" do
       end
     end
 
+    it "should define case insensitive index with mixed ids and strings" do
+      with_index Post, [:user_id, :str_short, :short_id, :body], :case_sensitive => false do
+        dump_posts.should match(to_regexp(%q{t.index ["user_id", "str_short", "short_id", "body"], :name => "index_posts_on_user_id_and_str_short_and_short_id_and_body", :case_sensitive => false}))
+      end
+    end
+
+    [:integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean].each do |col_type|
+      col_name = "#{col_type}_col"
+      it "should define case insensitive index that includes an #{col_type}" do
+        with_index Post, [:user_id, :str_short, col_name, :body], :case_sensitive => false do
+          dump_posts.should match(to_regexp(%Q!t.index ["user_id", "str_short", "#{col_name}", "body"], :name => "index_posts_on_user_id_and_str_short_and_#{col_name}_and_body", :case_sensitive => false!))
+        end
+      end
+    end
+
     it "should define conditions" do
       with_index Post, :user_id, :name => "posts_user_id_index", :conditions => "user_id IS NOT NULL" do
         dump_posts.should match(to_regexp(%q{t.index ["user_id"], :name => "posts_user_id_index", :conditions => "(user_id IS NOT NULL)"}))

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-if RUBY_VERSION > "1.9"
-  require 'simplecov'
-  require 'simplecov-gem-adapter'
-  SimpleCov.start "gem"
-end
+require 'simplecov'
+require 'simplecov-gem-adapter'
+SimpleCov.use_merging true
+SimpleCov.merge_timeout 3600
+SimpleCov.start "gem"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -55,4 +55,4 @@ def remove_all_models
     end
   end
 
-SimpleCov.command_name ActiveRecord::Base.connection.adapter_name if defined? SimpleCov
+SimpleCov.command_name "[ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING} - #{ActiveRecord::Base.connection.adapter_name}]"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -10,105 +9,93 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'SchemaPlus is an ActiveRecord extension that provides enhanced capabilities
+description: '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 for views.'
 email:
@@ -130,6 +117,14 @@ files:
 - gemfiles/rails-3.2/Gemfile.mysql2
 - gemfiles/rails-3.2/Gemfile.postgresql
 - gemfiles/rails-3.2/Gemfile.sqlite3
+- gemfiles/rails-4.0/Gemfile.base
+- gemfiles/rails-4.0/Gemfile.mysql2
+- gemfiles/rails-4.0/Gemfile.postgresql
+- gemfiles/rails-4.0/Gemfile.sqlite3
+- gemfiles/rails-edge/Gemfile.base
+- gemfiles/rails-edge/Gemfile.mysql2
+- gemfiles/rails-edge/Gemfile.postgresql
+- gemfiles/rails-edge/Gemfile.sqlite3
 - init.rb
 - lib/rails/tasks/database.rake
 - lib/schema_plus.rb
@@ -177,27 +172,26 @@ files:
 - spec/views_spec.rb
 homepage: https://github.com/lomba/schema_plus
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: schema_plus
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
   and support for foreign key constraints and views.
 test_files:
@@ -224,4 +218,3 @@ test_files:
 - spec/support/matchers/have_index.rb
 - spec/support/matchers/reference.rb
 - spec/views_spec.rb
-has_rdoc: