schema_plus_default_expr 0.1.4 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 46822d03ac2e3f6a2251dc59ba654e5f0181df8e
-  data.tar.gz: 9ad28e0665f3ca74133da292e752d763e8c806d5
+SHA256:
+  metadata.gz: 14597121db8f2e284e7e613c7d0b9ceedd8f98a2cd9f085d019660c34c6ef5a5
+  data.tar.gz: 51e9dddb7157edf31da2ec10761b38c56cf1919669bcb97f4477044441e2209f
 SHA512:
-  metadata.gz: 60984075b8d0c18a040075b45afc7ba4638fe53eca2441726733276d0f7148daa9cbf0432c54a10d9a4297d6ada7bc2f469c10026943824c7d2359467ab14ee2
-  data.tar.gz: b5b45b622fc4bd0363ed01702d4d6d56eed405291d7885d6685bbc3ab218aaff11a92710e6c2909d62878d836bc94c1d2bc1ffa3c764574d02272e691a8d432a
+  metadata.gz: f0a7b837d44f903c22ad3286bded62e008fc2c892e4e3d41ae9e7fe1f02f862a3db7532d4a178fc82cf56421d25dcfa2caff9e739ca69cd70a6c3c2c81f5c000
+  data.tar.gz: ae111294c25323bb9bd70c1ffad4fbbc2f41e47a21ab47d86f5e576631ab97126f8092f23b1c32d96f07de61585d6f3a023c5e8bd8517361a668000afdb24628

data/.github/workflows/prs.yml

@@ -0,0 +1,158 @@
+# 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.
+---
+name: CI PR Builds
+'on':
+  push:
+    branches:
+    - master
+  pull_request:
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.5'
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        activerecord:
+        - '5.2'
+        - '6.0'
+        - '6.1'
+        - '7.0'
+        db:
+        - sqlite3
+        - skip
+        dbversion:
+        - skip
+        exclude:
+        - ruby: '3.0'
+          activerecord: '5.2'
+        - ruby: '3.1'
+          activerecord: '5.2'
+        - ruby: '2.5'
+          activerecord: '7.0'
+        - db: skip
+          dbversion: skip
+        include:
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          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
+          dbversion: '9.6'
+        - ruby: '2.7'
+          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
+      POSTGRESQL_DB_USER: schema_plus_test
+      POSTGRESQL_DB_PASS: database
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+        bundler-cache: true
+    - name: Run bundle update
+      run: bundle update
+    - name: Start Postgresql
+      if: matrix.db == 'postgresql'
+      run: |
+        docker run --rm --detach \
+          -e POSTGRES_USER=$POSTGRESQL_DB_USER \
+          -e POSTGRES_PASSWORD=$POSTGRESQL_DB_PASS \
+          -p 5432:5432 \
+          --health-cmd "pg_isready -q" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database postgres:${{ matrix.dbversion }}
+    - name: Wait for database to start
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: |
+        COUNT=0
+        ATTEMPTS=20
+        until [[ $COUNT -eq $ATTEMPTS ]]; do
+          [ "$(docker inspect -f {{.State.Health.Status}} database)" == "healthy" ] && break
+          echo $(( COUNT++ )) > /dev/null
+          sleep 2
+        done
+    - name: Create testing database
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: bundle exec rake create_ci_database
+    - name: Run tests
+      run: bundle exec rake spec
+    - name: Shutdown database
+      if: always() && (matrix.db == 'postgresql' || matrix.db == 'mysql2')
+      run: docker stop database
+    - name: Coveralls Parallel
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
+        parallel: true
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        parallel-finished: true

data/.gitignore

@@ -2,6 +2,7 @@
 /tmp
 /pkg
 /Gemfile.local
+/.idea
 
 .byebug_history
 *.lock

data/.simplecov

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+SimpleCov.configure do
+  enable_coverage :branch
+  add_filter '/spec/'
+
+  add_group 'Binaries', '/bin/'
+  add_group 'Libraries', '/lib/'
+
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
+end

