schema_plus 2.0.0.pre3 → 2.0.0.pre5

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

@@ -6,14 +6,8 @@ module SchemaPlusForeignKeys
       # enhancements
       module PostgresqlAdapter
 
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            alias_method_chain :rename_table, :schema_plus_foreign_keys
-          end
-        end
-
-        def rename_table_with_schema_plus_foreign_keys(oldname, newname) #:nodoc:
-          rename_table_without_schema_plus_foreign_keys(oldname, newname)
+        def rename_table(oldname, newname) #:nodoc:
+          super
           rename_foreign_keys(oldname, newname)
         end
 

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

@@ -8,19 +8,13 @@ module SchemaPlusForeignKeys
 
         # :enddoc:
 
-        def self.included(base)
-          base.class_eval do
-            alias_method_chain :rename_table, :schema_plus_foreign_keys
-          end
-        end
-
         def initialize(*args)
           super
           execute('PRAGMA FOREIGN_KEYS = ON')
         end
 
-        def rename_table_with_schema_plus_foreign_keys(oldname, newname) #:nodoc:
-          rename_table_without_schema_plus_foreign_keys(oldname, newname)
+        def rename_table(oldname, newname) #:nodoc:
+          super
           rename_foreign_keys(oldname, newname)
         end
 

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

@@ -5,20 +5,13 @@ module SchemaPlusForeignKeys
 
         attr_accessor :schema_plus_config #:nodoc:
 
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            alias_method_chain :add_reference, :schema_plus_foreign_keys
-            alias_method_chain :invert_add_index, :schema_plus_foreign_keys
-          end
-        end
-
         # seems like this is fixing a rails bug:
         #   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
         #
-        def add_reference_with_schema_plus_foreign_keys(table_name, ref_name, options = {}) #:nodoc:
+        def add_reference(table_name, ref_name, options = {}) #:nodoc:
           polymorphic = options.delete(:polymorphic)
           options[:references] = nil if polymorphic
           # ugh.  copying and pasting code from ::ActiveRecord::ConnectionAdapters::SchemaStatements#add_reference
@@ -30,7 +23,8 @@ module SchemaPlusForeignKeys
           self
         end
 
-        def invert_add_index_with_schema_plus_foreign_keys(args)
+        # overrides to add if_exists option
+        def invert_add_index(args)
           table, columns, options = *args
           [:remove_index, [table, (options||{}).merge(column: columns, if_exists: true)]]
         end

data/lib/schema_plus_foreign_keys/active_record/schema.rb

@@ -1,23 +1,14 @@
 module SchemaPlusForeignKeys
   module ActiveRecord
-    module Schema #:nodoc: all
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
+    module Schema
       module ClassMethods
-        def self.extended(base)
-          class << base
-            alias_method_chain :define, :schema_plus_foreign_keys
-          end
-        end
 
-        def define_with_schema_plus_foreign_keys(info={}, &block)
+        def define(*args)
           fk_override = { :auto_create => false, :auto_index => false }
           save = Hash[fk_override.keys.collect{|key| [key, SchemaPlusForeignKeys.config.send(key)]}]
           begin
             SchemaPlusForeignKeys.config.update_attributes(fk_override)
-            define_without_schema_plus_foreign_keys(info, &block)
+            super
           ensure
             SchemaPlusForeignKeys.config.update_attributes(save)
           end

data/lib/schema_plus_foreign_keys/middleware/dumper.rb

@@ -34,7 +34,7 @@ module SchemaPlusForeignKeys
 
         # Ignore the foreign key dumps at the end of the schema; we'll put them in/near their tables
         def after(env)
-          env.dump.foreign_keys = []
+          env.dump.final.reject!(&it =~/foreign_key/)
         end
 
         private

data/lib/schema_plus_foreign_keys/middleware/sql.rb

@@ -0,0 +1,11 @@
+module SchemaPlusForeignKeys
+  module Middleware
+    module Sql
+      module Table
+        def after(env)
+          env.sql.body = ([env.sql.body] + env.table_definition.foreign_keys.map(&:to_sql)).join(', ')
+        end
+      end
+    end
+  end
+end

data/schema_dev.yml

@@ -1,5 +1,4 @@
 ruby:
-    - 1.9.3
     - 2.1.5
 activerecord:
     - 4.2

data/schema_plus.gemspec

@@ -2,37 +2,38 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "schema_plus/version"
 
-Gem::Specification.new do |s|
-  s.name        = "schema_plus"
-  s.version     = SchemaPlus::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = ">= 1.9.2"
-  s.authors     = ["Ronen Barzel", "Michal Lomnicki"]
-  s.email       = ["ronen@barzel.org", "michal.lomnicki@gmail.com"]
-  s.homepage    = "https://github.com/SchemaPlus/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'
+Gem::Specification.new do |gem|
+  gem.name        = "schema_plus"
+  gem.version     = SchemaPlus::VERSION
+  gem.platform    = Gem::Platform::RUBY
+  gem.required_ruby_version = ">= 1.9.2"
+  gem.authors     = ["Ronen Barzel", "Michal Lomnicki"]
+  gem.email       = ["ronen@barzel.org", "michal.lomnicki@gmail.com"]
+  gem.homepage    = "https://github.com/SchemaPlus/schema_plus"
+  gem.summary     = "Enhances ActiveRecord schema mechanism, including more DRY index creation and support for foreign key constraints and views."
+  gem.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."
+  gem.license = 'MIT'
 
