Merge pull request #47 from grafana/handle-numeric-template-variables

Support numeric values when applying template variables to SQL queries
grafana · Jun 15, 2023 · 7774bf8 · 7774bf8
2 parents 07bd2a2 + 7b52a68
commit 7774bf8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/sql/utils/utils.test.ts b/src/sql/utils/utils.test.ts
@@ -12,6 +12,7 @@ describe('filterQuery', () => {
 
 const scopedVars: Record<string, any> = {
   $simple: 'foo',
+  $numeric: 123,
   $multiple: ['foo', 'bar'],
 };
 // simplified version of getTemplateSrv().replace
@@ -35,6 +36,15 @@ describe('applySQLTemplateVariables', () => {
     expect(res.rawSQL).toEqual('select * from foo');
   });
 
+  it('should replace a numeric var', () => {
+    const res = applySQLTemplateVariables(
+      { ...mockQuery, rawSQL: 'select * from $numeric' },
+      scopedVars,
+      getTemplateSrv
+    );
+    expect(res.rawSQL).toEqual('select * from 123');
+  });
+
   it('should replace a multiple var', () => {
     const res = applySQLTemplateVariables(
       { ...mockQuery, rawSQL: 'select * from foo where var in ($multiple)' },

diff --git a/src/sql/utils/utils.ts b/src/sql/utils/utils.ts
@@ -22,7 +22,7 @@ export function applySQLTemplateVariables(
 }
 
 function interpolateVariable(value: string | string[]) {
-  if (typeof value === 'string') {
+  if (typeof value === 'string' || typeof value === 'number') {
     return value;
   }