Skip to content

Add UPDATE, DELETE support, fix escaped quotes, detect invalid SQL #4

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.

Sign up for GitHub

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

Open
nerdrew wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add UPDATE, DELETE support, fix escaped quotes, detect invalid SQL #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67af857
large refactor
nerdrew Jul 13, 2016
beefbea
COALESCE, sql functions, 1E1
nerdrew Oct 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ GENERATED_PARSER = 'lib/sql-parser/parser.racc.rb'
GENERATED_LEXER = 'lib/sql-parser/parser.rex.rb'

file GENERATED_LEXER => 'lib/sql-parser/parser.rex' do |t|
sh "rex -o #{t.name} #{t.prerequisites.first}"
sh "bundle exec rex -o #{t.name} #{t.prerequisites.first}"
end

file GENERATED_PARSER => 'lib/sql-parser/parser.racc' do |t|
sh "racc -o #{t.name} #{t.prerequisites.first}"
sh "bundle exec racc -o #{t.name} #{t.prerequisites.first}"
end

task :parser => [GENERATED_LEXER, GENERATED_PARSER]

# Make sure the parser's up-to-date when we test.
Rake::Task['test'].prerequisites << :parser
Rake::Task['test'].prerequisites << :parser
106 changes: 72 additions & 34 deletions lib/sql-parser/parser.racc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,55 @@ rule
direct_sql_data_statement
: direct_select_statement_multiple_rows
| insert_specification
| update_statement
| delete_statement

direct_select_statement_multiple_rows
: query_expression order_by_clause { result = SQLParser::Statement::DirectSelect.new(val[0], val[1]) }
update_statement
: UPDATE table_reference SET assignment_list where_clause order_by_clause limit_clause { result = SQLParser::Statement::Update.new(val[1], val[3], val[4], val[5], val[6]) }

# module contents
order_by_clause
: # no action
| ORDER BY sort_specification_list { result = SQLParser::Statement::OrderBy.new(val[2]) }
assignment_list
: assignment_list comma assignment { result = Array(val[0]) + Array(val[2]) }
| assignment { result = Array(val[0]) }

sort_specification_list
: sort_specification_list comma sort_specification { result = Array(val[0]) + Array(val[2]) }
| sort_specification
assignment
: column_reference equals_operator value_expression { result = SQLParser::Statement::Assignment.new(val[0], val[2]) }

sort_specification
: sort_key ordering_specification { result = val[1].new(val[0]) }
# MySQL seems to support deletes from multiple tables http://dev.mysql.com/doc/refman/5.7/en/delete.html
delete_statement
: DELETE FROM table_reference where_clause order_by_clause limit_clause { result = SQLParser::Statement::Delete.new(val[2], val[3], val[4], val[5]) }

sort_key
: column_name
| unsigned_integer { result = SQLParser::Statement::Integer.new(val[0]) }
direct_select_statement_multiple_rows
: query_expression maybe_for_update { result = SQLParser::Statement::DirectSelect.new(val[0], val[1]) }

ordering_specification
: { result = SQLParser::Statement::Ascending } # default
| ASC { result = SQLParser::Statement::Ascending }
| DESC { result = SQLParser::Statement::Descending }
maybe_for_update
: # no action
| FOR UPDATE

# queries
subquery
# FIXME: shortcut
: left_paren query_expression right_paren { result = SQLParser::Statement::Subquery.new(val[1]) }

query_expression
: query_specification
: SELECT distinct select_list table_expression { result = SQLParser::Statement::Select.new(val[1], val[2], val[3]) }

insert_specification
: INSERT INTO table_reference value_list { result = SQLParser::Statement::Insert.new(val[2], nil, val[3]) }
| INSERT INTO table_reference column_list value_list { result = SQLParser::Statement::Insert.new(val[2], val[3], val[4]) }
: INSERT INTO table_factor column_list value_list { result = SQLParser::Statement::Insert.new(val[2], val[3], val[4]) }

column_list
: left_paren in_column_list right_paren { result = SQLParser::Statement::InColumnList.new(val[1]) }
: # no action
| left_paren in_column_list right_paren { result = SQLParser::Statement::InColumnList.new(val[1]) }

in_column_list
: value_expression comma in_column_list { result = Array(val[0]) + Array(val[2]) }
| value_expression
: column_reference comma in_column_list { result = Array(val[0]) + Array(val[2]) }
| column_reference

value_list
: VALUES left_paren in_value_list right_paren { result = SQLParser::Statement::InValueList.new(val[2]) }

query_specification
: SELECT select_list table_expression { result = SQLParser::Statement::Select.new(val[1], val[2]) }
| SELECT select_list { result = SQLParser::Statement::Select.new(val[1]) }
distinct
: # no action
| DISTINCT

