diff --git a/src/metabase/driver/generic_sql.clj b/src/metabase/driver/generic_sql.clj index d01d391bb1ba079805ff5320f2602e9ea7354be5..bbd1df8b302960bbca7babdc434eed6fbb64d4a8 100644 --- a/src/metabase/driver/generic_sql.clj +++ b/src/metabase/driver/generic_sql.clj @@ -15,6 +15,7 @@ [metabase.models [field :as field] [table :as table]] + metabase.query-processor.interface [metabase.util [honeysql-extensions :as hx] [ssh :as ssh]]) diff --git a/src/metabase/driver/generic_sql/query_processor.clj b/src/metabase/driver/generic_sql/query_processor.clj index 477787d944d54edaf5a0a05ee464fabfc75d2aef..39fd675742f0c21545ea20043c6bd30cb9a40c30 100644 --- a/src/metabase/driver/generic_sql/query_processor.clj +++ b/src/metabase/driver/generic_sql/query_processor.clj @@ -19,7 +19,8 @@ (:import clojure.lang.Keyword [java.sql PreparedStatement ResultSet ResultSetMetaData SQLException] [java.util Calendar TimeZone] - [metabase.query_processor.interface AgFieldRef BinnedField DateTimeField DateTimeValue Expression ExpressionRef Field FieldLiteral RelativeDateTimeValue Value])) + [metabase.query_processor.interface AgFieldRef BinnedField DateTimeField DateTimeValue Expression + ExpressionRef Field FieldLiteral RelativeDateTimeValue Value])) (def ^:dynamic *query* "The outer query currently being processed." diff --git a/src/metabase/models/params.clj b/src/metabase/models/params.clj index 59a4285a8b53f03baceab078c5bab0d794284145..8ff5b66265d24370f337c9d9dfc35dec971e2e50 100644 --- a/src/metabase/models/params.clj +++ b/src/metabase/models/params.clj @@ -1,6 +1,7 @@ (ns metabase.models.params "Utility functions for dealing with parameters for Dashboards and Cards." (:require [metabase.query-processor.middleware.expand :as ql] + metabase.query-processor.interface [metabase.util :as u] [toucan.db :as db]) (:import metabase.query_processor.interface.FieldPlaceholder)) diff --git a/test_resources/log4j.properties b/test_resources/log4j.properties index 75116bf562a111292e65f08dfd7e38bb8b0414e5..68cd0bc6c3a9cde28ddab196cbd81984caaaddc3 100644 --- a/test_resources/log4j.properties +++ b/test_resources/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootLogger=WARN, console +log4j.rootLogger=ERROR, console # log to the console log4j.appender.console=org.apache.log4j.ConsoleAppender @@ -15,12 +15,7 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p%c - %m%n # customizations to logging by package -log4j.logger.com.mchange=ERROR -log4j.logger.org.eclipse.jetty.server.HttpChannel=ERROR log4j.logger.metabase=ERROR log4j.logger.metabase.test-setup=INFO -log4j.logger.metabase.sync=DEBUG -log4j.logger.metabase.task.sync-databases=INFO log4j.logger.metabase.test.data.datasets=INFO -log4j.logger.metabase.test.data=DEBUG -log4j.logger.metabase.util.encryption=INFO +log4j.logger.metabase.test.data=INFO