From 07c9772d403d382bb96c6f369349abc56b5e3b11 Mon Sep 17 00:00:00 2001 From: Sergey Kurt Date: Tue, 8 Nov 2016 16:48:56 +0300 Subject: [PATCH] errors.New(fmt.Sprintf(...)) -> fmt.Errorf(...) --- mssql_dialect.go | 4 +--- mysql_dialect.go | 3 +-- oracle_dialect.go | 3 +-- postgres_dialect.go | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mssql_dialect.go b/mssql_dialect.go index a4d5a02f..2c6fede4 100644 --- a/mssql_dialect.go +++ b/mssql_dialect.go @@ -5,7 +5,6 @@ package xorm import ( - "errors" "fmt" "strconv" "strings" @@ -380,8 +379,7 @@ func (db *mssql) GetColumns(tableName string) ([]string, map[string]*core.Column if _, ok := core.SqlTypes[ct]; ok { col.SQLType = core.SQLType{Name: ct, DefaultLength: 0, DefaultLength2: 0} } else { - return nil, nil, errors.New(fmt.Sprintf("unknow colType %v for %v - %v", - ct, tableName, col.Name)) + return nil, nil, fmt.Errorf("Unknown colType %v for %v - %v", ct, tableName, col.Name) } } diff --git a/mysql_dialect.go b/mysql_dialect.go index 2ff57f1c..0ac5bad8 100644 --- a/mysql_dialect.go +++ b/mysql_dialect.go @@ -6,7 +6,6 @@ package xorm import ( "crypto/tls" - "errors" "fmt" "strconv" "strings" @@ -375,7 +374,7 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column if _, ok := core.SqlTypes[colType]; ok { col.SQLType = core.SQLType{Name: colType, DefaultLength: len1, DefaultLength2: len2} } else { - return nil, nil, errors.New(fmt.Sprintf("unkonw colType %v", colType)) + return nil, nil, fmt.Errorf("Unknown colType %v", colType) } if colKey == "PRI" { diff --git a/oracle_dialect.go b/oracle_dialect.go index a8b9d286..d4aee930 100644 --- a/oracle_dialect.go +++ b/oracle_dialect.go @@ -5,7 +5,6 @@ package xorm import ( - "errors" "fmt" "strconv" "strings" @@ -757,7 +756,7 @@ func (db *oracle) GetColumns(tableName string) ([]string, map[string]*core.Colum } if _, ok := core.SqlTypes[col.SQLType.Name]; !ok { - return nil, nil, errors.New(fmt.Sprintf("unkonw colType %v %v", *dataType, col.SQLType)) + return nil, nil, fmt.Errorf("Unknown colType %v %v", *dataType, col.SQLType) } col.Length = dataLen diff --git a/postgres_dialect.go b/postgres_dialect.go index 2fc1e09e..27daabc6 100644 --- a/postgres_dialect.go +++ b/postgres_dialect.go @@ -5,7 +5,6 @@ package xorm import ( - "errors" "fmt" "strconv" "strings" @@ -990,7 +989,7 @@ WHERE c.relkind = 'r'::char AND c.relname = $1 AND s.table_schema = $2 AND f.att col.SQLType = core.SQLType{Name: strings.ToUpper(dataType), DefaultLength: 0, DefaultLength2: 0} } if _, ok := core.SqlTypes[col.SQLType.Name]; !ok { - return nil, nil, errors.New(fmt.Sprintf("unknow colType: %v", dataType)) + return nil, nil, fmt.Errorf("Unknown colType: %v", dataType) } col.Length = maxLen