urdt/ussd
5
0
Fork 1
Code Issues 41 Pull Requests Actions Packages Projects Releases Wiki Activity

postgres-switch-for-tests #255

Merged
lash merged 15 commits from postgres-switch-for-tests into master 2025-01-10 12:07:07 +01:00
Conversation 1 Commits 15 Files Changed 10 +190 -73
Alfred-mk commented 2025-01-06 13:10:26 +01:00
Member
Copy Link
  • Add a flag to switch to postgres while running the test

also resolves #119

- Add a flag to switch to postgres while running the test also resolves https://git.grassecon.net/urdt/ussd/issues/119
Alfred-mk added 3 commits 2025-01-06 13:10:26 +01:00
specify the base directory for loading the .env file 3ee15497a5
pass the base directory to load the .env file 79de0a9092
add a db flag to specify the database of choice c12e867ac3
Alfred-mk added 5 commits 2025-01-08 08:59:30 +01:00
create a schema if it does not exist and use it in the connection 46a6d2bc6e
use a flag to pass the schema to the context 81c3378ea6
allow the BuildConnStr to be accessed by different packages f59c3a53ef
pass the dbschema in the context a37f6e6da3
cleanup the generated test data for the schema ea9cab930e
Alfred-mk added 1 commit 2025-01-08 09:06:25 +01:00
Merge branch 'master' into postgres-switch-for-tests 4b5f08e25e
Alfred-mk requested review from lash 2025-01-08 09:12:44 +01:00
Alfred-mk changed title from WIP: postgres-switch-for-tests to postgres-switch-for-tests 2025-01-08 09:13:26 +01:00
lash requested changes 2025-01-08 12:37:27 +01:00
lash left a comment
Owner
Copy Link

I am wondering, since this affects the connection string, whether we should merge in the other PR into this one first.

I am wondering, since this affects the connection string, whether we should merge in the other PR into this one first.
cmd/main.go Outdated
@@ -27,3 +29,3 @@
func init() {
initializers.LoadEnvVariables()
initializers.LoadEnvVariables(baseDir)
lash commented 2025-01-08 12:23:07 +01:00
Owner
Copy Link

I don't think we want to use the testdataloader package in main. Let's remove the basedir, and if needed using a different env/config file should be a matter of switches.

I don't think we want to use the `testdataloader` package in main. Let's remove the basedir, and if needed using a different env/config file should be a matter of switches.
Alfred-mk marked this conversation as resolved
internal/storage/storageservice.go Outdated
@@ -88,6 +89,11 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.D
return nil, fmt.Errorf("failed to select the database")
}
schema, ok := ctx.Value("Schema").(string)
lash commented 2025-01-08 12:32:59 +01:00
Owner
Copy Link

can we try to use the connection string instead of context, if it works? https://github.com/jackc/pgx/issues/1013

it fits better with the connection string refactor that I will merge this into afterwards.

can we try to use the connection string instead of context, if it works? https://github.com/jackc/pgx/issues/1013 it fits better with the connection string refactor that I will merge this into afterwards.
Alfred-mk marked this conversation as resolved
internal/storage/storageservice.go
@@ -101,0 +105,4 @@
connStr := BuildConnStr()
// Ensure the schema exists
err = ensureSchemaExists(ctx, connStr, schema)
lash commented 2025-01-08 12:33:50 +01:00
Owner
Copy Link

If we are using connection string, then this needs to be url parsed to get the query string in order to determine the schema.

If we are using connection string, then this needs to be url parsed to get the query string in order to determine the schema.
lash marked this conversation as resolved
lash added 29 commits 2025-01-08 23:27:37 +01:00
WIP add connection string parser dc1674ec55
Implement connstr 2e30739ec9
Merge branch 'lash/purify' into lash/purify-more 418080d093
Add connstr to last executable c3cbe1cd92
Merge branch 'lash/purify' into lash/purify-more e92e498726
WIP revert connstr gdbm to dir only, add file as table spec dc61d05584
Update executables with new conn str 2992f7ae8e
Remove commented code a4d6cef9c0
Rename accountservice testservice source file f61e65f4fe
Refactor to use conndata as menustorageservice conn arg 450dfa02cc
Improve error message 89c21847b9
Update env example 3a9f3fa373
Remove unnecessary connection chain step cc9760125a
Remove unused methods in storage interfaces, improve logs 51b6fc0dde
Edit ssh cli help text d39740a09a
Merge branch 'master' into lash/purify-more cc2f7b41df
Merge branch 'lash/purify-more' into lash/ssh-fixes 5c7a535288
Enable env, config, db in ssh 52fd1eced2
Merge remote-tracking branch 'urdt' into lash/purify-more cd575c2edb
Merge branch 'lash/ssh-fixes' into lash/purify-more 02823fd64e
Merge branch 'master' into lash/purify-more 462c0d7677
Fix remaining conflict in cmd cli 599815c343
Add auth conn string to ssh, use connstr for execs 1fa830f286
Merge branch 'master' into lash/purify-more 6339f0c2e5
Repalce missing context 721f80d0f2
Merge branch 'master' into lash/purify-more 4d7589ad95
Merge branch 'master' into lash/purify-more 379d98ccd5
Merge branch 'lash/purify-more' into postgres-switch-for-tests ddefdd7fb3
Rehabilitate tests df8c9aab0c
lash changed target branch from master to lash/purify-more 2025-01-08 23:28:37 +01:00
lash added 1 commit 2025-01-09 08:42:32 +01:00
Implement postgres schema b50a51df9b
Alfred-mk added 1 commit 2025-01-09 11:01:42 +01:00
Replace the connStr if it is not set 3fccfaab61
lash changed target branch from lash/purify-more to master 2025-01-09 13:04:58 +01:00
Alfred-mk added 1 commit 2025-01-10 11:41:31 +01:00
Refactored the code to switch between postgres and gdbm, with db cleanup 9a6d8e5158
Alfred-mk added 1 commit 2025-01-10 11:43:34 +01:00
Merge branch 'master' into postgres-switch-for-tests c29abfe21e
Alfred-mk requested review from lash 2025-01-10 11:47:53 +01:00
lash merged commit 8f5ed0cd4f into master 2025-01-10 12:07:07 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
lash
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
Activity
Doing
An item actively being worked on currently
Activity
Hold
Not being actively worked on
Activity
Proposal
A proposal for a new feature or enhancement
Activity
QA
Ready for QA testing
Activity
Validate
Dev team validating changes
Runner
AT
Runner
CLI
Runner
HTTP
Runner
SSH
cleanup
devops
documentation
easypeasy
A task that can be completed with little effort
 exchange
relating to swapping of assets and offramps
 i18n
Languages and translations
 legacy
Legacy features from the old ussd system to be ported
 meta
container for other issues
 migration
optimization
privilege
features that have to do with special, privileged axx
 refactor
smell
Code smell
 support
transparency and help with exception states
 tooling
ux
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Alfred-mk carlos kamikazechaser lash willruddick
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: urdt/ussd#255
Delete Branch "postgres-switch-for-tests"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?