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.

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

Fix column list parsing for multiline INSERT statements #1373

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Fix column list parsing for multiline INSERT statements #1373

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
df57cbf
Fix column list parsing for multiline INSERT statements
Fiery-Fenix Aug 15, 2024
31fad4a
Fixed additional bug with lowercase statements
Fiery-Fenix Aug 18, 2024
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
4 changes: 2 additions & 2 deletions batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
)

var normalizeInsertQueryMatch = regexp.MustCompile(`(?i)(INSERT\s+INTO\s+([^(]+)(?:\s*\([^()]*(?:\([^()]*\)[^()]*)*\))?)(?:\s*VALUES)?`)
var truncateFormat = regexp.MustCompile(`\sFORMAT\s+[^\s]+`)
var truncateFormat = regexp.MustCompile(`(?i)\sFORMAT\s+[^\s]+`)
var truncateValues = regexp.MustCompile(`\sVALUES\s.*$`)
var extractInsertColumnsMatch = regexp.MustCompile(`INSERT INTO .+\s\((?P<Columns>.+)\)$`)
var extractInsertColumnsMatch = regexp.MustCompile(`(?si)INSERT INTO .+\s\((?P<Columns>.+)\)$`)

func extractNormalizedInsertQueryAndColumns(query string) (normalizedQuery string, tableName string, columns []string, err error) {
query = truncateFormat.ReplaceAllString(query, "")
Expand Down
96 changes: 96 additions & 0 deletions batch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,83 +25,179 @@ import (

func TestExtractNormalizedInsertQueryAndColumns(t *testing.T) {
var testCases = []struct {
name string
query string
expectedNormalizedQuery string
expectedTableName string
expectedColumns []string
expectedError bool
}{
{
name: "Regular insert",
query: "INSERT INTO table_name (col1, col2) VALUES (1, 2)",
expectedNormalizedQuery: "INSERT INTO table_name (col1, col2) FORMAT Native",
expectedTableName: "table_name",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Lowercase insert",
query: "insert into table_name (col1, col2) values (1, 2)",
expectedNormalizedQuery: "insert into table_name (col1, col2) FORMAT Native",
expectedTableName: "table_name",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Insert with mixed case, multiline and format specified",
query: `INSERT INTO "db"."table_name" (
col1,
col2
) Values (
1,
2
)
format JSONEachRow`,
expectedNormalizedQuery: `INSERT INTO "db"."table_name" (
col1,
col2
) FORMAT Native`,
expectedTableName: "\"db\".\"table_name\"",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Multiline insert",
query: `INSERT INTO table_name (
col1,
col2
) VALUES (
1,
2
)`,
expectedNormalizedQuery: `INSERT INTO table_name (
col1,
col2
) FORMAT Native`,
expectedTableName: "table_name",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Multiline insert, with columns inline",
query: `INSERT INTO table_name (col1, col2) VALUES (
1,
2
)`,
expectedNormalizedQuery: `INSERT INTO table_name (col1, col2) FORMAT Native`,
expectedTableName: "table_name",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Multiline insert, with values inline",
query: `INSERT INTO table_name (
col1,
col2
) VALUES (1, 2)`,
expectedNormalizedQuery: `INSERT INTO table_name (
col1,
col2
) FORMAT Native`,
expectedTableName: "table_name",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Insert with backtick quoted database and table names",
query: "INSERT INTO `db`.`table_name` (col1, col2) VALUES (1, 2)",
expectedNormalizedQuery: "INSERT INTO `db`.`table_name` (col1, col2) FORMAT Native",
expectedTableName: "`db`.`table_name`",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Insert with double quoted database and table names",
query: "INSERT INTO \"db\".\"table_name\" (col1, col2) VALUES (1, 2)",
expectedNormalizedQuery: "INSERT INTO \"db\".\"table_name\" (col1, col2) FORMAT Native",
expectedTableName: "\"db\".\"table_name\"",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Insert with special characters in database and table names",
query: "INSERT INTO `_test_1345# $.ДБ`.`2. Таблица №2`",
expectedNormalizedQuery: "INSERT INTO `_test_1345# $.ДБ`.`2. Таблица №2` FORMAT Native",
expectedTableName: "`_test_1345# $.ДБ`.`2. Таблица №2`",
expectedColumns: []string{},
expectedError: false,
},
{
name: "Insert with special characters in database and table names, with columns",
query: "INSERT INTO `_test_1345# $.ДБ`.`2. Таблица №2` (col1, col2)",
expectedNormalizedQuery: "INSERT INTO `_test_1345# $.ДБ`.`2. Таблица №2` (col1, col2) FORMAT Native",
expectedTableName: "`_test_1345# $.ДБ`.`2. Таблица №2`",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Insert with special characters in database and table names, with columns and values",
query: "INSERT INTO `_test_1345# $.ДБ`.`2. Таблица №2` (col1, col2) VALUES (1, 2)",
expectedNormalizedQuery: "INSERT INTO `_test_1345# $.ДБ`.`2. Таблица №2` (col1, col2) FORMAT Native",
expectedTableName: "`_test_1345# $.ДБ`.`2. Таблица №2`",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Insert without database name",
query: "INSERT INTO table_name (col1, col2) VALUES (1, 2) FORMAT Native",
expectedNormalizedQuery: "INSERT INTO table_name (col1, col2) FORMAT Native",
expectedTableName: "table_name",
expectedColumns: []string{"col1", "col2"},
expectedError: false,
},
{
name: "Insert without columns and values",
query: "INSERT INTO table_name",
expectedNormalizedQuery: "INSERT INTO table_name FORMAT Native",
expectedTableName: "table_name",
expectedColumns: []string{},
expectedError: false,
},
{
name: "Insert with format",
query: "INSERT INTO table_name FORMAT Native",
expectedNormalizedQuery: "INSERT INTO table_name FORMAT Native",
expectedTableName: "table_name",
expectedColumns: []string{},
expectedError: false,
},
{
name: "Insert with lowercase format",
query: "INSERT INTO table_name format Native",
expectedNormalizedQuery: "INSERT INTO table_name FORMAT Native",
expectedTableName: "table_name",
expectedColumns: []string{},
expectedError: false,
},
{
name: "Insert with JSONEachRow format",
query: "INSERT INTO table_name FORMAT JSONEachRow",
expectedNormalizedQuery: "INSERT INTO table_name FORMAT Native",
expectedTableName: "table_name",
expectedColumns: []string{},
expectedError: false,
},
{
name: "Insert with quoted table name only",
query: "INSERT INTO `table_name` VALUES (1, 2)",
expectedNormalizedQuery: "INSERT INTO `table_name` FORMAT Native",
expectedTableName: "`table_name`",
expectedColumns: []string{},
expectedError: false,
},
{
name: "Select, should produce error",
query: "SELECT * FROM table_name",
expectedError: true,
},
Expand Down
Loading