spaces in timestamp column name (#1490)

* spaces in timestamp column name * spaces in timestamp column name * spaces in timestamp column name Co-authored-by: egor-ryashin <[email protected]>
rilldata · Dec 20, 2022 · 7c8b961 · 7c8b961
1 parent 50b96c9
commit 7c8b961
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 12 deletions.
diff --git a/runtime/queries/column_timeseries.go b/runtime/queries/column_timeseries.go
@@ -72,7 +72,7 @@ func (q *ColumnTimeseries) Resolve(ctx context.Context, rt *runtime.Runtime, ins
 		return nil
 	}
 	var measures = normaliseMeasures(q.Measures, true)
-	var timestampColumn = q.TimestampColumnName
+	var timestampColumn = safeName(q.TimestampColumnName)
 	var tableName = q.TableName
 	var filter string
 	if q.Filters != nil {
@@ -98,7 +98,7 @@ func (q *ColumnTimeseries) Resolve(ctx context.Context, rt *runtime.Runtime, ins
         -- transform the original data, and optionally sample it.
         series AS (
           SELECT 
-            date_trunc('` + timeGranularity + `', "` + EscapeDoubleQuotes(timestampColumn) + `") as ` + tsAlias + `,` + getExpressionColumnsFromMeasures(measures) + `
+            date_trunc('` + timeGranularity + `', ` + timestampColumn + `) as ` + tsAlias + `,` + getExpressionColumnsFromMeasures(measures) + `
           FROM "` + EscapeDoubleQuotes(tableName) + `" ` + filter + `
           GROUP BY ` + tsAlias + ` ORDER BY ` + tsAlias + `
         )

diff --git a/runtime/queries/metricsview_timeseries.go b/runtime/queries/metricsview_timeseries.go
@@ -90,7 +90,8 @@ func (q *MetricsViewTimeSeries) Resolve(ctx context.Context, rt *runtime.Runtime
 }
 
 func (q *MetricsViewTimeSeries) buildMetricsTimeSeriesSQL(mv *runtimev1.MetricsView) (string, []any, error) {
-	timeCol := fmt.Sprintf("DATE_TRUNC('%s', %s) AS %s", q.TimeGranularity, mv.TimeDimension, mv.TimeDimension)
+	timestampColumnName := safeName(mv.TimeDimension)
+	timeCol := fmt.Sprintf("DATE_TRUNC('%s', %s) AS %s", q.TimeGranularity, timestampColumnName, timestampColumnName)
 	selectCols := []string{timeCol}
 	for _, n := range q.MeasureNames {
 		found := false
@@ -111,11 +112,11 @@ func (q *MetricsViewTimeSeries) buildMetricsTimeSeriesSQL(mv *runtimev1.MetricsV
 	args := []any{}
 	if mv.TimeDimension != "" {
 		if q.TimeStart != nil {
-			whereClause += fmt.Sprintf(" AND %s >= ?", mv.TimeDimension)
+			whereClause += fmt.Sprintf(" AND %s >= ?", timestampColumnName)
 			args = append(args, q.TimeStart.AsTime())
 		}
 		if q.TimeEnd != nil {
-			whereClause += fmt.Sprintf(" AND %s < ?", mv.TimeDimension)
+			whereClause += fmt.Sprintf(" AND %s < ?", timestampColumnName)
 			args = append(args, q.TimeEnd.AsTime())
 		}
 	}
@@ -134,7 +135,7 @@ func (q *MetricsViewTimeSeries) buildMetricsTimeSeriesSQL(mv *runtimev1.MetricsV
 		strings.Join(selectCols, ", "),
 		mv.Model,
 		whereClause,
-		mv.TimeDimension,
+		timestampColumnName,
 	)
 	return sql, args, nil
 }
diff --git a/runtime/queries/metricsview_toplist.go b/runtime/queries/metricsview_toplist.go
@@ -89,7 +89,7 @@ func (q *MetricsViewToplist) Resolve(ctx context.Context, rt *runtime.Runtime, i
 }
 
 func (q *MetricsViewToplist) buildMetricsTopListSql(mv *runtimev1.MetricsView) (string, []any, error) {
-	dimName := quoteName(q.DimensionName)
+	dimName := safeName(q.DimensionName)
 	selectCols := []string{dimName}
 	for _, n := range q.MeasureNames {
 		found := false
@@ -108,13 +108,14 @@ func (q *MetricsViewToplist) buildMetricsTopListSql(mv *runtimev1.MetricsView) (
 
 	args := []any{}
 	whereClause := "1=1"
+	timestampColumnName := safeName(mv.TimeDimension)
 	if mv.TimeDimension != "" {
 		if q.TimeStart != nil {
-			whereClause += fmt.Sprintf(" AND %s >= ?", mv.TimeDimension)
+			whereClause += fmt.Sprintf(" AND %s >= ?", timestampColumnName)
 			args = append(args, q.TimeStart.AsTime())
 		}
 		if q.TimeEnd != nil {
-			whereClause += fmt.Sprintf(" AND %s < ?", mv.TimeDimension)
+			whereClause += fmt.Sprintf(" AND %s < ?", timestampColumnName)
 			args = append(args, q.TimeEnd.AsTime())
 		}
 	}
@@ -131,7 +132,7 @@ func (q *MetricsViewToplist) buildMetricsTopListSql(mv *runtimev1.MetricsView) (
 	orderClause := "true"
 	for _, s := range q.Sort {
 		orderClause += ", "
-		orderClause += s.Name
+		orderClause += safeName(s.Name)
 		if !s.Ascending {
 			orderClause += " DESC"
 		}

diff --git a/runtime/queries/metricsview_totals.go b/runtime/queries/metricsview_totals.go
@@ -107,13 +107,14 @@ func (q *MetricsViewTotals) buildMetricsTotalsSql(mv *runtimev1.MetricsView) (st
 
 	whereClause := "1=1"
 	args := []any{}
+	timestampColumnName := safeName(mv.TimeDimension)
 	if mv.TimeDimension != "" {
 		if q.TimeStart != nil {
-			whereClause += fmt.Sprintf(" AND %s >= ?", mv.TimeDimension)
+			whereClause += fmt.Sprintf(" AND %s >= ?", timestampColumnName)
 			args = append(args, q.TimeStart.AsTime())
 		}
 		if q.TimeEnd != nil {
-			whereClause += fmt.Sprintf(" AND %s < ?", mv.TimeDimension)
+			whereClause += fmt.Sprintf(" AND %s < ?", timestampColumnName)
 			args = append(args, q.TimeEnd.AsTime())
 		}
 	}

diff --git a/runtime/queries/sqlutil.go b/runtime/queries/sqlutil.go
@@ -0,0 +1,38 @@
+package queries
+
+import (
+	"context"
+	"strings"
+
+	"github.com/google/uuid"
+	"github.com/rilldata/rill/runtime/drivers"
+)
+
+func escapeSingleQuotes(value string) string {
+	return strings.ReplaceAll(value, "'", "''")
+}
+
+func escapeDoubleQuotes(column string) string {
+	return strings.ReplaceAll(column, "\"", "\"\"")
+}
+
+func safeName(name string) string {
+	if name == "" {
+		return name
+	}
+	return quoteName(escapeDoubleQuotes(name))
+}
+
+func dropTempTable(olap drivers.OLAPStore, priority int, tableName string) {
+	rs, er := olap.Execute(context.Background(), &drivers.Statement{
+		Query:    `DROP TABLE "` + tableName + `"`,
+		Priority: priority,
+	})
+	if er == nil {
+		rs.Close()
+	}
+}
+
+func tempName(prefix string) string {
+	return prefix + strings.ReplaceAll(uuid.New().String(), "-", "")
+}
diff --git a/runtime/server/queries_metrics_test.go b/runtime/server/queries_metrics_test.go
@@ -32,6 +32,20 @@ func TestServer_MetricsViewTotals(t *testing.T) {
 	require.Equal(t, 2.0, tr.Data.Fields["measure_0"].GetNumberValue())
 }
 
+func TestServer_MetricsViewTotals_timestamp_name_with_spaces(t *testing.T) {
+	server, instanceId := getMetricsTestServer(t, "ad_bids_2rows")
+
+	tr, err := server.MetricsViewTotals(context.Background(), &runtimev1.MetricsViewTotalsRequest{
+		InstanceId:      instanceId,
+		MetricsViewName: "ad_bids_metrics_garbled",
+		MeasureNames:    []string{"measure_0"},
+		TimeEnd:         parseTime(t, "2022-01-02T00:00:00Z"),
+	})
+	require.NoError(t, err)
+	require.Equal(t, 1, len(tr.Data.Fields))
+	require.Equal(t, 1.0, tr.Data.Fields["measure_0"].GetNumberValue())
+}
+
 func TestServer_MetricsViewTotals_EmptyModel(t *testing.T) {
 	server, instanceId := getMetricsTestServer(t, "ad_bids_2rows")
 

diff --git a/runtime/testruntime/testdata/ad_bids_2rows/dashboards/ad_bids_metrics_garbled.yaml b/runtime/testruntime/testdata/ad_bids_2rows/dashboards/ad_bids_metrics_garbled.yaml
@@ -0,0 +1,33 @@
+model: ad_bids_garbled
+display_name: Ad bids
+description:
+
+timeseries: timestamp name with spaces
+default_timegrain: ""
+timegrains:
+  - 1 day
+  - 1 month
+
+dimensions:
+  - label: Publisher
+    property: publisher
+    description: ""
+  - label: Domain
+    property: domain
+    description: ""
+  - label: Id
+    property: id
+
+measures:
+  - label: "Number of bids"
+    expression: count(*)
+    description: ""
+    format_preset: ""
+  - label: "Total volume"
+    expression: sum(volume)
+    description: ""
+    format_preset: ""
+  - label: "Total impressions"
+    expression: sum(impressions)
+  - label: "Total clicks"
+    expression: sum(clicks)
diff --git a/runtime/testruntime/testdata/ad_bids_2rows/models/ad_bids_garbled.sql b/runtime/testruntime/testdata/ad_bids_2rows/models/ad_bids_garbled.sql
@@ -0,0 +1,11 @@
+SELECT
+    (id::HUGEINT + 170141183460469231731687303715884105726)::HUGEINT as id,
+    timestamp as "timestamp name with spaces",
+    publisher,
+    domain,
+    bid_price,
+    volume,
+    impressions,
+    "ad words",
+    clicks
+FROM ad_bids_source