schema_plus 2.0.0.pre6 → 2.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f00ceb73134fe17d30d0eea3cc3c4d1176a790e9
-  data.tar.gz: 009e690b13ef1abb8633048f8b791588934ecf40
+  metadata.gz: aaba43d34df0accaa981d624082fa7e8f8179029
+  data.tar.gz: da8fb2f9b6aa8c36e55449889304c07450f639d1
 SHA512:
-  metadata.gz: a4824b1d4d83099b03c1e1b053cc49f65083851080292a4d186575f970ebfca6a98e89b5485dc1f4f2c6ceaca7df43b277d808c4f88e1c98f3299a46b317d3c6
-  data.tar.gz: 9fed9ef9efc18014d2f0315245f2af09a1654f8b2d3db048ffa40eb408703a12ecce328989a8b6289a93f3598614cd1c021d24c877b6049e031585c778162db3
+  metadata.gz: 2c211b1b568712234f41659aae7c42d7aceae6e749c9445453eb115cdb4c9fb20055ee9e25dc1639626d3ba0530f53336bbd7e41ceae20c75d16335fce0335b8
+  data.tar.gz: 368cacb87bd95602fb2b7ab3d641c8f9988553c878d7c1835693411c191adf25ebac4462de0db229e7bc24954f08acbb70615916818a97c1f53de221de11b16e

data/README.md

@@ -24,7 +24,7 @@ Gem | Description | Included In `schema_plus` gem?
 <p style="color:grey">schema_plus_foreign_keys | Extended support for foreign keys, including creation as column options, `:deferrable`, and SQLite3 support | Y
 [schema_plus_indexes](https://github.com/SchemaPlus/schema_plus_indexes) | Convenience and consistency in using indexes | Y
 [schema_plus_pg_indexes](https://github.com/SchemaPlus/schema_plus_pg_indexes) |PostgreSQL index features: `case_insenstive`, `expression` and `operator_class` | Y
-<p style="color:grey">schema_plus_tables</p> | Convenience and consistency in using tables | Y
+[schema_plus_tables](https://github.com/SchemaPlus/schema_plus_views) | Convenience and consistency in using tables | Y
 [schema_plus_views](https://github.com/SchemaPlus/schema_plus_views) | Create and drop views in migrations | Y
 [schema_validations](https://github.com/SchemaPlus/schema_validations) | Automatically defines ActiveRecord validations based on database constraints |
 
@@ -56,6 +56,9 @@ In cases where ActiveRecord 4.2 has introduced features previously supported onl
   * `:conditions` => `:where`
   * `:kind` => `:using`
 
+* `drop_table` deprecates this option:
+  * `cascade: true` => `force: :cascade`
+
 * Foreign key definitions deprecate options to `:on_update` and `:on_delete`:
   * `:set_null` => `:nullify`
 
@@ -176,20 +179,7 @@ has some information that may be of assistance in resolving these issues.
 
 ### Tables
 
-SchemaPlus extends rails' `drop_table` method to accept these options:
-
-    drop_table :table_name                    # same as rails
-    drop_table :table_name, if_exists: true   # no error if table doesn't exist
-    drop_table :table_name, cascade: true     # delete dependencies
-
-The `:cascade` option is particularly useful given foreign key constraints.
-For Postgresql it is implemented using `DROP TABLE...CASCADE` which deletes
-all dependencies.  For MySQL, SchemaPlus implements the `:cascade` option to
-delete foreign key references, but does not delete any other dependencies.
-For Sqlite3, the `:cascade` option is ignored, but Sqlite3 always drops tables
-with cascade-like behavior.
-
-SchemaPlus likewise extends `create_table ... force: true` to use `:cascade`
+SchemaPlus extends `create_table ... force: true` to use `:cascade`
 
 ### Column Defaults: Expressions
 

data/lib/schema_plus/foreign_keys.rb

@@ -11,6 +11,7 @@ require_relative 'foreign_keys/active_record/migration/command_recorder'
 require_relative 'foreign_keys/middleware/dumper'
 require_relative 'foreign_keys/middleware/migration'
 require_relative 'foreign_keys/middleware/model'
+require_relative 'foreign_keys/middleware/mysql'
 require_relative 'foreign_keys/middleware/sql'
 
 module SchemaPlus::ForeignKeys

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

@@ -17,7 +17,7 @@ module SchemaPlus::ForeignKeys
           config_options = options.delete(:foreign_keys) || {}
 
           # override rails' :force to cascade
-          drop_table(table, if_exists: true, cascade: true) if options.delete(:force)
+          # drop_table(table, if_exists: true, force: true) if options.delete(:force)
 
           super(table, options) do |table_definition|
             table_definition.schema_plus_config = SchemaPlus::ForeignKeys.config.merge(config_options)

data/lib/schema_plus/foreign_keys/middleware/mysql.rb

@@ -0,0 +1,20 @@
+module SchemaPlus::ForeignKeys
+  module Middleware
+
+    module Mysql
+      module Migration
+        module DropTable
+
+          def around(env)
+            if (env.options[:force] == :cascade)
+              env.connection.reverse_foreign_keys(env.table_name).each do |foreign_key|
+                env.connection.remove_foreign_key(foreign_key.from_table, name: foreign_key.name)
+              end
+            end
+            yield env
+          end
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre6"
+  VERSION = "2.0.0.pre7"
 end

data/schema_plus.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "activerecord", "~> 4.2"
   gem.add_dependency "valuable"
-  gem.add_dependency "schema_plus_core", "~> 0.1"
+  gem.add_dependency "schema_plus_core", "~> 0.2"
   gem.add_dependency "schema_monkey_rails", "~> 0.1", ">= 0.1.2"
   gem.add_dependency "schema_plus_columns", "~> 0.1"
   gem.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.3"
   gem.add_dependency "schema_plus_pg_indexes", "~> 0.1", ">= 0.1.3"
+  gem.add_dependency "schema_plus_tables", "~> 0.1"
   gem.add_dependency "schema_plus_views", "~> 0.1"
 
   gem.add_development_dependency "schema_dev", "~> 3.1"

data/spec/schema_plus_db_default/column_spec.rb

@@ -46,7 +46,7 @@ describe SchemaPlus::DbDefault do
 
   def create_table(model, columns_with_options)
     migration.suppress_messages do
-      migration.create_table model.table_name, :force => true do |t|
+      migration.create_table model.table_name, :force => :cascade do |t|
         columns_with_options.each_pair do |column, options|
           t.send :string, column, options
         end

data/spec/schema_plus_default_expr/schema_dumper_spec.rb

@@ -9,7 +9,7 @@ describe "Schema dump" do
     end
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table, :cascade => true end
+        connection.tables.each do |table| drop_table table, force: :cascade end
 
         create_table :posts, :force => true do |t|
           t.text :body

data/spec/schema_plus_foreign_keys/schema_dumper_spec.rb

@@ -9,7 +9,7 @@ describe "Schema dump" do
     end
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table, :cascade => true end
+        connection.tables.each do |table| drop_table table, force: :cascade end
 
         create_table :users, :force => true do |t|
           t.string :login
@@ -135,7 +135,7 @@ describe "Schema dump" do
         end
         ActiveRecord::Migration.suppress_messages do
           ActiveRecord::Schema.define do
-            connection.tables.each do |table| drop_table table, :cascade => true end
+            connection.tables.each do |table| drop_table table, force: :cascade end
 
             create_table :grade_systems, force: true do |t|
               t.string   :name

data/spec/spec_helper.rb

@@ -42,7 +42,7 @@ def define_schema(config={}, &block)
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
         connection.tables.each do |table|
-          drop_table table, :cascade => true
+          drop_table table, force: :cascade
         end
         instance_eval &block
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre6
+  version: 2.0.0.pre7
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: schema_monkey_rails
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: schema_plus_tables
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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_plus_views
   requirement: !ruby/object:Gem::Requirement
@@ -276,13 +290,9 @@ 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/mysql.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/version.rb
 - schema_dev.yml
 - schema_plus.gemspec

data/lib/schema_plus/tables.rb

@@ -1,15 +0,0 @@
-require 'schema_plus/core'
-
-require_relative 'tables/active_record/connection_adapters/abstract_adapter'
-
-module SchemaPlus::Tables
-  module ActiveRecord
-    module ConnectionAdapters
-      autoload :Mysql2Adapter, 'schema_plus/tables/active_record/connection_adapters/mysql2_adapter'
-      autoload :PostgresqlAdapter, 'schema_plus/tables/active_record/connection_adapters/postgresql_adapter'
-      autoload :Sqlite3Adapter, 'schema_plus/tables/active_record/connection_adapters/sqlite3_adapter'
-    end
-  end
-end
-
-SchemaMonkey.register SchemaPlus::Tables

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

@@ -1,20 +0,0 @@
-module SchemaPlus::Tables
-  module ActiveRecord
-    module ConnectionAdapters
-      module AbstractAdapter
-
-        # Extends rails' drop_table to include these options:
-        #   :cascade
-        #   :if_exists
-        #
-        def drop_table(name, options = {})
-          sql = "DROP TABLE"
-          sql += " IF EXISTS" if options[:if_exists]
-          sql += " #{quote_table_name(name)}"
-          sql += " CASCADE" if options[:cascade]
-          execute sql
-        end
-      end
-    end
-  end
-end

data/lib/schema_plus/tables/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,25 +0,0 @@
-module SchemaPlus::Tables
-  module ActiveRecord
-    module ConnectionAdapters
-      module Mysql2Adapter
-
-        # implement cascade by removing foreign keys
-        def drop_table(name, options={})
-          if options[:cascade]
-            reverse_foreign_keys(name).each do |foreign_key|
-              remove_foreign_key(foreign_key.from_table, name: foreign_key.name)
-            end
-          end
-
-          sql = 'DROP'
-          sql += ' TEMPORARY' if options[:temporary]
-          sql += ' TABLE'
-          sql += ' IF EXISTS' if options[:if_exists]
-          sql += " #{quote_table_name(name)}"
-
-          execute sql
-        end
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module SchemaPlus::Tables
-  module ActiveRecord
-    module ConnectionAdapters
-      module PostgresqlAdapter
-        # pg gem defines a drop_table with fewer options than our Abstract
-        # one, so use the abstract one instead
-        def drop_table(name, options={})
-          SchemaPlus::Tables::ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_method(:drop_table).bind(self).call(name, options)
-        end
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-module SchemaPlus::Tables
-  module ActiveRecord
-    module ConnectionAdapters
-      module Sqlite3Adapter
-
-        def drop_table(name, options={})
-          super(name, options.except(:cascade))
-        end
-      end
-    end
-  end
-end