schema_plus 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5b988ea47657ad4e1be912509f3d17c4c4e329
-  data.tar.gz: e4fcc4ac3d1ca3003e4a9c7fc1c0a48e687dd197
+  metadata.gz: 14f770e20ed8fc7090ddc3fd58e95976e6a6ae13
+  data.tar.gz: 999f0ad6bd7a1346dda3ebc152ec2a0f7a430488
 SHA512:
-  metadata.gz: 4ea4f3e69dd6fd4705146b05123e7ec245414ef77de85382a5ada63bebfce065088d4447ea9f411b82444d33c94d7a9ce6ad96a76061816a7a851023a9672e8f
-  data.tar.gz: 9251ec18b5b5f416627162c4adecff472c22c82ac23076461d7b8d045f40744f246827da14580c17d5957efb45218a7b235d71ffbcc1092e1b7486a4547cc3f2
+  metadata.gz: 33fdfaee05d32853f87112adc5d156970f4d5bddec6c2f8379a283ad16cf6e9eb3e5adfb84dbf60af476e340f51c15ab6f53d2336877226e670602bbf141d35e
+  data.tar.gz: 3ff056bfd48ea22a5004f3f6760d4bec52127bde7040b65082f2de86fcf00b1353be1a1f46a6b1d37dc04ab87ef0cb6f8146578d985cb126d118b77a670dc124

data/README.md

@@ -17,15 +17,14 @@ For added rails DRYness see also the gems
 
 SchemaPlus supports all combinations of:
 
-*   Rails 3.2, 4.0, and 4.1 (currently 4.1.0beta3)
+*   Rails/ActiveRecord 3.2, 4.0, and 4.1 (currently 4.1.0beta3)
 *   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, 2.0.0, or 2.1.0
 
 And also supports:
 
-* jruby with Rails 3.2 and PostgreSQL or MySQL
-
+* jruby with Rails/ActiveRecord 3.2 and PostgreSQL or MySQL
 
 
 ## Installation
@@ -77,7 +76,7 @@ You can also create multi-column indexes, for example:
 
     t.string :country_code
     t.string :area_code
-    t.string :local_number      index: { with: [:country_code, :area_code], unique: true }
+    t.string :local_number,      index: { with: [:country_code, :area_code], unique: true }
 
 And you can specify index orders:
 
@@ -224,6 +223,8 @@ the above views you can define
     class UncommentedPost < ActiveRecord::Base
     end
 
+Note: In Postgres, all internal views (the ones with `pg_` prefix) will be skipped.
+
 ### Column Defaults: Expressions
 
 SchemaPlus allows defaults to be set using expressions or constant values:
@@ -297,6 +298,19 @@ of foreign key constraints, you can re-enable it:
 
 * *nothing currently waiting to be released*
 
