update getFieldIndex() in DatabricksQuery

Author: KSDaemon

packages/cubejs-databricks-jdbc-driver/src/DatabricksQuery.ts

@@ -144,42 +144,19 @@ export class DatabricksQuery extends BaseQuery {
     return `\`${name}\``;
   }
 
-  public getFieldIndex(id: string) {
-    const dimension = this.dimensionsForSelect().find((d: any) => d.dimension === id);
-    if (dimension) {
-      return super.getFieldIndex(id);
+  public override getFieldIndex(id: string): string | number | null {
+    const idx = super.getFieldIndex(id);
+    if (idx !== null) {
+      return idx;
     }
+
     return this.escapeColumnName(this.aliasName(id, false));
   }
 
   public unixTimestampSql() {
     return 'unix_timestamp()';
   }
 
-  public orderHashToString(hash: any) {
-    if (!hash || !hash.id) {
-      return null;
-    }
-
-    const fieldIndex = this.getFieldIndex(hash.id);
-    if (fieldIndex === null) {
-      return null;
-    }
-
-    const dimensionsForSelect = this.dimensionsForSelect();
-    const dimensionColumns = R.flatten(
-      dimensionsForSelect.map((s: any) => s.selectColumns() && s.aliasName())
-    )
-      .filter(s => !!s);
-
-    if (dimensionColumns.length) {
-      const direction = hash.desc ? 'DESC' : 'ASC';
-      return `${fieldIndex} ${direction}`;
-    }
-
-    return null;
-  }
-
   public defaultRefreshKeyRenewalThreshold() {
     return 120;
   }

packages/cubejs-schema-compiler/src/adapter/BaseQuery.js

@@ -2568,7 +2568,7 @@ export class BaseQuery {
   }
 
   /**
-   * XXX: String as return value is added because of HiveQuery.getFieldIndex()
+   * XXX: String as return value is added because of HiveQuery.getFieldIndex() and DatabricksQuery.getFieldIndex()
    * @protected
    * @param {string} id member name in form of "cube.member[.granularity]"
    * @returns {number|string|null}