Skip to content
Snippets Groups Projects
Commit 96eb4985 authored by Cam Saül's avatar Cam Saül
Browse files

linty fix

parent d853cc8a
Branches
Tags
No related merge requests found
......@@ -43,19 +43,19 @@
(defn class->base-type
"Return the `Field.base_type` that corresponds to a given class returned by the DB."
[klass]
(or ({Boolean :BooleanField
Double :FloatField
Float :FloatField
Integer :IntegerField
Long :IntegerField
String :TextField
java.math.BigDecimal :DecimalField
java.math.BigInteger :BigIntegerField
java.sql.Date :DateField
java.sql.Timestamp :DateTimeField
java.util.Date :DateField
java.util.UUID :TextField
org.postgresql.util.PGobject :UnknownField} klass)
(or ({Boolean :BooleanField
Double :FloatField
Float :FloatField
Integer :IntegerField
Long :IntegerField
String :TextField
java.math.BigDecimal :DecimalField
java.math.BigInteger :BigIntegerField
java.sql.Date :DateField
java.sql.Timestamp :DateTimeField
java.util.Date :DateField
java.util.UUID :TextField
org.postgresql.util.PGobject :UnknownField} klass)
(cond
(isa? klass clojure.lang.IPersistentMap) :DictionaryField)
(do (log/warn (format "Don't know how to map class '%s' to a Field base_type, falling back to :UnknownField." klass))
......@@ -110,9 +110,9 @@
{:pre [(keyword? engine)
(is-engine? engine)
(map? details-map)]}
(let [{:keys [can-connect? humanize-connection-error-message]} (engine->driver engine)]
(let [{:keys [humanize-connection-error-message], :as driver} (engine->driver engine)]
(try
(can-connect? details-map)
((:can-connect? driver) details-map)
(catch Throwable e
(log/error "Failed to connect to database:" (.getMessage e))
(when rethrow-exceptions
......
......@@ -204,5 +204,6 @@
:field-values-lazy-seq field-values-lazy-seq
:table-rows-seq table-rows-seq
:table-fks table-fks
:field-avg-length (partial field-avg-length (:sql-string-length-fn driver))}
:field-avg-length (partial field-avg-length (:sql-string-length-fn driver))
:field-percent-urls field-percent-urls}
driver))
......@@ -123,32 +123,33 @@
driver/class->base-type))))))
(defdriver mongo
{:driver-name "MongoDB"
:details-fields [{:name "host"
:display-name "Host"
:default "localhost"}
{:name "port"
:display-name "Port"
:type :integer
:default 27017}
{:name "dbname"
:display-name "Database name"
:placeholder "carrierPigeonDeliveries"
:required true}
{:name "user"
:display-name "Database username"
:placeholder "What username do you use to login to the database?"}
{:name "pass"
:display-name "Database password"
:type :password
:placeholder "******"}]
:features #{:nested-fields}
:can-connect? can-connect?
:active-table-names active-table-names
:field-values-lazy-seq field-values-lazy-seq
:active-column-names->type active-column-names->type
:table-pks (constantly #{"_id"})
:process-query process-query
:process-query-in-context process-query-in-context
:sync-in-context sync-in-context
:active-nested-field-name->type active-nested-field-name->type})
{:driver-name "MongoDB"
:details-fields [{:name "host"
:display-name "Host"
:default "localhost"}
{:name "port"
:display-name "Port"
:type :integer
:default 27017}
{:name "dbname"
:display-name "Database name"
:placeholder "carrierPigeonDeliveries"
:required true}
{:name "user"
:display-name "Database username"
:placeholder "What username do you use to login to the database?"}
{:name "pass"
:display-name "Database password"
:type :password
:placeholder "******"}]
:features #{:nested-fields}
:can-connect? can-connect?
:active-table-names active-table-names
:field-values-lazy-seq field-values-lazy-seq
:active-column-names->type active-column-names->type
:table-pks (constantly #{"_id"})
:process-query process-query
:process-query-in-context process-query-in-context
:sync-in-context sync-in-context
:humanize-connection-error-message humanize-connection-error-message
:active-nested-field-name->type active-nested-field-name->type})
......@@ -147,7 +147,7 @@
(-> {:driver-name "MySQL"
:details-fields [{:name "host"
:display-name "Host"
:default "localhost"}
:default "localhost"}
{:name "port"
:display-name "Port"
:type :integer
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment