schema_plus_default_expr 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c24085ed3bb05ff633fe8317b15b33bec10b8f3b113843d858f09910dec72738
-  data.tar.gz: cc98c4e98034a47315afe49030f6282bc61bc2d591c469bd979727fc54572a1a
+  metadata.gz: 14597121db8f2e284e7e613c7d0b9ceedd8f98a2cd9f085d019660c34c6ef5a5
+  data.tar.gz: 51e9dddb7157edf31da2ec10761b38c56cf1919669bcb97f4477044441e2209f
 SHA512:
-  metadata.gz: 1e38b77bed24b4fe6ca1bc56e27b230910aa4e5ef69b70edb6d80032bbbedd7b77cf40d84b2444c390d318c313b73c7b7b79ec4b895274ef254c33469813844f
-  data.tar.gz: acafe28b6be7464f484150bbaaaf645fc0d39853e6247ece343f1745e0c96af3bed7a0cae5d4c3e6a543afcd26dcedbc011d1147dda2cb579f7bc964772c3d9c
+  metadata.gz: f0a7b837d44f903c22ad3286bded62e008fc2c892e4e3d41ae9e7fe1f02f862a3db7532d4a178fc82cf56421d25dcfa2caff9e739ca69cd70a6c3c2c81f5c000
+  data.tar.gz: ae111294c25323bb9bd70c1ffad4fbbc2f41e47a21ab47d86f5e576631ab97126f8092f23b1c32d96f07de61585d6f3a023c5e8bd8517361a668000afdb24628

data/.github/workflows/prs.yml

@@ -22,9 +22,12 @@ jobs:
         - '2.5'
         - '2.7'
         - '3.0'
+        - '3.1'
         activerecord:
         - '5.2'
         - '6.0'
+        - '6.1'
+        - '7.0'
         db:
         - sqlite3
         - skip
@@ -33,6 +36,10 @@ jobs:
         exclude:
         - ruby: '3.0'
           activerecord: '5.2'
+        - ruby: '3.1'
+          activerecord: '5.2'
+        - ruby: '2.5'
+          activerecord: '7.0'
         - db: skip
           dbversion: skip
         include:
@@ -44,6 +51,10 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '2.7'
           activerecord: '5.2'
           db: postgresql
@@ -52,10 +63,38 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
       POSTGRESQL_DB_HOST: 127.0.0.1

data/README.md

@@ -31,9 +31,17 @@ SchemaPlus::DefaultExpr is tested on:
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **2.5** with activerecord **5.2**, using **sqlite3** and **postgresql:9.6**
 * ruby **2.5** with activerecord **6.0**, using **sqlite3** and **postgresql:9.6**
+* ruby **2.5** with activerecord **6.1**, using **sqlite3** and **postgresql:9.6**
 * ruby **2.7** with activerecord **5.2**, using **sqlite3** and **postgresql:9.6**
 * ruby **2.7** with activerecord **6.0**, using **sqlite3** and **postgresql:9.6**
+* ruby **2.7** with activerecord **6.1**, using **sqlite3** and **postgresql:9.6**
+* ruby **2.7** with activerecord **7.0**, using **sqlite3** and **postgresql:9.6**
 * ruby **3.0** with activerecord **6.0**, using **sqlite3** and **postgresql:9.6**
+* ruby **3.0** with activerecord **6.1**, using **sqlite3** and **postgresql:9.6**
+* ruby **3.0** with activerecord **7.0**, using **sqlite3** and **postgresql:9.6**
+* ruby **3.1** with activerecord **6.0**, using **sqlite3** and **postgresql:9.6**
+* ruby **3.1** with activerecord **6.1**, using **sqlite3** and **postgresql:9.6**
+* ruby **3.1** with activerecord **7.0**, using **sqlite3** and **postgresql:9.6**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -77,6 +85,7 @@ t.json :fields, default: { field1: 'a', field2: 'b' }
 
 ## History
 
+* **1.0.1** - Add AR 6.1, 7.0 and Ruby 3.1
 * **1.0.0** - Add AR 6.0, Ruby 3.0 and dropped AR < 5.2 and Ruby < 5.2
 * **0.1.5** - Compatibility with AR 5.2.
 * **0.1.4** - Compatibility with AR 5.  Thanks to [@pedantic-git](https://github.com/pedantic-git)

data/gemfiles/activerecord-6.1/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.1", "< 6.2"

data/gemfiles/activerecord-6.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-7.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

data/gemfiles/activerecord-7.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_plus/default_expr/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module DefaultExpr
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/schema_dev.yml

@@ -2,9 +2,12 @@ ruby:
     - 2.5
     - 2.7
     - 3.0
+    - 3.1
 activerecord:
     - 5.2
     - 6.0
+    - 6.1
+    - 7.0
 db:
     - sqlite3
     - postgresql

data/schema_plus_default_expr.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_dependency "activerecord", ">= 5.2", "< 6.1"
-  gem.add_dependency "schema_plus_core", '~> 3.0.0'
+  gem.add_dependency "activerecord", ">= 5.2", "< 7.1"
+  gem.add_dependency "schema_plus_core", '~> 3.1.0'
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake", "~> 13.0"
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 4.1"
+  gem.add_development_dependency "schema_dev", "~> 4.2.0"
 end

data/spec/column_default_spec.rb

@@ -1,18 +1,8 @@
 require 'spec_helper'
 
 describe "Column definition" do
-  def stub_model(name, base = ActiveRecord::Base, &block)
-    klass = Class.new(base)
-
-    if block_given?
-      klass.instance_eval(&block)
-    end
-
-    stub_const(name, klass)
-  end
-
   before(:each) do
-    define_schema do
+    apply_migration do
       create_table :models, :force => true do |t|
       end
     end
@@ -125,8 +115,8 @@ describe "Column definition" do
   private
 
   def define_test_column(type, **options)
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table Model.table_name, :force => true do |t|
+    apply_migration do
+      create_table Model.table_name, :force => true do |t|
         t.send type, :test_column, **options
         t.integer :dummy
       end

data/spec/migration_spec.rb

@@ -3,41 +3,37 @@ require 'spec_helper'
 describe ActiveRecord::Migration do
 
   before(:each) do
-    define_schema do
+    apply_migration do
       create_table :posts, :force => true do |t|
         t.string :content
       end
     end
-    class Post < ::ActiveRecord::Base ; end
   end
 
   context "when table is created" do
-
-    before(:each) do
-      @model = Post
-    end
+    let(:model) { stub_model('Post') }
 
     it "should properly handle default values for booleans" do
       expect {
-        recreate_table(@model) do |t|
+        recreate_table(model) do |t|
           t.boolean :bool, :default => true
         end
       }.to_not raise_error
-      expect(@model.create.reload.bool).to be true
+      expect(model.create.reload.bool).to be true
     end
 
     it "should properly handle default values for json (#195)", :postgresql => :only do
-      recreate_table(@model) do |t|
+      recreate_table(model) do |t|
         t.json :json, :default => {}
       end
-      expect(@model.create.reload.json).to eq({})
+      expect(model.create.reload.json).to eq({})
     end
 
   end
 
   def recreate_table(model, opts={}, &block)
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table model.table_name, **opts.merge(:force => true), &block
+    apply_migration do
+      create_table model.table_name, **opts.merge(:force => true), &block
     end
     model.reset_column_information
   end

data/spec/schema_dumper_spec.rb

@@ -2,93 +2,92 @@ require 'spec_helper'
 require 'stringio'
 
 describe "Schema dump" do
+  let(:model) { stub_model('Post') }
 
-  before(:all) do
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table, force: :cascade end
-
+  context "with date default", :postgresql => :only do
+    before do
+      apply_migration do
         create_table :posts, :force => true do |t|
-          t.text :body
-          t.integer :user_id
-          t.integer :first_comment_id
-          t.string :string_no_default
-          t.integer :short_id
-          t.string :str_short
-          t.integer :integer_col
-          t.float :float_col
-          t.decimal :decimal_col
-          t.datetime :datetime_col
-          t.timestamp :timestamp_col
-          t.time :time_col
-          t.date :date_col
-          t.binary :binary_col
-          t.boolean :boolean_col
         end
-
       end
     end
-    class ::Post < ActiveRecord::Base ; end
-  end
 
-  context "with date default", :postgresql => :only do
     it "should dump the default hash expr as now()" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
+      with_additional_column model, :posted_at, :datetime, :default => :now do
         expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}\s*$})
       end
     end
 
     it "should dump the default hash expr as CURRENT_TIMESTAMP" do
-      with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
+      with_additional_column model, :posted_at, :datetime, :default => { :expr => 'date \'2001-09-28\'' } do
         expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default\s*=>).*2001-09-28.*})
       end
     end
+  end
+
+  context 'with a complex expression', postgresql: :only do
+    before do
+      apply_migration do
+        create_table :posts, :force => true do |t|
+        end
+      end
+    end
 
     it "can dump a complex default expression" do