data/README.md

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_default_expr.svg)](http://badge.fury.io/rb/schema_plus_default_expr)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_default_expr.svg)](http://travis-ci.org/SchemaPlus/schema_plus_default_expr)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_default_expr.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_default_expr)
-[![Dependency Status](https://gemnasium.com/lomba/schema_plus_default_expr.svg)](https://gemnasium.com/SchemaPlus/schema_plus_default_expr)
+[![Build Status](https://github.com/SchemaPlus/schema_plus_default_expr/actions/workflows/prs.yml/badge.svg)](https://github.com/SchemaPlus/schema_plus_default_expr/actions)
+[![Coverage Status](https://coveralls.io/repos/github/SchemaPlus/schema_plus_default_expr/badge.svg?branch=master)](https://coveralls.io/github/SchemaPlus/schema_plus_default_expr?branch=master)
 
 # SchemaPlus::DefaultExpr
 
@@ -30,7 +29,19 @@ SchemaPlus::DefaultExpr is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2**, using **sqlite3** and **postgresql**
+* 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 -->
 
@@ -40,16 +51,22 @@ MySQL only supports SQL expression defaults for `TIMESTAMP` column types, which
 
 SchemaPlus::DefaultExpr augments the syntax for setting column defaults, to support expressions or constant values:
 
-    t.datetime :seen_at, default: { expr: 'NOW()' }
-    t.datetime :seen_at, default: { value: "2011-12-11 00:00:00" }
+```ruby
+t.datetime :seen_at, default: { expr: 'NOW()' }
+t.datetime :seen_at, default: { value: "2011-12-11 00:00:00" }
+```
 
 The standard syntax will still work as usual:
 
-    t.datetime :seen_at, default: "2011-12-11 00:00:00"
+```ruby
+t.datetime :seen_at, default: "2011-12-11 00:00:00"
+```
 
 Also, as a convenience
 
-    t.datetime :seen_at, default: :now
+```ruby
+t.datetime :seen_at, default: :now
+```
 
 resolves to:
 
@@ -61,17 +78,21 @@ resolves to:
 
 If you are using Postgresql with a `json` column, ActiveRecord allows you to use a Hash for a default value.  Be aware that if the hash contains just one key which is `:expr` or `:value`, then SchemaPlus::DefaultExpr will interpret, and use the corresponding value for the default.  That is, these are equivalent:
 
-	t.json :fields, default: { value: { field1: 'a', field2: 'b' } }
-    t.json :fields, default: { field1: 'a', field2: 'b' }
-
+```ruby
+t.json :fields, default: { value: { field1: 'a', field2: 'b' } }
+t.json :fields, default: { field1: 'a', field2: 'b' }
+```
 
 ## History
 
-* 0.1.4 - Compatibility with AR 5.  Thanks to [@pedantic-git](https://github.com/pedantic-git)
-* 0.1.3 - Missing require
-* 0.1.2 - Explicit gem dependencies
-* 0.1.1 - Fix dumping bug (#1); upgrade to schema_plus_core 1.0
-* 0.1.0 - Initial release, extracted from schema_plus 1.x
+* **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)
+* **0.1.3** - Missing require
+* **0.1.2** - Explicit gem dependencies
+* **0.1.1** - Fix dumping bug (#1); upgrade to schema_plus_core 1.0
+* **0.1.0** - Initial release, extracted from schema_plus 1.x
 
 ## Development & Testing
 
@@ -86,7 +107,7 @@ Some things to know about to help you develop and test:
 * **schema_dev**:  SchemaPlus::DefaultExpr uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
   facilitate running rspec tests on the matrix of ruby, activerecord, and database
   versions that the gem supports, both locally and on
-  [travis-ci](http://travis-ci.org/SchemaPlus/schema_plus_default_expr)
+  [github actions](https://github.com/SchemaPlus/schema_plus_default_expr/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -98,7 +119,6 @@ Some things to know about to help you develop and test:
   The matrix of configurations is specified in `schema_dev.yml` in
   the project root.
 
-
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - end -->
 
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_PLUS_CORE - begin -->

data/gemfiles/Gemfile.base

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gemspec :path => File.expand_path('..', __FILE__)
+gemspec path: File.expand_path('..', __FILE__)
 
 File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/activerecord-5.2/Gemfile.base

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

data/gemfiles/activerecord-5.2/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-4.2 → activerecord-5.2}/Gemfile.sqlite3

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

data/gemfiles/activerecord-6.0/Gemfile.base

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

data/gemfiles/activerecord-6.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-6.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/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/middleware.rb

@@ -41,7 +41,7 @@ module SchemaPlus::DefaultExpr
         def after(env)
           env.connection.columns(env.table.name).each do |column|
             if !column.default_function.nil?
-              if col = env.table.columns.find(&its.name == column.name)
+              if col = env.table.columns.find { |it| it.name == column.name }
                 col.options[:default] = { expr: column.default_function }
               end
             end

data/lib/schema_plus/default_expr/version.rb

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

data/lib/schema_plus/default_expr.rb

@@ -1,5 +1,4 @@
 require 'schema_plus/core'
-require 'its-it'
 
 require_relative 'default_expr/version'
 require_relative 'default_expr/middleware'

data/schema_dev.yml

@@ -1,7 +1,13 @@
 ruby:
-    - 2.1.5
+    - 2.5
+    - 2.7
+    - 3.0
+    - 3.1
 activerecord:
-    - 4.2
+    - 5.2
+    - 6.0
+    - 6.1
+    - 7.0
 db:
     - sqlite3
     - postgresql

data/schema_plus_default_expr.gemspec

@@ -17,14 +17,13 @@ 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", "< 6.0"
-  gem.add_dependency "schema_plus_core", ">= 1.0", "< 3.0"
-  gem.add_dependency "its-it", "~> 1.2"
+  gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_development_dependency "bundler", "~> 1.7"
-  gem.add_development_dependency "rake", "~> 10.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", "~> 3.6"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency "schema_dev", "~> 4.2.0"
 end

data/spec/column_default_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe "Column definition" do
   before(:each) do
-    define_schema do
+    apply_migration do
       create_table :models, :force => true do |t|
       end
     end
-    class Model < ::ActiveRecord::Base ; end
+    stub_model('Model')
   end
 
   subject {
@@ -114,10 +114,10 @@ describe "Column definition" do
 
   private
 
-  def define_test_column(type, *args)
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table Model.table_name, :force => true do |t|
-        t.send type, :test_column, *args
+  def define_test_column(type, **options)
+    apply_migration do
+      create_table Model.table_name, :force => true do |t|
+        t.send type, :test_column, **options
         t.integer :dummy
       end
     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

@@ -1,6 +1,5 @@
 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'))
@@ -16,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: 0.1.4
+  version: 1.0.1
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,82 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: its-it
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.1.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
@@ -112,59 +92,41 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-- !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'
-description: 
+        version: 4.2.0
+description:
 email:
 - ronen@barzel.org
 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/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.2/Gemfile.base
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
+- 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
@@ -183,7 +145,7 @@ homepage: https://github.com/SchemaPlus/schema_plus_default_expr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,16 +153,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.5.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Extends ActiveRecord migrations to allow an SQL expression for the default
   value of a column

data/.travis.yml

@@ -1,17 +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.5
-gemfile:
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
-env: POSTGRESQL_DB_USER=postgres
-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/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/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