Merge branch 'apache:master' into disable-sqlparse

apache · Oct 8, 2024 · ef1b54d · ef1b54d
2 parents 482dc3a + a849c29
commit ef1b54d
Show file tree

Hide file tree

Showing 90 changed files with 23,215 additions and 19,082 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -446,6 +446,7 @@ select = [
     "E7",
     "E9",
     "F",
+    "PT009",
     "TRY201",
 ]
 ignore = []

diff --git a/superset-embedded-sdk/package-lock.json b/superset-embedded-sdk/package-lock.json
diff --git a/superset-embedded-sdk/package.json b/superset-embedded-sdk/package.json
@@ -47,7 +47,7 @@
     "babel-loader": "^9.1.3",
     "jest": "^29.7.0",
     "typescript": "^5.6.2",
-    "webpack": "^5.94.0",
+    "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4"
   },
   "repository": {

diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/AdhocMetrics.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/AdhocMetrics.test.ts
@@ -25,7 +25,7 @@ describe('AdhocMetrics', () => {
   });
 
   it('Clear metric and set simple adhoc metric', () => {
-    const metric = 'SUM(num_girls)';
+    const metric = 'sum(num_girls)';
     const metricName = 'Sum Girls';
     cy.get('[data-test=metrics]')
       .find('[data-test="remove-control-button"]')

diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/visualizations/table.test.ts
@@ -100,7 +100,7 @@ describe('Visualization > Table', () => {
     });
     cy.verifySliceSuccess({
       waitAlias: '@chartData',
-      querySubstring: /group by\n.*name/i,
+      querySubstring: /GROUP BY.*name/i,
       chartSelector: 'table',
     });
   });
@@ -247,7 +247,7 @@ describe('Visualization > Table', () => {
     cy.visitChartByParams(formData);
     cy.verifySliceSuccess({
       waitAlias: '@chartData',
-      querySubstring: /group by\n.*state/i,
+      querySubstring: /GROUP BY.*state/i,
       chartSelector: 'table',
     });
     cy.get('td').contains(/\d*%/);