3.4.4 $database.$table wrong expaned to `billing.``.billing`

[Slach]

source query

SELECT
    concat(toString(toYear(bill_BillingPeriodStartDate)), ' - ',
                  arrayElement(['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], 
                  toMonth(bill_BillingPeriodStartDate))
           ) month,
    sum(lineItem_BlendedCost) cost
FROM $database.$table
WHERE lineItem_LineItemType != 'Credit' AND aws_account IN (${user:singlequote})
AND bill_BillingPeriodStartDate >= toStartOfYear(today())
GROUP BY bill_BillingPeriodStartDate
ORDER BY bill_BillingPeriodStartDate

generated SQL

/* grafana dashboard='Cost Analysis', user='3' */
SELECT
    concat(toString(toYear(bill_BillingPeriodStartDate)), ' - ',
                  arrayElement(['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], 
                  toMonth(bill_BillingPeriodStartDate))
           ) month,
    sum(lineItem_BlendedCost) cost
FROM billing.``.billing
WHERE lineItem_LineItemType != 'Credit' AND aws_account IN ('altinity','altinity-dev','altinity-dev-1','altinity-staging','altinity-inc-prod','altinity-inc-prod-1','altinity-inc','altinity-mp')
AND bill_BillingPeriodStartDate >= toStartOfYear(today())
GROUP BY bill_BillingPeriodStartDate
ORDER BY bill_BillingPeriodStartDate

$database macros generated from $database template variable

[Slach]

ok. we found root reason

before 3.4.x we have following transformation sequence

• templateSrv.apply for $variables again
• transform macros
• templateSrv.apply for $variables, second, cause macros can produce something like $__from

after 3.4.x

• transform macros
• templateSrv.apply for $variables, second, cause macros can produce something like $__from

@lunaticusgreen let's rollback behavior for compatibilbity
and let's add yellow warning when template varible name corresponding with any macro which exists in plugin