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

Devex: Resolve merge conflicts dev #143

Merged
merged 88 commits into from
Nov 20, 2024
Merged

Devex: Resolve merge conflicts dev #143

merged 88 commits into from
Nov 20, 2024

Conversation

jthompson-arcus
Copy link
Collaborator

No description provided.

@jthompson-arcus
Add primary key field to tables
e5e4da4
@jthompson-arcus
Temporary fix to preserve current functionality
1cffcdf
@jthompson-arcus
Re-create review_testdb.sqlite
ec0c753
@jthompson-arcus
Repair mod_review_form tests
193f05d
@jthompson-arcus
Repair fct_SQLite tests
58435dc
@jthompson-arcus
Rebuild testdb.sqlite
8f59b04
@jthompson-arcus
Temporary fix for adding queries to work as expected
ec868d8
@jthompson-arcus
Add preliminary logging table
804f7de
@jthompson-arcus
Add "all_review_data_log" to list of expected tables
48314ae
@jthompson-arcus
Update db_save_review to update instead of append
0b2eb31
@jthompson-arcus
Repair tests from db_save_review() changes
37a7c11
@jthompson-arcus
Merge branch 'dev' into jt-113-logging_tables
91a8c49
@jthompson-arcus
Only store old records in logging table
f98f0d2
@jthompson-arcus
Modify update process to only updated/append appropriate records
9e55193
@jthompson-arcus
Actually pull the newer record when updated
f66f758
@jthompson-arcus
Add db_version table to DB
2ad8cc7
@jthompson-arcus
Add edit_date_time to logging table
75ad1d1
@jthompson-arcus
Update all columns not considered in common
4c8e2e5
@jthompson-arcus
Correct error in creating primary key tables
3f32584
@jthompson-arcus
Update fct_SQLite.R tests to reflect changes
b81500d
@jthompson-arcus
Update test DB
d268d14
@jthompson-arcus
Incorporate review logging tests into test-fct_SQLite.R
1cb9afa
@jthompson-arcus
Add logging tests to test-mod_review_forms.R
c6dace0
@jthompson-arcus
Add index to all_review_data table
7effc4c
@jthompson-arcus
Utilize UPSERT for DB append/update procedure
cd5d630
@jthompson-arcus
Make UPSERT process more robust
564d0f9
@jthompson-arcus
Add function update_db_version() to migrate old DBs
af8f76c
@jthompson-arcus
Update version and NEWS
f2ef3a6
@jthompson-arcus
Fix warning message popping up in tests
2c633d2
@jthompson-arcus
Resolve merge conflicts with dev
f299d4a 
Merge branch 'dev' into jt-113-logging_tables

# Conflicts:
#	DESCRIPTION
LDSamson and others added 25 commits November 15, 2024 15:12
@LDSamson
Update Alpine Docker test results
9d8555b
@jthompson-arcus
Use DBI directly instead of tbl() and collect()
0e266d7
@jthompson-arcus
Fix typo in user_db version check
1405702
@jthompson-arcus
Only update records with new status.
240c4e8
@jthompson-arcus
Remove argument no longer used
8085287
@jthompson-arcus
Remove common_vars from tests
a797883
@jthompson-arcus
Repair tests with db_get_table() returning data.frame not tibble
20f9528
@jthompson-arcus
Update review_testdb.sqlite
6fb21a6
@jthompson-arcus
Update mod_review_forms test with new testing DB
2a7b9e9
@jthompson-arcus
Update all_review_data_id_update_trigger to include idx_cols
c6ef19c
@jthompson-arcus
Add keys argument to db_add_log()
1a85f40
@jthompson-arcus
Resolve some R CMD check issues
c427f2d
@aclark02-arcus @LDSamson
Add pkgdown gha workflow
5d52f83 
(cherry picked from commit d62de80)
@aclark02-arcus @LDSamson
don't rely on renv.lock
bbf2b53 
(cherry picked from commit 3381f26)
@aclark02-arcus @LDSamson
update news
e9ed1a4 
(cherry picked from commit 279bc5c)
@LDSamson
Update pkgdown workflow for use on dev and devex
734f9ca
@jthompson-arcus
Small NEWS.md wording update
92677b0
@jthompson-arcus
Merge pull request #138 from openpharma/ls_create_v0.1.1
573c633 
Create v0.1.1 release
@jthompson-arcus
Resolve merge conflicts with main
0e8b655 
Merge branch 'main' into jt-resolve_merge_conflicts_main

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	R/fct_utils.R
#	inst/golem-config.yml
#	tests/testthat/_snaps/mod_review_forms.md
#	tests/testthat/fixtures/review_testdb.sqlite
#	tests/testthat/test-mod_review_forms.R
@LDSamson
small alignment fix
a9488cc
@LDSamson
Merge pull request #142 from openpharma/jt-resolve_merge_conflicts_main
906daf8 
Resolve merge conflicts `main`
@LDSamson
Merge branch 'dev' into jt-113-simplify_review_process
b8e598e
@LDSamson
Improve alignment according to https://style.tidyverse.org/syntax.htm…
f57b549 
…l#long-function-calls, improve db_add_log docs, add function argument check to db_add_log
@LDSamson
Merge pull request #135 from openpharma/jt-113-simplify_review_process
740a10a 
Simplify review process
@jthompson-arcus
Resolve merge conflicts with dev
993035f 
Merge branch 'dev' into jt-resolve_merge_conflicts_dev

# Conflicts:
#	DESCRIPTION
@jthompson-arcus jthompson-arcus marked this pull request as ready for review November 20, 2024 14:47
@jthompson-arcus jthompson-arcus changed the title Resolve merge conflicts dev Devex: Resolve merge conflicts dev Nov 20, 2024
aclark02-arcus
aclark02-arcus approved these changes Nov 20, 2024
View reviewed changes
Copy link
Collaborator

@aclark02-arcus aclark02-arcus left a comment

Choose a reason for hiding this comment

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

This looks reeeaaaal nice. 👍🏼

@aclark02-arcus aclark02-arcus merged commit b359324 into devex Nov 20, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aclark02-arcus aclark02-arcus aclark02-arcus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jthompson-arcus @aclark02-arcus @LDSamson