refactor: turn Dialect into a per-driver interface

cli/cmd/project/tables.go

@@ -2,10 +2,10 @@ package project
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/rilldata/rill/cli/pkg/cmdutil"
 	runtimev1 "github.com/rilldata/rill/proto/gen/rill/runtime/v1"
-	"github.com/rilldata/rill/runtime/drivers"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/types/known/structpb"
 )
@@ -90,7 +90,7 @@ func TablesCmd(ch *cmdutil.Helper) *cobra.Command {
 
 				// Get row count using SQL query
 				var rowCount string
-				countQuery := fmt.Sprintf("SELECT COUNT(*) FROM %s", drivers.DialectDuckDB.EscapeIdentifier(table.Name))
+				countQuery := fmt.Sprintf("SELECT COUNT(*) FROM %s", escapeIdentifier(table.Name))
 				queryRes, err := rt.RuntimeServiceClient.QueryResolver(cmd.Context(), &runtimev1.QueryResolverRequest{
 					InstanceId:         instanceID,
 					Resolver:           "sql",
@@ -140,3 +140,12 @@ func must[T any](v T, err error) T {
 	}
 	return v
 }
+
+func escapeIdentifier(ident string) string {
+	if ident == "" {
+		return ident
+	}
+	// Most other dialects follow ANSI SQL: use double quotes.
+	// Replace any internal double quotes with escaped double quotes.
+	return fmt.Sprintf(`"%s"`, strings.ReplaceAll(ident, `"`, `""`)) // nolint:gocritic
+}

runtime/drivers/athena/dialect.go

@@ -0,0 +1,15 @@
+package athena
+
+import (
+	"github.com/rilldata/rill/runtime/drivers"
+)
+
+type dialect struct {
+	drivers.BaseDialect
+}
+
+var DialectAthena drivers.Dialect = func() drivers.Dialect {
+	d := &dialect{}
+	d.BaseDialect = drivers.NewBaseDialect(drivers.DialectNameAthena, drivers.DoubleQuotesEscapeIdentifier, drivers.DoubleQuotesEscapeIdentifier)
+	return d
+}()

runtime/drivers/athena/olap.go

@@ -20,7 +20,7 @@ var _ drivers.OLAPStore = &Connection{}
 
 // Dialect implements drivers.OLAPStore.
 func (c *Connection) Dialect() drivers.Dialect {
-	return drivers.DialectAthena
+	return DialectAthena
 }
 
 // Exec implements drivers.OLAPStore.

runtime/drivers/bigquery/dialect.go

@@ -0,0 +1,27 @@
+package bigquery
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/rilldata/rill/runtime/drivers"
+)
+
+type dialect struct {
+	drivers.BaseDialect
+}
+
+var DialectBigQuery drivers.Dialect = func() drivers.Dialect {
+	d := &dialect{}
+	d.BaseDialect = drivers.NewBaseDialect(drivers.DialectNameBigQuery, BigQueryEscapeIdentifier, BigQueryEscapeIdentifier)
+	return d
+}()
+
+func BigQueryEscapeIdentifier(ident string) string {
+	if ident == "" {
+		return ident
+	}
+	// Bigquery uses backticks for quoting identifiers
+	// Replace any backticks inside the identifier with double backticks
+	return fmt.Sprintf("`%s`", strings.ReplaceAll(ident, "`", "``"))
+}

runtime/drivers/bigquery/olap.go

@@ -24,7 +24,7 @@ var _ drivers.OLAPStore = (*Connection)(nil)
 
 // Dialect implements drivers.OLAPStore.
 func (c *Connection) Dialect() drivers.Dialect {
-	return drivers.DialectBigQuery
+	return DialectBigQuery
 }
 
 // Exec implements drivers.OLAPStore.

runtime/drivers/clickhouse/crud.go

@@ -575,12 +575,12 @@ func (c *Connection) createDictionary(ctx context.Context, name, sql string, out
 		return fmt.Errorf("clickhouse: no primary key specified for dictionary %q", name)
 	}
 
-	srcTbl := fmt.Sprintf("CLICKHOUSE(TABLE %s)", c.Dialect().EscapeStringValue(tempTable))
+	srcTbl := fmt.Sprintf("CLICKHOUSE(TABLE %s)", drivers.EscapeStringValue(tempTable))
 	if outputProps.DictionarySourceUser != "" {
 		if outputProps.DictionarySourcePassword == "" {
 			return fmt.Errorf("clickhouse: no password specified for dictionary user")
 		}
-		srcTbl = fmt.Sprintf("CLICKHOUSE(TABLE %s USER %s PASSWORD %s)", c.Dialect().EscapeStringValue(tempTable), safeSQLString(outputProps.DictionarySourceUser), safeSQLString(outputProps.DictionarySourcePassword))
+		srcTbl = fmt.Sprintf("CLICKHOUSE(TABLE %s USER %s PASSWORD %s)", drivers.EscapeStringValue(tempTable), safeSQLString(outputProps.DictionarySourceUser), safeSQLString(outputProps.DictionarySourcePassword))
 	}
 
 	// create dictionary
@@ -731,5 +731,5 @@ func tempTableForDictionary(name string) string {
 }
 
 func safeSQLString(name string) string {
-	return drivers.DialectClickHouse.EscapeStringValue(name)
+	return drivers.EscapeStringValue(name)
 }