diff --git a/contrib/drivers/mssql/mssql.go b/contrib/drivers/mssql/mssql.go index 908aba1a8..f566870ce 100644 --- a/contrib/drivers/mssql/mssql.go +++ b/contrib/drivers/mssql/mssql.go @@ -223,7 +223,7 @@ func (d *Driver) Tables(ctx context.Context, schema ...string) (tables []string, return nil, err } - result, err = d.DoGetAll(ctx, link, `SELECT NAME FROM SYSOBJECTS WHERE XTYPE='U' AND STATUS >= 0 ORDER BY NAME`) + result, err = d.DoSelect(ctx, link, `SELECT NAME FROM SYSOBJECTS WHERE XTYPE='U' AND STATUS >= 0 ORDER BY NAME`) if err != nil { return } @@ -289,7 +289,7 @@ ORDER BY a.id,a.colorder`, table, ) structureSql, _ = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(structureSql)) - result, err = d.DoGetAll(ctx, link, structureSql) + result, err = d.DoSelect(ctx, link, structureSql) if err != nil { return nil } diff --git a/contrib/drivers/oracle/oracle.go b/contrib/drivers/oracle/oracle.go index 4ea25c96b..ccae47bd5 100644 --- a/contrib/drivers/oracle/oracle.go +++ b/contrib/drivers/oracle/oracle.go @@ -194,7 +194,7 @@ func (d *Driver) parseSql(sql string) string { // Note that it ignores the parameter `schema` in oracle database, as it is not necessary. func (d *Driver) Tables(ctx context.Context, schema ...string) (tables []string, err error) { var result gdb.Result - result, err = d.DoGetAll(ctx, nil, "SELECT TABLE_NAME FROM USER_TABLES ORDER BY TABLE_NAME") + result, err = d.DoSelect(ctx, nil, "SELECT TABLE_NAME FROM USER_TABLES ORDER BY TABLE_NAME") if err != nil { return } @@ -245,7 +245,7 @@ FROM USER_TAB_COLUMNS WHERE TABLE_NAME = '%s' ORDER BY COLUMN_ID`, return nil } structureSql, _ = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(structureSql)) - result, err = d.DoGetAll(ctx, link, structureSql) + result, err = d.DoSelect(ctx, link, structureSql) if err != nil { return nil } diff --git a/contrib/drivers/pgsql/pgsql.go b/contrib/drivers/pgsql/pgsql.go index 4f87cdc01..31696134e 100644 --- a/contrib/drivers/pgsql/pgsql.go +++ b/contrib/drivers/pgsql/pgsql.go @@ -142,7 +142,7 @@ func (d *Driver) Tables(ctx context.Context, schema ...string) (tables []string, schema[0], ) } - result, err = d.DoGetAll(ctx, link, query) + result, err = d.DoSelect(ctx, link, query) if err != nil { return } @@ -198,7 +198,7 @@ ORDER BY a.attnum`, return nil } structureSql, _ = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(structureSql)) - result, err = d.DoGetAll(ctx, link, structureSql) + result, err = d.DoSelect(ctx, link, structureSql) if err != nil { return nil } diff --git a/contrib/drivers/sqlite/sqlite.go b/contrib/drivers/sqlite/sqlite.go index bca87fb33..66bba094d 100644 --- a/contrib/drivers/sqlite/sqlite.go +++ b/contrib/drivers/sqlite/sqlite.go @@ -106,7 +106,7 @@ func (d *Driver) Tables(ctx context.Context, schema ...string) (tables []string, return nil, err } - result, err = d.DoGetAll(ctx, link, `SELECT NAME FROM SQLITE_MASTER WHERE TYPE='table' ORDER BY NAME`) + result, err = d.DoSelect(ctx, link, `SELECT NAME FROM SQLITE_MASTER WHERE TYPE='table' ORDER BY NAME`) if err != nil { return } @@ -141,7 +141,7 @@ func (d *Driver) TableFields(ctx context.Context, table string, schema ...string if link, err = d.SlaveLink(useSchema); err != nil { return nil } - result, err = d.DoGetAll(ctx, link, fmt.Sprintf(`PRAGMA TABLE_INFO(%s)`, table)) + result, err = d.DoSelect(ctx, link, fmt.Sprintf(`PRAGMA TABLE_INFO(%s)`, table)) if err != nil { return nil } diff --git a/database/gdb/gdb.go b/database/gdb/gdb.go index 9b79fc6d9..2b9034325 100644 --- a/database/gdb/gdb.go +++ b/database/gdb/gdb.go @@ -94,7 +94,7 @@ type DB interface { // Internal APIs for CURD, which can be overwritten by custom CURD implements. // =========================================================================== - DoSelect(ctx context.Context, link Link, sql string, args ...interface{}) (result Result, err error) // See Core.DoGetAll. + DoSelect(ctx context.Context, link Link, sql string, args ...interface{}) (result Result, err error) // See Core.DoSelect. DoInsert(ctx context.Context, link Link, table string, data List, option DoInsertOption) (result sql.Result, err error) // See Core.DoInsert. DoUpdate(ctx context.Context, link Link, table string, data interface{}, condition string, args ...interface{}) (result sql.Result, err error) // See Core.DoUpdate. DoDelete(ctx context.Context, link Link, table string, condition string, args ...interface{}) (result sql.Result, err error) // See Core.DoDelete.