test fix

src/metabase/driver/query_processor.clj

@@ -2,6 +2,7 @@
   "Preprocessor that does simple transformations to all incoming queries, simplifing the driver-specific implementations."
   (:require [clojure.core.match :refer [match]]
             [clojure.tools.logging :as log]
+            [korma.core :refer :all]
             [metabase.db :refer :all]
             [metabase.driver.interface :as i]
             [metabase.models.field :refer [Field field->fk-table]]))
@@ -121,7 +122,8 @@
     ;; If we're doing a "rows" aggregation with no breakout or fields clauses add one that will exclude Fields that are supposed to be hidden
     (and (= aggregation ["rows"])
          (not breakout)
-         (not fields))            (assoc :fields (sel :many :id Field :table_id source_table, :active true, :preview_display true, :field_type [not= "sensitive"]))))
+         (not fields))            (assoc :fields (sel :many :id Field :table_id source_table, :active true, :preview_display true,
+                                                      :field_type [not= "sensitive"], (order :position :asc), (order :id :desc)))))
 
 
 ;; ### PREPROCESS-CUMULATIVE-SUM

test/metabase/driver/generic_sql/query_processor_test.clj

@@ -12,7 +12,9 @@
 ;; Check that we get an error response formatted the way we'd expect
 (expect
     {:status :failed
-     :error (format "Column \"CHECKINS.NAME\" not found; SQL statement:\nSELECT \"CHECKINS\".* FROM \"CHECKINS\" WHERE (\"CHECKINS\".\"NAME\" = ?) LIMIT %d" max-result-rows)}
+     :error (str "Column \"CHECKINS.NAME\" not found; SQL statement:\nSELECT \"CHECKINS\".\"ID\", CAST(\"DATE\" AS DATE), "
+                 "\"CHECKINS\".\"VENUE_ID\", \"CHECKINS\".\"USER_ID\" FROM \"CHECKINS\" WHERE (\"CHECKINS\".\"NAME\" = ?) LIMIT "
+                 max-result-rows)}
   ;; This will print a stacktrace. Better to reassure people that that's on purpose than to make people question whether the tests are working
   (do (log/info (color/green "NOTE: The following stacktrace is expected <3"))
       (driver/process-query {:database @db-id