Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix overwriting of HASH_DATA_COLUMNS #21

Merged
merged 3 commits into from
Nov 5, 2020
Merged

Fix overwriting of HASH_DATA_COLUMNS #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9310bac
Fix overwritting of HASH_DATA_COLUMNS
dwilkins Oct 27, 2020
80b28be
Upgrade CircleCI configuration and Appraisals
dwilkins Oct 27, 2020
1e9390c
Fix HASH_DATA_COLUMNS to not be shared between ActiveRecord models
Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
appraise 'rails-4-2-8' do
gem "rails", "4.2.8"
end

appraise 'rails-4-2-9' do
gem "rails", "4.2.9"
end

appraise 'rails-5-0-3' do
gem "rails", "5.0.3"
end

appraise 'rails-5-0-4' do
gem "rails", "5.0.4"
end

appraise 'rails-5-1-2' do
gem "rails", "5.1.2"
appraise 'rails-5-1-6-2' do
gem "rails", "5.1.6.2"
end

appraise 'rails-5-2-1' do
Expand Down
4 changes: 0 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ gemspec

gem 'minitest-ci' # for CircleCI
gem 'minitest-focus', group: %i[development test], require: false
gem 'pry-byebug', group: %i[development test]
gem 'pry-highlight', group: %i[development test]
gem 'pry-rails', group: %i[development test]
gem 'pry-remote', group: %i[development test]
gem 'pg', '~> 0.18', group: %i[development test]
gem 'rubocop', require: false

Expand Down
141 changes: 59 additions & 82 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,135 +3,117 @@ PATH
specs:
squint (1.1.1)
pg
rails (>= 4.2.8)
rails (>= 5.1.6.2)

GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.4)
actionpack (= 5.0.4)
nio4r (>= 1.2, < 3.0)
actioncable (5.1.7)
actionpack (= 5.1.7)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.4)
actionpack (= 5.0.4)
actionview (= 5.0.4)
activejob (= 5.0.4)
actionmailer (5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.4)
actionview (= 5.0.4)
activesupport (= 5.0.4)
actionpack (5.1.7)
actionview (= 5.1.7)
activesupport (= 5.1.7)
rack (~> 2.0)
rack-test (~> 0.6.3)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.4)
activesupport (= 5.0.4)
actionview (5.1.7)
activesupport (= 5.1.7)
builder (~> 3.1)
erubis (~> 2.7.0)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.4)
activesupport (= 5.0.4)
activejob (5.1.7)
activesupport (= 5.1.7)
globalid (>= 0.3.6)
activemodel (5.0.4)
activesupport (= 5.0.4)
activerecord (5.0.4)
activemodel (= 5.0.4)
activesupport (= 5.0.4)
arel (~> 7.0)
activesupport (5.0.4)
activemodel (5.1.7)
activesupport (= 5.1.7)
activerecord (5.1.7)
activemodel (= 5.1.7)
activesupport (= 5.1.7)
arel (~> 8.0)
activesupport (5.1.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
appraisal (2.2.0)
bundler
rake
thor (>= 0.14.0)
arel (7.1.4)
arel (8.0.0)
ast (2.3.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
builder (3.2.3)
byebug (9.0.6)
coderay (1.1.1)
builder (3.2.4)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.0.5)
crass (1.0.6)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
equalizer (0.0.11)
erubis (2.7.0)
globalid (0.4.0)
erubi (1.9.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (0.8.4)
i18n (0.8.6)
ice_nine (0.11.2)
json (2.1.0)
loofah (2.0.3)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.2.0)
minitest (5.10.2)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-ci (3.2.0)
minitest (>= 5.0.6)
minitest-focus (1.1.2)
minitest (>= 4, < 6)
nio4r (2.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
parallel (1.11.2)
parser (2.4.0.0)
ast (~> 2.2)
pg (0.21.0)
powerpack (0.1.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
pry-highlight (0.1.0)
coderay
json
nokogiri
pry
pry-rails (0.3.6)
pry (>= 0.10.4)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
rack (2.0.3)
rack (2.0.9)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.4)
actioncable (= 5.0.4)
actionmailer (= 5.0.4)
actionpack (= 5.0.4)
actionview (= 5.0.4)
activejob (= 5.0.4)
activemodel (= 5.0.4)
activerecord (= 5.0.4)
activesupport (= 5.0.4)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.4)
rails (5.1.7)
actioncable (= 5.1.7)
actionmailer (= 5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
activemodel (= 5.1.7)
activerecord (= 5.1.7)
activesupport (= 5.1.7)
bundler (>= 1.3.0)
railties (= 5.1.7)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.0.4)
actionpack (= 5.0.4)
activesupport (= 5.0.4)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.7)
actionpack (= 5.1.7)
activesupport (= 5.1.7)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand All @@ -146,11 +128,10 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1)
slop (3.6.0)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand All @@ -159,7 +140,7 @@ GEM
virtus
thor (0.19.4)
thread_safe (0.3.6)
tzinfo (1.2.3)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.3.0)
virtus (1.0.5)
Expand All @@ -169,7 +150,7 @@ GEM
equalizer (~> 0.0, >= 0.0.9)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
websocket-extensions (0.1.5)

