Final changes

sqlfluff · May 24, 2024 · a870fca · a870fca
1 parent 660b08e
commit a870fca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/features/helper/dbtInterface.ts b/src/features/helper/dbtInterface.ts
@@ -30,6 +30,7 @@ export enum DbtInterfaceErrorCode {
   CompileSqlFailure = 1,
   ExecuteSqlFailure = 2,
   ProjectParseFailure = 3,
+  UnlintableUnfixable = 0
 }
 
 export interface DbtInterfaceErrorContainer {
@@ -185,7 +186,6 @@ export class DbtInterface {
       abortController.abort();
     }, timeout);
     let response: Response;
-
     try {
       response = await fetch(
         encodeURI(this.getFormatURL()),

diff --git a/src/features/providers/sqlfluff.ts b/src/features/providers/sqlfluff.ts
@@ -62,7 +62,7 @@ export default class SQLFluff {
 
       return new Promise<CommandOutput>(async (resolve) => {
         const code = response?.error?.code ?? 0;
-        const succeeded = code === 0;
+        const succeeded = (code === 0  && !response?.error);
         if (!succeeded && !Configuration.suppressNotifications() && !this.shownDbtInterfacePopup) {
           const message = response?.error?.message ?? "DBT-Interface formatting error.";
           const detail = response?.error?.data?.error ?? "";
@@ -73,6 +73,8 @@ export default class SQLFluff {
             if (chosen === runDbt) {
               await vscode.commands.executeCommand("dbtPowerUser.dbtCompile");
             }
+          } else if(code === DbtInterfaceErrorCode.UnlintableUnfixable) {
+            vscode.window.showErrorMessage("Unable to load SQLFluff due to configuration issue. Try linting an sql file to see more details.")
           } else {
             vscode.window.showErrorMessage([message, detail].join("\n"));
           }
@@ -146,7 +148,7 @@ export default class SQLFluff {
 
       return new Promise<CommandOutput>(async (resolve) => {
         const code = response?.error?.code ?? 0;
-        const succeeded = code === 0;
+        const succeeded = (code === 0 && !response?.error);
         if (!succeeded && !Configuration.suppressNotifications() && !this.shownDbtInterfacePopup) {
           const message = response?.error?.message ?? "DBT-Interface linting error.";
           const detail = response?.error?.data?.error ?? "";
@@ -158,6 +160,8 @@ export default class SQLFluff {
             if (chosen === runDbt) {
               await vscode.commands.executeCommand("dbtPowerUser.dbtCompile");
             }
+          } else if(code === DbtInterfaceErrorCode.UnlintableUnfixable) {
+            vscode.window.showErrorMessage("Unable to load SQLFluff due to configuration issue. Try linting an sql file to see more details.")
           } else {
             vscode.window.showErrorMessage([message, detail].join("\n"));
           }