+
+### 1.5.1
+
+* Now respects ActiveRecord::SchemaDumper.ignore_tables for views (issue #153)
+
+### 1.5.0
+* Can now be used with activerecord standalone, doesn't need all of rails.
+* `views` ignores postgres internal views, thanks to [@everplays](https://github.com/everplays) (issue #147)
+
+### 1.4.1
+
+* Bug fixes `migration.add_references` with `polymophic: true` (issue #145 and others)
+
 ### 1.4.0
 
 * Supports jruby & mysql, thanks to [@rzenha](https://github.com/razenha)

data/gemfiles/Gemfile.base

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => File.expand_path('..', __FILE__)
+
+gem "byebug" if RUBY_VERSION > "2"

data/gemfiles/rails-3.2/Gemfile.base

@@ -1,4 +1,3 @@
-source 'https://rubygems.org'
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../../..', __FILE__)
 gem "rails", "~> 3.2.0"

data/gemfiles/rails-4.0/Gemfile.base

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

data/gemfiles/rails-4.1/Gemfile.base

@@ -1,4 +1,3 @@
-source 'https://rubygems.org'
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../../..', __FILE__)
 gem "rails", "~> 4.1.0.beta1"

data/gemfiles/rails-edge/Gemfile.base

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

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

@@ -83,6 +83,7 @@ module SchemaPlus
         # are specified simultaneously.
         #
         def add_index(table_name, column_name, options = {})
+          options = {} if options.nil?  # some callers explicitly pass options=nil
           column_name, options = [], column_name if column_name.is_a?(Hash)
           column_names = Array(column_name).compact
           if column_names.empty?
@@ -264,6 +265,7 @@ module SchemaPlus
             SELECT viewname
               FROM pg_views
             WHERE schemaname = ANY (current_schemas(false))
+            AND viewname NOT LIKE 'pg\_%'
           SQL
           sql += " AND schemaname != 'postgis'" if adapter_name == 'PostGIS'
           query(sql, name).map { |row| row[0] }

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

@@ -4,10 +4,16 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def self.included(base) #:nodoc:
       base.class_eval do
         alias_method_chain :create_table, :schema_plus
+        alias_method_chain :add_reference, :schema_plus unless ::ActiveRecord::VERSION::MAJOR.to_i < 4
         include AddIndex
       end
     end
 
+    def add_reference_with_schema_plus(table_name, ref_name, options = {}) #:nodoc:
+      options[:references] = nil if options[:polymorphic]
+      add_reference_without_schema_plus(table_name, ref_name, options)
+    end
+
     ##
     # :method: create_table
     #
@@ -76,7 +82,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       # an error.)
       #
       def add_index_with_schema_plus(table, columns, options={})
-        options.delete(:if_exists)
+        options.delete(:if_exists) if options # some callers explcitly pass options=nil
         add_index_without_schema_plus(table, columns, options)
       rescue => e
         SchemaStatements.add_index_exception_handler(self, table, columns, options, e)

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

@@ -27,8 +27,9 @@ module SchemaPlus
         # should track it down separately and submit a patch/fix to rails
         #
         def add_reference_with_schema_plus(table_name, ref_name, options = {}) #:nodoc:
+          options[:references] = nil if options[:polymorphic]
           # which is the worse hack...?
-          if RUBY_VERSION >= "2.0.0"
+          if RUBY_VERSION >= "2.0.0" and self.delegate.respond_to? :add_reference_sql
             # .. rebinding a method from a different module?  (can't do this in ruby 1.9.3)
             ::ActiveRecord::ConnectionAdapters::SchemaStatements.instance_method(:add_reference).bind(self).call(table_name, ref_name, options)
           else

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -52,6 +52,7 @@ module SchemaPlus
         tables_without_schema_plus(nil)
 
         @connection.views.each do |view_name|
+          next if Array.wrap(::ActiveRecord::SchemaDumper.ignore_tables).any? {|pattern| view_name.match pattern}
           definition = @connection.view_definition(view_name)
           @table_dumps[view_name] = "  create_view #{view_name.inspect}, #{definition.inspect}, :force => true\n"
         end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.4.0"
+  VERSION = "1.5.1"
 end

data/schema_plus.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/lomba/schema_plus"
   s.summary     = "Enhances ActiveRecord schema mechanism, including more DRY index creation and support for foreign key constraints and views."
   s.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."
+  s.license = 'MIT'
 
   s.rubyforge_project = "schema_plus"
 
@@ -20,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("rails", ">= 3.2")
+  s.add_dependency("activerecord", ">= 3.2")
   s.add_dependency("valuable")
 
   s.add_development_dependency("rake")

data/spec/connections/mysql/connection.rb

@@ -14,4 +14,4 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus

data/spec/connections/mysql2/connection.rb

@@ -14,4 +14,4 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus

data/spec/connections/postgresql/connection.rb

@@ -13,4 +13,4 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus

data/spec/connections/sqlite3/connection.rb

@@ -11,5 +11,5 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus
 ActiveRecord::Base.connection.execute "PRAGMA synchronous = OFF"

data/spec/migration_spec.rb

@@ -599,6 +599,44 @@ describe ActiveRecord::Migration do
 
     end
 
+    context "when add reference" do
+
+      before(:each) do
+        @model = Comment
+      end
+
+      it "should create foreign key" do
+        add_reference(:post) do
+          @model.should reference(:posts, :id).on(:post_id)
+        end
+      end
+
+      it "should not create a foreign_key if polymorphic" do
+        add_reference(:post, :polymorphic => true) do
+          @model.should_not reference(:posts, :id).on(:post_id)
+        end
+      end
+
+      it "should create a two-column index if polymophic and index requested" do
+        add_reference(:post, :polymorphic => true, :index => true) do
+          @model.should have_index.on([:post_id, :post_type])
+        end
+      end
+
+
+      protected
+      def add_reference(column_name, *args)
+        table = @model.table_name
+        ActiveRecord::Migration.suppress_messages do
+          ActiveRecord::Migration.add_reference(table, column_name, *args)
+          @model.reset_column_information
+          yield if block_given?
+          ActiveRecord::Migration.remove_column(table, "#{column_name}_id")
+        end
+      end
+
+    end unless ::ActiveRecord::VERSION::MAJOR.to_i < 4
+
     context "when column is changed" do
 
       before(:each) do

data/spec/views_spec.rb

@@ -17,13 +17,6 @@ describe ActiveRecord do
 
   let(:connection) { ActiveRecord::Base.connection }
 
-  let (:dump) {
-    StringIO.open { |stream|
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      stream.string
-    }
-  }
-
   context "views" do
 
     around (:each) do |example|
@@ -38,6 +31,7 @@ describe ActiveRecord do
     end
 
     it "should instrospect" do
+      # for postgresql, ignore views named pg_*
       connection.views.sort.should == %W[a_ones ab_ones]
       connection.view_definition('a_ones').should match(%r{^SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1}i)
       connection.view_definition('ab_ones').should match(%r{^SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1}i)
@@ -58,6 +52,14 @@ describe ActiveRecord do
       dump.should 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
+      dump(ignore_tables: /b_/) do |dump|
+        dump.should match(%r{create_view "a_ones", "SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}i)
+        dump.should_not match(%r{"ab_ones"})
+      end
+    end
+
+
     it "dump should not reference current database" do
       # why check this?  mysql default to providing the view definition
       # with tables explicitly scoped to the current database, which
@@ -142,6 +144,7 @@ describe ActiveRecord do
 
         create_view :a_ones, Item.select('b, s').where(:a => 1)
         create_view :ab_ones, "select s from a_ones where b = 1"
+        create_view :pg_dummy_internal, "select 1" if SchemaPlusHelpers.postgresql?
       end
     end
     connection.execute "insert into items (a, b, s) values (1, 1, 'one_one')"
@@ -157,13 +160,16 @@ describe ActiveRecord do
         drop_view "ab_ones"
         drop_view "a_ones"
         drop_table "items"
+        drop_view :pg_dummy_internal if SchemaPlusHelpers.postgresql?
       end
     end
   end
 
-  def dump
+  def dump(opts={})
     StringIO.open { |stream|
+      ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore_tables])
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+      yield stream.string if block_given?
       stream.string
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -126,6 +126,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.base
 - gemfiles/rails-3.2/Gemfile.base
 - gemfiles/rails-3.2/Gemfile.mysql
 - gemfiles/rails-3.2/Gemfile.mysql2
@@ -190,7 +191,8 @@ files:
 - spec/support/matchers/reference.rb
 - spec/views_spec.rb
 homepage: https://github.com/lomba/schema_plus
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []