schema_plus_foreign_keys 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92096a0a42cf0026642c8ff73b8076c42cf25f85
-  data.tar.gz: f3d60f8304240085ec49cf8cfb395e050c4fd345
+  metadata.gz: 3c82c1e41e5b9f6ca1cfb1f5d4df97db636f573f
+  data.tar.gz: ae9f1d6d16f4e77f36dd5b8246873b50da4d8ba8
 SHA512:
-  metadata.gz: 491625f5bcc6fe7ce45ecacc83c6d1296b41c946316e783e7d2fe96a3d286fcf0039847d2eafd10a5603cca9018c34e6fe28932e81bfd94d722688cf90b22f3b
-  data.tar.gz: 8710875bd68becc5666cbca804721ffbe4e6a550cd67be1cc1e7fa4e329bf26a56fb7048f5f7689be0ebf7b6da6c7b13dc26552749fff4e591e63219bf835635
+  metadata.gz: c88017019c8f44d10b3b833e8f19e1612f0311f5a07c0c05af87046c87e238081cfc0811af6e813a68365d523ec51c4343e7e6ebe30024cd3577c9f0aaef6e68
+  data.tar.gz: 12e0728c42a03ba247ddd28e3885e1cfc1f3948ecbb46bb10baafb389db218952358d0762c4e79ef5ddff280457fd63ba289cd1fb81258ea8c67190a42a90a0f

data/.travis.yml

@@ -5,7 +5,7 @@
 ---
 sudo: false
 rvm:
-- 2.1.8
+- 2.3.1
 gemfile:
 - gemfiles/activerecord-4.2.0/Gemfile.mysql2
 - gemfiles/activerecord-4.2.0/Gemfile.postgresql
