Skip to content

Commit

Permalink
test against latest 7.0.x AR version
Browse files Browse the repository at this point in the history
  • Loading branch information
haffla committed Oct 15, 2023
1 parent b3a63ed commit 2441d85
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.1
3.2.2
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ appraise "activerecord-6.1.0" do
gem "activerecord", "~> 6.1"
end

appraise "activerecord-7.0.1" do
gem "activerecord", "~> 7.0.1"
appraise "activerecord-7.0.8" do
gem "activerecord", "~> 7.0.8"
end
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ WORKDIR /usr/src/app

COPY lib/jsonb_accessor/version.rb ./lib/jsonb_accessor/version.rb
COPY jsonb_accessor.gemspec Gemfile ./
# RUN bundle install
RUN bundle install
COPY . ./
17 changes: 8 additions & 9 deletions db/schema.rb
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# frozen_string_literal: true

# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your
# database schema. If you need to create the application database on another
# system, you should be using db:schema:load, not running all the migrations
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
# This file is the source Rails uses to define your schema when running `bin/rails
# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
# be faster and is potentially less error prone than running all of your
# migrations from scratch. Old migrations may fail to apply correctly if those
# migrations use external dependencies or application code.
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20_150_407_031_737) do
ActiveRecord::Schema[7.1].define(version: 2015_04_07_031737) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"

Expand All @@ -30,7 +28,8 @@
t.float "float_type"
t.time "time_type"
t.date "date_type"
t.datetime "datetime_type"
t.datetime "datetime_type", precision: nil
t.decimal "decimal_type"
end

end
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "activerecord", "~> 7.0.1"
gem "activerecord", "~> 7.0.8"

gemspec path: "../"
8 changes: 4 additions & 4 deletions jsonb_accessor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "activerecord", ">= 5.0"
spec.add_dependency "activesupport", ">= 5.0"
spec.add_dependency "activerecord", ">= 5.0", "< 7.1"
spec.add_dependency "activesupport", ">= 5.0", "< 7.1"
if is_java
spec.add_dependency "activerecord-jdbcpostgresql-adapter", ">= 50.0"
else
spec.add_dependency "pg", ">= 0.18.1"
end

spec.add_development_dependency "appraisal", "~> 2.2.0"
spec.add_development_dependency "appraisal", "~> 2.5"
spec.add_development_dependency "awesome_print"
spec.add_development_dependency "database_cleaner", "~> 1.6.0"
spec.add_development_dependency "database_cleaner-active_record", "~> 2.1"
spec.add_development_dependency "pry"
spec.add_development_dependency "pry-doc"
spec.add_development_dependency "pry-nav"
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
require "pry-nav"
require "pry-doc"
require "awesome_print"
require "database_cleaner"
require "database_cleaner-active_record"
require "yaml"
require "active_support/testing/time_helpers"

Expand Down

0 comments on commit 2441d85

Please sign in to comment.