schema_plus_core 2.2.2 → 3.1.0.beta.3

data/spec/dumper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestDumper
@@ -44,16 +46,14 @@ describe SchemaMonkey::Middleware::Dumper do
 
   let(:migration) { ::ActiveRecord::Migration }
 
-  TestCustomType = SchemaDev::Rspec::Helpers.postgresql?
-
-  around(:each) do |example|
+  around(postgresql: :only) do |example|
     begin
-      migration.execute "CREATE TYPE custom_type AS ENUM ('a', 'b')";
+      migration.execute "CREATE TYPE custom_type AS ENUM ('a', 'b')"
       example.run
     ensure
       migration.execute "DROP TYPE IF EXISTS custom_type CASCADE";
     end
-  end if TestCustomType
+  end
 
   before(:each) do
     migration.create_table "things" do |t|
@@ -64,7 +64,10 @@ describe SchemaMonkey::Middleware::Dumper do
       t.references :thing
     end
     migration.add_foreign_key("other", "things")
-    migration.execute "CREATE TABLE custom_table ( my_column custom_type DEFAULT 'a'::custom_type NOT NULL)" if TestCustomType
+  end
+
+  before(postgresql: :only) do
+    migration.execute "CREATE TABLE custom_table ( my_column custom_type DEFAULT 'a'::custom_type NOT NULL)"
   end
 
   context "column default expressions", postgresql: :only do
@@ -77,13 +80,13 @@ describe SchemaMonkey::Middleware::Dumper do
   end
 
   context TestDumper::Middleware::Dumper::Initial do