-  s.rubyforge_project = "schema_plus"
+  gem.rubyforge_project = "schema_plus"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", "~> 4.2"
-  s.add_dependency "valuable"
-  s.add_dependency "schema_monkey", "~> 1.0", ">= 1.0.1"
-  s.add_dependency "schema_monkey_rails", "~> 0.1", ">= 0.1.1"
-  s.add_dependency "schema_plus_indexes", "~> 0.1"
-  s.add_dependency "schema_plus_pg_indexes", "~> 0.1"
+  gem.add_dependency "activerecord", "~> 4.2"
+  gem.add_dependency "valuable"
+  gem.add_dependency "schema_plus_core", "~> 0.1"
+  gem.add_dependency "schema_monkey_rails", "~> 0.1", ">= 0.1.2"
+  gem.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.2"
+  gem.add_dependency "schema_plus_pg_indexes", "~> 0.1", ">= 0.1.3"
+  gem.add_dependency "schema_plus_views", "~> 0.1"
 
-  s.add_development_dependency "schema_dev", "~> 3.0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 3.0.0"
-  s.add_development_dependency "rdoc"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency "schema_dev", "~> 3.1"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "rdoc"
+  gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "simplecov-gem-profile"
 end
 

data/spec/schema_plus_foreign_keys/foreign_key_spec.rb

@@ -29,28 +29,6 @@ describe "Foreign Key" do
 
   end
 
-  context "with modifications to SQL generated by upstream visit_TableDefinition" do
-    before(:each) do
-      allow_any_instance_of(ActiveRecord::Base.connection.class.const_get(:SchemaCreation))
-      .to receive(:visit_TableDefinition_without_schema_plus_foreign_keys)
-      .and_return('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
-          end
-        end
-      }.to raise_error(RuntimeError, /Internal Error: Can't find.*Rails internals have changed/)
-    end
-  end
-
   context "modification" do
 
     before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre5
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -40,27 +40,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: schema_monkey
+  name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: schema_monkey_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: schema_monkey_rails
+  name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -68,7 +82,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -78,14 +92,17 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: schema_plus_indexes
+  name: schema_plus_pg_indexes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,8 +110,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: schema_plus_pg_indexes
+  name: schema_plus_views
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -113,14 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +161,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +245,7 @@ files:
 - lib/schema_plus_db_default/db_default.rb
 - lib/schema_plus_db_default/middleware.rb
 - lib/schema_plus_default_expr.rb
+- lib/schema_plus_default_expr/active_record/connection_adapters/column.rb
 - lib/schema_plus_default_expr/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus_default_expr/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus_default_expr/active_record/connection_adapters/sqlite3_adapter.rb
@@ -238,7 +259,6 @@ files:
 - lib/schema_plus_foreign_keys/active_record/connection_adapters/foreign_key_definition.rb
 - lib/schema_plus_foreign_keys/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus_foreign_keys/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_plus_foreign_keys/active_record/connection_adapters/schema_statements.rb
 - lib/schema_plus_foreign_keys/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus_foreign_keys/active_record/connection_adapters/table_definition.rb
 - lib/schema_plus_foreign_keys/active_record/migration/command_recorder.rb
@@ -246,18 +266,13 @@ files:
 - lib/schema_plus_foreign_keys/middleware/dumper.rb
 - lib/schema_plus_foreign_keys/middleware/migration.rb
 - lib/schema_plus_foreign_keys/middleware/model.rb
+- lib/schema_plus_foreign_keys/middleware/sql.rb
 - lib/schema_plus_foreign_keys/version.rb
 - lib/schema_plus_tables.rb
 - lib/schema_plus_tables/active_record/connection_adapters/abstract_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_plus_views.rb
-- lib/schema_plus_views/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_plus_views/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_plus_views/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_plus_views/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_plus_views/middleware.rb
 - schema_dev.yml
 - schema_plus.gemspec
 - spec/schema/auto_schema.rb
@@ -275,8 +290,6 @@ files:
 - spec/schema_plus_foreign_keys/named_schemas_spec.rb
 - spec/schema_plus_foreign_keys/schema_dumper_spec.rb
 - spec/schema_plus_foreign_keys/schema_spec.rb
-- spec/schema_plus_views/named_schemas_spec.rb
-- spec/schema_plus_views/views_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers/automatic_foreign_key_matchers.rb
@@ -323,8 +336,6 @@ test_files:
 - spec/schema_plus_foreign_keys/named_schemas_spec.rb
 - spec/schema_plus_foreign_keys/schema_dumper_spec.rb
 - spec/schema_plus_foreign_keys/schema_spec.rb
-- spec/schema_plus_views/named_schemas_spec.rb
-- spec/schema_plus_views/views_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers/automatic_foreign_key_matchers.rb

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

@@ -1,33 +0,0 @@
-module SchemaPlusForeignKeys::ActiveRecord::ConnectionAdapters
-  module SchemaStatements
-
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        alias_method_chain :create_table, :schema_plus_foreign_keys
-      end
-    end
-
-    ##
-    # :method: create_table
-    #
-    # SchemaPlusForeignKeys extends SchemaStatements::create_table to allow you to specify configuration options per table.  Pass them in as a hash keyed by configuration set (see SchemaPlusForeignKeys::Config),
-    # for example:
-    #
-    #     create_table :widgets, :foreign_keys => {:auto_create => true, :on_delete => :cascade} do |t|
-    #        ...
-    #     end
-    def create_table_with_schema_plus_foreign_keys(table, options = {})
-      options = options.dup
-      config_options = options.delete(:foreign_keys) || {}
-
-      # override rails' :force to cascade
-      drop_table(table, if_exists: true, cascade: true) if options.delete(:force)
-
-      create_table_without_schema_plus_foreign_keys(table, options) do |table_definition|
-        table_definition.schema_plus_config = SchemaPlusForeignKeys.config.merge(config_options)
-        yield table_definition if block_given?
-      end
-    end
-  end
-
-end