Remove need for --begin-sql comments

[akdor1154]

I've been stuffing around with this for ages, and I finally think I've managed to remove the need for --begin-sql and --end-sql or ; delimiters for the syntax block.

The strategy is to detect "select", "with", or "--", and just mark from there to the end of the string as SQL. This fits my usage perfectly.. unsure if it is useful for everyone (e.g. you might want to add "INSERT", etc, or you might not like this approach at all..)

I've updated demo.py|png to show this in action, along with the readme:

Additionally I've set the name of the matched section to meta.embedded.SQL to set the language mode to SQL - this fixes some final highlight stuff, and makes VSCode's bracket matching and comment/uncomment features work properly as well. You might want to pinch this even if you don't like the rest of this PR.

One drawback is that I can't force the string to start with select|with|--; it has to just find it at any point in the string (due to the single-line-context-only property of the highlighting system). So if you have something like

str = """ I'd like to go and select some nice flowers """,
                             ^^^ sql from here

it will "mis-fire". I'm not aware of any way to prevent this.

Cheers Jarrad

[alanwilter]

And what about adding support for raw string? I have queries where I need to add r"""select ... or even rf"""" select {foo}... because those queries has things like:

select regexp_split_to_table(path::text, '\.')::int as ancestor from ...

If I don't add r""" (for raw), flake8 will complain about invalid escape sequence '\.' flake8(W605).

[munro]

@akdor1154 I've created a fork that adds support to this, it's still a little buggy, but I really want this to work so I can give y'all access so we can start hacking on a solution—so far it's been "good enough" for me to not spend any more time on this though. :) You can install better-python-string-sql in the VS Code market place!

https://marketplace.visualstudio.com/items?itemName=Submersible.better-python-string-sql

https://github.com/Submersible/better-python-string-sql/

Also, I imagine eventually this all will be rolled up into the MagicPython extension, as they're already trying to get support for SQL there: https://github.com/MagicStack/MagicPython/issues/27

What I need help on is setting up some automated tests, so I can start keeping track of bugs I encounter while using it, so it can be perfect 💫

[akdor1154]

Ah nice! I can't promise I'll look into testing in the immediate future, I don't know anything about testing syntaxes. It sounds difficult to DIY unless MS have published tooling for this. I did find https://github.com/PanAeon/vscode-tmgrammar-test with a quick google, if I get spare time (hahahahahahaha) I'll play with how that works with your repo.

Will definitely start using your fork, thanks.

[ptweir]

hey all, sorry I haven't been very diligent about maintaining this project. I worry about breaking backwards compatibility, so will hold off merging this for now. Get in touch if I'm misreading though!

[technicallypete]

hey all, sorry I haven't been very diligent about maintaining this project. I worry about breaking backwards compatibility, so will hold off merging this for now. Get in touch if I'm misreading though!

Just started using this 5 minutes ago; this is awesome!

A huge help would be to remove semicolon as terminator, or make it configurable.

This is pretty much just laziness, but in my migration files I'll do multi sql statements:

op.execute('''

--sql
create table "x" (
    "id" integer not null
);

--sql
CREATE UNIQUE INDEX x_pkey ON x USING btree (id);

--sql
alter table "x" add constraint "x_pkey" PRIMARY KEY using index "x_pkey";

''')

Would be cool to not have to add --sql before each statement (or not have to use multiple op.execute's)

This would be totally fine, imo:

op.execute('''--begin-sql

create table "x" (
  "id" integer not null
);

CREATE UNIQUE INDEX x_pkey ON x USING btree (id);

alter table "x" add constraint "x_pkey" PRIMARY KEY using index "x_pkey";

--end-sql''')

Also, the semicolon hightlighted in red makes it look like a sql syntax issue, too :)