schema_plus_foreign_keys 0.1.6 → 1.0.0

data/spec/named_schemas_spec.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe "with multiple schemas" do
+describe "with multiple schemas", sqlite3: :skip do
   def connection
     ActiveRecord::Base.connection
   end
@@ -22,7 +24,7 @@ describe "with multiple schemas" do
 
   before(:each) do
     define_schema do
-      create_table :users, :force => true do |t|
+      create_table :users, force: true do |t|
         t.string :login
       end
     end
@@ -56,8 +58,8 @@ describe "with multiple schemas" do
     end
 
     it "should not find foreign keys in other schema" do
-      connection.create_table :comments, :force => true do |t|
-        t.integer :user_id, :foreign_key => false
+      connection.create_table :comments, force: true do |t|
+        t.references :user, foreign_key: false
       end
       Comment.reset_column_information
       expect(Comment.foreign_keys.length).to eq(0)
@@ -66,8 +68,8 @@ describe "with multiple schemas" do
     end
 
     it "should find foreign keys in this schema" do
-      connection.create_table :comments, :force => true do |t|
-        t.integer :user_id, :foreign_key => true
+      connection.create_table :comments, force: true do |t|
+        t.references :user, foreign_key: true
       end
       Comment.reset_column_information
       expect(Comment.foreign_keys.map(&:column).flatten).to eq(["user_id"])
@@ -80,13 +82,13 @@ describe "with multiple schemas" do
   context "foreign key migrations" do
     before(:each) do
       define_schema do
-        create_table "items", :force => true do |t|
+        create_table "items", force: true do |t|
         end
-        create_table "schema_plus_test2.groups", :force => true do |t|
+        create_table "schema_plus_test2.groups", force: true do |t|
         end
-        create_table "schema_plus_test2.members", :force => true do |t|
-          t.integer :item_id, :foreign_key => true unless SchemaDev::Rspec::Helpers.mysql?
-          t.integer :group_id, :foreign_key => { references: "schema_plus_test2.groups" }
+        create_table "schema_plus_test2.members", force: true do |t|
+          t.references :item, foreign_key: { name: 'fk_test2_members_items' } unless SchemaDev::Rspec::Helpers.mysql?
+          t.references :group, foreign_key: { name: 'fk_test2_members_groups', references: "schema_plus_test2.groups" }
         end
       end
       class Group < ::ActiveRecord::Base
@@ -122,13 +124,13 @@ describe "with multiple schemas" do
       expect(Member.foreign_keys.map(&:to_table)).to include "schema_plus_test2.groups"
     end
 
-    it "should reference table in default schema", :mysql => :skip do
+    it "should reference table in default schema", mysql: :skip do
       expect(Member.foreign_keys.map(&:to_table)).to include "items"
     end
 
     it "should include the schema in the constraint name" do
-      expected_names = ["fk_schema_plus_test2_members_group_id"]
-      expected_names << "fk_schema_plus_test2_members_item_id" unless SchemaDev::Rspec::Helpers.mysql?
+      expected_names = ["fk_test2_members_groups"]
+      expected_names << "fk_test2_members_items" unless SchemaDev::Rspec::Helpers.mysql?
       expect(Member.foreign_keys.map(&:name).sort).to match_array(expected_names.sort)
     end
   end

data/spec/schema_dumper_spec.rb

@@ -1,23 +1,24 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'stringio'
 
 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|
+        create_table :users, force: true do |t|
           t.string :login
           t.datetime :deleted_at
-          t.integer :first_post_id, index: { unique: true }
+          t.references :first_post, index: { unique: true }
         end
 
-        create_table :posts, :force => true do |t|
+        create_table :posts, force: true do |t|
           t.text :body
-          t.integer :user_id
-          t.integer :first_comment_id
+          t.references :user
+          t.references :first_comment
           t.string :string_no_default
           t.integer :short_id
           t.string :str_short
@@ -32,10 +33,10 @@ describe "Schema dump" do
           t.boolean :boolean_col
         end
 
-        create_table :comments, :force => true do |t|
+        create_table :comments, force: true do |t|
           t.text :body
-          t.integer :post_id
-          t.integer :commenter_id
+          t.references :post
+          t.references :commenter
         end
       end
     end
@@ -53,25 +54,25 @@ describe "Schema dump" do
 
   it "should include foreign_key definition" do
     with_foreign_key Post, :user_id, :users, :id do
