Skip to content

Commit

Permalink
Merge pull request #78 from G5/rails_7
Browse files Browse the repository at this point in the history
rails 7 friendly
  • Loading branch information
Matt-Bishop authored Oct 14, 2024
2 parents 9b1c4ee + f698ea5 commit 6c77088
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.5.1
ruby-2.7.2
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [4.0.0] - 2024-10-14
###
- Rails 7 support
## [3.1.0] - 2018-09-05
###
- [Rails 6 support](https://github.com/G5/storext/pull/65)
Expand Down
2 changes: 1 addition & 1 deletion lib/storext/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Storext
VERSION = "3.3.0"
VERSION = "4.0.0"
end
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20141126071057_install_hstore.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class InstallHstore < ActiveRecord::Migration
class InstallHstore < ActiveRecord::Migration[4.2]
def change
enable_extension :hstore
end
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20141126071133_create_books.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateBooks < ActiveRecord::Migration
class CreateBooks < ActiveRecord::Migration[4.2]
def change
create_table :books do |t|
t.hstore :data
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20141127001905_create_authors.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateAuthors < ActiveRecord::Migration
class CreateAuthors < ActiveRecord::Migration[4.2]
def change
create_table :authors do |t|
t.hstore :data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddAnotherHstoreToBook < ActiveRecord::Migration
class AddAnotherHstoreToBook < ActiveRecord::Migration[4.2]
def change
add_column :books, :another_hstore, :hstore
end
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20150112063603_create_phones.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreatePhones < ActiveRecord::Migration
class CreatePhones < ActiveRecord::Migration[4.2]
def change
create_table :phones do |t|
t.hstore :data
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20150113011502_create_cars.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateCars < ActiveRecord::Migration
class CreateCars < ActiveRecord::Migration[4.2]
def change
create_table :cars do |t|
t.hstore :data
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20150130013803_create_coffees.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateCoffees < ActiveRecord::Migration
class CreateCoffees < ActiveRecord::Migration[4.2]
def change
create_table :coffees do |t|
t.hstore :data
Expand Down
24 changes: 12 additions & 12 deletions spec/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@
# 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: 20150130013803) do
ActiveRecord::Schema.define(version: 2015_01_30_013803) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
enable_extension "hstore"
enable_extension "plpgsql"

create_table "authors", force: :cascade do |t|
create_table "authors", id: :serial, force: :cascade do |t|
t.hstore "data"
end

create_table "books", force: :cascade do |t|
create_table "books", id: :serial, force: :cascade do |t|
t.hstore "data"
t.hstore "another_hstore"
end

create_table "cars", force: :cascade do |t|
create_table "cars", id: :serial, force: :cascade do |t|
t.hstore "data"
end

create_table "coffees", force: :cascade do |t|
create_table "coffees", id: :serial, force: :cascade do |t|
t.hstore "data"
end

create_table "phones", force: :cascade do |t|
create_table "phones", id: :serial, force: :cascade do |t|
t.hstore "data"
end

Expand Down
2 changes: 1 addition & 1 deletion storext.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.test_files = Dir["test/**/*"]

s.add_dependency "virtus"
s.add_dependency "activerecord", [">= 4.0", "< 6.2"]
s.add_dependency "activerecord", ">= 4.0"

s.add_development_dependency "pg"
s.add_development_dependency "rspec"
Expand Down

0 comments on commit 6c77088

Please sign in to comment.