Cannot correctly escape table name containing "-" symbol

[chenlujjj]

Suppose database name is "test", table name is "a.b.c-d", then the escaped result is "test.a.b.c-d", it will lead to syntax error in sql.

Expected result is "test.a.b.c-d", it will work.

Maybe some change shoule be made to func (q *EvalQuery) escapeIdentifier(identifier string) string ？

[Slach]

Sorry for late response,

could you share your ogirinal query with $table macro?
and query which you see in "Generated SQL"?

[chenlujjj]

original query:

SELECT
    $timeSeries as t,
    count()
FROM $table

WHERE $timeFilter

GROUP BY t

ORDER BY t

generated sql:

SELECT
    (intDiv(toFloat64(timestamp) * 1000, (5 * 1000)) * (5 * 1000)) as t,
    count()
FROM test.a.b.c-d

WHERE toDateTime64(timestamp, 3) >= toDateTime64(1661337946, 3)

GROUP BY t

ORDER BY t

[Slach]

lets wait when grafana team will review https://github.com/Altinity/clickhouse-grafana/releases/tag/v2.5.1

[chenlujjj]

Cool!

[chenlujjj]

BTW, I'm wondering about when would the escapeIdentifier function in the go and typescript files takes effect respectively.

I think when I click the "Generated SQL" button, the escapeIdentifier function in the typescript file works. How about the function in go file ?

[Slach]

same changes applied to golang part to
look to 8dfba84 for details

[visago]

lets wait when grafana team will review https://github.com/Altinity/clickhouse-grafana/releases/tag/v2.5.1

We still need to wait for Grafana team to update something before 2.5.1 will work ?

[Slach]

@visago 2.5.1 released on grafana.com, just install new plugin version

[visago]

Ah ! okay, yeah just did a grafana-cli plugins install vertamedia-clickhouse-datasource 2.5.1 !

[visago]

I just tested 2.5.1 and getting the same issue. I noticed escapeTableIdentifier function was created in src/sql_query.ts, but its not called like in the go code ?

https://github.com/Altinity/clickhouse-grafana/blob/master/src/sql_query.ts#L122-L125

[Slach]

Oh, sorry, my fault ;(

[Slach]

@visago 2.5.2 released, please test

[visago]

@Slach tested and verified working ! Thanks so much for the quick response !