Skip to content
Snippets Groups Projects
Unverified Commit 5e2b60fc authored by Cam Saül's avatar Cam Saül
Browse files

Hierarchical Type System (Second Try) :two:

parent 826b1150
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 407 additions and 330 deletions
sample_dataset/metabase/sample_dataset/generate.clj
+ 2
− 2
View file @ 5e2b60fc
......@@ -341,7 +341,7 @@
:source {:description "The channel through which we acquired this user. Valid values include: Affiliate, Facebook, Google, Organic and Twitter"}
:state {:description "The state or province of the account’s billing address"}
:zip {:description "The postal code of the account’s billing address"
:special_type :zip_code}}}
:special_type :type/ZipCode}}}
:products {:description "This is our product catalog. It includes all products ever sold by the Sample Company."
:columns {:category {:description "The type of product, valid values include: Doohicky, Gadget, Gizmo and Widget"}
:created_at {:description "The date the product was added to our catalog."}
......@@ -353,7 +353,7 @@
:vendor {:description "The source of the product."}}}
:reviews {:description "These are reviews our customers have left on products. Note that these are not tied to orders so it is possible people have reviewed products they did not purchase from us."
:columns {:body {:description "The review the user left. Limited to 2000 characters."
:special_type :desc}
:special_type :type/Description}
:created_at {:description "The day and time a review was written by a user."}
:id {:description "A unique internal identifier for the review. Should not be used externally."}
:product_id {:description "The product the review was for"}
......
src/metabase/api/field.clj
+ 12
− 16
View file @ 5e2b60fc
......@@ -5,12 +5,14 @@
[metabase.db.metadata-queries :as metadata]
(metabase.models [hydrate :refer [hydrate]]
[field :refer [Field] :as field]
[field-values :refer [FieldValues create-field-values-if-needed! field-should-have-field-values?]])))
[field-values :refer [FieldValues create-field-values-if-needed! field-should-have-field-values?]])
metabase.types
[metabase.util :as u]))
(defannotation FieldSpecialType
"Param must be a valid `Field` special type."
(defannotation FieldType
"Param must be a valid `Field` type."
[symb value :nillable]
(checkp-contains? field/special-types symb (keyword value)))
(checkp-with (u/rpartial isa? :type/*) symb (keyword value) (str "Invalid field type: " value)))
(defannotation FieldVisibilityType
"Param must be a valid `Field` visibility type."
......@@ -34,22 +36,16 @@
display_name NonEmptyString
fk_target_field_id Integer
points_of_interest NonEmptyString
special_type FieldSpecialType
special_type FieldType
visibility_type FieldVisibilityType}
(let-404 [field (Field id)]
(write-check field)
(let [special_type (keyword (get body :special_type (:special_type field)))
visibility_type (or visibility_type (:visibility_type field))
;; only let target field be set for :fk type fields, and if it's not in the payload then leave the current value
fk-target-field-id (when (= :fk special_type)
;; only let target field be set for :type/FK type fields, and if it's not in the payload then leave the current value
fk-target-field-id (when (isa? special_type :type/FK)
(get body :fk_target_field_id (:fk_target_field_id field)))]
;; make sure that the special type is allowed for the base type
(check (field/valid-special-type-for-base-type? special_type (:base_type field))
[400 (format "Special type %s cannot be used for fields with base type %s. Base type must be one of: %s"
special_type
(:base_type field)
(field/special-type->valid-base-types special_type))])
;; validate that fk_target_field_id is a valid Field
;; TODO - we should also check that the Field is within the same database as our field
(when fk-target-field-id
......@@ -76,7 +72,7 @@
(defendpoint GET "/:id/values"
"If `Field`'s special type is `category`/`city`/`state`/`country`, or its base type is `BooleanField`, return
"If `Field`'s special type derives from `type/Category`, or its base type is `type/Boolean`, return
all distinct values of the field, and a map of human-readable values defined by the user."
[id]
(let-404 [field (Field id)]
......@@ -88,13 +84,13 @@
(defendpoint POST "/:id/value_map_update"
"Update the human-readable values for a `Field` whose special type is `category`/`city`/`state`/`country`
or whose base type is `BooleanField`."
or whose base type is `type/Boolean`."
[id :as {{:keys [values_map]} :body}]
{values_map [Required Dict]}
(let-404 [field (Field id)]
(write-check field)
(check (field-should-have-field-values? field)
[400 "You can only update the mapped values of a Field whose 'special_type' is 'category'/'city'/'state'/'country' or whose 'base_type' is 'BooleanField'."])
[400 "You can only update the mapped values of a Field whose 'special_type' is 'category'/'city'/'state'/'country' or whose 'base_type' is 'type/Boolean'."])
(if-let [field-values-id (db/select-one-id FieldValues, :field_id id)]
(check-500 (db/update! FieldValues field-values-id
:human_readable_values values_map))
......
src/metabase/db.clj
+ 19
− 0
View file @ 5e2b60fc
......@@ -860,3 +860,22 @@
[[source-entity fk] [dest-entity pk]]
{:left-join [(entity->table-name dest-entity) [:= (qualify source-entity fk)
(qualify dest-entity pk)]]})
(defn isa
"Convenience for generating an HoneySQL `IN` clause for a keyword and all of its descendents.
Intended for use with the type hierarchy in `metabase.types`.
(db/select Field :special_type (db/isa :type/URL))
->
(db/select Field :special_type [:in #{\"type/URL\" \"type/ImageURL\" \"type/AvatarURL\"}])
Also accepts optional EXPR for use directly in a HoneySQL `where`:
(db/select Field {:where (db/isa :special_type :type/URL)})
->
(db/select Field {:where [:in :special_type #{\"type/URL\" \"type/ImageURL\" \"type/AvatarURL\"}]})"
([type-keyword]
[:in (set (map u/keyword->qualified-name (cons type-keyword (descendants type-keyword))))])
([expr type-keyword]
[:in expr (last (isa type-keyword))]))
src/metabase/db/metadata_queries.clj
+ 1
− 1
View file @ 5e2b60fc
......@@ -29,7 +29,7 @@
(defn field-distinct-values
"Return the distinct values of FIELD.
This is used to create a `FieldValues` object for `:category` Fields."
This is used to create a `FieldValues` object for `:type/Category` Fields."
([field]
(field-distinct-values field @(resolve 'metabase.sync-database.analyze/low-cardinality-threshold)))
([{field-id :id :as field} max-results]
......
src/metabase/db/migrations.clj
+ 59
− 2
View file @ 5e2b60fc
(ns metabase.db.migrations
"Clojure-land data migration definitions and fns for running them."
(:require [clojure.tools.logging :as log]
(metabase [db :as db]
[driver :as driver])
(metabase [config :as config]
[db :as db]
[driver :as driver]
types)
[metabase.events.activity-feed :refer [activity-feed-topics]]
(metabase.models [activity :refer [Activity]]
[card :refer [Card]]
......@@ -231,3 +233,58 @@
:last_analyzed (u/new-sql-timestamp))
;; add this column to the set we've processed already
(swap! processed-fields conj column-name)))))))))))))))))
;;; New type system
(def ^:private ^:const old-special-type->new-type
{"avatar" "type/AvatarURL"
"category" "type/Category"
"city" "type/City"
"country" "type/Country"
"desc" "type/Description"
"fk" "type/FK"
"id" "type/PK"
"image" "type/ImageURL"
"json" "type/SerializedJSON"
"latitude" "type/Latitude"
"longitude" "type/Longitude"
"name" "type/Name"
"number" "type/Number"
"state" "type/State"
"timestamp_milliseconds" "type/UNIXTimestampMilliseconds"
"timestamp_seconds" "type/UNIXTimestampSeconds"
"url" "type/URL"
"zip_code" "type/ZipCode"})
;; make sure the new types are all valid
(when-not config/is-prod?
(doseq [[_ t] old-special-type->new-type]
(assert (isa? (keyword t) :type/*))))
(def ^:private ^:const old-base-type->new-type
{"ArrayField" "type/Array"
"BigIntegerField" "type/BigInteger"
"BooleanField" "type/Boolean"
"CharField" "type/Text"
"DateField" "type/Date"
"DateTimeField" "type/DateTime"
"DecimalField" "type/Decimal"
"DictionaryField" "type/Dictionary"
"FloatField" "type/Float"
"IntegerField" "type/Integer"
"TextField" "type/Text"
"TimeField" "type/Time"
"UUIDField" "type/UUID"
"UnknownField" "type/*"})
(when-not config/is-prod?
(doseq [[_ t] old-base-type->new-type]
(assert (isa? (keyword t) :type/*))))
(defmigration migrate-base-types
(doseq [[old-type new-type] old-special-type->new-type]
(db/update-where! 'Field {:special_type old-type}
:special_type new-type))
(doseq [[old-type new-type] old-base-type->new-type]
(db/update-where! 'Field {:base_type old-type}
:base_type new-type)))
src/metabase/driver.clj
+ 20
− 20
View file @ 5e2b60fc
......@@ -290,28 +290,28 @@
"Return the `Field.base_type` that corresponds to a given class returned by the DB.
This is used to infer the types of results that come back from native queries."
[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 :DateTimeField
java.util.UUID :TextField
clojure.lang.PersistentArrayMap :DictionaryField
clojure.lang.PersistentHashMap :DictionaryField
clojure.lang.PersistentVector :ArrayField
org.postgresql.util.PGobject :UnknownField} klass)
(or ({Boolean :type/Boolean
Double :type/Float
Float :type/Float
Integer :type/Integer
Long :type/Integer
String :type/Text
java.math.BigDecimal :type/Decimal
java.math.BigInteger :type/BigInteger
java.sql.Date :type/Date
java.sql.Timestamp :type/DateTime
java.util.Date :type/DateTime
java.util.UUID :type/Text
clojure.lang.PersistentArrayMap :type/Dictionary
clojure.lang.PersistentHashMap :type/Dictionary
clojure.lang.PersistentVector :type/Array
org.postgresql.util.PGobject :type/*} klass)
(condp isa? klass
clojure.lang.IPersistentMap :DictionaryField
clojure.lang.IPersistentVector :ArrayField
clojure.lang.IPersistentMap :type/Dictionary
clojure.lang.IPersistentVector :type/Array
nil)
(do (log/warn (format "Don't know how to map class '%s' to a Field base_type, falling back to :UnknownField." klass))
:UnknownField)))
(do (log/warn (format "Don't know how to map class '%s' to a Field base_type, falling back to :type/*." klass))
:type/*)))
;; ## Driver Lookup
......
src/metabase/driver/bigquery.clj
+ 7
− 7
View file @ 5e2b60fc
......@@ -143,12 +143,12 @@
(execute (.get (.tables client) project-id dataset-id table-id))))
(def ^:private ^:const bigquery-type->base-type
{"BOOLEAN" :BooleanField
"FLOAT" :FloatField
"INTEGER" :IntegerField
"RECORD" :DictionaryField ; RECORD -> field has a nested schema
"STRING" :TextField
"TIMESTAMP" :DateTimeField})
{"BOOLEAN" :type/Boolean
"FLOAT" :type/Float
"INTEGER" :type/Integer
"RECORD" :type/Dictionary ; RECORD -> field has a nested schema
"STRING" :type/Text
"TIMESTAMP" :type/DateTime})
(defn- table-schema->metabase-field-info [^TableSchema schema]
(for [^TableFieldSchema field (.getFields schema)]
......@@ -374,7 +374,7 @@
(and (seq schema-name) (seq field-name) (seq table-name))
(log/error "Don't know how to alias: " this))]}
(cond
field (recur field) ; DateTimeField
field (recur field) ; type/DateTime
index (name (let [{{{ag-type :aggregation-type} :aggregation} :query} sqlqp/*query*]
(if (= ag-type :distinct) :count
ag-type)))
......
src/metabase/driver/crate.clj
+ 27
− 27
View file @ 5e2b60fc
......@@ -11,33 +11,33 @@
(def ^:private ^:const column->base-type
"Map of Crate column types -> Field base types
Crate data types -> https://crate.io/docs/reference/sql/data_types.html"
{:integer :IntegerField
:string :TextField
:boolean :BooleanField
:byte :IntegerField
:short :IntegerField
:long :BigIntegerField
:float :FloatField
:double :FloatField
:ip :UnknownField
:timestamp :DateTimeField
:geo_shape :DictionaryField
:geo_point :ArrayField
:object :DictionaryField
:array :ArrayField
:object_array :ArrayField
:string_array :ArrayField
:integer_array :ArrayField
:float_array :ArrayField
:boolean_array :ArrayField
:byte_array :ArrayField
:timestamp_array :ArrayField
:short_array :ArrayField
:long_array :ArrayField
:double_array :ArrayField
:ip_array :ArrayField
:geo_shape_array :ArrayField
:geo_point_array :ArrayField})
{:integer :type/Integer
:string :type/Text
:boolean :type/Boolean
:byte :type/Integer
:short :type/Integer
:long :type/BigInteger
:float :type/Float
:double :type/Float
:ip :type/*
:timestamp :type/DateTime
:geo_shape :type/Dictionary
:geo_point :type/Array
:object :type/Dictionary
:array :type/Array
:object_array :type/Array
:string_array :type/Array
:integer_array :type/Array
:float_array :type/Array
:boolean_array :type/Array
:byte_array :type/Array
:timestamp_array :type/Array
:short_array :type/Array
:long_array :type/Array
:double_array :type/Array
:ip_array :type/Array
:geo_shape_array :type/Array
:geo_point_array :type/Array})
(def ^:private ^:const now (hsql/call :current_timestamp 3))
......
src/metabase/driver/druid.clj
+ 3
− 3
View file @ 5e2b60fc
......@@ -69,8 +69,8 @@
;; string-encoded booleans + dates are treated as strings (!)
{:name field-name
:base-type (if (= :metric druid-field-type)
:FloatField
:TextField)})
:type/Float
:type/Text)})
(defn- describe-table [database table]
(let [details (:details database)
......@@ -80,7 +80,7 @@
:fields (set (concat
;; every Druid table is an event stream w/ a timestamp field
[{:name "timestamp"
:base-type :DateTimeField
:base-type :type/DateTime
:pk? true}]
(map (partial describe-table-field :dimension) dimensions)
(map (partial describe-table-field :metric) metrics)))}))
......
src/metabase/driver/druid/query_processor.clj
+ 8
− 5
View file @ 5e2b60fc
......@@ -59,11 +59,14 @@
"Is this `Field`/`DateTimeField` a `:dimension` or `:metric`?"))
(extend-protocol IDimensionOrMetric
Field (dimension-or-metric? [this] (case (:base-type this)
:TextField :dimension
:FloatField :metric
:IntegerField :metric))
DateTimeField (dimension-or-metric? [this] (dimension-or-metric? (:field this))))
Field (dimension-or-metric? [{:keys [base-type]}]
(cond
(isa? base-type :type/Text) :dimension
(isa? base-type :type/Float) :metric
(isa? base-type :type/Integer) :metric))
DateTimeField (dimension-or-metric? [this]
(dimension-or-metric? (:field this))))
(def ^:private ^:const query-type->default-query
......
src/metabase/driver/generic_sql.clj
+ 3
− 3
View file @ 5e2b60fc
......@@ -215,7 +215,7 @@
pk-field (field/Field (table/pk-field-id table))
pk-field-k (when pk-field
(qualify+escape table pk-field))
transform-fn (if (contains? #{:TextField :CharField} (:base_type field))
transform-fn (if (isa? (:base_type field) :type/Text)
u/jdbc-clob->str
identity)
select* {:select [[field-k :field]] ; if we don't specify an explicit ORDER BY some DBs like Redshift will return them in a (seemingly) random order
......@@ -338,8 +338,8 @@
(merge {:name column_name
:custom {:column-type type_name}
:base-type (or (column->base-type driver (keyword type_name))
(do (log/warn (format "Don't know how to map column type '%s' to a Field base_type, falling back to :UnknownField." type_name))
:UnknownField))}
(do (log/warn (format "Don't know how to map column type '%s' to a Field base_type, falling back to :type/*." type_name))
:type/*))}
(when calculated-special-type
{:special-type calculated-special-type})))))
......
src/metabase/driver/generic_sql/query_processor.clj
+ 4
− 4
View file @ 5e2b60fc
......@@ -76,10 +76,10 @@
Field
(formatted [{:keys [schema-name table-name special-type field-name]}]
(let [field (keyword (hx/qualify-and-escape-dots schema-name table-name field-name))]
(case special-type
:timestamp_seconds (sql/unix-timestamp->timestamp (driver) field :seconds)
:timestamp_milliseconds (sql/unix-timestamp->timestamp (driver) field :milliseconds)
field)))
(cond
(isa? special-type :type/UNIXTimestampSeconds) (sql/unix-timestamp->timestamp (driver) field :seconds)
(isa? special-type :type/UNIXTimestampMilliseconds) (sql/unix-timestamp->timestamp (driver) field :milliseconds)
:else field)))
DateTimeField
(formatted [{unit :unit, field :field}]
......
src/metabase/driver/h2.clj
+ 73
− 71
View file @ 5e2b60fc
(ns metabase.driver.h2
;; TODO - This namespace should be reworked to use `u/drop-first-arg` like newer drivers
(:require [clojure.string :as s]
(:require [clojure.java.jdbc :as jdbc]
[clojure.string :as s]
[honeysql.core :as hsql]
[metabase.db :as db]
[metabase.db.spec :as dbspec]
......@@ -9,69 +10,69 @@
[metabase.util :as u]
[metabase.util.honeysql-extensions :as hx]))
(defn- column->base-type [_ column-type]
({:ARRAY :UnknownField
:BIGINT :BigIntegerField
:BINARY :UnknownField
:BIT :BooleanField
:BLOB :UnknownField
:BOOL :BooleanField
:BOOLEAN :BooleanField
:BYTEA :UnknownField
:CHAR :CharField
:CHARACTER :CharField
:CLOB :TextField
:DATE :DateField
:DATETIME :DateTimeField
:DEC :DecimalField
:DECIMAL :DecimalField
:DOUBLE :FloatField
:FLOAT :FloatField
:FLOAT4 :FloatField
:FLOAT8 :FloatField
:GEOMETRY :UnknownField
:IDENTITY :IntegerField
:IMAGE :UnknownField
:INT :IntegerField
:INT2 :IntegerField
:INT4 :IntegerField
:INT8 :BigIntegerField
:INTEGER :IntegerField
:LONGBLOB :UnknownField
:LONGTEXT :TextField
:LONGVARBINARY :UnknownField
:LONGVARCHAR :TextField
:MEDIUMBLOB :UnknownField
:MEDIUMINT :IntegerField
:MEDIUMTEXT :TextField
:NCHAR :CharField
:NCLOB :TextField
:NTEXT :TextField
:NUMBER :DecimalField
:NUMERIC :DecimalField
:NVARCHAR :TextField
:NVARCHAR2 :TextField
:OID :UnknownField
:OTHER :UnknownField
:RAW :UnknownField
:REAL :FloatField
:SIGNED :IntegerField
:SMALLDATETIME :DateTimeField
:SMALLINT :IntegerField
:TEXT :TextField
:TIME :TimeField
:TIMESTAMP :DateTimeField
:TINYBLOB :UnknownField
:TINYINT :IntegerField
:TINYTEXT :TextField
:UUID :TextField
:VARBINARY :UnknownField
:VARCHAR :TextField
:VARCHAR2 :TextField
:VARCHAR_CASESENSITIVE :TextField
:VARCHAR_IGNORECASE :TextField
:YEAR :IntegerField
(keyword "DOUBLE PRECISION") :FloatField} column-type))
(def ^:private ^:const column->base-type
{:ARRAY :type/*
:BIGINT :type/BigInteger
:BINARY :type/*
:BIT :type/Boolean
:BLOB :type/*
:BOOL :type/Boolean
:BOOLEAN :type/Boolean
:BYTEA :type/*
:CHAR :type/Text
:CHARACTER :type/Text
:CLOB :type/Text
:DATE :type/Date
:DATETIME :type/DateTime
:DEC :type/Decimal
:DECIMAL :type/Decimal
:DOUBLE :type/Float
:FLOAT :type/Float
:FLOAT4 :type/Float
:FLOAT8 :type/Float
:GEOMETRY :type/*
:IDENTITY :type/Integer
:IMAGE :type/*
:INT :type/Integer
:INT2 :type/Integer
:INT4 :type/Integer
:INT8 :type/BigInteger
:INTEGER :type/Integer
:LONGBLOB :type/*
:LONGTEXT :type/Text
:LONGVARBINARY :type/*
:LONGVARCHAR :type/Text
:MEDIUMBLOB :type/*
:MEDIUMINT :type/Integer
:MEDIUMTEXT :type/Text
:NCHAR :type/Text
:NCLOB :type/Text
:NTEXT :type/Text
:NUMBER :type/Decimal
:NUMERIC :type/Decimal
:NVARCHAR :type/Text
:NVARCHAR2 :type/Text
:OID :type/*
:OTHER :type/*
:RAW :type/*
:REAL :type/Float
:SIGNED :type/Integer
:SMALLDATETIME :type/DateTime
:SMALLINT :type/Integer
:TEXT :type/Text
:TIME :type/Time
:TIMESTAMP :type/DateTime
:TINYBLOB :type/*
:TINYINT :type/Integer
:TINYTEXT :type/Text
:UUID :type/Text
:VARBINARY :type/*
:VARCHAR :type/Text
:VARCHAR2 :type/Text
:VARCHAR_CASESENSITIVE :type/Text
:VARCHAR_IGNORECASE :type/Text
:YEAR :type/Integer
(keyword "DOUBLE PRECISION") :type/Float})
;; These functions for exploding / imploding the options in the connection strings are here so we can override shady options
......@@ -118,9 +119,8 @@
(hsql/raw "timestamp '1970-01-01T00:00:00Z'")))
(defn- process-query-in-context [_ qp]
(fn [{query-type :type, :as query}]
{:pre [query-type]}
(defn- check-native-query-not-using-default-user [{query-type :type, :as query}]
(u/prog1 query
;; For :native queries check to make sure the DB in question has a (non-default) NAME property specified in the connection string.
;; We don't allow SQL execution on H2 databases for the default admin account for security reasons
(when (= (keyword query-type) :native)
......@@ -129,9 +129,11 @@
[_ options] (connection-string->file+options db)
{:strs [USER]} options]
(when (or (s/blank? USER)
(= USER "sa")) ; "sa" is the default USER
(throw (Exception. "Running SQL queries against H2 databases using the default (admin) database user is forbidden.")))))
(qp query)))
(= USER "sa")) ; "sa" is the default USER
(throw (Exception. "Running SQL queries against H2 databases using the default (admin) database user is forbidden.")))))))
(defn- process-query-in-context [_ qp]
(comp qp check-native-query-not-using-default-user))
;; H2 doesn't have date_trunc() we fake it by formatting a date to an appropriate string
......@@ -215,7 +217,7 @@
sql/ISQLDriver
(merge (sql/ISQLDriverDefaultsMixin)
{:active-tables sql/post-filtered-active-tables
:column->base-type column->base-type
:column->base-type (u/drop-first-arg column->base-type)
:connection-details->spec connection-details->spec
:date date
:string-length-fn (u/drop-first-arg string-length-fn)
......
src/metabase/driver/mongo/query_processor.clj
+ 3
− 3
View file @ 5e2b60fc
......@@ -103,10 +103,10 @@
(mongo-let [field (as-> field <>
(->initial-rvalue <>)
(cond
(= special-type :timestamp_milliseconds)
(isa? special-type :type/UNIXTimestampSeconds)
{$add [(java.util.Date. 0) <>]}
(= special-type :timestamp_seconds)
(isa? special-type :type/UNIXTimestampMilliseconds)
{$add [(java.util.Date. 0) {$multiply [<> 1000]}]}
:else <>))]
......@@ -162,7 +162,7 @@
Value
(->rvalue [{value :value, {:keys [field-name base-type]} :field}]
(if (and (= field-name "_id")
(= base-type :UnknownField))
(= base-type :type/*))
`(ObjectId. ~value)
value))
......
src/metabase/driver/mongo/util.clj
+ 1
− 1
View file @ 5e2b60fc
......@@ -109,4 +109,4 @@
last ; last result will be tuple with highest count
first ; keep just the type
driver/class->base-type) ; convert to Field base_type
:UnknownField))
:type/*))
src/metabase/driver/mysql.clj
+ 31
− 31
View file @ 5e2b60fc
......@@ -11,37 +11,37 @@
;;; # IMPLEMENTATION
(defn- column->base-type [column-type]
({:BIGINT :BigIntegerField
:BINARY :UnknownField
:BIT :BooleanField
:BLOB :UnknownField
:CHAR :CharField
:DATE :DateField
:DATETIME :DateTimeField
:DECIMAL :DecimalField
:DOUBLE :FloatField
:ENUM :UnknownField
:FLOAT :FloatField
:INT :IntegerField
:INTEGER :IntegerField
:LONGBLOB :UnknownField
:LONGTEXT :TextField
:MEDIUMBLOB :UnknownField
:MEDIUMINT :IntegerField
:MEDIUMTEXT :TextField
:NUMERIC :DecimalField
:REAL :FloatField
:SET :UnknownField
:SMALLINT :IntegerField
:TEXT :TextField
:TIME :TimeField
:TIMESTAMP :DateTimeField
:TINYBLOB :UnknownField
:TINYINT :IntegerField
:TINYTEXT :TextField
:VARBINARY :UnknownField
:VARCHAR :TextField
:YEAR :IntegerField} (keyword (s/replace (name column-type) #"\sUNSIGNED$" "")))) ; strip off " UNSIGNED" from end if present
({:BIGINT :type/BigInteger
:BINARY :type/*
:BIT :type/Boolean
:BLOB :type/*
:CHAR :type/Text
:DATE :type/Date
:DATETIME :type/DateTime
:DECIMAL :type/Decimal
:DOUBLE :type/Float
:ENUM :type/*
:FLOAT :type/Float
:INT :type/Integer
:INTEGER :type/Integer
:LONGBLOB :type/*
:LONGTEXT :type/Text
:MEDIUMBLOB :type/*
:MEDIUMINT :type/Integer
:MEDIUMTEXT :type/Text
:NUMERIC :type/Decimal
:REAL :type/Float
:SET :type/*
:SMALLINT :type/Integer
:TEXT :type/Text
:TIME :type/Time
:TIMESTAMP :type/DateTime
:TINYBLOB :type/*
:TINYINT :type/Integer
:TINYTEXT :type/Text
:VARBINARY :type/*
:VARCHAR :type/Text
:YEAR :type/Integer} (keyword (s/replace (name column-type) #"\sUNSIGNED$" "")))) ; strip off " UNSIGNED" from end if present
(def ^:private ^:const connection-args
"Map of args for the MySQL JDBC connection string.
......
src/metabase/driver/oracle.clj
+ 25
− 25
View file @ 5e2b60fc
......@@ -14,31 +14,31 @@
(def ^:private ^:const pattern->type
[;; Any types -- see http://docs.oracle.com/cd/B28359_01/server.111/b28286/sql_elements001.htm#i107578
[#"ANYDATA" :UnknownField] ; Instance of a given type with data plus a description of the type (?)
[#"ANYTYPE" :UnknownField] ; Can be any named SQL type or an unnamed transient type
[#"ARRAY" :UnknownField]
[#"BFILE" :UnknownField]
[#"BLOB" :UnknownField]
[#"RAW" :UnknownField]
[#"CHAR" :TextField]
[#"CLOB" :TextField]
[#"DATE" :DateField]
[#"DOUBLE" :FloatField]
[#"^EXPRESSION" :UnknownField] ; Expression filter type
[#"FLOAT" :FloatField]
[#"INTERVAL" :DateTimeField] ; Does this make sense?
[#"LONG RAW" :UnknownField]
[#"LONG" :TextField]
[#"^ORD" :UnknownField] ; Media types -- http://docs.oracle.com/cd/B28359_01/server.111/b28286/sql_elements001.htm#i121058
[#"NUMBER" :DecimalField]
[#"REAL" :FloatField]
[#"REF" :UnknownField]
[#"ROWID" :UnknownField]
[#"^SDO_" :UnknownField] ; Spatial types -- see http://docs.oracle.com/cd/B28359_01/server.111/b28286/sql_elements001.htm#i107588
[#"STRUCT" :UnknownField]
[#"TIMESTAMP" :DateTimeField]
[#"URI" :TextField]
[#"XML" :UnknownField]])
[#"ANYDATA" :type/*] ; Instance of a given type with data plus a description of the type (?)
[#"ANYTYPE" :type/*] ; Can be any named SQL type or an unnamed transient type
[#"ARRAY" :type/*]
[#"BFILE" :type/*]
[#"BLOB" :type/*]
[#"RAW" :type/*]
[#"CHAR" :type/Text]
[#"CLOB" :type/Text]
[#"DATE" :type/Date]
[#"DOUBLE" :type/Float]
[#"^EXPRESSION" :type/*] ; Expression filter type
[#"FLOAT" :type/Float]
[#"INTERVAL" :type/DateTime] ; Does this make sense?
[#"LONG RAW" :type/*]
[#"LONG" :type/Text]
[#"^ORD" :type/*] ; Media types -- http://docs.oracle.com/cd/B28359_01/server.111/b28286/sql_elements001.htm#i121058
[#"NUMBER" :type/Decimal]
[#"REAL" :type/Float]
[#"REF" :type/*]
[#"ROWID" :type/*]
[#"^SDO_" :type/*] ; Spatial types -- see http://docs.oracle.com/cd/B28359_01/server.111/b28286/sql_elements001.htm#i107588
[#"STRUCT" :type/*]
[#"TIMESTAMP" :type/DateTime]
[#"URI" :type/Text]
[#"XML" :type/*]])
(defn- connection-details->spec [{:keys [sid], :as details}]
(update (dbspec/oracle details) :subname (u/rpartial str \: sid)))
......
src/metabase/driver/postgres.clj
+ 58
− 58
View file @ 5e2b60fc
......@@ -18,63 +18,63 @@
"Map of Postgres column types -> Field base types.
Add more mappings here as you come across them."
[column-type]
({:bigint :BigIntegerField
:bigserial :BigIntegerField
:bit :UnknownField
:bool :BooleanField
:boolean :BooleanField
:box :UnknownField
:bpchar :CharField ; "blank-padded char" is the internal name of "character"
:bytea :UnknownField ; byte array
:cidr :TextField ; IPv4/IPv6 network address
:circle :UnknownField
:date :DateField
:decimal :DecimalField
:float4 :FloatField
:float8 :FloatField
:geometry :UnknownField
:inet :TextField
:int :IntegerField
:int2 :IntegerField
:int4 :IntegerField
:int8 :BigIntegerField
:interval :UnknownField ; time span
:json :TextField
:jsonb :TextField
:line :UnknownField
:lseg :UnknownField
:macaddr :TextField
:money :DecimalField
:numeric :DecimalField
:path :UnknownField
:pg_lsn :IntegerField ; PG Log Sequence #
:point :UnknownField
:real :FloatField
:serial :IntegerField
:serial2 :IntegerField
:serial4 :IntegerField
:serial8 :BigIntegerField
:smallint :IntegerField
:smallserial :IntegerField
:text :TextField
:time :TimeField
:timetz :TimeField
:timestamp :DateTimeField
:timestamptz :DateTimeField
:tsquery :UnknownField
:tsvector :UnknownField
:txid_snapshot :UnknownField
:uuid :UUIDField
:varbit :UnknownField
:varchar :TextField
:xml :TextField
(keyword "bit varying") :UnknownField
(keyword "character varying") :TextField
(keyword "double precision") :FloatField
(keyword "time with time zone") :TimeField
(keyword "time without time zone") :TimeField
(keyword "timestamp with timezone") :DateTimeField
(keyword "timestamp without timezone") :DateTimeField} column-type))
({:bigint :type/BigInteger
:bigserial :type/BigInteger
:bit :type/*
:bool :type/Boolean
:boolean :type/Boolean
:box :type/*
:bpchar :type/Text ; "blank-padded char" is the internal name of "character"
:bytea :type/* ; byte array
:cidr :type/Text ; IPv4/IPv6 network address
:circle :type/*
:date :type/Date
:decimal :type/Decimal
:float4 :type/Float
:float8 :type/Float
:geometry :type/*
:inet :type/Text
:int :type/Integer
:int2 :type/Integer
:int4 :type/Integer
:int8 :type/BigInteger
:interval :type/* ; time span
:json :type/Text
:jsonb :type/Text
:line :type/*
:lseg :type/*
:macaddr :type/Text
:money :type/Decimal
:numeric :type/Decimal
:path :type/*
:pg_lsn :type/Integer ; PG Log Sequence #
:point :type/*
:real :type/Float
:serial :type/Integer
:serial2 :type/Integer
:serial4 :type/Integer
:serial8 :type/BigInteger
:smallint :type/Integer
:smallserial :type/Integer
:text :type/Text
:time :type/Time
:timetz :type/Time
:timestamp :type/DateTime
:timestamptz :type/DateTime
:tsquery :type/*
:tsvector :type/*
:txid_snapshot :type/*
:uuid :type/UUID
:varbit :type/*
:varchar :type/Text
:xml :type/Text
(keyword "bit varying") :type/*
(keyword "character varying") :type/Text
(keyword "double precision") :type/Float
(keyword "time with time zone") :type/Time
(keyword "time without time zone") :type/Time
(keyword "timestamp with timezone") :type/DateTime
(keyword "timestamp without timezone") :type/DateTime} column-type))
(defn- column->special-type
"Attempt to determine the special-type of a Field given its name and Postgres column type."
......@@ -167,7 +167,7 @@
message))
(defn- prepare-value [{value :value, {:keys [base-type]} :field}]
(if (and (= base-type :UUIDField)
(if (and (= base-type :type/UUID)
value)
(java.util.UUID/fromString value)
value))
......
src/metabase/driver/sqlite.clj
+ 15
− 15
View file @ 5e2b60fc
......@@ -14,21 +14,21 @@
;; because SQLite types can have optional lengths, e.g. NVARCHAR(100) or NUMERIC(10,5)
;; See also http://www.sqlite.org/datatype3.html
(def ^:private ^:const pattern->type
[[#"BIGINT" :BigIntegerField]
[#"BIG INT" :BigIntegerField]
[#"INT" :IntegerField]
[#"CHAR" :TextField]
[#"TEXT" :TextField]
[#"CLOB" :TextField]
[#"BLOB" :UnknownField]
[#"REAL" :FloatField]
[#"DOUB" :FloatField]
[#"FLOA" :FloatField]
[#"NUMERIC" :FloatField]
[#"DECIMAL" :DecimalField]
[#"BOOLEAN" :BooleanField]
[#"DATETIME" :DateTimeField]
[#"DATE" :DateField]])
[[#"BIGINT" :type/BigInteger]
[#"BIG INT" :type/BigInteger]
[#"INT" :type/Integer]
[#"CHAR" :type/Text]
[#"TEXT" :type/Text]
[#"CLOB" :type/Text]
[#"BLOB" :type/*]
[#"REAL" :type/Float]
[#"DOUB" :type/Float]
[#"FLOA" :type/Float]
[#"NUMERIC" :type/Float]
[#"DECIMAL" :type/Decimal]
[#"BOOLEAN" :type/Boolean]
[#"DATETIME" :type/DateTime]
[#"DATE" :type/Date]])
;; register the SQLite concatnation operator `||` with HoneySQL as `sqlite-concat`
;; (hsql/format (hsql/call :sqlite-concat :a :b)) -> "(a || b)"
......
src/metabase/driver/sqlserver.clj
+ 36
− 36
View file @ 5e2b60fc
......@@ -11,42 +11,42 @@
(defn- column->base-type
"See [this page](https://msdn.microsoft.com/en-us/library/ms187752.aspx) for details."
[column-type]
({:bigint :BigIntegerField
:binary :UnknownField
:bit :BooleanField ; actually this is 1 / 0 instead of true / false ...
:char :CharField
:cursor :UnknownField
:date :DateField
:datetime :DateTimeField
:datetime2 :DateTimeField
:datetimeoffset :DateTimeField
:decimal :DecimalField
:float :FloatField
:geography :UnknownField
:geometry :UnknownField
:hierarchyid :UnknownField
:image :UnknownField
:int :IntegerField
:money :DecimalField
:nchar :CharField
:ntext :TextField
:numeric :DecimalField
:nvarchar :TextField
:real :FloatField
:smalldatetime :DateTimeField
:smallint :IntegerField
:smallmoney :DecimalField
:sql_variant :UnknownField
:table :UnknownField
:text :TextField
:time :TimeField
:timestamp :UnknownField ; not a standard SQL timestamp, see https://msdn.microsoft.com/en-us/library/ms182776.aspx
:tinyint :IntegerField
:uniqueidentifier :UUIDField
:varbinary :UnknownField
:varchar :TextField
:xml :UnknownField
(keyword "int identity") :IntegerField} column-type)) ; auto-incrementing integer (ie pk) field
({:bigint :type/BigInteger
:binary :type/*
:bit :type/Boolean ; actually this is 1 / 0 instead of true / false ...
:char :type/Text
:cursor :type/*
:date :type/Date
:datetime :type/DateTime
:datetime2 :type/DateTime
:datetimeoffset :type/DateTime
:decimal :type/Decimal
:float :type/Float
:geography :type/*
:geometry :type/*
:hierarchyid :type/*
:image :type/*
:int :type/Integer
:money :type/Decimal
:nchar :type/Text
:ntext :type/Text
:numeric :type/Decimal
:nvarchar :type/Text
:real :type/Float
:smalldatetime :type/DateTime
:smallint :type/Integer
:smallmoney :type/Decimal
:sql_variant :type/*
:table :type/*
:text :type/Text
:time :type/Time
:timestamp :type/* ; not a standard SQL timestamp, see https://msdn.microsoft.com/en-us/library/ms182776.aspx
:tinyint :type/Integer
:uniqueidentifier :type/UUID
:varbinary :type/*
:varchar :type/Text
:xml :type/*
(keyword "int identity") :type/Integer} column-type)) ; auto-incrementing integer (ie pk) field
(defn- connection-details->spec [{:keys [domain instance ssl], :as details}]
(-> ;; Having the `:ssl` key present, even if it is `false`, will make the driver attempt to connect with SSL
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment