forked from EmilLaursen/sqlmodel
-
Notifications
You must be signed in to change notification settings - Fork 0
Feat/rebase upstream #3
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
Open
EmilLaursen
wants to merge
227
commits into
main
Choose a base branch
from
feat/rebase-upstream
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or 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
… questions (fastapi#263) Co-authored-by: yanlong.wang <[email protected]> Co-authored-by: Han Xiao <[email protected]>
…i#315) (fastapi#322) Co-authored-by: Sebastián Ramírez <[email protected]>
Co-authored-by: Sebastián Ramírez <[email protected]>
Co-authored-by: Sebastián Ramírez <[email protected]>
…g SQLAlchemy type (fastapi#18) Co-authored-by: Sebastián Ramírez <[email protected]>
fastapi#45) Co-authored-by: Sebastián Ramírez <[email protected]>
….1` (fastapi#48) Co-authored-by: Sebastián Ramírez <[email protected]>
Co-authored-by: Sebastián Ramírez <[email protected]>
Co-authored-by: Sebastián Ramírez <[email protected]>
…construction from `SQLModelMetaclass.__init__` and upgrade minimum SQLAlchemy to `>=1.4.36` (fastapi#443) Co-authored-by: Sebastián Ramírez <[email protected]>
Co-authored-by: Sebastián Ramírez <[email protected]>
…astapi#428) Co-authored-by: Sebastián Ramírez <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…s moves things around without changes (fastapi#671)
…e` ) (fastapi#207) Co-authored-by: Sebastián Ramírez <[email protected]>
…api#273) Co-authored-by: Sebastián Ramírez <[email protected]>
…i#660) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 2.24.2 to 2.28.0. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](dawidd6/action-download-artifact@v2.24.2...v2.28.0) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sebastián Ramírez <[email protected]>
…stapi#634) Co-authored-by: Sebastián Ramírez <[email protected]>
…i#674) Co-authored-by: Luis Benitez <[email protected]>
updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](pre-commit/pre-commit-hooks@v4.4.0...v4.5.0) - [github.com/asottile/pyupgrade: v3.7.0 → v3.15.0](asottile/pyupgrade@v3.7.0...v3.15.0) - https://github.com/charliermarsh/ruff-pre-commit → https://github.com/astral-sh/ruff-pre-commit - [github.com/astral-sh/ruff-pre-commit: v0.0.275 → v0.1.1](astral-sh/ruff-pre-commit@v0.0.275...v0.1.1) - [github.com/psf/black: 23.3.0 → 23.10.0](psf/black@23.3.0...23.10.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…create-db-and-table.md` (fastapi#601) Co-authored-by: Sebastián Ramírez <[email protected]>
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.
Rebased on top of 0.0.9. There are a lot of conflicts, but as you can see from the commit log, a bunch of our changes have been made redundant by the upstream.
What remains are the FK name stuff, and adding timezone to datetime fields. Hopefully this works. The diff with main is not useful, due to the rebase of course. We will need to force-push.
To see our changes vs. upstream diff with the release tag.