Add a $__timeTzFilter macro to handle timestamps with time zone (#82)

Author: ryder-openai

README.md

@@ -72,8 +72,9 @@ Macro example                                          | Description
 ------------------------------------------------------ | -------------
 `$__time(dateColumn)`                                  | Will be replaced by an expression to convert to a UNIX timestamp and rename the column to `time`. For example, *TRY_TO_TIMESTAMP_NTZ(dateColumn) as time*
 `$__timeEpoch(dateColumn)`                             | Will be replaced by an expression to convert to a UNIX timestamp and rename the column to `time`.
-`$__timeFilter(dateColumn)`                            | Will be replaced by a time range filter using the specified column name. For example, *time > CONVERT_TIMEZONE('UTC', 'UTC', '2023-12-13T23:21:44Z'::timestamp_ntz) AND time < CONVERT_TIMEZONE('UTC', 'UTC', '2023-12-13T23:22:44Z'::timestamp_ntz)*
-`$__timeFilter(dateColumn, timezone)`                  | Will be replaced by a time range filter using the specified column name. For example, *time > CONVERT_TIMEZONE('UTC', 'America/New_York', '2023-12-13T23:22:46Z'::timestamp_ntz) AND time < CONVERT_TIMEZONE('UTC', 'America/New_York', '2023-12-13T23:23:46Z'::timestamp_ntz)*
+`$__timeFilter(dateColumn)`                            | Will be replaced by a time range filter using the specified column name, which is expected to be a timestamp without time zone. For example, *time > CONVERT_TIMEZONE('UTC', 'UTC', '2023-12-13T23:21:44Z'::timestamp_ntz) AND time < CONVERT_TIMEZONE('UTC', 'UTC', '2023-12-13T23:22:44Z'::timestamp_ntz)*
+`$__timeFilter(dateColumn, timezone)`                  | Will be replaced by a time range filter using the specified column name, which is expected to be a timestamp without time zone. For example, *time > CONVERT_TIMEZONE('UTC', 'America/New_York', '2023-12-13T23:22:46Z'::timestamp_ntz) AND time < CONVERT_TIMEZONE('UTC', 'America/New_York', '2023-12-13T23:23:46Z'::timestamp_ntz)*
+`$__timeTzFilter(dateColumn)`                          | Will be replaced by a time range filter using the specified column name, which is expected to be a timestamp with time zone. For example, *time > '2023-12-13T23:21:44Z'::timestamp_tz AND time < '2023-12-13T23:22:44Z'::timestamp_tz*
 `$__timeFrom()`                                        | Will be replaced by the start of the currently active time selection. For example, *1494410783*
 `$__timeTo()`                                          | Will be replaced by the end of the currently active time selection. For example, *1494410983*
 `$__timeGroup(dateColumn,'5m')`                        | Will be replaced by an expression usable in GROUP BY clause. For example, *floor(extract(epoch from dateColumn)/120)*120*

pkg/macros.go

@@ -95,6 +95,12 @@ func evaluateMacro(name string, args []string, configStruct *queryConfigStruct)
 			timezone = args[1]
 		}
 		return fmt.Sprintf("%s > CONVERT_TIMEZONE('UTC', %s, '%s'::timestamp_ntz) AND %s < CONVERT_TIMEZONE('UTC', %s, '%s'::timestamp_ntz)", column, timezone, timeRange.From.UTC().Format(time.RFC3339Nano), column, timezone, timeRange.To.UTC().Format(time.RFC3339Nano)), nil
+	case "__timeTzFilter":
+		if len(args) == 0 {
+			return "", fmt.Errorf("missing time column argument for macro %v", name)
+		}
+		column := args[0]
+		return fmt.Sprintf("%s > '%s'::timestamp_tz AND %s < '%s'::timestamp_tz", column, timeRange.From.UTC().Format(time.RFC3339Nano), column, timeRange.To.UTC().Format(time.RFC3339Nano)), nil
 	case "__timeFrom":
 		return fmt.Sprintf("'%s'", timeRange.From.UTC().Format(time.RFC3339Nano)), nil
 	case "__timeTo":

pkg/macros_test.go

@@ -38,6 +38,9 @@ func TestEvaluateMacro(t *testing.T) {
 		{name: "__timeFilter", args: []string{}, err: "missing time column argument for macro __timeFilter"},
 		{name: "__timeFilter", args: []string{"col"}, config: configStruct, response: "col > CONVERT_TIMEZONE('UTC', 'UTC', '" + timeRange.From.UTC().Format(time.RFC3339Nano) + "'::timestamp_ntz) AND col < CONVERT_TIMEZONE('UTC', 'UTC', '" + timeRange.To.UTC().Format(time.RFC3339Nano) + "'::timestamp_ntz)"},
 		{name: "__timeFilter", args: []string{"col", "'America/New_York'"}, config: configStruct, response: "col > CONVERT_TIMEZONE('UTC', 'America/New_York', '" + timeRange.From.UTC().Format(time.RFC3339Nano) + "'::timestamp_ntz) AND col < CONVERT_TIMEZONE('UTC', 'America/New_York', '" + timeRange.To.UTC().Format(time.RFC3339Nano) + "'::timestamp_ntz)"},
+		// __timeTzFilter
+		{name: "__timeTzFilter", args: []string{}, err: "missing time column argument for macro __timeTzFilter"},
+		{name: "__timeTzFilter", args: []string{"col"}, config: configStruct, response: "col > '" + timeRange.From.UTC().Format(time.RFC3339Nano) + "'::timestamp_tz AND col < '" + timeRange.To.UTC().Format(time.RFC3339Nano) + "'::timestamp_tz"},
 		// __timeFrom
 		{name: "__timeFrom", args: []string{}, config: configStruct, response: "'" + timeRange.From.UTC().Format(time.RFC3339Nano) + "'"},
 		// __timeTo