fix more sqlalchemy #1417
Open
fix more sqlalchemy #1417
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
November 14, 2024 11:26
xlorepdarkhelm
approved these changes
Nov 15, 2024
xlorepdarkhelm
requested changes
Dec 20, 2024
app/dao/fact_billing_dao.py
Outdated
| @@ -622,7 +622,7 @@ def fetch_sms_billing_for_organization(organization_id, financial_year): | |||
| AnnualBilling.financial_year_start == financial_year, | |||
| ), | |||
| ) | |||
| .outerjoin(ft_billing_subquery, Service.id == ft_billing_subquery.c.service_id) | |||
| .outerjoin(ft_billing_substmt, Service.id == ft_billing_substmt.c.service_id) | |||
| .filter( | |||
| @@ -377,19 +377,19 @@ def fetch_stats_for_all_services_by_date_range( | |||
| ) | |||
| ) | |||
| if not include_from_test_key: | |||
| subquery = subquery.filter(Notification.key_type != KeyType.TEST) | |||
| subquery = subquery.subquery() | |||
| substmt = substmt.filter(Notification.key_type != KeyType.TEST) | |||
| @@ -546,11 +546,11 @@ def get_total_notifications_for_date_range(start_date, end_date): | |||
| .order_by(FactNotificationStatus.local_date) | |||
| ) | |||
| if start_date and end_date: | |||
| query = query.filter( | |||
| stmt = stmt.filter( | |||
app/dao/services_dao.py
Outdated
| select(Service).filter_by(id=service_id).options(joinedload(Service.api_keys)) | ||
| select(Service) | ||
| .where(Service.id == service_id) | ||
| .options(joinedload(Service.api_keys)) | ||
| ) | ||
| if only_active: | ||
| stmt = stmt.filter(Service.active) |
app/dao/services_dao.py
Outdated
| @@ -392,24 +394,36 @@ def _delete_commit(stmt): | |||
| db.session.execute(stmt) | |||
| db.session.commit() | |||
|
|
|||
| subq = select(Template.id).filter_by(service=service).subquery() | |||
| subq = select(Template.id).where(Template.service == service).subquery() | |||
|
|
|||
| stmt = delete(TemplateRedacted).filter(TemplateRedacted.template_id.in_(subq)) | |||
app/dao/services_dao.py
Outdated
| ApiKey.get_history_model().service_id == service.id | ||
| ) | ||
| ) | ||
| _delete_commit(delete(AnnualBilling).where(AnnualBilling.service_id == service.id)) | ||
|
|
||
| stmt = ( | ||
| select(VerifyCode).join(User).filter(User.id.in_([x.id for x in service.users])) |
app/dao/services_dao.py
Outdated
| @@ -530,9 +530,9 @@ def dao_fetch_todays_stats_for_all_services( | |||
| ) | |||
|
|
|||
| if not include_from_test_key: | |||
| subquery = subquery.filter(Notification.key_type != KeyType.TEST) | |||
| substmt = substmt.filter(Notification.key_type != KeyType.TEST) | |||
app/dao/services_dao.py
Outdated
| ).label("permanent_failure_rate"), | ||
| ) | ||
| .join(subquery, subquery.c.service_id == Notification.service_id) | ||
| .join(substmt, substmt.c.service_id == Notification.service_id) | ||
| .filter( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix remaining queries affected by the upgrade to sqlalchemy 2.0
NOTE: To find things that need changing the search is
grep -ri "query\." ./**/**.py. In order to make search either, occurrences where 'query' was just being used as a variable name were changed to 'querie'.NOTE: There is one test in notification_dao where I changed the expected result. I think sqlalchemy broke whatever strange thing that test was trying to do. As a matter of good maintenance, I don't think the test is doing the right thing trying to override the behavior of the Pagination object based on a flag.
Security Considerations
N/A