chore: use any in place of interface{}

This addresses the lint raised by gopls for modernizing the usage of an
empty interface for the `any` type.

Signed-off-by: Prajwal S N <[email protected]>

Author: snprajwal

internal/codegen/golang/go_type.go

@@ -87,6 +87,6 @@ func goInnerType(req *plugin.GenerateRequest, options *opts.Options, col *plugin
 	case "sqlite":
 		return sqliteType(req, options, col)
 	default:
-		return "interface{}"
+		return "any"
 	}
 }

internal/codegen/golang/mysql_type.go

@@ -111,7 +111,7 @@ func mysqlType(req *plugin.GenerateRequest, options *opts.Options, col *plugin.C
 		return "json.RawMessage"
 
 	case "any":
-		return "interface{}"
+		return "any"
 
 	default:
 		for _, schema := range req.Catalog.Schemas {
@@ -134,7 +134,7 @@ func mysqlType(req *plugin.GenerateRequest, options *opts.Options, col *plugin.C
 		if debug.Active {
 			log.Printf("Unknown MySQL type: %s\n", columnType)
 		}
-		return "interface{}"
+		return "any"
 
 	}
 }

internal/codegen/golang/postgresql_type.go

@@ -178,7 +178,7 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 				return "pqtype.NullRawMessage"
 			}
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "jsonb", "pg_catalog.jsonb":
@@ -194,7 +194,7 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 				return "pqtype.NullRawMessage"
 			}
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "bytea", "blob", "pg_catalog.bytea":
@@ -293,7 +293,7 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverLibPQ:
 			return "pqtype.Inet"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "cidr":
@@ -308,7 +308,7 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverLibPQ:
 			return "pqtype.CIDR"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "macaddr", "macaddr8":
@@ -320,7 +320,7 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverLibPQ:
 			return "pqtype.Macaddr"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "ltree", "lquery", "ltxtquery":
@@ -359,15 +359,15 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Range[pgtype.Date]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "datemultirange":
 		switch driver {
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Multirange[pgtype.Range[pgtype.Date]]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "tsrange":
@@ -377,15 +377,15 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Range[pgtype.Timestamp]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "tsmultirange":
 		switch driver {
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Multirange[pgtype.Range[pgtype.Timestamp]]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "tstzrange":
@@ -395,15 +395,15 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Range[pgtype.Timestamptz]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "tstzmultirange":
 		switch driver {
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Multirange[pgtype.Range[pgtype.Timestamptz]]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "numrange":
@@ -413,15 +413,15 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Range[pgtype.Numeric]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "nummultirange":
 		switch driver {
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Multirange[pgtype.Range[pgtype.Numeric]]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "int4range":
@@ -431,15 +431,15 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Range[pgtype.Int4]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "int4multirange":
 		switch driver {
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Multirange[pgtype.Range[pgtype.Int4]]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "int8range":
@@ -449,22 +449,22 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Range[pgtype.Int8]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "int8multirange":
 		switch driver {
 		case opts.SQLDriverPGXV5:
 			return "pgtype.Multirange[pgtype.Range[pgtype.Int8]]"
 		default:
-			return "interface{}"
+			return "any"
 		}
 
 	case "hstore":
 		if driver.IsPGX() {
 			return "pgtype.Hstore"
 		}
-		return "interface{}"
+		return "any"
 
 	case "bit", "varbit", "pg_catalog.bit", "pg_catalog.varbit":
 		if driver == opts.SQLDriverPGXV5 {
@@ -549,16 +549,16 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 
 	case "void":
 		// A void value can only be scanned into an empty interface.
-		return "interface{}"
+		return "any"
 
 	case "any":
-		return "interface{}"
+		return "any"
 
 	default:
 		rel, err := parseIdentifierString(columnType)
 		if err != nil {
 			// TODO: Should this actually return an error here?
-			return "interface{}"
+			return "any"
 		}
 		if rel.Schema == "" {
 			rel.Schema = req.Catalog.DefaultSchema
@@ -602,5 +602,5 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 	if debug.Active {
 		log.Printf("unknown PostgreSQL type: %s\n", columnType)
 	}
-	return "interface{}"
+	return "any"
 }

internal/codegen/golang/result.go

@@ -415,7 +415,7 @@ func columnsToStruct(req *plugin.GenerateRequest, options *opts.Options, name st
 	// field with the same name has a known type, assign
 	// the known type to the field without a known type
 	for i, field := range gs.Fields {
-		if len(seen[field.Name]) > 1 && field.Type == "interface{}" {
+		if len(seen[field.Name]) > 1 && (field.Type == "interface{}" || field.Type == "any") {
 			for _, j := range seen[field.Name] {
 				if i == j {
 					continue

internal/codegen/golang/sqlite_type.go

@@ -57,7 +57,7 @@ func sqliteType(req *plugin.GenerateRequest, options *opts.Options, col *plugin.
 		return "sql.NullTime"
 
 	case "any":
-		return "interface{}"
+		return "any"
 
 	}
 
@@ -93,7 +93,7 @@ func sqliteType(req *plugin.GenerateRequest, options *opts.Options, col *plugin.
 			log.Printf("unknown SQLite type: %s\n", dt)
 		}
 
-		return "interface{}"
+		return "any"
 
 	}
 }