-      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*users})
+      expect(dump_posts).to match(%r{t.(integer|bigint)\s+"user_id".*foreign_key.*users})
     end
   end
 
   it "should include foreign_key name" do
-    with_foreign_key Post, :user_id, :users, :id, :name => "yippee" do
+    with_foreign_key Post, :user_id, :users, :id, name: "yippee" do
       expect(dump_posts).to match(/user_id.*foreign_key.*users.*:name=>"yippee"/)
     end
   end
 
   it "should respect foreign key's primary key" do
     with_foreign_key Post, :user_id, :users, :first_post_id do
-      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*:primary_key=>"first_post_id"})
+      expect(dump_posts).to match(%r{t.(integer|bigint)\s+"user_id".*foreign_key.*:primary_key=>"first_post_id"})
     end
   end
 
 
   it "should include foreign_key exactly once" do
-    with_foreign_key Post, :user_id, :users, :id, :name => "yippee" do
+    with_foreign_key Post, :user_id, :users, :id, name: "yippee" do
       expect(dump_posts.scan(/foreign_key.*yippee"/).length).to eq 1
     end
   end
@@ -97,7 +98,7 @@ describe "Schema dump" do
 
     it "should handle regexp in ignore_tables" do
       with_foreign_key Comment, :post_id, :posts, :id do
-        dump = dump_schema(:ignore => /post/)
+        dump = dump_schema(ignore: /post/)
         expect(dump).to match(/create_table "comments"/)
         expect(dump).not_to match(/create_table "posts"/)
       end
@@ -106,12 +107,12 @@ describe "Schema dump" do
   end
 
   it "should include foreign_key options" do
-    with_foreign_key Post, :user_id, :users, :id, :on_update => :cascade, :on_delete => :nullify do
-      expect(dump_posts).to match(%q[t.integer\s*"user_id",.*:foreign_key=>{:references=>"users", :name=>"fk_posts_user_id", :on_update=>:cascade, :on_delete=>:nullify}])
+    with_foreign_key Post, :user_id, :users, :id, on_update: :cascade, on_delete: :nullify do
+      expect(dump_posts).to match(%q[t.(integer|bigint)\s*"user_id",.*:foreign_key=>{:references=>"users", :name=>"fk_rails_\w+", :on_update=>:cascade, :on_delete=>:nullify}])
     end
   end
 
-  context "with cyclic foreign key constraints", :sqlite3 => :skip do
+  context "with cyclic foreign key constraints", sqlite3: :skip do
     before(:each) do
       ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, User.table_name, column: :commenter_id)
       ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, Post.table_name, column: :post_id)
@@ -143,33 +144,33 @@ 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
-              t.integer  :school_id
-              t.integer  :parent_id
-              t.integer  :profile_id
+              t.string     :name
+              t.references :school
+              t.references :parent
+              t.references :profile
             end
 
             create_table :schools, force: true do |t|
-              t.string   :name
-              t.integer  :default_grade_system_id
+              t.string     :name
+              t.references :default_grade_system
             end
 
             create_table :academic_years, force: true do |t|
-              t.string  :name
-              t.integer :school_id
+              t.string     :name
+              t.references :school
             end
 
             create_table :buildings, force: true do |t|
-              t.string   :name
-              t.integer  :school_id
+              t.string     :name
+              t.references :school
             end
 
             create_table :profiles, force: true do |t|
-              t.integer  :school_id
-              t.integer  :building_id
+              t.references :school
+              t.references :building
             end
 
           end
@@ -215,12 +216,12 @@ describe "Schema dump" do
   def with_foreign_keys(model, columnsets)
     table_columns = model.columns.reject{|column| column.name == 'id'}
     ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
+      ActiveRecord::Migration.create_table model.table_name, force: true do |t|
         table_columns.each do |column|
-          t.column column.name, column.type
+          t.column column.name, column.type, limit: column.limit
         end
         columnsets.each do |columns, referenced_table_name, referenced_columns, options|
-          t.foreign_key columns, referenced_table_name, (options||{}).merge(primary_key: referenced_columns)
+          t.foreign_key referenced_table_name, **(options||{}).merge(column: columns, primary_key: referenced_columns)
         end
       end
     end
@@ -231,7 +232,7 @@ describe "Schema dump" do
       ActiveRecord::Migration.suppress_messages do
         ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
           table_columns.each do |column|
-            t.column column.name, column.type
+            t.column column.name, column.type, limit: column.limit
           end
         end
       end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'simplecov'
-require 'simplecov-gem-profile'
-SimpleCov.start "gem"
+
+SimpleCov.start
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -22,7 +24,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 +50,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

data/spec/support/reference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Matchers
 
   class Reference
@@ -22,7 +24,7 @@ module SchemaPlus::Matchers
       @result.keep_if {|fk| fk.on_update == @on_update } if @on_update
       @result.keep_if {|fk| fk.on_delete == @on_delete } if @on_delete
       @result.keep_if {|fk| fk.deferrable == @deferrable } if @deferrable
-      @result.keep_if {|fk| fk.name == @name } if @name
+      @result.keep_if {|fk| @name.is_a?(String) ? fk.name == @name : fk.name.match?(@name) } if @name
       !@result.empty?
     end
 
@@ -76,4 +78,3 @@ module SchemaPlus::Matchers
   end
 
 end
-

metadata

@@ -1,99 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.0.0
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2022-05-06 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'
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: valuable
+  name: schema_plus_compatibility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: its-it
+  name: valuable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,42 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-gem-profile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 description: 'Extended support for foreign key constraints in ActiveRecord, including:
   definition as column attribute; deferrable; and SQLite3 support; cleaner dumps;
   and more!'
@@ -159,27 +137,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/prs.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".simplecov"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-4.2.0/Gemfile.base
-- gemfiles/activerecord-4.2.0/Gemfile.mysql2
-- gemfiles/activerecord-4.2.0/Gemfile.postgresql
-- gemfiles/activerecord-4.2.0/Gemfile.sqlite3
-- gemfiles/activerecord-4.2.1/Gemfile.base
-- gemfiles/activerecord-4.2.1/Gemfile.mysql2
-- gemfiles/activerecord-4.2.1/Gemfile.postgresql
-- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
-- gemfiles/activerecord-4.2.6/Gemfile.base
-- gemfiles/activerecord-4.2.6/Gemfile.mysql2
-- gemfiles/activerecord-4.2.6/Gemfile.postgresql
-- gemfiles/activerecord-4.2.6/Gemfile.sqlite3
+- gemfiles/activerecord-5.2/Gemfile.base
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
+- gemfiles/activerecord-6.0/Gemfile.base
+- gemfiles/activerecord-6.0/Gemfile.mysql2
+- gemfiles/activerecord-6.0/Gemfile.postgresql
+- gemfiles/activerecord-6.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
@@ -208,7 +184,7 @@ homepage: https://github.com/SchemaPlus/schema_plus_foreign_keys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,16 +192,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Extended support for foreign key constraints in ActiveRecord
 test_files:

data/.travis.yml

@@ -1,24 +0,0 @@
-# This file was auto-generated by the schema_dev tool, based on the data in
-#                 ./schema_dev.yml
-# Please do not edit this file; any changes will be overwritten next time
-# schema_dev gets run.
----
-sudo: false
-rvm:
-- 2.1.8
-gemfile:
-- gemfiles/activerecord-4.2.0/Gemfile.mysql2
-- gemfiles/activerecord-4.2.0/Gemfile.postgresql
-- gemfiles/activerecord-4.2.0/Gemfile.sqlite3
-- gemfiles/activerecord-4.2.1/Gemfile.mysql2
-- gemfiles/activerecord-4.2.1/Gemfile.postgresql
-- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
-- gemfiles/activerecord-4.2.6/Gemfile.mysql2
-- gemfiles/activerecord-4.2.6/Gemfile.postgresql
-- gemfiles/activerecord-4.2.6/Gemfile.sqlite3
-env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
-addons:
-  postgresql: '9.4'
-before_script: bundle exec rake create_databases
-after_script: bundle exec rake drop_databases
-script: bundle exec rake travis

data/gemfiles/activerecord-4.2.0/Gemfile.base

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

data/gemfiles/activerecord-4.2.0/Gemfile.mysql2

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

data/gemfiles/activerecord-4.2.0/Gemfile.postgresql

@@ -1,10 +0,0 @@
-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-4.2.1/Gemfile.base

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

data/gemfiles/activerecord-4.2.1/Gemfile.mysql2

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

data/gemfiles/activerecord-4.2.1/Gemfile.postgresql

@@ -1,10 +0,0 @@
-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-4.2.1/Gemfile.sqlite3

@@ -1,10 +0,0 @@
-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/gemfiles/activerecord-4.2.6/Gemfile.base

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

data/gemfiles/activerecord-4.2.6/Gemfile.mysql2

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

data/gemfiles/activerecord-4.2.6/Gemfile.postgresql

@@ -1,10 +0,0 @@
-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