Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Repeat By Variable case doesn't add single quotes for in($Var) query #712

Open
ADovgalyuk opened this issue Jan 23, 2025 · 1 comment · May be fixed by #715
Open

Repeat By Variable case doesn't add single quotes for in($Var) query #712

ADovgalyuk opened this issue Jan 23, 2025 · 1 comment · May be fixed by #715
Assignees
@lunaticusgreen
Labels
bug p1 Priority 1
Milestone
3.4.0

Comments

@ADovgalyuk
Copy link

ADovgalyuk commented Jan 23, 2025 •
edited
Loading

Grafana version: 11.4.0
AltinityPlugin: 3.3.1

I'm expecting that variable within condition 'in ($Var)' will be put in single brackets if $Var is a string. At least it was working this way in old plugin before angular - 2.5.4.

Easiest way to recreate. Create dashboard and add custom variable with multiple choice - test-1,test-2. Dummy query was used

select 1 where 1 in ($Var)
  1. Single panel, one variable selected, no repeat:
Reformatted Query
/* grafana dashboard=New dashboard, user=1 */
select 1 where 1 in ('test-1')
  1. Single panel, two variables selected, no repeat:
/* grafana dashboard=New dashboard, user=1 */
select 1 where 1 in ('test-1','test-2')
  1. Single panel, two variables selected, repeat configured in panel. Checking first panel:
/* grafana dashboard=New dashboard, user=1 */
select 1 where 1 in (test-1)

Cases 1,2 working as expected. But in case №3 I'm expecting test-1 to be in single quotes as well, without them query is incorrect.
I've faced this case while migrating from grafana 9 with pre-angular plugin version 2.5.4, and it was working correctly there for case №3.

select 1 where 1 in ('test-1');

I do understand there is a workaround to put single quotes manually, but still looks like a bug.
@Slach Slach added bug p1 Priority 1 labels Jan 23, 2025
@Slach Slach added this to the 3.4.0 milestone Jan 23, 2025
@Slach
Copy link
Collaborator

Slach commented Jan 23, 2025

@lunaticusgreen we also can use follwing dashboard for reproduce

{
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": {
          "type": "grafana",
          "uid": "-- Grafana --"
        },
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
  "editable": true,
  "fiscalYearStartMonth": 0,
  "graphTooltip": 0,
  "id": 3785,
  "links": [],
  "panels": [
    {
      "collapsed": false,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 0
      },
      "id": 3,
      "panels": [],
      "title": "No repeat, no single quotes",
      "type": "row"
    },
    {
      "datasource": {
        "type": "vertamedia-clickhouse-datasource",
        "uid": "${datasource}"
      },
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
            "align": "auto",
            "cellOptions": {
              "type": "auto"
            },
            "inspect": false
          },
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
            "steps": [
              {
                "color": "green"
              },
              {
                "color": "red",
                "value": 80
              }
            ]
          }
        },
        "overrides": []
      },
      "gridPos": {
        "h": 6,
        "w": 24,
        "x": 0,
        "y": 1
      },
      "id": 2,
      "options": {
        "cellHeight": "sm",
        "footer": {
          "countRows": false,
          "fields": "",
          "reducer": [
            "sum"
          ],
          "show": false
        },
        "showHeader": true
      },
      "pluginVersion": "11.4.0",
      "targets": [
        {
          "adHocFilters": [],
          "adHocValuesQuery": "",
          "add_metadata": true,
          "contextWindowSize": "10",
          "datasource": {
            "type": "vertamedia-clickhouse-datasource",
            "uid": "${datasource}"
          },
          "editorMode": "builder",
          "extrapolate": true,
          "format": "table",
          "interval": "",
          "intervalFactor": 1,
          "query": "SELECT (${type})",
          "rawQuery": "/* grafana dashboard=Variable test 11.4, user=4 */\nSELECT ('foo','bar','baz')",
          "refId": "A",
          "round": "0s",
          "showFormattedSQL": true,
          "skip_comments": true,
          "useWindowFuncForMacros": true
        }
      ],
      "title": "No single quotes",
      "type": "table"
    },
    {
      "collapsed": false,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 7
      },
      "id": 10,
      "panels": [],
      "title": "No repeat, single quotes",
      "type": "row"
    },
    {
      "datasource": {
        "type": "vertamedia-clickhouse-datasource",
        "uid": "${datasource}"
      },
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
            "align": "auto",
            "cellOptions": {
              "type": "auto"
            },
            "inspect": false
          },
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
            "steps": [
              {
                "color": "green"
              },
              {
                "color": "red",
                "value": 80
              }
            ]
          }
        },
        "overrides": []
      },
      "gridPos": {
        "h": 6,
        "w": 24,
        "x": 0,
        "y": 8
      },
      "id": 9,
      "options": {
        "cellHeight": "sm",
        "footer": {
          "countRows": false,
          "fields": "",
          "reducer": [
            "sum"
          ],
          "show": false
        },
        "showHeader": true
      },
      "pluginVersion": "11.4.0",
      "targets": [
        {
          "adHocFilters": [],
          "adHocValuesQuery": "",
          "add_metadata": true,
          "contextWindowSize": "10",
          "datasource": {
            "type": "vertamedia-clickhouse-datasource",
            "uid": "${datasource}"
          },
          "editorMode": "builder",
          "extrapolate": true,
          "format": "table",
          "interval": "",
          "intervalFactor": 1,
          "query": "SELECT ('${type}')",
          "rawQuery": "/* grafana dashboard=Variable test 11.4, user=4 */\nSELECT (''foo','bar','baz'')",
          "refId": "A",
          "round": "0s",
          "showFormattedSQL": true,
          "skip_comments": true,
          "useWindowFuncForMacros": true
        }
      ],
      "title": "No single quotes",
      "type": "table"
    },
    {
      "collapsed": false,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 14
      },
      "id": 7,
      "panels": [],
      "title": "Repeat, single quotes",
      "type": "row"
    },
    {
      "datasource": {
        "type": "vertamedia-clickhouse-datasource",
        "uid": "${datasource}"
      },
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
            "align": "auto",
            "cellOptions": {
              "type": "auto"
            },
            "inspect": false
          },
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
            "steps": [
              {
                "color": "green"
              },
              {
                "color": "red",
                "value": 80
              }
            ]
          }
        },
        "overrides": []
      },
      "gridPos": {
        "h": 6,
        "w": 24,
        "x": 0,
        "y": 15
      },
      "id": 8,
      "options": {
        "cellHeight": "sm",
        "footer": {
          "countRows": false,
          "fields": "",
          "reducer": [
            "sum"
          ],
          "show": false
        },
        "showHeader": true
      },
      "pluginVersion": "11.4.0",
      "repeat": "type",
      "repeatDirection": "h",
      "targets": [
        {
          "adHocFilters": [],
          "adHocValuesQuery": "",
          "add_metadata": true,
          "contextWindowSize": "10",
          "datasource": {
            "type": "vertamedia-clickhouse-datasource",
            "uid": "${datasource}"
          },
          "editorMode": "builder",
          "extrapolate": true,
          "format": "table",
          "interval": "",
          "intervalFactor": 1,
          "query": "SELECT ('${type}')",
          "rawQuery": "/* grafana dashboard=Variable test 11.4, user=4 */\nSELECT (''foo','bar','baz'')",
          "refId": "A",
          "round": "0s",
          "showFormattedSQL": true,
          "skip_comments": true,
          "useWindowFuncForMacros": true
        }
      ],
      "title": "$type",
      "type": "table"
    },
    {
      "collapsed": false,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 21
      },
      "id": 4,
      "panels": [],
      "title": "Repeat, no single quotes",
      "type": "row"
    },
    {
      "datasource": {
        "type": "vertamedia-clickhouse-datasource",
        "uid": "${datasource}"
      },
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
            "align": "auto",
            "cellOptions": {
              "type": "auto"
            },
            "inspect": false
          },
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
            "steps": [
              {
                "color": "green"
              },
              {
                "color": "red",
                "value": 80
              }
            ]
          }
        },
        "overrides": []
      },
      "gridPos": {
        "h": 6,
        "w": 24,
        "x": 0,
        "y": 22
      },
      "id": 5,
      "options": {
        "cellHeight": "sm",
        "footer": {
          "countRows": false,
          "fields": "",
          "reducer": [
            "sum"
          ],
          "show": false
        },
        "showHeader": true
      },
      "pluginVersion": "11.4.0",
      "repeat": "type",
      "repeatDirection": "h",
      "targets": [
        {
          "adHocFilters": [],
          "adHocValuesQuery": "",
          "add_metadata": true,
          "contextWindowSize": "10",
          "datasource": {
            "type": "vertamedia-clickhouse-datasource",
            "uid": "${datasource}"
          },
          "editorMode": "builder",
          "extrapolate": true,
          "format": "table",
          "interval": "",
          "intervalFactor": 1,
          "query": "SELECT (${type})",
          "rawQuery": "/* grafana dashboard=Variable test 11.4, user=4 */\nSELECT (baz)",
          "refId": "A",
          "round": "0s",
          "showFormattedSQL": true,
          "skip_comments": true,
          "useWindowFuncForMacros": true
        }
      ],
      "title": "$type",
      "type": "table"
    }
  ],
  "preload": false,
  "refresh": "",
  "schemaVersion": 40,
  "tags": [],
  "templating": {
    "list": [
      {
        "current": {
          "text": [
            "$__all"
          ],
          "value": [
            "$__all"
          ]
        },
        "includeAll": true,
        "multi": true,
        "name": "type",
        "options": [
          {
            "selected": false,
            "text": "foo",
            "value": "foo"
          },
          {
            "selected": false,
            "text": "bar",
            "value": "bar"
          },
          {
            "selected": false,
            "text": "baz",
            "value": "baz"
          }
        ],
        "query": "foo, bar, baz",
        "type": "custom"
      },
      {
        "current": {
          "text": "Archer Sink",
          "value": "a5617c9a-2798-477c-a708-a264b48dc43e"
        },
        "name": "datasource",
        "options": [],
        "query": "vertamedia-clickhouse-datasource",
        "refresh": 1,
        "regex": "",
        "type": "datasource"
      }
    ]
  },
  "time": {
    "from": "now-6h",
    "to": "now"
  },
  "timepicker": {},
  "timezone": "browser",
  "title": "Variable test 11.4",
  "uid": "ceak279mxrim8d",
  "version": 5,
  "weekStart": ""
}

@lunaticusgreen lunaticusgreen linked a pull request Jan 27, 2025 that will close this issue
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@lunaticusgreen lunaticusgreen

Labels
bug p1 Priority 1
Projects
None yet
Milestone
3.4.0
3 participants
@Slach @lunaticusgreen @ADovgalyuk