Merge pull request #501 from metabase/remove_driver_context_namespace

Remove metabase.driver.context namespace
metabase · Jun 23, 2015 · 0bc945d · 0bc945d
2 parents 54a7ac3 + eef54d2
commit 0bc945d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/src/metabase/driver/context.clj b/src/metabase/driver/context.clj
diff --git a/src/metabase/driver/generic_sql/util.clj b/src/metabase/driver/generic_sql/util.clj
@@ -8,7 +8,6 @@
             [korma.db :as kdb]
             [metabase.db :refer [sel]]
             [metabase.driver :as driver]
-            [metabase.driver.context :as context]
             [metabase.driver.query-processor :as qp]
             (metabase.models [database :refer [Database]]
                              [field :refer [Field]]
@@ -83,9 +82,7 @@
   [table-id]
   {:pre  [(integer? table-id)]
    :post [(map? %)]}
-  (korma-entity (or (and (= (:id context/*table*) table-id)
-                         context/*table*)
-                    (sel :one Table :id table-id)
+  (korma-entity (or (sel :one Table :id table-id)
                     (throw (Exception. (format "Table with ID %d doesn't exist!" table-id))))))
 
 (defn castify-field

diff --git a/src/metabase/driver/sync/queries.clj b/src/metabase/driver/sync/queries.clj
@@ -1,17 +1,14 @@
 (ns metabase.driver.sync.queries
   "Predefined QP queries that can be used to get metadata for syncing."
-  (:require [metabase.driver :as driver]
-            [metabase.driver.context :as context]))
+  (:require [metabase.driver :as driver]))
 
 (defn- qp-query [table query-dict]
-  (binding [context/*table* table
-            context/*database* @(:db table)]
-    (-> (driver/process-query {:database (:db_id table)
-                               :type "query"
-                               :query (assoc query-dict
-                                             :source_table (:id table))})
-        :data
-        :rows)))
+  (-> (driver/process-query {:database (:db_id table)
+                             :type "query"
+                             :query (assoc query-dict
+                                           :source_table (:id table))})
+      :data
+      :rows))
 
 (defn table-row-count
   "Fetch the row count of TABLE via the query processor."