diff --git a/app/client/src/WidgetQueryGenerators/GSheets/index.ts b/app/client/src/WidgetQueryGenerators/GSheets/index.ts index 3d99a93cc6c5..b12b7a25ebaf 100644 --- a/app/client/src/WidgetQueryGenerators/GSheets/index.ts +++ b/app/client/src/WidgetQueryGenerators/GSheets/index.ts @@ -259,7 +259,7 @@ export default abstract class GSheets extends BaseQueryGenerator { }; } - static build( + static async build( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, pluginInitalValues: { actionConfiguration: ActionConfigurationGSheets }, diff --git a/app/client/src/WidgetQueryGenerators/MSSQL/index.ts b/app/client/src/WidgetQueryGenerators/MSSQL/index.ts index b9fa9227ac33..d76dd8f821b5 100644 --- a/app/client/src/WidgetQueryGenerators/MSSQL/index.ts +++ b/app/client/src/WidgetQueryGenerators/MSSQL/index.ts @@ -1,5 +1,4 @@ import { BaseQueryGenerator } from "../BaseQueryGenerator"; -import { formatDialect, sql } from "sql-formatter"; import type { ActionConfigurationSQL, WidgetQueryGenerationConfig, @@ -11,7 +10,7 @@ import without from "lodash/without"; import { DatasourceConnectionMode } from "entities/Datasource"; export default abstract class MSSQL extends BaseQueryGenerator { - private static buildSelect( + private static async buildSelect( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, ) { @@ -77,6 +76,8 @@ export default abstract class MSSQL extends BaseQueryGenerator { { template: "", params: [] } as { template: string; params: string[] }, ); + const { formatDialect, sql } = await import("sql-formatter"); + //formats sql string const res = formatDialect(template, { params, @@ -196,7 +197,7 @@ export default abstract class MSSQL extends BaseQueryGenerator { }; } - public static build( + public static async build( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, pluginInitalValues: { actionConfiguration: ActionConfigurationSQL }, @@ -204,7 +205,7 @@ export default abstract class MSSQL extends BaseQueryGenerator { const allBuildConfigs = []; if (widgetConfig.select) { - allBuildConfigs.push(this.buildSelect(widgetConfig, formConfig)); + allBuildConfigs.push(await this.buildSelect(widgetConfig, formConfig)); } if ( diff --git a/app/client/src/WidgetQueryGenerators/MySQL/index.ts b/app/client/src/WidgetQueryGenerators/MySQL/index.ts index a1437aaa4968..96d4a15d3fa5 100644 --- a/app/client/src/WidgetQueryGenerators/MySQL/index.ts +++ b/app/client/src/WidgetQueryGenerators/MySQL/index.ts @@ -1,5 +1,4 @@ import { BaseQueryGenerator } from "../BaseQueryGenerator"; -import { formatDialect, mysql } from "sql-formatter"; import type { ActionConfigurationSQL, WidgetQueryGenerationConfig, @@ -11,7 +10,7 @@ import without from "lodash/without"; import { DatasourceConnectionMode } from "entities/Datasource"; export default abstract class MySQL extends BaseQueryGenerator { - private static buildSelect( + private static async buildSelect( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, ) { @@ -76,6 +75,7 @@ export default abstract class MySQL extends BaseQueryGenerator { }, { template: "", params: [] } as { template: string; params: string[] }, ); + const { formatDialect, mysql } = await import("sql-formatter"); //formats sql string const res = formatDialect(template, { @@ -196,7 +196,7 @@ export default abstract class MySQL extends BaseQueryGenerator { }; } - public static build( + public static async build( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, pluginInitalValues: { actionConfiguration: ActionConfigurationSQL }, @@ -204,7 +204,7 @@ export default abstract class MySQL extends BaseQueryGenerator { const allBuildConfigs = []; if (widgetConfig.select) { - allBuildConfigs.push(this.buildSelect(widgetConfig, formConfig)); + allBuildConfigs.push(await this.buildSelect(widgetConfig, formConfig)); } if ( diff --git a/app/client/src/WidgetQueryGenerators/PostgreSQL/index.ts b/app/client/src/WidgetQueryGenerators/PostgreSQL/index.ts index 1caee4ea2afa..c641b7c26667 100644 --- a/app/client/src/WidgetQueryGenerators/PostgreSQL/index.ts +++ b/app/client/src/WidgetQueryGenerators/PostgreSQL/index.ts @@ -1,5 +1,4 @@ import { BaseQueryGenerator } from "../BaseQueryGenerator"; -import { formatDialect, postgresql } from "sql-formatter"; import type { ActionConfigurationSQL, WidgetQueryGenerationConfig, @@ -11,7 +10,7 @@ import { without } from "lodash"; import { DatasourceConnectionMode } from "entities/Datasource"; export default abstract class PostgreSQL extends BaseQueryGenerator { - private static buildSelect( + private static async buildSelect( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, ) { @@ -87,6 +86,8 @@ export default abstract class PostgreSQL extends BaseQueryGenerator { { template: "", params: {} }, ); //formats sql string + const { formatDialect, postgresql } = await import("sql-formatter"); + const res = formatDialect(template, { params, dialect: postgresql, @@ -205,7 +206,7 @@ export default abstract class PostgreSQL extends BaseQueryGenerator { }; } - public static build( + public static async build( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, pluginInitalValues: { actionConfiguration: ActionConfigurationSQL }, @@ -213,7 +214,7 @@ export default abstract class PostgreSQL extends BaseQueryGenerator { const allBuildConfigs = []; if (widgetConfig.select) { - allBuildConfigs.push(this.buildSelect(widgetConfig, formConfig)); + allBuildConfigs.push(await this.buildSelect(widgetConfig, formConfig)); } if ( diff --git a/app/client/src/WidgetQueryGenerators/Snowflake/index.ts b/app/client/src/WidgetQueryGenerators/Snowflake/index.ts index a3fb7bb3b87d..60b0c620f507 100644 --- a/app/client/src/WidgetQueryGenerators/Snowflake/index.ts +++ b/app/client/src/WidgetQueryGenerators/Snowflake/index.ts @@ -1,5 +1,4 @@ import { BaseQueryGenerator } from "../BaseQueryGenerator"; -import { formatDialect, snowflake } from "sql-formatter"; import { QUERY_TYPE } from "../types"; import type { WidgetQueryGenerationConfig, @@ -11,7 +10,7 @@ import { without } from "lodash"; import { DatasourceConnectionMode } from "entities/Datasource"; export default abstract class Snowflake extends BaseQueryGenerator { - private static buildSelect( + private static async buildSelect( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, ) { @@ -78,6 +77,8 @@ export default abstract class Snowflake extends BaseQueryGenerator { ); //formats sql string + const { formatDialect, snowflake } = await import("sql-formatter"); + const res = formatDialect(template, { params, dialect: snowflake, @@ -199,7 +200,7 @@ export default abstract class Snowflake extends BaseQueryGenerator { }; } - public static build( + public static async build( widgetConfig: WidgetQueryGenerationConfig, formConfig: WidgetQueryGenerationFormConfig, pluginInitalValues: { actionConfiguration: ActionConfigurationSQL }, @@ -207,7 +208,7 @@ export default abstract class Snowflake extends BaseQueryGenerator { const allBuildConfigs = []; if (widgetConfig.select) { - allBuildConfigs.push(this.buildSelect(widgetConfig, formConfig)); + allBuildConfigs.push(await this.buildSelect(widgetConfig, formConfig)); } if ( diff --git a/app/client/src/sagas/OneClickBindingSaga.ts b/app/client/src/sagas/OneClickBindingSaga.ts index c7409189dfe0..f70cc0f1aac6 100644 --- a/app/client/src/sagas/OneClickBindingSaga.ts +++ b/app/client/src/sagas/OneClickBindingSaga.ts @@ -136,7 +136,8 @@ function* BindWidgetToDatasource( plugin.packageName, ); - const actionConfigurationList = widgetQueryGenerator.build( + const actionConfigurationList = yield call( + widgetQueryGenerator.build, widgetQueryGenerationConfig, action.payload, defaultValues,