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.

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

urgent fix: correct issue with locations import #979

Merged
merged 1 commit into from
Aug 22, 2024

Conversation

dodumosu
Copy link
Collaborator

Upgrading to SQLAlchemy 1.4 seems to have uncovered an issue in Flask-SQLAlchemy that affected locations import relevant issue.

Please consider critical.

@dodumosu dodumosu requested a review from takinbo August 22, 2024 12:36
Copy link
Collaborator

@takinbo takinbo left a comment

Choose a reason for hiding this comment

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

utACK

@takinbo takinbo merged commit 50abc3b into nditech:develop Aug 22, 2024
1 check was pending
@takinbo
Copy link
Collaborator

takinbo commented Aug 22, 2024

@dodumosu it appears that there are a few more places (mostly in the migrations) where get_bind() was used. Could you confirm is the updated alembic still uses get_bind and if that is not the case, we might have to also update the migrations affected.

@dodumosu
Copy link
Collaborator Author

dodumosu commented Aug 22, 2024

it's not affecting Alembic. I just created a new database and ran the full set of migrations on it to check.
Screenshot from 2024-08-22 13-54-02

Screenshot from 2024-08-22 13-54-26

takinbo pushed a commit to dodumosu/apollo that referenced this pull request Sep 9, 2024
takinbo added a commit that referenced this pull request Sep 9, 2024
* feat: implement exponents in QA

* feat: add filter for submission values

* chore: remove duplicated property

* feat: implement value search and hotlinking

this branch replaces the work on
#948

* feat: use expression builder for value search

* feat: use tom-select for first field dropdown

* feat: use custom dropdown on value

* chore: remove comment

* chore: switch to selectize from tom-select

* chore: remove tom-select artifacts

* chore: don't use label in dropdown

* fix: destroy selectize control when source changes to value

* chore: add destroyed hook

* feat: after changing source, warn for incomplete term

* feat: clean up selectize when term is removed.

* chore: various UI changes

- remove icon on button
- change button text color

* fix: don't destroy all the dropdowns

* fix: destroy all selectize instances on expression deletion

* feat: start using new template

* feat: working with new template

* chore: change delete button visibility rule

this commit changes the delete term button display rule.
now, it displays on each term unless there's only one available

* chore: remove unused code

* fix: correct issue with locations import (#979)

* chore(deps): bump gettext.js from 0.8.0 to 2.0.3 in /apollo/static (#978)

Bumps gettext.js from 0.8.0 to 2.0.3.

---
updated-dependencies:
- dependency-name: gettext.js
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: fix PWA issues (#980)

this commit fixes issues reported from users.
the issues are due to upgrading marshmallow

* chore(deps-dev): bump webpack from 5.76.0 to 5.94.0 in /apollo/static (#982)

Bumps [webpack](https://github.com/webpack/webpack) from 5.76.0 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.76.0...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: replace all usage of _joined_entities() (#981)

* fix: replace all usage of _joined_entities()

SQLAlchemy 1.4 removed an internal query method (_joined_entities())
that was used to check if a query was already joined to a model.
This pull request replaces the usages of that method.

* fix: add missing file

* feat: add unit tests and comment

* fixed a few nits

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim Akinbo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants