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

enhance: do not ignore error from gdb.FormatMultiLineSqlToSingle func #3368

Merged
merged 2 commits into from
Mar 13, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion contrib/drivers/mssql/mssql_do_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ WHERE TMP_.ROWNUMBER_ > %d AND TMP_.ROWNUMBER_ <= %d
)

func init() {
selectWithOrderSqlTmp = gdb.FormatMultiLineSqlToSingle(selectWithOrderSqlTmp)
var err error
selectWithOrderSqlTmp, err = gdb.FormatMultiLineSqlToSingle(selectWithOrderSqlTmp)
if err != nil {
panic(err)
}
}

// DoFilter deals with the sql string before commits it to underlying sql driver.
Expand Down
6 changes: 5 additions & 1 deletion contrib/drivers/mssql/mssql_table_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ ORDER BY a.id,a.colorder
)

func init() {
tableFieldsSqlTmp = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlTmp)
var err error
tableFieldsSqlTmp, err = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlTmp)
if err != nil {
panic(err)
}
}

// TableFields retrieves and returns the fields' information of specified table of current schema.
Expand Down
6 changes: 5 additions & 1 deletion contrib/drivers/mysql/mysql_table_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ WHERE
)

func init() {
tableFieldsSqlByMariadb = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlByMariadb)
var err error
tableFieldsSqlByMariadb, err = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlByMariadb)
if err != nil {
panic(err)
}
}

// TableFields retrieves and returns the fields' information of specified table of current
Expand Down
6 changes: 5 additions & 1 deletion contrib/drivers/oracle/oracle_do_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ SELECT * FROM (
)

func init() {
newSqlReplacementTmp = gdb.FormatMultiLineSqlToSingle(newSqlReplacementTmp)
var err error
newSqlReplacementTmp, err = gdb.FormatMultiLineSqlToSingle(newSqlReplacementTmp)
if err != nil {
panic(err)
}
}

// DoFilter deals with the sql string before commits it to underlying sql driver.
Expand Down
6 changes: 5 additions & 1 deletion contrib/drivers/oracle/oracle_table_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ FROM USER_TAB_COLUMNS WHERE TABLE_NAME = '%s' ORDER BY COLUMN_ID
)

func init() {
tableFieldsSqlTmp = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlTmp)
var err error
tableFieldsSqlTmp, err = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlTmp)
if err != nil {
panic(err)
}
}

// TableFields retrieves and returns the fields' information of specified table of current schema.
Expand Down
6 changes: 5 additions & 1 deletion contrib/drivers/pgsql/pgsql_table_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ ORDER BY a.attnum`
)

func init() {
tableFieldsSqlTmp = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlTmp)
var err error
tableFieldsSqlTmp, err = gdb.FormatMultiLineSqlToSingle(tableFieldsSqlTmp)
if err != nil {
panic(err)
}
}

// TableFields retrieves and returns the fields' information of specified table of current schema.
Expand Down
6 changes: 5 additions & 1 deletion contrib/drivers/pgsql/pgsql_tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ ORDER BY
)

func init() {
tablesSqlTmp = gdb.FormatMultiLineSqlToSingle(tablesSqlTmp)
var err error
tablesSqlTmp, err = gdb.FormatMultiLineSqlToSingle(tablesSqlTmp)
if err != nil {
panic(err)
}
}

// Tables retrieves and returns the tables of current schema.
Expand Down
12 changes: 6 additions & 6 deletions database/gdb/gdb_func.go
Original file line number Diff line number Diff line change
Expand Up @@ -931,16 +931,16 @@ func FormatSqlWithArgs(sql string, args []interface{}) string {
}

// FormatMultiLineSqlToSingle formats sql template string into one line.
func FormatMultiLineSqlToSingle(sqlTmp string) string {
func FormatMultiLineSqlToSingle(sql string) (string, error) {
var err error
// format sql template string.
sqlTmp, err = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(sqlTmp))
sql, err = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(sql))
if err != nil {
panic(err)
return "", err
}
sqlTmp, err = gregex.ReplaceString(`\s{2,}`, " ", gstr.Trim(sqlTmp))
sql, err = gregex.ReplaceString(`\s{2,}`, " ", gstr.Trim(sql))
if err != nil {
panic(err)
return "", err
}
return sqlTmp
return sql, nil
}
Loading