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

Add some more unreserved keywords to BigQuery #1588

Merged
merged 3 commits into from
Oct 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
100 changes: 95 additions & 5 deletions src/sqlfluff/dialects/bigquery_keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,66 +99,156 @@

# Note BigQuery doesn't have a list of Unreserved Keywords
# so these are just ones we need to allow parsing to work
bigquery_unreserved_keywords = """ALTER
bigquery_unreserved_keywords = """ACCOUNT
ADD
ADMIN
AFTER
ALTER
APPLY
AUTO_INCREMENT
BEGIN
BINARY
BINDING
CACHE
CASCADE
CHAIN
CHARACTER
CHECK
CLUSTER
COLUMN
COMMENT
COMMIT
CONCURRENTLY
CONNECT
CONSTRAINT
DAY
COPY
CURRENT_USER
CYCLE
DATA
DATABASE
DATE
DATEADD
DATETIME
DAY
DAYOFYEAR
DECLARE
DELETE
DESCRIBE
DETERMINISTIC
DOMAIN
DOUBLE
DROP
EXECUTE
EXPLAIN
EXTENSION
EXTERNAL
FILE
FILTER
FIRST
FOREIGN
FUNCTION
FUTURE
GRANT
GRANTED
GRANTS
HOUR
ILIKE
IMPORTED
INCREMENT
INDEX
INSERT
INTEGRATION
KEY
LANGUAGE
LARGE
LAST
MANAGE
MATERIALIZED
MAXVALUE
MINUS
MINUTE
MINVALUE
ML
MODEL
MODIFY
MONITOR
MONTH
NAME
NAN
NOCACHE
NOCYCLE
NOORDER
OBJECT
OFFSET
OPERATE
OPTION
OPTIONS
ORDINAL
OVERLAPS
OVERWRITE
OWNERSHIP
PRECISION
PRIMARY
PRIOR
PRIVILEGES
PROCEDURE
PUBLIC
QUALIFY
QUARTER
READ
REFERENCE_USAGE
REFERENCES
RENAME
REPLACE
RESOURCE
RESTRICT
RETURNS
REVOKE
RLIKE
ROLE
ROLLBACK
QUALIFY
QUARTER
ROW
ROUTINE
SCHEMA
SCHEMAS
SECOND
SEPARATOR
SEQUENCE
SESSION_USER
SHARE
STAGE
START
STREAM
SYSTEM_TIME
TABLE
TABLESPACE
TASK
TEMP
TEMPORARY
TIME
TIMESTAMP
TRANSACTION
TRANSIENT
TRIGGER
TRUNCATE
TYPE
UNIQUE
UNSIGNED
UPDATE
USAGE
USE
USE_ANY_ROLE
USER
VALUE
VALUES
VARYING
VERSION
VIEW
YEAR"""
WAREHOUSE
WEEK
WEEKDAY
WITHOUT
WORK
WRITE
YEAR
ZONE"""
11 changes: 11 additions & 0 deletions test/fixtures/parser/bigquery/select_rows_between.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
SELECT
is_sensitive,
breach_date,
total_number_of_affected_accounts,
SUM(total_number_of_affected_accounts) OVER (
PARTITION BY is_sensitive
ORDER BY is_sensitive, breach_date
ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
) AS cumulative_number_of_affected_accounts
FROM
table1
71 changes: 71 additions & 0 deletions test/fixtures/parser/bigquery/select_rows_between.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# YML test files are auto-generated from SQL files and should not be edited by
# hand. To help enforce this, the "hash" field in the file must match a hash
# computed by SQLFluff when running the tests. Please run
# `python test/generate_parse_fixture_yml.py` to generate them after adding or
# altering SQL files.
_hash: 5ffbd4722e9644ee5869aec87685fef9b6692871e3d4d7959c41be398247e5bf
file:
statement:
select_statement:
select_clause:
- keyword: SELECT
- select_clause_element:
column_reference:
identifier: is_sensitive
- comma: ','
- select_clause_element:
column_reference:
identifier: breach_date
- comma: ','
- select_clause_element:
column_reference:
identifier: total_number_of_affected_accounts
- comma: ','
- select_clause_element:
function:
function_name:
function_name_identifier: SUM
bracketed:
start_bracket: (
expression:
column_reference:
identifier: total_number_of_affected_accounts
end_bracket: )
over_clause:
keyword: OVER
bracketed:
start_bracket: (
window_specification:
partitionby_clause:
- keyword: PARTITION
- keyword: BY
- expression:
column_reference:
identifier: is_sensitive
orderby_clause:
- keyword: ORDER
- keyword: BY
- column_reference:
identifier: is_sensitive
- comma: ','
- column_reference:
identifier: breach_date
frame_clause:
- keyword: ROWS
- keyword: BETWEEN
- keyword: UNBOUNDED
- keyword: PRECEDING
- binary_operator: AND
- keyword: CURRENT
- keyword: ROW
end_bracket: )
alias_expression:
keyword: AS
identifier: cumulative_number_of_affected_accounts
from_clause:
keyword: FROM
from_expression:
from_expression_element:
table_expression:
table_reference:
identifier: table1