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

fix(wrangler): ignore comments when splitting sql into statements #8175

Merged
merged 2 commits into from
Feb 20, 2025

Conversation

edmundhung
Copy link
Member

@edmundhung edmundhung commented Feb 17, 2025

Fixes #7739.

This makes splitSqlQuery ignores both inline and block comments in the result query when splitting it into statements to avoid comments at the end of the SQL makes it into an extra statement.


  • Tests
    • TODO (before merge)
    • Tests included
    • Tests not necessary because:
  • Wrangler E2E Tests CI Job required? (Use "e2e" label or ask maintainer to run separately)
    • I don't know
    • Required
    • Not required because:
  • Public documentation
    • TODO (before merge)
    • Cloudflare docs PR(s):
    • Documentation not necessary because: bugfix

Copy link

changeset-bot bot commented Feb 17, 2025

🦋 Changeset detected

Latest commit: a44962a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
Name Type
wrangler Patch
@cloudflare/vitest-pool-workers Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link
Contributor

github-actions bot commented Feb 17, 2025

A wrangler prerelease is available for testing. You can install this latest build in your project with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-wrangler-8175

You can reference the automatically updated head of this PR with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/prs/8175/npm-package-wrangler-8175

Or you can use npx with this latest build directly:

npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-wrangler-8175 dev path/to/script.js
Additional artifacts:

cloudflare-workers-bindings-extension:

wget https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-workers-bindings-extension-8175 -O ./cloudflare-workers-bindings-extension.0.0.0-v676a567cf.vsix && code --install-extension ./cloudflare-workers-bindings-extension.0.0.0-v676a567cf.vsix

create-cloudflare:

npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-create-cloudflare-8175 --no-auto-update

@cloudflare/kv-asset-handler:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-kv-asset-handler-8175

miniflare:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-miniflare-8175

@cloudflare/pages-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-pages-shared-8175

@cloudflare/unenv-preset:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-unenv-preset-8175

@cloudflare/vite-plugin:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-vite-plugin-8175

@cloudflare/vitest-pool-workers:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-vitest-pool-workers-8175

@cloudflare/workers-editor-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-workers-editor-shared-8175

@cloudflare/workers-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-workers-shared-8175

@cloudflare/workflows-shared:

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/13377521995/npm-package-cloudflare-workflows-shared-8175

Note that these links will no longer work once the GitHub Actions artifact expires.


[email protected] includes the following runtime dependencies:

Package Constraint Resolved
miniflare workspace:* 3.20250204.1
workerd 1.20250214.0 1.20250214.0
workerd --version 1.20250214.0 2025-02-14

Please ensure constraints are pinned, and miniflare/workerd minor versions match.

@edmundhung edmundhung added the e2e Run wrangler e2e tests on a PR label Feb 17, 2025
@edmundhung edmundhung marked this pull request as ready for review February 17, 2025 20:01
@edmundhung edmundhung requested review from a team as code owners February 17, 2025 20:01
@CarmenPopoviciu CarmenPopoviciu added the d1 Relating to D1 label Feb 19, 2025
@CarmenPopoviciu
Copy link
Contributor

CarmenPopoviciu commented Feb 19, 2025

I have spoken with the D1 team and they will have a first pass at this PR as there are some concerns on their side this might not match prod behaviour, or might require some prod changes. Will wait on their thoughts before reviewing the PR myself ⏳

@lambrospetrou
Copy link
Contributor

I have spoken with the D1 team and they will have a first pass at this PR as there are some concerns on their side this might not match prod behaviour, or might require some prod changes. Will wait on their thoughts before reviewing the PR myself ⏳

From what I can see, this code is only for wrangler. We have different splitting logic in the backend, so since this only affects what SQL query is sent to D1 for migrations, I believe it's fine.

@edmundhung edmundhung merged commit eb46f98 into main Feb 20, 2025
38 of 39 checks passed
@edmundhung edmundhung deleted the edmundhung/fix-applyD1Migrations branch February 20, 2025 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
d1 Relating to D1 e2e Run wrangler e2e tests on a PR
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

🐛 BUG: applyD1Migrations fails with output from readD1Migrations if last line of a migration is a comment
3 participants