PLATFORMS
ruby
Expand All @@ -179,13 +160,9 @@ DEPENDENCIES
minitest-ci
minitest-focus
pg (~> 0.18)
pry-byebug
pry-highlight
pry-rails
pry-remote
rubocop
squint!
storext

BUNDLED WITH
1.17.3
2.1.4
70 changes: 50 additions & 20 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,54 @@
machine:
timezone:
America/Chicago
version: 2.1

dependencies:
override:
- 'rvm-exec 2.2.2 bundle install'
- 'rvm-exec 2.3.4 bundle install'
- 'rvm-exec 2.4.1 bundle install'
orbs:
ruby: circleci/ruby@1.1.0
node: circleci/node@2

post:
- 'rvm-exec 2.2.2 bundle exec appraisal install'
- 'rvm-exec 2.3.4 bundle exec appraisal install'
- 'rvm-exec 2.4.1 bundle exec appraisal install'
jobs:
# build:
# docker:
# - image: cimg/ruby:2.7-node
# steps:
# - checkout
# - ruby/install-deps
# - node/install-packages:
# package-mgr: yarn
# cache-key: "yarn.lock"

database:
override:
- 'rvm-exec 2.3.4 bundle exec appraisal rails-4-2-8 rake --rakefile test/dummy/Rakefile db:setup'
test:
parallelism: 1
docker:
- image: cimg/ruby:2.7-node
- image: circleci/postgres:9.6-alpine
environment:
POSTGRES_USER: squint-ruby
POSTGRES_DB: squint_test
POSTGRES_PASSWORD: ""
environment:
BUNDLE_JOBS: "1"
BUNDLE_RETRY: "3"
PGHOST: 127.0.0.1
PGUSER: squint-ruby
PGPASSWORD: ""
RAILS_ENV: test
steps:
- checkout
- ruby/install-deps
- run:
name: Wait for DB
command: dockerize -wait tcp://localhost:5432 -timeout 1m
- run: gem install bundler:2.0.2 && bundle version
- run: bundle install
- run: bundle exec appraisal generate
- run: bundle exec appraisal install
- run:
name: Database setup
command: bundle exec appraisal rails-5-1-6-2 rake --rakefile test/dummy/Rakefile db:setup --trace
- run: bundle exec appraisal rake

workflows:
version: 2
test:
jobs:
- test

test:
override:
- 'rvm-exec 2.2.2 bundle exec appraisal rake'
- 'rvm-exec 2.3.4 bundle exec appraisal rake'
- 'rvm-exec 2.4.1 bundle exec appraisal rake'
15 changes: 0 additions & 15 deletions gemfiles/Rails_4.2.8.gemfile
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions gemfiles/Rails_5.0.gemfile
View file
Open in desktop

This file was deleted.

Loading