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

Update version field in sql syntax file. #828

Merged
merged 1 commit into from
Mar 2, 2018
Merged

Conversation

corivera
Copy link
Member

@corivera corivera commented Mar 2, 2018

Changes to the SqlOps sql syntax file should come from the SQL.plist in the vscode-mssql repo via an update script. The syntax file was modified manually last time, so this commit version change was missed.

@corivera corivera requested review from kburtram and MattIrv March 2, 2018 21:28
@corivera corivera merged commit 94e8ce5 into master Mar 2, 2018
@corivera corivera deleted the UpdateSqlGrammarVersion branch March 2, 2018 22:32
@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/vscode-mssql/commit/cfc8b65ed6daf8252b0cbfd5611aadbd49353bca",
"version": "https://github.com/Microsoft/vscode-mssql/commit/c8effddd6a9df117f3ed45b60b487163950a7ea5",
Copy link
Member

Choose a reason for hiding this comment

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

is there a way to add the {{SQL CARBON EDIT}} comment in this file? otherwise, I'm afraid it may be missed in next VS Code merge? is the comment creates a syntax error in JSON file then perhaps we should add the comment into a text file in the extension with a note to update this field during merge, or something like that.

Copy link
Member Author

@corivera corivera Mar 3, 2018

Choose a reason for hiding this comment

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

Any sql syntax changes should be applied via an update script specified in https://github.com/Microsoft/sqlopsstudio/blob/master/extensions/sql/package.json , which also updates this version field. VSCode has the same script. I hadn't changed this field in the previous commit because I wasn't aware of that update workflow, and ended up doing the PRs in the reverse order. Currently VSCode has all the syntax changes up to this point (although they are one commit ahead), so there's no SqlOps divergence here.

Copy link
Member Author

Choose a reason for hiding this comment

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

aleklj pushed a commit to aleklj/azuredatastudio that referenced this pull request Oct 28, 2019
* Changing that SC Operation id be passed from ADS and some test addition

* Fixing typos
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.

3 participants