-    Then { expect(dump).to match(/Schema[.]define.*do\s+#{middleware}/) }
+    Then { expect(dump).to match(/Schema([\[\].0-9]+)?[.]define.*do\s+#{middleware}/) }
   end
 
   context TestDumper::Middleware::Dumper::Tables do
     Then { expect(dump).to match(/create_table "other".*create_table "#{middleware}".*create_table "things"/m) }
 
-    context 'int PK handling in rails 5.2+', postgresql: :only, rails: ['>= 5.2.0'] do
+    context 'int PK handling in rails 5.2+', postgresql: :only do
       before(:each) do
         migration.create_table "inttable", id: :serial do |t|
         end
@@ -91,12 +94,33 @@ describe SchemaMonkey::Middleware::Dumper do
 
       Then { expect(dump).to_not match(/create_table "inttable", id: :serial.*default:/m) }
     end
+
+    context 'expression index handling', postgresql: :only do
+      before(:each) do
+        migration.create_table "expressions" do |t|
+          t.string :field
+          t.string :column
+          t.index 'lower(field), id', name: 'index_expression_field'
+          t.index 'lower("column"), id', name: 'index_expression_column'
+        end
+      end
+
+      Then { expect(dump).to match(/index "lower.+field.+, id", :name=>"index_expression_field"/) }
+      Then { expect(dump).to match(/index "lower.+"column\\".+, id", :name=>"index_expression_column"/) }
+    end
   end
 
   context TestDumper::Middleware::Dumper::Table do
     Then { expect(dump).to match(/t[.]integer.*:option=>"#{middleware}" \# comment: #{middleware}/) }
     Then { expect(dump).to match(/statement: #{middleware}\s+end\s+(add_index.*)?\s+trailer: #{middleware}/) }
-    Then { expect(dump).to match(/could not dump table.*custom_table.*unknown type.*custom_type/mi) } if TestCustomType
+
+    Then(postgresql: :only, rails: '< 7.0') {
+      expect(dump).to match(/could not dump table.*custom_table.*unknown type.*custom_type/mi)
+    }
+    Then(postgresql: :only, rails: '>= 7.0') {
+      expect(dump).to match(/create_enum.+custom_type/mi)
+    }
+
     Then { expect(dump).to match(/t[.]index.*:option=>"#{middleware}"/) }
   end
 

data/spec/index_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe SchemaMonkey::Middleware::Migration::Index do

data/spec/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe SchemaMonkey::Middleware do
@@ -17,7 +19,7 @@ describe SchemaMonkey::Middleware do
 
     context TestReporter::Middleware::Query::Exec do
       Then { expect_middleware(enable: {sql: /SELECT column1/}) { connection.select_values("SELECT column1 FROM things") } }
-      Then { expect_middleware(enable: {sql: /^UPDATE/}) { thing.update_attributes!(column1: 3) } }
+      Then { expect_middleware(enable: {sql: /^UPDATE/}) { thing.update!(column1: 3) } }
       Then { expect_middleware(enable: {sql: /^DELETE/}) { thing.delete } }
     end
   end
@@ -30,7 +32,7 @@ describe SchemaMonkey::Middleware do
     end
 
     context TestReporter::Middleware::Schema::DataSources do
-      Then { expect_middleware { connection.data_sources() } }
+      Then { expect_middleware { connection.data_sources } }
     end
 
     context TestReporter::Middleware::Schema::Indexes do
@@ -119,6 +121,7 @@ describe SchemaMonkey::Middleware do
       end
 
       Then do
+
         class TestThingamajig < ActiveRecord::Base
           has_and_belongs_to_many :other_things, join_table: 'another_table'
         end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'simplecov'
-require 'simplecov-gem-profile'
-SimpleCov.start "gem"
+SimpleCov.start unless SimpleCov.running
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -38,4 +39,3 @@ RSpec.configure do |config|
 end
 
 SimpleCov.command_name "[ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING} - #{ActiveRecord::Base.connection.adapter_name}]"
-

data/spec/sql_struct_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe SchemaPlus::Core::SqlStruct do

data/spec/support/enableable.rb

@@ -1,9 +1,9 @@
-require "its-it"
+# frozen_string_literal: true
 
 module Enableable
 
   def enabled_middleware(root, env)
-    middleware = self.singleton_class.ancestors.find(&it.to_s.start_with?("#{root}::Middleware"))
+    middleware = self.singleton_class.ancestors.find { |it| it.to_s.start_with?("#{root}::Middleware") }
     return nil unless middleware.enabled?(env)
     middleware.disable if middleware.once?(env)
     middleware
@@ -32,5 +32,3 @@ module Enableable
     end
   end
 end
-
-

data/spec/support/test_reporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TestReporter
 
   class Called < Exception
@@ -15,7 +17,7 @@ module TestReporter
 
     def after(env)
       return unless middleware = enabled_middleware(TestReporter, env)
-      raise Called, middleware: middleware, env: env
+      raise Called.new middleware: middleware, env: env
     end
   end
 

metadata

@@ -1,85 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.1.0.beta.3
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: schema_monkey
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: its-it
+  name: schema_monkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.0.2.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.0.2.beta.1
 - !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.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,56 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 4.2.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-- !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'
-- !ruby/object:Gem::Dependency
-  name: its-it
-  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.2.beta.1
 description: Provides an internal extension API to ActiveRecord, in the form of middleware-style
   callback stacks
 email:
@@ -172,25 +122,30 @@ 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-5.0/Gemfile.base
-- gemfiles/activerecord-5.0/Gemfile.mysql2
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.0/Gemfile.sqlite3
-- gemfiles/activerecord-5.1/Gemfile.base
-- gemfiles/activerecord-5.1/Gemfile.mysql2
-- gemfiles/activerecord-5.1/Gemfile.postgresql
-- gemfiles/activerecord-5.1/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
+- gemfiles/activerecord-6.1/Gemfile.base
+- gemfiles/activerecord-6.1/Gemfile.mysql2
+- gemfiles/activerecord-6.1/Gemfile.postgresql
+- gemfiles/activerecord-6.1/Gemfile.sqlite3
+- gemfiles/activerecord-7.0/Gemfile.base
+- gemfiles/activerecord-7.0/Gemfile.mysql2
+- gemfiles/activerecord-7.0/Gemfile.postgresql
+- gemfiles/activerecord-7.0/Gemfile.sqlite3
 - lib/schema_plus/core.rb
 - lib/schema_plus/core/active_record/base.rb
 - lib/schema_plus/core/active_record/connection_adapters/abstract_adapter.rb
@@ -220,7 +175,7 @@ homepage: https://github.com/SchemaPlus/schema_plus_core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,16 +183,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'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Provides an internal extension API to ActiveRecord
 test_files:

data/.travis.yml

@@ -1,25 +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.4.4
-- 2.5.1
-gemfile:
-- gemfiles/activerecord-5.0/Gemfile.mysql2
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.0/Gemfile.sqlite3
-- gemfiles/activerecord-5.1/Gemfile.mysql2
-- gemfiles/activerecord-5.1/Gemfile.postgresql
-- gemfiles/activerecord-5.1/Gemfile.sqlite3
-- gemfiles/activerecord-5.2/Gemfile.mysql2
-- gemfiles/activerecord-5.2/Gemfile.postgresql
-- gemfiles/activerecord-5.2/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-5.0/Gemfile.base

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

data/gemfiles/activerecord-5.0/Gemfile.mysql2

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

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

data/gemfiles/activerecord-5.1/Gemfile.base

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

data/gemfiles/activerecord-5.1/Gemfile.mysql2

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

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