bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
oldme
2024-03-13 19:22:17 +08:00
committed by GitHub
parent a8713da97f
commit 4feda4c395
8 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/drivers/mssql/mssql_do_filter.go
View File

@ -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.

6
contrib/drivers/mssql/mssql_table_fields.go
View File

@ -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.

6
contrib/drivers/mysql/mysql_table_fields.go
View File

@ -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

6
contrib/drivers/oracle/oracle_do_filter.go
View File

@ -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.

6
contrib/drivers/oracle/oracle_table_fields.go
View File

@ -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.

6
contrib/drivers/pgsql/pgsql_table_fields.go
View File

@ -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.

6
contrib/drivers/pgsql/pgsql_tables.go
View File

@ -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.

12
database/gdb/gdb_func.go
View File

@ -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
}