Skip to content

Sync Tortoise ORM adapter with upstream and fix commit history#2

Merged
danielfrankcom merged 4 commits into
mainfrom
dev/frankcom/preserve-tortoise-history
Jan 28, 2026
Merged

Sync Tortoise ORM adapter with upstream and fix commit history#2
danielfrankcom merged 4 commits into
mainfrom
dev/frankcom/preserve-tortoise-history

Conversation

@danielfrankcom

@danielfrankcom danielfrankcom commented Jan 28, 2026

Copy link
Copy Markdown
Contributor

This PR re-syncs the aurora-dsql-tortoise-orm subtree without --squash to preserve the original commit SHAs and tags from the upstream repository.

The previous sync (c9c4616) used git subtree pull --squash, which collapsed the upstream commits into a single squash commit. This meant:

  • The original commit SHAs (7f919ee, a2e496a) didn't exist in this repo
  • We couldn't create a v0.1.2 tag pointing to the same SHA as upstream's 0.1.2

To fix this, I ran git subtree pull without --squash. A merge commit resolved the duplicate changes cleanly since the file contents were already identical.

Note the most recent commit in this repo now matches the exact SHA from the upstream repo: awslabs/aurora-dsql-tortoise-orm@c76809e

Changes

  • Brings in original commits with the same SHAs
  • Adds the missing changelog update for 0.1.2 (c76809e)

Important

This PR must be merged with a merge commit (not squash or rebase) to preserve the commit SHAs.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

danielfrankcom and others added 4 commits January 27, 2026 08:45
This PR updates the pre-commit hooks to use the local tool versions
managed by `uv`, rather than declaring custom versions in the
`.pre-commit-config.yml`.

Going forward it makes it easier to manage the tool versions, and
prevents drift between the dev environment versions and the versions
used by the pre-commit checks.

You can see based on the file format diff, there were already minor
changes between the versions being used. Keeping the CI checks in sync
with the local checks will help prevent annoying mismatches.

By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.
This PR adds a license classifier so PyPI better reports the license.
This is just a package metadata change, and doesn't affect the licensing
of the repo itself which already has the correct license specifiers.

By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.
This PR was automatically created by
[changelog-from-release](https://github.com/rhysd/changelog-from-release)
action for 0.1.2

Co-authored-by: danielfrankcom <danielfrankcom@users.noreply.github.com>
@danielfrankcom danielfrankcom requested a review from a team as a code owner January 28, 2026 18:13

@amaksimo amaksimo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you!

@danielfrankcom danielfrankcom merged commit 511b8f4 into main Jan 28, 2026
15 checks passed
amaksimo added a commit that referenced this pull request Jan 28, 2026
## Summary

This PR adds two more Aurora DSQL adapters to the monorepo:

- **Hibernate** (`java/hibernate/`) - Aurora DSQL Dialect for Hibernate
- **Django** (`python/django/`) - Aurora DSQL adapter for Django

## Changes

Both repos were added using `git subtree add` **without `--squash`** to
preserve the full commit history and SHAs (learned from PR #2).

### New directories:
- `java/hibernate/` - from
[aurora-dsql-hibernate](https://github.com/awslabs/aurora-dsql-hibernate)
- `python/django/` - from
[aurora-dsql-django](https://github.com/awslabs/aurora-dsql-django)
(branch: version-0)

### Namespaced tags (already pushed):
- `java/hibernate/v1.0.0`
- `python/django/v0.1.0`, `v0.2.0`, `v0.2.1`, `v0.3.0`

## Important

**This PR must be merged with a merge commit** (not squash or rebase) to
preserve the original commit SHAs from the upstream repositories.

## Next steps after merge

1. Add CI/CD workflows for the new adapters
2. Update pyproject.toml/build.gradle with monorepo tag patterns for
versioning
3. Update repository links in READMEs
4. Create deprecation PRs for the original repos

## Final monorepo structure

```
aurora-dsql-orms/
├── java/
│   ├── flyway/       # Flyway support (Gradle)
│   └── hibernate/    # Hibernate dialect (Gradle) ← NEW
├── python/
│   ├── django/       # Django adapter ← NEW
│   ├── sqlalchemy/   # SQLAlchemy dialect
│   └── tortoise-orm/ # Tortoise ORM adapter
└── typescript/       # (placeholder)
```
@danielfrankcom danielfrankcom deleted the dev/frankcom/preserve-tortoise-history branch February 5, 2026 00:36
amaksimo added a commit that referenced this pull request Apr 27, 2026
- Add back examples in migrate help text (pkale comment #1)
- Restructure stderr/exitCode logic: always print stderr for diagnostics,
  gate failure on exitCode in both handleMigrate and handleTransform
  (pkale comments #2, #3, #4)
- Add CLI integration tests for unfixable SQL (DROP CONSTRAINT),
  fixable SQL (FK + index), and prisma migrate diff pipe workflow
  (pkale comment #6)
- Remove VARCHAR(30) assertion from workflow test (pkale comment #7)
- Remove false claim about prebuilt binaries in README
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