QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-18 23:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ag-grid-table): fix AND filter conditions not applied (#38369)

Browse Source
This commit is contained in:
amaannawab923
2026-03-13 19:42:14 +05:30
committed by GitHub
parent f6106cd26f
commit ca2d26a1e2
5 changed files with 369 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
superset-frontend/plugins/plugin-chart-ag-grid-table/test/buildQuery.test.ts
View File

@@ -1090,4 +1090,258 @@ describe('plugin-chart-ag-grid-table', () => {
expect(query.metrics).toEqual([]);
});
});
describe('buildQuery - label-to-SQL resolution in WHERE/HAVING', () => {
test('should resolve inline SQL metric labels in WHERE clause', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
metrics: [
{
expressionType: 'SQL',
sqlExpression: 'SUM(revenue)',
label: 'Total Revenue',
},
],
},
{
ownState: {
agGridComplexWhere: 'Total Revenue > 1000',
},
},
).queries[0];
expect(query.extras?.where).toBe('(SUM(revenue)) > 1000');
});
test('should resolve SIMPLE metric labels in HAVING clause', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
metrics: [
{
expressionType: 'SIMPLE',
aggregate: 'SUM',
column: { column_name: 'revenue' },
label: 'Total Revenue',
},
],
},
{
ownState: {
agGridHavingClause: 'Total Revenue > 1000',
},
},
).queries[0];
expect(query.extras?.having).toBe('(SUM(revenue)) > 1000');
});
test('should resolve adhoc column SQL expressions in WHERE clause', () => {
const adhocColumn = createAdhocColumn('UPPER(city)', 'City Upper');
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
groupby: [adhocColumn],
},
{
ownState: {
agGridComplexWhere: "City Upper = 'NEW YORK'",
},
},
).queries[0];
expect(query.extras?.where).toContain('UPPER(city)');
});
test('should wrap CASE expressions in parentheses', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
},
{
ownState: {
agGridComplexWhere: "degree_level = 'High'",
metricSqlExpressions: {
degree_level:
"CASE WHEN degree = 'PhD' THEN 'High' ELSE 'Low' END",
},
},
},
).queries[0];
expect(query.extras?.where).toBe(
"(CASE WHEN degree = 'PhD' THEN 'High' ELSE 'Low' END) = 'High'",
);
});
test('should wrap aggregate expressions in parentheses', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
},
{
ownState: {
agGridHavingClause: 'total_count > 100',
metricSqlExpressions: {
total_count: 'COUNT(*)',
},
},
},
).queries[0];
expect(query.extras?.having).toBe('(COUNT(*)) > 100');
});
test('should quote simple column names without parentheses', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
},
{
ownState: {
agGridComplexWhere: "status = 'active'",
metricSqlExpressions: {
status: 'user_status',
},
},
},
).queries[0];
expect(query.extras?.where).toBe('"user_status" = \'active\'');
});
test('should resolve longer labels before shorter ones', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
metrics: [
{
expressionType: 'SQL',
sqlExpression: 'COUNT(*)',
label: 'count',
},
{
expressionType: 'SQL',
sqlExpression: 'COUNT(DISTINCT id)',
label: 'count_distinct',
},
],
},
{
ownState: {
agGridHavingClause: 'count_distinct > 5 AND count > 10',
},
},
).queries[0];
expect(query.extras?.having).toContain('(COUNT(DISTINCT id)) > 5');
expect(query.extras?.having).toContain('(COUNT(*)) > 10');
});
test('should prefer query-level expressions over datasource-level', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
metrics: [
{
expressionType: 'SQL',
sqlExpression: 'SUM(amount)',
label: 'total',
},
],
},
{
ownState: {
agGridHavingClause: 'total > 500',
metricSqlExpressions: {
total: 'SUM(old_amount)',
},
},
},
).queries[0];
// Query-level SUM(amount) should win over datasource-level SUM(old_amount)
expect(query.extras?.having).toBe('(SUM(amount)) > 500');
});
test('should not modify clause when no labels match', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
},
{
ownState: {
agGridComplexWhere: 'physical_column > 10',
},
},
).queries[0];
expect(query.extras?.where).toBe('physical_column > 10');
});
test('should resolve labels in both WHERE and HAVING simultaneously', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: true,
metrics: [
{
expressionType: 'SQL',
sqlExpression: 'SUM(sales)',
label: 'Total Sales',
},
],
},
{
ownState: {
agGridComplexWhere: "region = 'West'",
agGridHavingClause: 'Total Sales > 1000',
metricSqlExpressions: {
region: "CASE WHEN area = 'W' THEN 'West' ELSE 'East' END",
},
},
},
).queries[0];
expect(query.extras?.where).toContain('CASE WHEN');
expect(query.extras?.having).toBe('(SUM(sales)) > 1000');
});
test('should not resolve labels when server pagination is disabled', () => {
const query = buildQuery(
{
...basicFormData,
server_pagination: false,
metrics: [
{
expressionType: 'SQL',
sqlExpression: 'SUM(revenue)',
label: 'Total Revenue',
},
],
},
{
ownState: {
agGridComplexWhere: 'Total Revenue > 1000',
metricSqlExpressions: {
some_col: 'COUNT(*)',
},
},
},
).queries[0];
expect(query.extras?.where || undefined).toBeUndefined();
});
});
});