-      with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
+      with_additional_column model, :name, :string, :default => { :expr => 'substring(random()::text from 3 for 6)' } do
         expect(dump_posts).to match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
       end
     end
   end
 
   context "with date default", :sqlite3 => :only do
+    before do
+      apply_migration do
+        create_table :posts, :force => true do |t|
+        end
+      end
+    end
+
     it "should dump the default hash expr as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
+      with_additional_column model, :posted_at, :datetime, :default => :now do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(?DATETIME\('now'\)\)?"\s*\}})
       end
     end
 
     it "should dump the default hash expr string as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(DATETIME\('now'\)\)"\s*\}})
+      with_additional_column model, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(default:|:default\s*=>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"\(?DATETIME\('now'\)\)?"\s*\}})
       end
     end
 
     it "should dump the default value normally" do
-      with_additional_column Post, :posted_at, :string, :default => "now" do
+      with_additional_column model, :posted_at, :string, :default => "now" do
         expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default\s*=>)\s*"now"})
       end
     end
   end
 
   it "should leave out :default when default was changed to null" do
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
+    apply_migration do
+      create_table :posts, :force => true do |t|
+        t.datetime :date_column, default: { expr: :now }
+      end
+
+      change_column_default :posts, :date_column, nil
     end
-    # mysql2 includes 'limit: 255' in the output.  that's OK, just want to
-    # make sure the full line doesn't have 'default' in it.
-    expect(dump_posts).to match(%r{t\.string\s+"string_no_default"\s*(,\s*limit:\s*\d+)?$})
+    expect(dump_posts).to match(%r{t\.datetime\s+"date_column"$})
   end
 
   protected
+
   def to_regexp(string)
     Regexp.new(Regexp.escape(string))
   end
 
   def with_additional_column(model, column_name, column_type, options)
-    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|
+    table_columns = model.columns.reject { |column| column.name == 'id' }
+    apply_migration do
+      create_table model.table_name, :force => true do |t|
         table_columns.each do |column|
           t.column column.name, column.type, :default => column.default
         end
@@ -98,8 +97,8 @@ describe "Schema dump" do
     yield
   end
 
-  def dump_schema(opts={})
-    stream = StringIO.new
+  def dump_schema(opts = {})
+    stream                                   = StringIO.new
     ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore]) || []
     ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
     stream.string
@@ -110,4 +109,3 @@ describe "Schema dump" do
   end
 
 end
-

data/spec/spec_helper.rb

@@ -15,18 +15,36 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.warnings = true
+
+  config.around do |example|
+    begin
+      example.run
+    ensure
+      apply_migration do
+        ActiveRecord::Base.connection.tables.each do |table|
+          drop_table table, force: :cascade
+        end
+      end
+    end
+  end
 end
 
-def define_schema(&block)
+def stub_model(name, base = ActiveRecord::Base, &block)
+  klass = Class.new(base)
+
+  if block_given?
+    klass.instance_eval(&block)
+  end
+
+  stub_const(name, klass)
+end
+
+def apply_migration(&block)
   ActiveRecord::Migration.suppress_messages do
     ActiveRecord::Schema.define do
-      connection.tables.each do |table|
-        drop_table table, force: :cascade
-      end
       instance_eval &block
     end
   end
 end
 
-
 SimpleCov.command_name "[ruby#{RUBY_VERSION}-activerecord#{::ActiveRecord.version}-#{ActiveRecord::Base.connection.adapter_name}]"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_default_expr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.0
 description:
 email:
 - ronen@barzel.org
@@ -121,6 +121,12 @@ files:
 - gemfiles/activerecord-6.0/Gemfile.base
 - gemfiles/activerecord-6.0/Gemfile.postgresql
 - gemfiles/activerecord-6.0/Gemfile.sqlite3
+- gemfiles/activerecord-6.1/Gemfile.base
+- gemfiles/activerecord-6.1/Gemfile.postgresql
+- gemfiles/activerecord-6.1/Gemfile.sqlite3
+- gemfiles/activerecord-7.0/Gemfile.base
+- gemfiles/activerecord-7.0/Gemfile.postgresql
+- gemfiles/activerecord-7.0/Gemfile.sqlite3
 - lib/schema_plus/default_expr.rb
 - lib/schema_plus/default_expr/active_record/connection_adapters/abstract_adapter.rb
 - lib/schema_plus/default_expr/active_record/connection_adapters/column.rb
@@ -154,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Extends ActiveRecord migrations to allow an SQL expression for the default