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

Jump to bottom

Feature: support trilogy adapter #607

Merged
merged 21 commits into from
Nov 4, 2023
Merged

Feature: support trilogy adapter #607

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c5edd75
add trilogy to Gemfile
zmariscal Sep 12, 2023
802587b
create trilogy rake task and add it to Rakefile
zmariscal Sep 12, 2023
8c55d81
bundle current github workflows without trilogy
zmariscal Sep 12, 2023
a331a2a
add trilogy to databases.ci.yml
zmariscal Sep 12, 2023
2109996
ensure trilogy AR connection files are added
zmariscal Sep 12, 2023
2b6df26
add private method to control #value returned
zmariscal Sep 12, 2023
bcf5e48
connect to the db if trilogy adapter used
zmariscal Sep 12, 2023
5d8bbf5
create github trilogy workflow
zmariscal Sep 12, 2023
dc079a2
use the trilogy adapter in the db.ci yml file
zmariscal Sep 21, 2023
f46d5ac
remove require statements as they aren't needed
zmariscal Sep 21, 2023
3fc6466
Remove constant and follow pattern of if block
zmariscal Sep 21, 2023
32ef97f
revert trilogy additions in test file
zmariscal Sep 21, 2023
69aced2
when adding trilogy to various places
zmariscal Sep 26, 2023
c95dc75
if value doesn't respond to #empty? we don't want to continue
zmariscal Sep 26, 2023
e5f311e
when running tests we need to ensure AR is aware of Trilogy
zmariscal Sep 26, 2023
3de57ac
add github action steps to resolve database.yml or DATABASE_URL
zmariscal Oct 10, 2023
334b5a8
update github envs appropriately
zmariscal Oct 10, 2023
1bc20ba
target host when executing github action
zmariscal Oct 14, 2023
9311e0d
update workflow and order the args for the mysql command differently
zmariscal Oct 21, 2023
663f12a
Merge branch 'master' into feature--support-trilogy-adapter
zmariscal Nov 3, 2023
f79e913
remove trilogy github action for now
zmariscal Nov 3, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/trilogy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
MYSQL_ROOT_PASSWORD: root
- name: Create user, grant privledges,and flush # workaround to resolve https://github.com/trilogy-libraries/activerecord-trilogy-adapter/issues/64
run: |
mysql -e "CREATE USER 'test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'test';" -u${{ env.MYSQL_USER }} -p${{ env.MYSQL_PASSWORD }}
mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'test'@'localhost' WITH GRANT OPTION;" -u${{ env.MYSQL_USER }} -p${{ env.MYSQL_PASSWORD }}
mysql -e "FLUSH PRIVILEGES;" -u${{ env.MYSQL_USER }} -p${{ env.MYSQL_PASSWORD }}
mysql -h 127.0.0.1 -e "CREATE USER 'test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'test';" -u${{ env.MYSQL_USER }} -p${{ env.MYSQL_PASSWORD }}
mysql -h 127.0.0.1 -e "GRANT ALL PRIVILEGES ON *.* TO 'test'@'localhost' WITH GRANT OPTION;" -u${{ env.MYSQL_USER }} -p${{ env.MYSQL_PASSWORD }}
mysql -h 127.0.0.1 -e "FLUSH PRIVILEGES;" -u${{ env.MYSQL_USER }} -p${{ env.MYSQL_PASSWORD }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cfis do you know if there's a way for me to run the GitHub actions on my own fork? I'm making educated guesses at the Github action issues around these mysql commands.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think via the .github/workflows/trilogy.yml file. But since that is part of the PR maybe it doesn't work (might have to be merged first?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cfis I can spin up a new PR and see if merging in other components first resolve this issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cfis any objections in me breaking this into two PR's?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me. Sorry this taking so long to merge. I can try and focus on it next week.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First PR is here: #610

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see two more PRs after that one. The first with the trilogy guts and the second being the GitHub action. How do you feel about that?

- name: Trilogy test
run: bundle exec rake trilogy:test
Loading