Skip to content

Commit

Permalink
Added support for Trilogy
Browse files Browse the repository at this point in the history
  • Loading branch information
ankane committed Oct 7, 2024
1 parent 27bb505 commit 2fed291
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ jobs:

- uses: ankane/setup-mysql@v1
- run: ADAPTER=mysql2 bundle exec rake test
- run: ADAPTER=trilogy bundle exec rake test
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.6.2 (unreleased)

- Added support for Trilogy

## 0.6.1 (2024-09-04)

- Improved CSP support
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ gem "combustion"
gem "rails", "~> 7.2.0"
gem "sqlite3"
gem "mysql2"
gem "trilogy"
gem "pg"
gem "benchmark-ips"
1 change: 1 addition & 0 deletions gemfiles/rails61.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ gem "combustion"
gem "rails", "~> 6.1.0"
gem "sqlite3", "< 2"
gem "mysql2"
gem "activerecord-trilogy-adapter"
gem "pg"
1 change: 1 addition & 0 deletions gemfiles/rails70.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ gem "combustion"
gem "rails", "~> 7.0.0"
gem "sqlite3", "< 2"
gem "mysql2"
gem "activerecord-trilogy-adapter"
gem "pg"
1 change: 1 addition & 0 deletions gemfiles/rails71.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ gem "combustion"
gem "rails", "~> 7.1.0"
gem "sqlite3", "< 2"
gem "mysql2"
gem "trilogy"
gem "pg"
1 change: 1 addition & 0 deletions gemfiles/rails80.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ gem "combustion"
gem "rails", "~> 8.0.0.beta1"
gem "sqlite3"
gem "mysql2"
gem "trilogy"
gem "pg"
2 changes: 1 addition & 1 deletion test/internal/config/database.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
test:
adapter: <%= ENV["ADAPTER"] || "sqlite3" %>
database: <%= ["postgresql", "mysql2"].include?(ENV["ADAPTER"]) ? "field_test_test" : "db/combustion_test.sqlite" %>
database: <%= ["postgresql", "mysql2", "trilogy"].include?(ENV["ADAPTER"]) ? "field_test_test" : "db/combustion_test.sqlite" %>

0 comments on commit 2fed291

Please sign in to comment.