From 597ac974e265b49da8db49d161bff6511c96a777 Mon Sep 17 00:00:00 2001
From: Cam Saul <cammsaul@gmail.com>
Date: Fri, 10 Nov 2017 18:28:27 -0800
Subject: [PATCH] Make sure to require clj namespaces before we import their
classes
---
src/metabase/driver/generic_sql.clj | 1 +
src/metabase/driver/generic_sql/query_processor.clj | 3 ++-
src/metabase/models/params.clj | 1 +
test_resources/log4j.properties | 9 ++-------
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/metabase/driver/generic_sql.clj b/src/metabase/driver/generic_sql.clj
index d01d391bb1b..bbd1df8b302 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 477787d944d..39fd675742f 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 59a4285a8b5..8ff5b66265d 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 75116bf562a..68cd0bc6c3a 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
--
GitLab