diff --git a/contrib/drivers/mssql/mssql_do_filter.go b/contrib/drivers/mssql/mssql_do_filter.go index 1a1fab537..8cf790e4f 100644 --- a/contrib/drivers/mssql/mssql_do_filter.go +++ b/contrib/drivers/mssql/mssql_do_filter.go @@ -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. diff --git a/contrib/drivers/mssql/mssql_table_fields.go b/contrib/drivers/mssql/mssql_table_fields.go index d15a7f009..db2a9ba3e 100644 --- a/contrib/drivers/mssql/mssql_table_fields.go +++ b/contrib/drivers/mssql/mssql_table_fields.go @@ -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. diff --git a/contrib/drivers/mysql/mysql_table_fields.go b/contrib/drivers/mysql/mysql_table_fields.go index 133751f98..72ffa7e29 100644 --- a/contrib/drivers/mysql/mysql_table_fields.go +++ b/contrib/drivers/mysql/mysql_table_fields.go @@ -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 diff --git a/contrib/drivers/oracle/oracle_do_filter.go b/contrib/drivers/oracle/oracle_do_filter.go index 4c20c2cfd..0d9f8ed49 100644 --- a/contrib/drivers/oracle/oracle_do_filter.go +++ b/contrib/drivers/oracle/oracle_do_filter.go @@ -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. diff --git a/contrib/drivers/oracle/oracle_table_fields.go b/contrib/drivers/oracle/oracle_table_fields.go index b3c90c922..aa20858dc 100644 --- a/contrib/drivers/oracle/oracle_table_fields.go +++ b/contrib/drivers/oracle/oracle_table_fields.go @@ -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. diff --git a/contrib/drivers/pgsql/pgsql_table_fields.go b/contrib/drivers/pgsql/pgsql_table_fields.go index 22155b41b..d53667c08 100644 --- a/contrib/drivers/pgsql/pgsql_table_fields.go +++ b/contrib/drivers/pgsql/pgsql_table_fields.go @@ -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. diff --git a/contrib/drivers/pgsql/pgsql_tables.go b/contrib/drivers/pgsql/pgsql_tables.go index 32f2c51a2..a00cc3410 100644 --- a/contrib/drivers/pgsql/pgsql_tables.go +++ b/contrib/drivers/pgsql/pgsql_tables.go @@ -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. diff --git a/database/gdb/gdb_func.go b/database/gdb/gdb_func.go index 411d506c2..00a00462a 100644 --- a/database/gdb/gdb_func.go +++ b/database/gdb/gdb_func.go @@ -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 }