select_list
: asterisk { result = SQLParser::Statement::All.new }
Expand All @@ -71,18 +70,23 @@ rule
derived_column
: value_expression AS column_name { result = SQLParser::Statement::As.new(val[0], val[2]) }
| value_expression column_name { result = SQLParser::Statement::As.new(val[0], val[1]) }
| search_condition
| value_expression

table_expression
: from_clause where_clause group_by_clause having_clause { result = SQLParser::Statement::TableExpression.new(val[0], val[1], val[2], val[3]) }
: # no action
| from_clause where_clause group_by_clause having_clause order_by_clause limit_clause { result = SQLParser::Statement::TableExpression.new(val[0], val[1], val[2], val[3], val[4], val[5]) }

from_clause
: FROM table_reference { result = SQLParser::Statement::FromClause.new(val[1]) }

table_reference
table_factor
: table_name AS column_name { result = SQLParser::Statement::As.new(val[0], val[2]) }
| table_name column_name { result = SQLParser::Statement::As.new(val[0], val[1]) }
| table_name

table_reference
: table_factor
| joined_table

table_subquery
Expand Down Expand Up @@ -140,6 +144,30 @@ rule
: # no action
| HAVING search_condition { result = SQLParser::Statement::HavingClause.new(val[1]) }

order_by_clause
: # no action
| ORDER BY sort_specification_list { result = SQLParser::Statement::OrderBy.new(val[2]) }

sort_specification_list
: sort_specification_list comma sort_specification { result = Array(val[0]) + Array(val[2]) }
| sort_specification

sort_specification
: sort_key ordering_specification { result = val[1].new(val[0]) }

sort_key
: column_reference
| value_expression

ordering_specification
: { result = SQLParser::Statement::Ascending } # default
| ASC { result = SQLParser::Statement::Ascending }
| DESC { result = SQLParser::Statement::Descending }

limit_clause
: # no action
| LIMIT unsigned_integer { result = SQLParser::Statement::Limit.new(val[1]) }

# query expression components
row_subquery
: subquery
Expand Down Expand Up @@ -196,9 +224,6 @@ rule
| boolean_test

boolean_test
: boolean_primary

boolean_primary
: predicate
| left_paren search_condition right_paren { result = val[1] }

Expand All @@ -209,6 +234,7 @@ rule
| like_predicate
| null_predicate
| exists_predicate
| value_expression

comparison_predicate
: row_value_constructor equals_operator row_value_constructor { result = SQLParser::Statement::Equals.new(val[0], val[2]) }
Expand All @@ -225,6 +251,10 @@ rule
row_value_constructor_element
: value_expression

value_expression_list
: value_expression comma value_expression_list { result = Array(val[0]) + Array(val[2]) }
| value_expression

value_expression
: numeric_value_expression
| general_literal
Expand All @@ -248,6 +278,7 @@ rule
| column_reference
| set_function_specification
| left_paren value_expression right_paren { result = val[1] }
| NULL { result = SQLParser::Statement::Null.new }

unsigned_value_specification
: unsigned_literal
Expand All @@ -261,14 +292,18 @@ rule
: CURRENT_USER { result = SQLParser::Statement::CurrentUser.new }

column_reference
: qualifier period column_name { result = SQLParser::Statement::QualifiedColumn.new(val[0], val[2]) }
: qualifier period column_or_star { result = SQLParser::Statement::QualifiedColumn.new(val[0], val[2]) }
| column_name

column_or_star
: column_name
| asterisk { result = SQLParser::Statement::All.new }

qualifier
: table_name

set_function_specification
: COUNT left_paren asterisk right_paren { result = SQLParser::Statement::Count.new(SQLParser::Statement::All.new) }
: COUNT left_paren distinct asterisk right_paren { result = SQLParser::Statement::Count.new(SQLParser::Statement::All.new) }
| general_set_function

general_set_function
Expand All @@ -277,6 +312,9 @@ rule
| MAX left_paren value_expression right_paren { result = SQLParser::Statement::Maximum.new(val[2]) }
| MIN left_paren value_expression right_paren { result = SQLParser::Statement::Minimum.new(val[2]) }
| SUM left_paren value_expression right_paren { result = SQLParser::Statement::Sum.new(val[2]) }
| COALESCE left_paren value_expression_list right_paren { result = SQLParser::Statement::Coalesce.new(*val[2]) }
| sql_function left_paren value_expression_list right_paren { result = SQLParser::Statement::SQLFunction.new(val[0], *val[2]) }
| sql_function left_paren right_paren { result = SQLParser::Statement::SQLFunction.new(val[0]) }

# literal numbers, strings, dates and times
unsigned_numeric_literal
Expand Down
Loading