Merge branch 'master' into feat/query-panel-migration

package.json

@@ -106,6 +106,10 @@
       {
         "title": "dbt Power User",
         "properties": {
+          "dbt.unquotedCaseInsensitiveIdentifierRegex": {
+            "type": "string",
+            "markdownDescription": "Regex to identify unquoted identifiers. Example: `^([_A-Z]+[_A-Z0-9$]*)$`"
+          },
           "dbt.dbtIntegration": {
             "type": "string",
             "enum": [
@@ -1147,7 +1151,7 @@
     "eslint-config-prettier": "^8.9.0",
     "eslint-plugin-prettier": "^5.0.1",
     "file-loader": "^6.1.0",
-    "glob": "^10.3.10",
+    "glob": "^10.3.15",
     "husky": "^9.0.11",
     "lint-staged": "^14.0.1",
     "mocha": "^10.3.0",

src/commands/tests/staleModelColumnTest.ts

@@ -2,7 +2,7 @@ import { Diagnostic, DiagnosticSeverity, Range, Uri } from "vscode";
 import { ScanContext } from "./scanContext";
 import { AltimateScanStep } from "./step";
 import { readFileSync } from "fs";
-import { provideSingleton } from "../../utils";
+import { getColumnNameByCase, provideSingleton } from "../../utils";
 import { createFullPathForNode } from "../../manifest/parsers";
 
 @provideSingleton(StaleModelColumnTest)
@@ -84,11 +84,8 @@ export class StaleModelColumnTest implements AltimateScanStep {
         // do model-level checks here.
         const modelDict =
           altimateCatalog[projectName + projectRootUri][modelKey];
-        const existingColumnsLowered = Object.keys(value.columns).map((key) =>
-          key.toLowerCase(),
-        );
         const allDBColumns = modelDict.map(({ column_name }) =>
-          column_name.toLowerCase(),
+          getColumnNameByCase(column_name, project.getAdapterType()),
         );
         const packagePath = project.getPackageInstallPath();
         if (packagePath === undefined) {
@@ -97,7 +94,11 @@ export class StaleModelColumnTest implements AltimateScanStep {
           );
         }
         for (const existingCol of Object.keys(value.columns)) {
-          if (!allDBColumns.includes(existingCol.toLowerCase())) {
+          if (
+            !allDBColumns.includes(
+              getColumnNameByCase(existingCol, project.getAdapterType()),
+            )
+          ) {
             const errMessage = `Column ${existingCol} listed in model ${value.name} is not found in the database.
             It may be outdated or misspelled.`;
             // If we are here, the patch_path is guaranteed to be defined since

src/commands/tests/undocumentedModelColumnTest.ts

@@ -1,7 +1,7 @@
 import { Diagnostic, DiagnosticSeverity, Range } from "vscode";
 import { ScanContext } from "./scanContext";
 import { AltimateScanStep } from "./step";
-import { provideSingleton } from "../../utils";
+import { getColumnNameByCase, provideSingleton } from "../../utils";
 
 @provideSingleton(UndocumentedModelColumnTest)
 export class UndocumentedModelColumnTest implements AltimateScanStep {
@@ -47,11 +47,13 @@ export class UndocumentedModelColumnTest implements AltimateScanStep {
         const modelDict =
           altimateCatalog[projectName + projectRootUri][modelKey];
         const existingColumnsLowered = Object.keys(value.columns).map((key) =>
-          key.toLowerCase(),
+          getColumnNameByCase(key, project.getAdapterType()),
         );
         for (const column of modelDict) {
           if (
-            !existingColumnsLowered.includes(column.column_name.toLowerCase())
+            !existingColumnsLowered.includes(
+              getColumnNameByCase(column.column_name, project.getAdapterType()),
+            )
           ) {
             const errMessage = `Column ${column.column_name} is undocumented in model: ${value.name}`;
 

src/content_provider/sqlPreviewContentProvider.ts

@@ -14,6 +14,9 @@ import {
 import { DBTProjectContainer } from "../manifest/dbtProjectContainer";
 import { debounce, provideSingleton } from "../utils";
 import { TelemetryService } from "../telemetry";
+import { DeferToProdService } from "../services/deferToProdService";
+import { AltimateRequest } from "../altimate";
+import { ManifestPathType } from "../constants";
 
 @provideSingleton(SqlPreviewContentProvider)
 export class SqlPreviewContentProvider
@@ -28,6 +31,8 @@ export class SqlPreviewContentProvider
 
   constructor(
     private dbtProjectContainer: DBTProjectContainer,
+    private deferToProdService: DeferToProdService,
+    private altimateRequest: AltimateRequest,
     private telemetry: TelemetryService,
   ) {
     this.subscriptions = workspace.onDidCloseTextDocument((compilationDoc) =>
@@ -81,7 +86,21 @@ export class SqlPreviewContentProvider
       }
       this.telemetry.sendTelemetryEvent("requestCompilation");
       await project.refreshProjectConfig();
-      return await project.unsafeCompileQuery(query);
+      const result = await project.unsafeCompileQuery(query);
+      const { manifestPathType } =
+        this.deferToProdService.getDeferConfigByProjectRoot(
+          project.projectRoot.fsPath,
+        );
+      const dbtIntegrationMode = workspace
+        .getConfiguration("dbt")
+        .get<string>("dbtIntegration", "core");
+      if (
+        dbtIntegrationMode === "core" &&
+        manifestPathType === ManifestPathType.REMOTE
+      ) {
+        this.altimateRequest.sendDeferToProdEvent(ManifestPathType.REMOTE);
+      }
+      return result;
     } catch (error: any) {
       const errorMessage = (error as Error).message;
       window.showErrorMessage(`Error while compiling: ${errorMessage}`);

src/dbt_client/dbtCoreIntegration.ts

@@ -383,6 +383,13 @@ export class DBTCoreProjectIntegration
           result = await queryThread!.lock<ExecuteSQLResult>(
             (python) => python`to_dict(project.execute_sql(${compiledQuery}))`,
           );
+          const { manifestPathType } =
+            this.deferToProdService.getDeferConfigByProjectRoot(
+              this.projectRoot.fsPath,
+            );
+          if (manifestPathType === ManifestPathType.REMOTE) {
+            this.altimateRequest.sendDeferToProdEvent(ManifestPathType.REMOTE);
+          }
         } catch (err) {
           const message = `Error while executing sql: ${compiledQuery}`;
           this.dbtTerminal.error("dbtCore:executeSQL", message, err);

src/hover_provider/utils.ts

@@ -26,7 +26,7 @@ export function generateHoverMarkdownString(
     );
     if (column.data_type !== null) {
       content.appendMarkdown(
-        `<span>-&nbsp;${column.data_type.toUpperCase()}</span>`,
+        `<span>-&nbsp;${column.data_type.toLowerCase()}</span>`,
       );
     }
     if (column.description !== "") {

src/manifest/dbtProject.ts

@@ -23,6 +23,7 @@ import { DBTTerminal } from "../dbt_client/dbtTerminal";
 import {
   debounce,
   extendErrorWithSupportLinks,
+  getColumnNameByCase,
   setupWatcherHandler,
 } from "../utils";
 import {
@@ -1006,20 +1007,26 @@ select * from renamed
       // Flagging events where more than 100 columns are fetched from db to get a sense of how many of these happen
       this.telemetry.sendTelemetryEvent("excessiveColumnsFetchedFromDB");
     }
-    const columns: Record<string, ColumnMetaData> = {};
+    const columnsFromManifest: Record<string, ColumnMetaData> = {};
     Object.entries(node.columns).forEach(([k, v]) => {
-      columns[k.toLowerCase()] = v;
+      columnsFromManifest[getColumnNameByCase(k, this.getAdapterType())] = v;
     });
 
     for (const c of columnsFromDB) {
-      const existing_column = columns[c.column.toLowerCase()];
+      const columnNameFromDB = getColumnNameByCase(
+        c.column,
+        this.getAdapterType(),
+      );
+      const existing_column = columnsFromManifest[columnNameFromDB];
       if (existing_column) {
-        existing_column.data_type = existing_column.data_type || c.dtype;
+        existing_column.data_type = (
+          existing_column.data_type || c.dtype
+        )?.toLowerCase();
         continue;
       }
-      node.columns[c.column] = {
-        name: c.column,
-        data_type: c.dtype,
+      node.columns[columnNameFromDB] = {
+        name: columnNameFromDB,
+        data_type: c.dtype?.toLowerCase(),
         description: "",
       };
     }

src/services/dbtTestService.ts

@@ -4,7 +4,7 @@ import {
   CreateDbtTestRequest,
   UserInputError,
 } from "../altimate";
-import { provideSingleton } from "../utils";
+import { isColumnNameEqual, provideSingleton } from "../utils";
 import { DocGenService } from "./docGenService";
 import { StreamingService } from "./streamingService";
 import { QueryManifestService } from "./queryManifestService";
@@ -85,7 +85,7 @@ export class DbtTestService {
   public getConfigByTest(
     test: TestMetaData,
     modelName: string,
-    column_name?: string,
+    columnNameFromTestMetadata?: string,
   ) {
     const eventResult = this.queryManifestService.getEventByCurrentProject();
     if (!eventResult?.event) {
@@ -133,7 +133,7 @@ export class DbtTestService {
     const model = parsedDocFile.models?.find((m: any) => m.name === modelName);
 
     // model test
-    if (!column_name) {
+    if (!columnNameFromTestMetadata) {
       this.dbtTerminal.debug(
         "getDbtTestCode",
         "finding model test from yml",
@@ -145,7 +145,9 @@ export class DbtTestService {
 
     const column =
       model.columns &&
-      model.columns.find((yamlColumn: any) => yamlColumn.name === column_name);
+      model.columns.find((yamlColumn: any) =>
+        isColumnNameEqual(yamlColumn.name, columnNameFromTestMetadata),
+      );
     this.dbtTerminal.debug(
       "getDbtTestCode",
       "finding column test from yml",