public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: use any rather than interface{} (#74066)

Browse Source
This commit is contained in:
Ryan McKinley
2023-08-30 18:46:47 +03:00
committed by GitHub
parent 3e272d2bda
commit 025b2f3011
525 changed files with 2528 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/migrator/dialect.go
+3 -3
View File
@@ -47,8 +47,8 @@ type Dialect interface {
UpdateTableSQL(tableName string, columns []*Column) string
IndexCheckSQL(tableName, indexName string) (string, []interface{})
ColumnCheckSQL(tableName, columnName string) (string, []interface{})
IndexCheckSQL(tableName, indexName string) (string, []any)
ColumnCheckSQL(tableName, columnName string) (string, []any)
// UpsertSQL returns the upsert sql statement for a dialect
UpsertSQL(tableName string, keyCols, updateCols []string) string
UpsertMultipleSQL(tableName string, keyCols, updateCols []string, count int) (string, error)
@@ -235,7 +235,7 @@ func (b *BaseDialect) RenameColumn(table Table, column *Column, newName string)
)
}
func (b *BaseDialect) ColumnCheckSQL(tableName, columnName string) (string, []interface{}) {
func (b *BaseDialect) ColumnCheckSQL(tableName, columnName string) (string, []any) {
return "", nil
}
pkg/services/sqlstore/migrator/mysql_dialect.go
+4 -4
View File
@@ -111,14 +111,14 @@ func (db *MySQLDialect) UpdateTableSQL(tableName string, columns []*Column) stri
return "ALTER TABLE " + db.Quote(tableName) + " " + strings.Join(statements, ", ") + ";"
}
func (db *MySQLDialect) IndexCheckSQL(tableName, indexName string) (string, []interface{}) {
args := []interface{}{tableName, indexName}
func (db *MySQLDialect) IndexCheckSQL(tableName, indexName string) (string, []any) {
args := []any{tableName, indexName}
sql := "SELECT 1 FROM " + db.Quote("INFORMATION_SCHEMA") + "." + db.Quote("STATISTICS") + " WHERE " + db.Quote("TABLE_SCHEMA") + " = DATABASE() AND " + db.Quote("TABLE_NAME") + "=? AND " + db.Quote("INDEX_NAME") + "=?"
return sql, args
}
func (db *MySQLDialect) ColumnCheckSQL(tableName, columnName string) (string, []interface{}) {
args := []interface{}{tableName, columnName}
func (db *MySQLDialect) ColumnCheckSQL(tableName, columnName string) (string, []any) {
args := []any{tableName, columnName}
sql := "SELECT 1 FROM " + db.Quote("INFORMATION_SCHEMA") + "." + db.Quote("COLUMNS") + " WHERE " + db.Quote("TABLE_SCHEMA") + " = DATABASE() AND " + db.Quote("TABLE_NAME") + "=? AND " + db.Quote("COLUMN_NAME") + "=?"
return sql, args
}
pkg/services/sqlstore/migrator/postgres_dialect.go
+2 -2
View File
@@ -96,8 +96,8 @@ func (db *PostgresDialect) SQLType(c *Column) string {
return res
}
func (db *PostgresDialect) IndexCheckSQL(tableName, indexName string) (string, []interface{}) {
args := []interface{}{tableName, indexName}
func (db *PostgresDialect) IndexCheckSQL(tableName, indexName string) (string, []any) {
args := []any{tableName, indexName}
sql := "SELECT 1 FROM " + db.Quote("pg_indexes") + " WHERE" + db.Quote("tablename") + "=? AND " + db.Quote("indexname") + "=?"
return sql, args
}
pkg/services/sqlstore/migrator/sqlite_dialect.go
+2 -2
View File
@@ -75,8 +75,8 @@ func (db *SQLite3) SQLType(c *Column) string {
}
}
func (db *SQLite3) IndexCheckSQL(tableName, indexName string) (string, []interface{}) {
args := []interface{}{tableName, indexName}
func (db *SQLite3) IndexCheckSQL(tableName, indexName string) (string, []any) {
args := []any{tableName, indexName}
sql := "SELECT 1 FROM " + db.Quote("sqlite_master") + " WHERE " + db.Quote("type") + "='index' AND " + db.Quote("tbl_name") + "=? AND " + db.Quote("name") + "=?"
return sql, args
}