Skip to content
Snippets Groups Projects
Unverified Commit 9f5f81a3 authored by Cam Saul's avatar Cam Saul
Browse files

Revert unintentional indentation changes, etc. [ci drivers]

parent 5d8f8804
No related branches found
No related tags found
No related merge requests found
......@@ -82,7 +82,7 @@
com.sun.jmx/jmxri]]
[medley "0.8.4"] ; lightweight lib of useful functions
[metabase/throttle "1.0.1"] ; Tools for throttling access to API endpoints and other code pathways
[mysql/mysql-connector-java "5.1.45"] ; !!! Don't upgrade to 6.0+ yet -- that's Java 8 only !!!
[mysql/mysql-connector-java "5.1.45"] ; !!! Don't upgrade to 6.0+ yet -- that's Java 8 only !!!
[jdistlib "0.5.1" ; Distribution statistic tests
:exclusions [com.github.wendykierp/JTransforms]]
[net.sf.cssbox/cssbox "4.12" ; HTML / CSS rendering
......
......@@ -172,7 +172,7 @@
Is this property required? Defaults to `false`.")
(^{:style/indent 1} execute-query ^java.util.Map [this, ^java.util.Map query]
"Execute a query against the database and return the results.
"Execute a query against the database and return the results.
The query passed in will contain:
......@@ -255,7 +255,7 @@
(qp query)))")
(^{:style/indent 2} sync-in-context [this database ^clojure.lang.IFn f]
"*OPTIONAL*. Drivers may provide this function if they need to do special setup before a sync operation such as
"*OPTIONAL*. Drivers may provide this function if they need to do special setup before a sync operation such as
`sync-database!`. The sync operation itself is encapsulated as the lambda F, which must be called with no
arguments.
......
......@@ -462,25 +462,25 @@
"Default implementations for methods in `ISQLDriver`."
[]
(require 'metabase.driver.generic-sql.query-processor)
{:active-tables fast-active-tables
{:active-tables fast-active-tables
;; don't resolve the vars yet so during interactive dev if the underlying impl changes we won't have to reload all
;; the drivers
:apply-source-table (resolve 'metabase.driver.generic-sql.query-processor/apply-source-table)
:apply-aggregation (resolve 'metabase.driver.generic-sql.query-processor/apply-aggregation)
:apply-breakout (resolve 'metabase.driver.generic-sql.query-processor/apply-breakout)
:apply-fields (resolve 'metabase.driver.generic-sql.query-processor/apply-fields)
:apply-filter (resolve 'metabase.driver.generic-sql.query-processor/apply-filter)
:apply-join-tables (resolve 'metabase.driver.generic-sql.query-processor/apply-join-tables)
:apply-limit (resolve 'metabase.driver.generic-sql.query-processor/apply-limit)
:apply-order-by (resolve 'metabase.driver.generic-sql.query-processor/apply-order-by)
:apply-page (resolve 'metabase.driver.generic-sql.query-processor/apply-page)
:column->special-type (constantly nil)
:current-datetime-fn (constantly :%now)
:excluded-schemas (constantly nil)
:field->identifier (u/drop-first-arg (comp (partial apply hsql/qualify) field/qualified-name-components))
:field->alias (u/drop-first-arg :name)
:quote-style (constantly :ansi)
:set-timezone-sql (constantly nil)})
:apply-source-table (resolve 'metabase.driver.generic-sql.query-processor/apply-source-table)
:apply-aggregation (resolve 'metabase.driver.generic-sql.query-processor/apply-aggregation)
:apply-breakout (resolve 'metabase.driver.generic-sql.query-processor/apply-breakout)
:apply-fields (resolve 'metabase.driver.generic-sql.query-processor/apply-fields)
:apply-filter (resolve 'metabase.driver.generic-sql.query-processor/apply-filter)
:apply-join-tables (resolve 'metabase.driver.generic-sql.query-processor/apply-join-tables)
:apply-limit (resolve 'metabase.driver.generic-sql.query-processor/apply-limit)
:apply-order-by (resolve 'metabase.driver.generic-sql.query-processor/apply-order-by)
:apply-page (resolve 'metabase.driver.generic-sql.query-processor/apply-page)
:column->special-type (constantly nil)
:current-datetime-fn (constantly :%now)
:excluded-schemas (constantly nil)
:field->identifier (u/drop-first-arg (comp (partial apply hsql/qualify) field/qualified-name-components))
:field->alias (u/drop-first-arg :name)
:quote-style (constantly :ansi)
:set-timezone-sql (constantly nil)})
(defn IDriverSQLDefaultsMixin
......
......@@ -179,7 +179,6 @@
:limit 5}}))))
;; make sure we can do a query with breakout and aggregation using a SQL source query
(datasets/expect-with-engines (non-timeseries-engines-with-feature :nested-queries)
breakout-results
(rows+cols
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment