schema_plus_core 2.2.1 → 3.0.0

data/lib/schema_plus/core/active_record/schema_dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 require 'tsort'
 
@@ -44,6 +46,54 @@ module SchemaPlus
           end
         end
 
+        TABLE_COLUMN_MATCHES = [
+            [ # first match expression index case
+                %r{
+                  ^
+                  t\.index \s*
+                    "(?<index_cols>(?:[^"\\]|\\.)*?)" \s*
+                    , \s*
+                    name\: \s* [:'"](?<name>[^"\s]+)[,"]? \s*
+                    ,? \s*
+                    (?<options>.*)
+                  $
+                  }x,
+                ->(m) {
+                  index_cols = m[:index_cols].gsub('\\"', '"')
+                  SchemaDump::Table::Index.new name: m[:name], columns: index_cols, options: eval("{" + m[:options] + "}")
+                }
+            ],
+            [ # general matching of columns
+                %r{
+                  ^
+                  t\.(?<type>\S+) \s*
+                    [:'"](?<name>[^"\s]+)[,"]? \s*
+                    ,? \s*
+                    (?<options>.*)
+                  $
+                  }x,
+                ->(m) {
+                  SchemaDump::Table::Column.new name: m[:name], type: m[:type], options: eval("{" + m[:options] + "}"), comments: []
+                }
+            ],
+            [ # index definitions with multiple columns
+                %r{
+                  ^
+                  t\.index \s*
+                    \[(?<index_cols>.*?)\] \s*
+                    , \s*
+                    name\: \s* [:'"](?<name>[^"\s]+)[,"]? \s*
+                    ,? \s*
+                    (?<options>.*)
+                  $
+                  }x,
+                ->(m) {
+                  index_cols = m[:index_cols].tr(%q{'":}, '').strip.split(/\s*,\s*/)
+                  SchemaDump::Table::Index.new name: m[:name], columns: index_cols, options: eval("{#{m[:options]}}")
+                }
+            ]
+        ].freeze
+
         def table(table, _)
           SchemaMonkey::Middleware::Dumper::Table.start(dumper: self, connection: @connection, dump: @dump, table: @dump.tables[table] = SchemaDump::Table.new(name: table)) do |env|
             stream = StringIO.new
@@ -68,34 +118,13 @@ module SchemaPlus
               env.table.trailer = m[:trailer].split("\n").map(&:strip).reject{|s| s.blank?}
               table_objects = m[:columns].strip.split("\n").map { |col|
                 cs = col.strip
-                m = cs.match %r{
-                ^
-                t\.(?<type>\S+) \s*
-                  [:'"](?<name>[^"\s]+)[,"]? \s*
-                  ,? \s*
-                  (?<options>.*)
-                $
-                }x
-                if !m.nil?
-                  SchemaDump::Table::Column.new name: m[:name], type: m[:type], options: eval("{" + m[:options] + "}"), comments: []
-                else
-                  m = cs.match %r{
-                  ^
-                  t\.index \s*
-                    \[(?<index_cols>.*?)\] \s*
-                    , \s*
-                    name\: \s* [:'"](?<name>[^"\s]+)[,"]? \s*
-                    ,? \s*
-                    (?<options>.*)
-                  $
-                  }x
-                  if m.nil?
-                    nil
-                  else
-                    index_cols = m[:index_cols].tr(%q{'":}, '').strip.split(/\s*,\s*/)
-                    SchemaDump::Table::Index.new name: m[:name], columns: index_cols, options: eval("{#{m[:options]}}")
-                  end
+                result = nil
+                # find the first regex that matches and grab the column definition
+                TABLE_COLUMN_MATCHES.find do |(r, l)|
+                  m = cs.match r
+                  result = m.nil? ? nil : l.call(m)
                 end
+                result
               }.reject { |o| o.nil? }
               env.table.columns = table_objects.select { |o| o.is_a? SchemaDump::Table::Column }
               env.table.indexes = table_objects.select { |o| o.is_a? SchemaDump::Table::Index }

data/lib/schema_plus/core/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module Middleware

data/lib/schema_plus/core/schema_dump.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     class SchemaDump
@@ -43,7 +45,8 @@ module SchemaPlus
         @dependencies[tablename].sort.uniq.reject{|t| @dumper.ignored? t}.each(&block)
       end
 
-      class Table < KeyStruct[:name, :pname, :options, :columns, :indexes, :statements, :trailer, :alt]
+      class Table < Struct.new(:name, :pname, :options, :columns, :indexes, :statements, :trailer, :alt,
+                               keyword_init: true)
         def initialize(*args)
           super
           self.columns ||= []
@@ -85,7 +88,7 @@ module SchemaPlus
           stream.puts ""
         end
 
-        class Column < KeyStruct[:name, :type, :options, :comments]
+        class Column < Struct.new(:name, :type, :options, :comments, keyword_init: true)
 
           def assemble(stream, typelen, namelen)
             stream.write "t.%-#{typelen}s " % type
@@ -102,7 +105,7 @@ module SchemaPlus
           end
         end
 
-        class Index < KeyStruct[:name, :columns, :options]
+        class Index < Struct.new(:name, :columns, :options, keyword_init: true)
 
           def assemble(stream)
             stream.write columns.inspect + ", " + {name: name}.merge(options).to_s.sub(/^{(.*)}$/, '\1')

data/lib/schema_plus/core/sql_struct.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module SqlStruct
-      IndexComponents = KeyStruct[:name, :type, :columns, :options, :algorithm, :using]
+      IndexComponents = Struct.new(:name, :type, :columns, :options, :algorithm, :using, keyword_init: true)
 
-      class Table < KeyStruct[:command, :name, :body, :options, :quotechar, :inheritance]
+      class Table < Struct.new(:command, :name, :body, :options, :quotechar, :inheritance, keyword_init: true)
 
         INHERITANCE_REGEX = %r{ \s* (?<inheritance>INHERITS \s* \( [^)]* \)) }mxi
 

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
-    VERSION = "2.2.1"
+    VERSION = "3.0.0"
   end
 end

data/lib/schema_plus/core.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require "schema_monkey"
-require 'its-it'
 require "pathname"
 
 module SchemaPlus
@@ -26,8 +27,6 @@ require_relative "core/schema_dump"
 require_relative "core/sql_struct"
 require_relative "core/version"
 
-if ActiveRecord.version >= Gem::Version.new('5.2.0.rc1')
-  require_relative "core/active_record/connection_adapters/postgresql/schema_dumper"
-end
+require_relative "core/active_record/connection_adapters/postgresql/schema_dumper"
 
 SchemaMonkey.register(SchemaPlus::Core)

data/schema_dev.yml

@@ -1,11 +1,11 @@
 ruby:
-    - 2.4.4
-    - 2.5.1
+    - 2.5
+    - 2.7
+    - 3.0
 activerecord:
-    - 5.0
-    - 5.1
     - 5.2
+    - 6.0
 db:
+    - postgresql
     - mysql2
     - sqlite3
-    - postgresql

data/schema_plus_core.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'schema_plus/core/version'
@@ -18,16 +19,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 5.0"
-  gem.add_dependency "schema_monkey", "~> 2.1"
-  gem.add_dependency "its-it", "~> 1.2"
+  gem.required_ruby_version = ">= 2.5.0"
+
+  gem.add_dependency "activerecord", ">= 5.2", "< 6.1"
+  gem.add_dependency "schema_monkey", "~> 3.0.1"
 
-  gem.add_development_dependency "bundler", "~> 1.7"
-  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "rake", "~> 13.0.0"
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "rspec-given"
-  gem.add_development_dependency "schema_dev", "~> 3.11"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-gem-profile"
-  gem.add_development_dependency "its-it"
+  gem.add_development_dependency "schema_dev", "~> 4.1"
 end

data/spec/column_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestImplementsReference
@@ -27,8 +29,7 @@ describe SchemaMonkey::Middleware::Migration::Column do
     let (:spy) { described_class.const_get(:SPY) }
 
     let (:pk_type) do
-      if ActiveRecord.version >= Gem::Version.new('5.1') &&
-         ActiveRecord::Base.connection.adapter_name =~ /mysql|postgresql/i
+      if ActiveRecord::Base.connection.adapter_name =~ /mysql|postgresql/i
         :bigint
       else
         :integer

data/spec/dumper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestDumper
@@ -82,6 +84,29 @@ describe SchemaMonkey::Middleware::Dumper do
 
   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 do
+      before(:each) do
+        migration.create_table "inttable", id: :serial do |t|
+        end
+      end
+
+      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

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
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -16,6 +17,12 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 SchemaDev::Rspec.setup
 
 RSpec.configure do |config|
+
+  config.filter_run_excluding rails: -> (v) {
+    rails_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+    test = Gem::Requirement.new(v)
+    !test.satisfied_by?(rails_version)
+  }
   config.warnings = true
   config.around(:each) do |example|
     ActiveRecord::Migration.suppress_messages do

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.1
+  version: 3.0.0
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2022-04-22 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: '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: '2.1'
+        version: '6.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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.0.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.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.1'
 description: Provides an internal extension API to ActiveRecord, in the form of middleware-style
   callback stacks
 email:
@@ -172,25 +122,22 @@ 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
 - 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 +167,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 +175,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.7.6
-signing_key: 
+rubygems_version: 3.0.8
+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"
-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"