@@ -16,6 +16,9 @@ gemfile:
 - gemfiles/activerecord-4.2.6/Gemfile.mysql2
 - gemfiles/activerecord-4.2.6/Gemfile.postgresql
 - gemfiles/activerecord-4.2.6/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_foreign_keys.svg)](http://badge.fury.io/rb/schema_plus_foreign_keys)
 [![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_foreign_keys.svg)](http://travis-ci.org/SchemaPlus/schema_plus_foreign_keys)
 [![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_foreign_keys.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_foreign_keys)
-[![Dependency Status](https://gemnasium.com/lomba/schema_plus_foreign_keys.svg)](https://gemnasium.com/SchemaPlus/schema_plus_foreign_keys)
 
 # SchemaPlus::ForeignKeys
 
@@ -142,14 +141,16 @@ SchemaPlus::ForeignKeys is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.8** with activerecord **4.2.0**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.1.8** with activerecord **4.2.1**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.1.8** with activerecord **4.2.6**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **4.2.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **4.2.1**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **4.2.6**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## History
 
+* 0.1.7 - Compatibility with ActiveRecord 5.0.
 * 0.1.6 - Missing require
 * 0.1.5 - Explicit gem dependencies
 * 0.1.4 - Upgrade schema_plus_core dependency

data/gemfiles/activerecord-5.0/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 5.0.0"

data/gemfiles/activerecord-5.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_plus/foreign_keys.rb

@@ -1,4 +1,5 @@
 require 'schema_plus/core'
+require 'schema_plus_compatibility'
 require 'its-it'
 require 'valuable'
 

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract/schema_creation.rb

@@ -0,0 +1,29 @@
+module SchemaPlus
+  module Core
+    module ActiveRecord
+      module ConnectionAdapters
+        module AbstractAdapter
+          module SchemaCreation
+
+            def visit_ForeignKeyDefinition(o)
+              # schema_plus_foreign_keys already implements a superior
+              # conversion of ForeignKeyDefinitions to SQL
+              o.to_sql
+            end
+
+            # The TableDefinition::foreign_keys attribute contains ForeignKeyDefinitions instead of
+            # [to_table, options] tuples when using schema_plus_foreign_keys.
+            # This function happily accepts to_table and options arguments anyway, so we just ignore
+            # all arguments and treat to_table as the ForeignKeyDefinition and convert it to SQL
+            # directly.
+            def foreign_key_in_create(from_table, to_table, options)
+              accept to_table # This is the ForeignKeyDefinition
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -1,3 +1,5 @@
+require_relative 'abstract/schema_creation'
+
 module SchemaPlus::ForeignKeys
   module ActiveRecord
     # SchemaPlus::ForeignKeys adds several methods to the connection adapter (as returned by ActiveRecordBase#connection).  See AbstractAdapter for details.

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

@@ -8,6 +8,12 @@ module SchemaPlus::ForeignKeys
 
         # :enddoc:
 
+        # Even though SQLite3 has limited support for foreign keys, ActiveRecord does not
+        # enable it by default.
+        def supports_foreign_keys?
+          true
+        end
+
         def add_foreign_key(table_name, to_table, options = {})
           raise NotImplementedError, "Sqlite3 does not support altering a table to add foreign key constraints (table #{table_name.inspect} to #{to_table.inspect})"
         end

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

@@ -14,7 +14,7 @@ module SchemaPlus::ForeignKeys
           @inline_fks = Hash.new{ |h, k| h[k] = [] }
           @backref_fks = Hash.new{ |h, k| h[k] = [] }
 
-          env.connection.tables.each do |table|
+          env.connection.tables_only.each do |table|
             if (fks = env.connection.foreign_keys(table)).any?
               env.dump.data.has_fks = true
               @inline_fks[table] = fks

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

@@ -2,22 +2,23 @@ module SchemaPlus::ForeignKeys
   module Middleware
     module Sql
       module Table
-        def after(env)
-          foreign_keys = if env.table_definition.foreign_keys.is_a? Array
-                           env.table_definition.foreign_keys
-                         else
-                           env.table_definition.foreign_keys.values.tap { |v| v.flatten! }
-                         end
+        if Gem::Requirement.new('< 5.0.0.alpha.1').satisfied_by?(::ActiveRecord.version)
+          def after(env)
+            foreign_keys = if env.table_definition.foreign_keys.is_a? Array
+                             env.table_definition.foreign_keys
+                           else
+                             env.table_definition.foreign_keys.values.tap { |v| v.flatten! }
+                           end
 
-          # create foreign key constraints inline in table definition
-          env.sql.body = ([env.sql.body] + foreign_keys.map(&:to_sql)).join(', ')
+            # create foreign key constraints inline in table definition
+            env.sql.body = ([env.sql.body] + foreign_keys.map(&:to_sql)).join(', ')
 
-          # prevents AR >= 4.2.1 from emitting add_foreign_key after the table
-          env.table_definition.foreign_keys.clear
+            # prevents AR >= 4.2.1 from emitting add_foreign_key after the table
+            env.table_definition.foreign_keys.clear
+          end
         end
 
         module SQLite3
-
           def before(env)
             env.connection.execute('PRAGMA FOREIGN_KEYS = ON') if env.table_definition.foreign_keys.any?
           end

data/lib/schema_plus/foreign_keys/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module ForeignKeys
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/schema_dev.yml

@@ -1,9 +1,10 @@
 ruby:
-    - 2.1.8
+    - 2.3.1
 activerecord:
     - 4.2.0
     - 4.2.1
     - 4.2.6
+    - 5.0
 db:
     - mysql2
     - sqlite3

data/schema_plus_foreign_keys.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_core", "~> 1.0"
+  gem.add_dependency "activerecord", ">= 4.2", "< 5.1"
+  gem.add_dependency "schema_plus_core"
+  gem.add_dependency "schema_plus_compatibility", "~> 0.2"
   gem.add_dependency "valuable"
   gem.add_dependency "its-it", "~> 1.2"
 

data/spec/deprecation_spec.rb

@@ -122,6 +122,7 @@ describe 'Deprecations' do
 
     it "deprecates :set_null" do
       expect(ActiveSupport::Deprecation).to receive(:warn).with(/set_null.*nullify/)
+      allow(ActiveSupport::Deprecation).to receive(:warn).with(/table_exists\? currently checks/)
       define_schema do
         create_table :posts
         create_table :comments do |t|
@@ -136,6 +137,7 @@ describe 'Deprecations' do
   describe "in table definition" do
     it "deprecates 3-column form" do
       expect(ActiveSupport::Deprecation).to receive(:warn).with(/positional arg.*primary_key/)
+      allow(ActiveSupport::Deprecation).to receive(:warn).with(/table_exists\? currently checks/)
       define_schema do
         create_table :posts, primary_key: :funky
         create_table :comments do |t|

data/spec/migration_spec.rb

@@ -329,7 +329,7 @@ describe ActiveRecord::Migration do
         it "should remove a foreign key constraint"+suffix, :sqlite3 => :skip do
           Comment.reset_column_information
           expect(Comment).to reference(:users, :id).on(:user_id)
-          migration = Class.new ::ActiveRecord::Migration do
+          migration = Class.new ::ActiveRecord::Migration.latest_version do
             define_method(:change) {
               change_table("comments", :bulk => bulk) do |t|
                 t.integer :user_id, foreign_key: true

data/spec/schema_dumper_spec.rb

@@ -6,7 +6,7 @@ describe "Schema dump" do
   before(:each) do
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table, force: :cascade end
+        connection.tables_only.each do |table| drop_table table, force: :cascade end
 
         create_table :users, :force => true do |t|
           t.string :login
@@ -143,7 +143,7 @@ describe "Schema dump" do
 
         ActiveRecord::Migration.suppress_messages do
           ActiveRecord::Schema.define do
-            connection.tables.each do |table| drop_table table, force: :cascade end
+            connection.tables_only.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

@@ -22,7 +22,7 @@ RSpec.configure do |config|
       begin
         example.run
       ensure
-        ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.tables_only.each do |table|
           ActiveRecord::Migration.drop_table table, force: :cascade
         end
       end
@@ -48,7 +48,7 @@ def define_schema(config={}, &block)
   with_fk_config(config) do
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
-        connection.tables.each do |table|
+        connection.tables_only.each do |table|
           drop_table table, force: :cascade
         end
         instance_eval &block

metadata

@@ -1,43 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: schema_plus_compatibility
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -178,8 +198,13 @@ files:
 - gemfiles/activerecord-4.2.6/Gemfile.mysql2
 - gemfiles/activerecord-4.2.6/Gemfile.postgresql
 - gemfiles/activerecord-4.2.6/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.base
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
 - lib/schema_plus/foreign_keys.rb
 - lib/schema_plus/foreign_keys/active_record/base.rb
+- lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract/schema_creation.rb
 - lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract_adapter.rb
 - 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
@@ -224,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Extended support for foreign key constraints in ActiveRecord