schema_plus_views 0.4.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff5c6a7f05fbebbb07b6b84ec71761cc533640f3affe94d3e3153645a5599cc
-  data.tar.gz: 8f79673795c32b02c6ca0ff80495e115cdd3c9caf24e73c8fcf7c4ade95b4923
+  metadata.gz: 8488b18b4bda00ae806bf8dcd52367e6f59b22b2dd5e01cf34ae1749aed7a067
+  data.tar.gz: 832ccae549c83a189933034e2e8eb28f7d1ff7d4a1fd0306a125a09ee3401cff
 SHA512:
-  metadata.gz: 928a52a3e5e42e5e745754a35ad03244dba6fadb7d8681dc48b20643aaaa34675ce0e9befd4d58a6a3139bdaafab132cc5815d4f7be021f78a77eddbf8486ab8
-  data.tar.gz: 674f0f9bcb0d7cbda52e9d32a2b21d67e3a095f9c2970a34b55db9146d8bee78379fe4e83c37f951b8aacf8c838d11159a35af12169f27bedf97b1ef6ea4adb2
+  metadata.gz: 0e88b4ffe5417e860f3fb1d1f6a07aeff83352f976d75a0b3ffbb46d90d27b58e19527a802d25ea0f29536cdd138c121157c7272364003ee21b474d2f8677fad
+  data.tar.gz: 2b1d72485341f1ad9bf464540a9222cfb3d3c231c976323a8bd7110038f22268361e4fd8088532190f41267a61ca32b2d7d3aa94976b834e447d4909abfd83db

data/.github/workflows/prs.yml

@@ -0,0 +1,329 @@
+# 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:
+        - mysql2
+        - 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: '5.2'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '12'
+    env:
+      BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
+      MYSQL_DB_HOST: 127.0.0.1
+      MYSQL_DB_USER: root
+      MYSQL_DB_PASS: database
+      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 Mysql
+      if: matrix.db == 'mysql2'
+      run: |
+        docker run --rm --detach \
+          -e MYSQL_ROOT_PASSWORD=$MYSQL_DB_PASS \
+          -p 3306:3306 \
+          --health-cmd "mysqladmin ping --host=127.0.0.1 --password=$MYSQL_DB_PASS --silent" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database mysql:5.6
+    - 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
 
 *.lock
 *.log

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/Gemfile

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec
 
-File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local
+gemfile_local = File.expand_path '../Gemfile.local', __FILE__
+eval File.read(gemfile_local), binding, gemfile_local if File.exist? gemfile_local

data/README.md

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_views.svg)](http://badge.fury.io/rb/schema_plus_views)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_views.svg)](http://travis-ci.org/SchemaPlus/schema_plus_views)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_views.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_views)
-[![Dependency Status](https://gemnasium.com/lomba/schema_plus_views.svg)](https://gemnasium.com/SchemaPlus/schema_plus_views)
+[![Build Status](https://github.com/SchemaPlus/schema_plus_views/actions/workflows/pr.yml/badge.svg)](http://github.com/SchemaPlus/schema_plus_views/actions)
+[![Coverage Status](https://coveralls.io/github/SchemaPlus/schema_plus_views/badge.svg)](https://coveralls.io/github/SchemaPlus/schema_plus_views)
 
 # SchemaPlus::Views
 
@@ -28,8 +27,19 @@ SchemaPlus::Views is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.5.9** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.7.3** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.5** with activerecord **5.2**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.5** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.5** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **5.2**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **7.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.0** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.0** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.0** with activerecord **7.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.1** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.1** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.1** with activerecord **7.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -189,16 +199,19 @@ options in `env.options`
 
 ## History
 
-* 0.4.0 - Added support for Rails 5.2 and materialized views in PostgreSQL
-* 0.3.1 - Upgrade schema_plus_core and schema_dev dependencies
-* 0.3.0
+* **1.0.1** - Add AR 6.1, 7.0 and Ruby 3.1 support
+* **1.0.0** - Add ruby 3 and AR 6.0, drop Ruy < 2.5
+* **0.4.1** - Corrected spacing around dumped schema
+* **0.4.0** - Added support for Rails 5.2 and materialized views in PostgreSQL
+* **0.3.1** - Upgrade schema_plus_core and schema_dev dependencies
+* **0.3.0**
   - Added middleware stacks
   - Bug fix: view_definition: strip white space from result (postgresql)
-* 0.2.3 - Remove unnecessary escaping in dump; use single-quote heredoc
-* 0.2.2 - Prettier dumps: use heredoc for definition string
-* 0.2.1 - Fix db:rollback
-* 0.2.0 - Added :allow_replace option (thanks to [@hcarver](https://github.com/hcarver))
-* 0.1.0 - Initial release, extracted from schema_plus 1.x
+* **0.2.3** - Remove unnecessary escaping in dump; use single-quote heredoc
+* **0.2.2** - Prettier dumps: use heredoc for definition string
+* **0.2.1** - Fix db:rollback
+* **0.2.0** - Added :allow_replace option (thanks to [@hcarver](https://github.com/hcarver))
+* **0.1.0** - Initial release, extracted from schema_plus 1.x
 
 ## Development & Testing
 
@@ -211,7 +224,7 @@ Some things to know about to help you develop and test:
 * **schema_dev**:  SchemaPlus::Views 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_views)
+  [github actions](https://github.com/SchemaPlus/schema_plus_views/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -223,7 +236,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/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

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.mysql2

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

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.mysql2

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

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.mysql2

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

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/views/active_record/connection_adapters/abstract_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Views
   module ActiveRecord
     module ConnectionAdapters

data/lib/schema_plus/views/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Views
   module ActiveRecord
     module ConnectionAdapters

data/lib/schema_plus/views/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Views
   module ActiveRecord
     module ConnectionAdapters

data/lib/schema_plus/views/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Views
   module ActiveRecord
     module ConnectionAdapters

data/lib/schema_plus/views/active_record/migration/command_recorder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Views
   module ActiveRecord
     module Migration

data/lib/schema_plus/views/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Views
   module Middleware
 
@@ -21,7 +23,7 @@ module SchemaPlus::Views
               end
             end
 
-            view = View.new(
+            view = ::SchemaPlus::Views::SchemaDump::View.new(
               name:       view_name,
               definition: definition,
               view_type:  view_type,
@@ -47,25 +49,6 @@ module SchemaPlus::Views
 
           options
         end
-
-        # quacks like a SchemaMonkey Dump::Table
-        class View < KeyStruct[:name, :definition, :view_type, :indexes]
-          def assemble(stream)
-            extra_options = ", materialized: true" if view_type == :materialized
-            heredelim     = "END_VIEW_#{name.upcase}"
-            stream.puts <<~ENDVIEW
-              create_view "#{name}", <<-'#{heredelim}', :force => true#{extra_options}
-                #{definition}
-              #{heredelim}
-            ENDVIEW
-
-            indexes.each do |index|
-              stream.write "add_index \"#{name}\", "
-              index.assemble(stream)
-              stream.puts ""
-            end
-          end
-        end
       end
     end
 

data/lib/schema_plus/views/schema_dump.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module SchemaPlus
+  module Views
+    class SchemaDump
+      # quacks like a SchemaMonkey Dump::Table
+      class View < Struct.new(:name, :definition, :view_type, :indexes, keyword_init: true)
+        def assemble(stream)
+          extra_options = ", materialized: true" if view_type == :materialized
+          heredelim     = "END_VIEW_#{name.upcase}"
+          stream.puts <<~ENDVIEW
+                create_view "#{name}", <<-'#{heredelim}', :force => true#{extra_options}
+              #{definition}
+                #{heredelim}
+          ENDVIEW
+          stream.puts
+
+          indexes.each do |index|
+            stream.write "  add_index \"#{name}\", "
+            index.assemble(stream)
+            stream.puts ""
+          end
+          stream.puts ""
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus/views/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Views
-    VERSION = "0.4.0"
+    VERSION = '1.0.1'
   end
 end

data/lib/schema_plus/views.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'schema_plus/core'
 
 module SchemaPlus
@@ -9,6 +11,7 @@ require_relative 'views/version'
 require_relative 'views/active_record/connection_adapters/abstract_adapter'
 require_relative 'views/active_record/migration/command_recorder'
 require_relative 'views/middleware'
+require_relative 'views/schema_dump'
 
 module SchemaPlus::Views
   module ActiveRecord

data/lib/schema_plus_views.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'schema_plus/views'

data/schema_dev.yml

@@ -1,8 +1,13 @@
 ruby:
-    - 2.5.9
-    - 2.7.3
+    - 2.5
+    - 2.7
+    - 3.0
+    - 3.1
 activerecord:
     - 5.2
+    - 6.0
+    - 6.1
+    - 7.0
 db:
     - mysql2
     - sqlite3

data/schema_plus_views.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/views/version'
@@ -17,13 +18,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 5.2"
-  gem.add_dependency "schema_plus_core"
+  gem.required_ruby_version = '>= 2.5'
+
+  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", "~> 10.0"
-  gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 3.13.1"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency "rake", '~> 13.0'
+  gem.add_development_dependency "rspec", '~> 3.0'
+  gem.add_development_dependency "schema_dev", '~> 4.2.0'
 end

data/spec/dumper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 class Item < ActiveRecord::Base

data/spec/introspection_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 class Item < ActiveRecord::Base

data/spec/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestMiddleware

data/spec/migration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 class Item < ActiveRecord::Base

data/spec/named_schemas_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "with multiple schemas" do

data/spec/sanity_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 

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'))

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_views
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-14 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        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: '7.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +64,14 @@ dependencies:
     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
@@ -86,42 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.1
-- !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.2.0
 description:
 email:
 - ronen@barzel.org
@@ -129,8 +107,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/prs.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".simplecov"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,6 +119,18 @@ files:
 - 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/views.rb
 - lib/schema_plus/views/active_record/connection_adapters/abstract_adapter.rb
 - lib/schema_plus/views/active_record/connection_adapters/mysql2_adapter.rb
@@ -147,6 +138,7 @@ files:
 - lib/schema_plus/views/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/views/active_record/migration/command_recorder.rb
 - lib/schema_plus/views/middleware.rb
+- lib/schema_plus/views/schema_dump.rb
 - lib/schema_plus/views/version.rb
 - lib/schema_plus_views.rb
 - schema_dev.yml
@@ -170,14 +162,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Adds support for views to ActiveRecord

data/.travis.yml

@@ -1,89 +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.
----
-rvm:
-- 2.5.9
-- 2.7.3
-gemfile:
-- gemfiles/activerecord-5.2/Gemfile.sqlite3
-before_script: bundle exec rake create_databases
-after_script: bundle exec rake drop_databases
-script: bundle exec rake travis
-jobs:
-  include:
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.mysql2
-    rvm: 2.5.9
-    services:
-    - mysql
-    env: MYSQL_DB_USER=travis
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.5.9
-    addons:
-      postgresql: '10'
-      apt:
-        packages:
-        - postgresql-10
-        - postgresql-client-10
-    env: POSTGRESQL_DB_USER=postgres
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.5.9
-    addons:
-      postgresql: '11'
-      apt:
-        packages:
-        - postgresql-11
-        - postgresql-client-11
-    env: POSTGRESQL_DB_USER=travis PGPORT=5433
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.5.9
-    addons:
-      postgresql: '12'
-      apt:
-        packages:
-        - postgresql-12
-        - postgresql-client-12
-    env: POSTGRESQL_DB_USER=travis PGPORT=5433
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.5.9
-    addons:
-      postgresql: '9.6'
-    env: POSTGRESQL_DB_USER=postgres
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.mysql2
-    rvm: 2.7.3
-    services:
-    - mysql
-    env: MYSQL_DB_USER=travis
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.7.3
-    addons:
-      postgresql: '11'
-      apt:
-        packages:
-        - postgresql-11
-        - postgresql-client-11
-    env: POSTGRESQL_DB_USER=travis PGPORT=5433
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.7.3
-    addons:
-      postgresql: '12'
-      apt:
-        packages:
-        - postgresql-12
-        - postgresql-client-12
-    env: POSTGRESQL_DB_USER=travis PGPORT=5433
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.7.3
-    addons:
-      postgresql: '10'
-      apt:
-        packages:
-        - postgresql-10
-        - postgresql-client-10
-    env: POSTGRESQL_DB_USER=postgres
-  - gemfile: gemfiles/activerecord-5.2/Gemfile.postgresql
-    rvm: 2.7.3
-    addons:
-      postgresql: '9.6'
-    env: POSTGRESQL_DB_USER=postgres