Pull in set of reserved words from Redshift docs #117
Conversation
sqlalchemy_redshift/dialect.py
Outdated
| @@ -96,6 +98,36 @@ class RedshiftImpl(postgresql.PostgresqlImpl): | |||
| \s* \) \s* # Arbitrary whitespace and literal ')' | |||
| """, re.VERBOSE) | |||
|
|
|||
| # Reserved words as extracted from Redshift docs. | |||
| # Command used to extract: | |||
| # curl -q "http://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html" | tr '\n' '\r' | sed 's/.*\(AES128.*WITHOUT\).*/\1/' | tr '\r' '\n' | sed 's/^\([A-Z0-9_]*\).*/"\1",/' | paste -s -d' ' - | fold -s -w 70 | awk '{print " "$0}' | tr 'A-Z' 'a-z' # noqa | |||
There was a problem hiding this comment.
I'd probably just create a reserved words file and read it with
RESERVED_WORDS = set(pkg_resources.resource_string(__name__, 'reserved-words.txt').split('\n'))There was a problem hiding this comment.
can you also port your shell script to python and move it somewhere outside of sqlalchemy_redshift?
There was a problem hiding this comment.
The postgres base dialect has the list hardcoded, so I like keeping with what that's doing. This seems like the simplest approach to make it obvious what's going on, rather than adding indirection by separating it to a different file.
There was a problem hiding this comment.
OK, I guess it depends how often it changes.
There was a problem hiding this comment.
put the script in './script.sh" and refer to it in the comment, rather than the whole thing with #noqa
There was a problem hiding this comment.
oh, and of course the URL is https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
sqlalchemy_redshift/dialect.py
Outdated
| @@ -96,6 +98,36 @@ class RedshiftImpl(postgresql.PostgresqlImpl): | |||
| \s* \) \s* # Arbitrary whitespace and literal ')' | |||
| """, re.VERBOSE) | |||
|
|
|||
| # Reserved words as extracted from Redshift docs. | |||
| # Command used to extract: | |||
| # curl -q "http://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html" | tr '\n' '\r' | sed 's/.*\(AES128.*WITHOUT\).*/\1/' | tr '\r' '\n' | sed 's/^\([A-Z0-9_]*\).*/"\1",/' | paste -s -d' ' - | fold -s -w 70 | awk '{print " "$0}' | tr 'A-Z' 'a-z' # noqa | |||
There was a problem hiding this comment.
put the script in './script.sh" and refer to it in the comment, rather than the whole thing with #noqa
|
Moved the script to pull_reserved_words.sh |
pull_reserved_words.sh
Outdated
| @@ -0,0 +1,17 @@ | |||
| #!/bin/sh | |||
sqlalchemy_redshift/dialect.py
Outdated
| @@ -96,6 +98,36 @@ class RedshiftImpl(postgresql.PostgresqlImpl): | |||
| \s* \) \s* # Arbitrary whitespace and literal ')' | |||
| """, re.VERBOSE) | |||
|
|
|||
| # Reserved words as extracted from Redshift docs. | |||
| # See pull_reserved_words.sh in this package for the code used to | |||
There was a problem hiding this comment.
nit, technically it's not in the package, it's just outside the package ;)
|
nice |
|
I'm going to go ahead and try cutting a release. |
Addresses #94
Todos
[ ] Documentationnot needed for this change