diff --git a/.dir-locals.el b/.dir-locals.el
index bce0983be7cecf51c44bff345095c2a299cfa0e2..240f200944ce8031f67b547284a3efbc3f96a1aa 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -4,24 +4,31 @@
(put 'defannotation 'clojure-doc-string-elt 2)
(put 'defendpoint 'clojure-doc-string-elt 3)
(put 'defhook 'clojure-doc-string-elt 2)
+ (put 'defna 'clojure-doc-string-elt 2)
+ (put 'defne 'clojure-doc-string-elt 2)
(put 'defsetting 'clojure-doc-string-elt 2)
;; Define custom indentation for functions inside metabase.
;; This list isn't complete; add more forms as we come across them.
(define-clojure-indent
(api-let 2)
+ (assert 1)
(assoc* 1)
(auto-parse 1)
(catch-api-exceptions 0)
(check 1)
+ (checkp 1)
+ (conda 0)
(context 2)
(create-database-definition 1)
+ (dataset-case 0)
(execute-query 1)
+ (execute-sql! 2)
(expect 1)
(expect-eval-actual-first 1)
(expect-expansion 0)
(expect-let 1)
- (expect-when-testing-against-dataset 1)
+ (expect-when-testing-dataset 1)
(expect-when-testing-mongo 1)
(expect-with-all-drivers 1)
(expect-with-dataset 1)
@@ -32,10 +39,22 @@
(let-500 1)
(match 1)
(match-$ 1)
+ (matcha 1)
+ (matche 1)
+ (matchu 1)
(macrolet 1)
(org-perms-case 1)
(pdoseq 1)
+ (post-insert 1)
+ (post-select 1)
+ (post-update 1)
+ (pre-cascade-delete 1)
+ (pre-insert 1)
+ (pre-update 1)
+ (project 1)
+ (qp-expect-with-all-datasets 1)
(qp-expect-with-datasets 1)
+ (query-with-temp-db 1)
(resolve-private-fns 1)
(symbol-macrolet 1)
(sync-in-context 2)
diff --git a/.gitignore b/.gitignore
index fc3739969df9cd81b75e6aa9d0f116c1abacf304..a0c6add0b45cdbcbce98526aeebfcf9ec8b395f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ profiles.clj
/*.lock.db
/*.trace.db
/resources/frontend_client/app/dist/
+/resources/frontend_client/index.html
/node_modules/
/.babel_cache
/coverage
+/resources/sample-dataset.db.trace.db
+/deploy/artifacts/*
diff --git a/build-uberjar b/build-uberjar
new file mode 100755
index 0000000000000000000000000000000000000000..489e442c26ccb6035b960d4aef3b49b06b27fdd1
--- /dev/null
+++ b/build-uberjar
@@ -0,0 +1,22 @@
+#! /bin/bash
+
+echo "Running 'npm install' to download javascript dependencies..." &&
+npm install &&
+
+if [ -n "$CI_DISABLE_WEBPACK_MINIFICATION" ]; then
+ echo "Running 'webpack' to assemble and minify frontend assets..."
+ ./node_modules/webpack/bin/webpack.js
+else
+ echo "Running 'webpack -p' to assemble and minify frontend assets..."
+ ./node_modules/webpack/bin/webpack.js -p
+fi &&
+
+if [ -f resources/sample-dataset.db.mv.db ]; then
+ echo "Sample Dataset already generated."
+else
+ echo "Running 'lein generate-sample-dataset' to generate the sample dataset..."
+ lein generate-sample-dataset
+fi &&
+
+echo "Running 'lein uberjar'..." &&
+lein uberjar
diff --git a/circle.yml b/circle.yml
index 2fa20f32457d144d71067d9e02abe3da741c59bf..a128b2922ce59711b9a7e0e81a6c8e8bff58cd1f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,12 +4,28 @@ machine:
java:
version:
oraclejdk8
+ python:
+ version: 2.7.3
+dependencies:
+ override:
+ - lein deps
+ - pip install awscli==1.7.3
+database:
+ post:
+ # MySQL doesn't load named timezone information automatically, you have to run this command to load it
+ - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u ubuntu mysql
test:
override:
- # 0) runs unit tests w/ H2 local DB. Runs against both Mongo + H2 test datasets
- # 1) runs unit tests w/ Postgres local DB. Only runs against H2 test dataset so we can be sure tests work in either scenario
- # 2) runs Eastwood linter + Bikeshed linter
- # 3) runs JS linter + JS test
- # 4) runs lein uberjar
- - case $CIRCLE_NODE_INDEX in 0) MB_TEST_DATASETS=generic-sql,mongo lein test ;; 1) MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 2) lein eastwood && lein bikeshed --max-line-length 240 ;; 3) npm run lint && npm run build && npm run test ;; 4) CI_DISABLE_WEBPACK_MINIFICATION=1 lein uberjar ;; esac:
+ # 0) runs unit tests w/ H2 local DB. Runs against Mongo, H2, Postgres
+ # 1) runs unit tests w/ Postgres local DB. Runs against H2, MySQL
+ # 2) runs Eastwood linter
+ # 3) Bikeshed linter
+ # 4) runs JS linter + JS test
+ # 5) runs ./build-uberjar
+ - case $CIRCLE_NODE_INDEX in 0) MB_TEST_DATASETS=h2,mongo,postgres lein test ;; 1) MB_TEST_DATASETS=h2,mysql MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 2) lein eastwood ;; 3) lein bikeshed --max-line-length 240 ;; 4) npm install && npm run lint && npm run build && npm run test ;; 5) CI_DISABLE_WEBPACK_MINIFICATION=1 ./build-uberjar ;; esac:
parallel: true
+deployment:
+ master:
+ branch: master
+ commands:
+ - ./deploy/deploy_aws.sh $STACK_ID $APP_ID
diff --git a/deploy/aws-eb-docker/.ebextensions/extend_timeout.config b/deploy/aws-eb-docker/.ebextensions/extend_timeout.config
new file mode 100644
index 0000000000000000000000000000000000000000..f81a14bf2db8ec8d8510555e9740e77132601388
--- /dev/null
+++ b/deploy/aws-eb-docker/.ebextensions/extend_timeout.config
@@ -0,0 +1,4 @@
+option_settings:
+ - namespace: aws:elasticbeanstalk:command
+ option_name: Timeout
+ value: 600
diff --git a/deploy/aws-eb-docker/.ebextensions/http_redirect.config b/deploy/aws-eb-docker/.ebextensions/http_redirect.config
new file mode 100644
index 0000000000000000000000000000000000000000..05913d20429b3ad012a30f23086d0b09c2cb066e
--- /dev/null
+++ b/deploy/aws-eb-docker/.ebextensions/http_redirect.config
@@ -0,0 +1,5 @@
+commands:
+ test_command:
+ command: sed -i 's/location \/ {/location \/ {\nif ($http_x_forwarded_proto != "https") {\n set $var "redirect";\n}\n\nif ($request_uri = "\/api\/health") {\n set $var "${var}_health";\n}\n\nif ($var = 'redirect') {\n rewrite ^ https:\/\/$host$request_uri? permanent;\n}\n/' *-proxy.conf
+ cwd: /etc/nginx/sites-available
+ ignoreErrors: true
diff --git a/deploy/aws-eb-docker/Dockerfile b/deploy/aws-eb-docker/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..f25652308eac3519cafa1a27c2d513c87f867fc6
--- /dev/null
+++ b/deploy/aws-eb-docker/Dockerfile
@@ -0,0 +1,23 @@
+FROM ubuntu:trusty
+
+ENV LC_ALL C
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV MB_JETTY_PORT 3000
+
+# basic update of our system + adding Java
+RUN apt-get update && \
+ apt-get install -y openjdk-7-jre
+
+# include our local build in the image
+# TODO: eventually we could probably set this up to download the jar file dynamically
+COPY ./metabase-standalone.jar /app/
+COPY ./run_metabase.sh /app/
+RUN chmod 755 /app/run_metabase.sh
+
+# make our webserver port available
+EXPOSE 3000
+
+# run it
+ENTRYPOINT ["/app/run_metabase.sh"]
diff --git a/deploy/aws-eb-docker/Dockerrun.aws.json b/deploy/aws-eb-docker/Dockerrun.aws.json
new file mode 100644
index 0000000000000000000000000000000000000000..6cb23d3bc46e9bc2844f89ea8ee4c665622ae06b
--- /dev/null
+++ b/deploy/aws-eb-docker/Dockerrun.aws.json
@@ -0,0 +1,4 @@
+{
+ "AWSEBDockerrunVersion": "1",
+ "Logging": "/var/log/metabase"
+}
diff --git a/deploy/aws-eb-docker/run_metabase.sh b/deploy/aws-eb-docker/run_metabase.sh
new file mode 100644
index 0000000000000000000000000000000000000000..558f7bbac7010724d04f977c90cf87eea51e530f
--- /dev/null
+++ b/deploy/aws-eb-docker/run_metabase.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Metabase Web Container
+export MB_JETTY_HOST=$HOSTNAME
+# NOTE: we set MB_JETTY_PORT in our Dockerfile in order to ensure we bind to the port exposed by Docker
+
+# Metabase Database Info
+# TODO: we could make this generic by first checking if the $RDS_* env variables are available and if
+# so then apply the code below and map them to our Metabase env variables
+export MB_DB_DBNAME=$RDS_DB_NAME
+export MB_DB_USER=$RDS_USERNAME
+export MB_DB_PASS=$RDS_PASSWORD
+export MB_DB_HOST=$RDS_HOSTNAME
+export MB_DB_PORT=$RDS_PORT
+
+# TODO: dynamically determine type, probably using the port number
+export MB_DB_TYPE=postgres
+
+java -Dlogfile.path=target/log -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -jar /app/metabase-standalone.jar
diff --git a/deploy/deploy_aws.sh b/deploy/deploy_aws.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b471295cfc9d9f1688caea1908a548eab5e2dee7
--- /dev/null
+++ b/deploy/deploy_aws.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# for reference
+# CIRCLE_SHA1=a3262e9b60a25e6a8a7faa29478b2b455b5ec4a3
+# CIRCLE_BRANCH=master
+
+if [ $# -ne 2 ]; then
+ echo "usage: $0 stackid appid"
+ exit 1
+fi
+
+STACKID=$1
+APPID=$2
+echo "deploying $CIRCLE_SHA1 from $CIRCLE_BRANCH ..."
+aws opsworks create-deployment --stack-id $STACKID --app-id $APPID --comment "deploying $CIRCLE_SHA1 from $CIRCLE_BRANCH" --command='{"Name": "deploy"}'
diff --git a/deploy/deploy_prototype.sh b/deploy/deploy_prototype.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6283b9d62aaed257f81e6800ef2b0856aa970eb6
--- /dev/null
+++ b/deploy/deploy_prototype.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -eo pipefail
+
+BASEDIR=$(dirname $0)
+source "$BASEDIR/functions"
+
+if [ -z $1 ]; then
+ echo "Oops! You need to specify the name of the EB app version to deploy."
+ exit 1
+fi
+
+EB_VERSION_LABEL=$1
+EB_ENVIRONMENT=metabase-proto
+
+# deploy EB version to environment
+deploy_version ${EB_ENVIRONMENT} ${EB_VERSION_LABEL}
diff --git a/deploy/deploy_staging.sh b/deploy/deploy_staging.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ecc7aeb93965352919f0e1f1bce7277efca13b93
--- /dev/null
+++ b/deploy/deploy_staging.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eo pipefail
+
+BASEDIR=$(dirname $0)
+source "$BASEDIR/functions"
+
+EB_ENVIRONMENT=metabase-staging
+
+# deploy EB version to environment
+deploy_version ${EB_ENVIRONMENT}
diff --git a/deploy/deploy_version.sh b/deploy/deploy_version.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ff0c07c34d155379a6e5e26bddc8d169b456ffc7
--- /dev/null
+++ b/deploy/deploy_version.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -eo pipefail
+
+BASEDIR=$(dirname $0)
+source "$BASEDIR/functions"
+
+# deploy EB version to environment
+deploy_version "$1" "$2"
diff --git a/deploy/functions b/deploy/functions
new file mode 100644
index 0000000000000000000000000000000000000000..fc54a51276f9985cca7c59a512d03d7127991464
--- /dev/null
+++ b/deploy/functions
@@ -0,0 +1,92 @@
+#!/bin/bash
+set -eo pipefail
+[[ -f /root/bin/aws.sh ]] && source /root/bin/aws.sh
+
+BASEDIR=$(dirname $0)
+PROJECT_ROOT=$(cd ${BASEDIR}/..; pwd)
+
+ARTIFACTS_DIR="$PROJECT_ROOT/deploy/artifacts"
+ARTIFACTS_S3BUCKET=${S3BUCKET:=metabase-artifacts}
+
+BRANCH=$(cd ${PROJECT_ROOT}; $(which git) rev-parse --abbrev-ref HEAD)
+# OpsWorks creates a deploy branch. We'll use master in this case
+[[ "$BRANCH" == "deploy" ]] && BRANCH="master"
+
+COMMITISH=$(cd ${PROJECT_ROOT}; $(which git) rev-parse --short HEAD)
+DATE=$(date +%Y-%m-%d)
+DEFAULT_RELEASE_ZIP_FILE_NAME="metabase-$BRANCH-$DATE-$COMMITISH.zip"
+
+export LANG=en_US.UTF-8
+export LANGUAGE=$LANG
+export LC_ALL=$LANG
+
+build_uberjar() {
+ [[ "$USER" == "root" ]] && export LEIN_ROOT=true
+ $(which locale) | $(which sort) || true
+
+ echo "building uberjar"
+ ${PROJECT_ROOT}/build-uberjar
+}
+
+upload_release_artifacts() {
+ $(which locale) | $(which sort) || true
+
+ echo "uploading $ARTIFACTS_DIR/*.jar -> $ARTIFACTS_S3BUCKET/jar/"
+ aws s3 cp $ARTIFACTS_DIR/ s3://$ARTIFACTS_S3BUCKET/jar/ --recursive --exclude "*" --include "*.jar"
+ echo "uploading $ARTIFACTS_DIR/*.zip -> $ARTIFACTS_S3BUCKET/eb/"
+ aws s3 cp $ARTIFACTS_DIR/ s3://$ARTIFACTS_S3BUCKET/eb/ --recursive --exclude "*" --include "*.zip"
+}
+
+mk_release_artifacts() {
+ METABASE_JAR_NAME="metabase-standalone.jar"
+ RELEASE_TYPE="aws-eb-docker"
+ RELEASE_JAR_FILE_NAME=${METABASE_JAR_NAME%-standalone.jar}-$BRANCH-$DATE-$COMMITISH.jar
+ RELEASE_ZIP_FILE_NAME="$1"
+ UBERJAR_DIR="${PROJECT_ROOT}/target/uberjar"
+
+ if [[ -z $RELEASE_ZIP_FILE_NAME ]]; then
+ RELEASE_ZIP_FILE_NAME=$DEFAULT_RELEASE_ZIP_FILE_NAME
+ echo "release name not provided defaulting to $RELEASE_ZIP_FILE_NAME"
+ fi
+
+ RELEASE_FILES="${PROJECT_ROOT}/deploy/${RELEASE_TYPE}"
+ RELEASE_FILE="${PROJECT_ROOT}/${RELEASE_ZIP_FILE_NAME}"
+
+ # package up the release files
+ cd $RELEASE_FILES; zip -r $RELEASE_FILE * .ebextensions
+
+ # add the built uberjar
+ cd $UBERJAR_DIR; cp metabase-*-SNAPSHOT-*.jar $METABASE_JAR_NAME ; zip $RELEASE_FILE $METABASE_JAR_NAME
+
+ mkdir -p $ARTIFACTS_DIR
+ rm -f $ARTIFACTS_DIR/*
+ mv -f $RELEASE_FILE $ARTIFACTS_DIR/
+ mv -f $UBERJAR_DIR/$METABASE_JAR_NAME $ARTIFACTS_DIR/$RELEASE_JAR_FILE_NAME
+
+ upload_release_artifacts
+}
+
+create_eb_version() {
+ EB_APPLICATION=Metabase
+ EB_VERSION_LABEL=$1
+ S3_KEY=$2
+
+ $(which locale) | $(which sort) || true
+
+ [[ -z "$EB_VERSION_LABEL" ]] && EB_VERSION_LABEL="$BRANCH-$DATE-$COMMITISH"
+ [[ -z "$S3_KEY" ]] && S3_KEY=$DEFAULT_RELEASE_ZIP_FILE_NAME
+
+ echo "Creating app version in EB"
+ aws elasticbeanstalk create-application-version --no-auto-create-application --region us-east-1 --application-name ${EB_APPLICATION} --version-label ${EB_VERSION_LABEL} --source-bundle S3Bucket="${ARTIFACTS_S3BUCKET}",S3Key="eb/${S3_KEY}"
+}
+
+deploy_version() {
+ EB_ENVIRONMENT=$1
+ EB_VERSION_LABEL=$2
+
+ $(which locale) | $(which sort) || true
+
+ [[ -z "$EB_ENVIRONMENT" ]] && EB_VERSION_LABEL="metabase-staging" && echo ""
+ [[ -z "$EB_VERSION_LABEL" ]] && EB_VERSION_LABEL="$BRANCH-$DATE-$COMMITISH"
+ aws elasticbeanstalk update-environment --region us-east-1 --environment-name ${EB_ENVIRONMENT} --version-label ${EB_VERSION_LABEL}
+}
diff --git a/deploy/mk_release.sh b/deploy/mk_release.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b3b5a88dbd9eff24ac17a5de80c5af1011f2eed3
--- /dev/null
+++ b/deploy/mk_release.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -eo pipefail
+
+BASEDIR=$(dirname $0)
+source "$BASEDIR/functions"
+
+build_uberjar
+mk_release_artifacts "$1"
diff --git a/deploy/upload_version.sh b/deploy/upload_version.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3aa6e2cefd064ebaea9192008f81c5c1babfed5b
--- /dev/null
+++ b/deploy/upload_version.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eo pipefail
+
+BASEDIR=$(dirname $0)
+source "$BASEDIR/functions"
+
+create_eb_version "$1" "$2"
diff --git a/docs/INFORMATION_COLLECTION.md b/docs/INFORMATION_COLLECTION.md
new file mode 100644
index 0000000000000000000000000000000000000000..a630be6906d4166724834a5b8dc685e358147afd
--- /dev/null
+++ b/docs/INFORMATION_COLLECTION.md
@@ -0,0 +1,81 @@
+# About the Information we collect:
+
+Metabase uses Google Analytics to collect anonymous usage information from the installed servers that enable this feature. Below are the events we have instrumented, as well as the information we collect about the user performing the action and the instance being used.
+
+While this list of anonymous information we collect might seem long, it’s useful to compare this to other alternatives. With a typical SaaS platform, not only will this information be collected, but it will also be accompanied by information about your data, how often it is accessed, the specific queries that you use, specific numbers of records all tied to your company and current plan.
+
+We collect this information to improve your experience and the quality of Metabase, and in the list below, we spell out exactly why we collect each bit of information.
+
+If you prefer not to provide us with this anonymous usage data, please go to your instance’s admin section and set the “collect-anonymouse-usage-metrics†value to False.
+
+
+### Example questions we want to answer:
+* Is our query interface working?
+ * Are users stopping halfway through a question?
+ * Are users using filters?
+ * Are users using groupings?
+ * How often are users using bare rows vs other aggregation options?
+ * are people clicking on column headings to sort or manually adding a sort clause?
+* How often are users writing SQL instead of using the query interface?
+ * are these queries written by a select group of analysts or is the entire company sql literate?
+* Are people using dashboards as a starting point for queries?
+* how many clicks are there on dashboard cards?
+* How many of these clicks result in modified queries that are executed?
+* How often are questions saved?
+* How often are saved questions added to dashboards?
+
+
+### What we will do with the answers to these questions:
+* Prioritize improvements in the query interface vs the SQL interface.
+* Optimize the product for the usage patterns our users are using the product for
+* Stay on top of browser incompatibilities
+* Optimize our dashboards for either passive consumption or as a starting point for further exploration depending on how they are being used
+
+While we will closely follow reported issues and feature requests, we aim to make as many of our users happy and provide them with improvements in features that matter to them. Allowing us to collect information about your instance gives your users a vote in future improvements in a direct way.
+
+
+# The data we collect:
+
+
+### Events
+
+| Category | Action | Why we collect this|
+|---------|--------|--------------------|
+| Card Query Builder | Card added to dashboard | To understand how often users add cards to dashboards. If we find that people mainly add cards vs keep them free standing, we will prioritize dashboards features vs ad hoc questioning. |
+| Card Query Builder | filter added | Are users actively filtering in queries or using materialized views? |
+| Card Query Builder | aggregation added | Are users mainly looking at rows or segments of tables or running aggregate metrics. If the former, we intend to improve the power of our segmentation features. |
+| Card Query Builder | group by added | How often do users slice and dice information by dimensions? Is this intuitive? Are users trying and failing to do this? |
+| Card Query Builder | sort added | How often do users manually sort vs use the sort icon on the columns? |
+| Card Query Builder | sort icon clicked | How often do users manually sort vs use the sort icon on the columns? |
+| Card Query Builder | limit applied | How often do users manually limit the results that come back? |
+| Card Query Builder | query ran | Looking for mismatches between people adding sorts, limits, etc and actually running the query. Are there discrepencies between these numbers and the rest of the query clause events? Are there browsers or languages where these numbers are out of wack? |
+| Card Query Builder | saved | How often are users saving a question for later vs running quick Ad Hoc questions? |
+| SQL Query | started | How often do users need to revert to SQL? If this is very high, it’s an indication our query language is not expressive enough or the query builder easy enough. We watch this number to understand how to improve our query language. |
+| SQL Query | run | How often are sql queries started but not run? This is used as an alerting condition on bugs or issues with the SQL interface. |
+| SQL Query | saved | How often are people saving sql backed questions? |
+| SQL Query | Card added to dashboard | This helps us understand whether our query language is expressive enough for ad hoc queries, whether it is also expressive enough for canonical dashboards, or if it doesn’t go far enough in one or both of those cases. |
+| Dashboard | Rearrange Started | How often do users wish to rearrange their dashboards? |
+| Dashboard | Rearrange Finished | How often do users commit their changes to dashboard lay out. If this number is much less than rearrange starts, there might be a bug or UX issue. |
+| Dashboard | Card Clicked | How often are dashboard cards used as a starting point for further exploration? |
+
+
+
+### Visitor Custom Variables
+
+| Name | Value | Why we collect this |
+| ---- | ----- | ------------------- |
+| User newb score | # sql queries written | To understand if “bad†conditions (such as users starting queries but not executing them) are due to novice users |
+| User newb score |# non-sql queries written |To understand if “bad†conditions (such as users starting queries but not executing them) are due to novice users|
+| User newb score | total queries written | To understand if “bad†conditions (such as users starting queries but not executing them) are due to novice users|
+| Instance newb score |# databases |To understand how many databases are typically used by our users. If we see that a typical installation has many databases, we will prioritize |
+| Instance newb score | # admins | To know if we should provide tools that allow a group of admins to collaboratively annotate data, manage connections, or we can ignore these features. |
+| Instance newb score | # active users |To understand if problems or active usage correlate with how many users are using the instance. Are there issues that compound as more users are asking questions and creating dashboards?|
+| Instance newb score |# dashboards| How many dashboards do our instances typically have? Should we optimize our interface for companies with a few core dashboards or many special use dashboards?|
+| Instance newb score |# saved sql questions | To understand how much our user base depends on raw SQL questions vs using our query language. This determines how much we emphasis on tools for writing SQL vs improving the query lanauge.|
+| Instance newb score |# saved non-sql questions | To understand how much our user base depends on raw SQL questions vs using our query language. This determines how much we emphasis on tools for writing SQL vs improving the query lanauge.|
+| Instance newb score |% tables annotated |To understand if certain “bad†conditions (such as users starting queries but not executing them) are linked to whether there is enough metadata added by the instance administrators|
+| Instance newb score |% fields annotated |To understand if certain “bad†conditions (such as users starting queries but not executing them) are linked to whether there is enough metadata added by the instance administrators |
+
+
+
+
diff --git a/docs/developers-guide.md b/docs/developers-guide.md
index 119adc41e959ad4196aa6774230376a895654c51..9a8c039f4e8f77db6fbc4381a7ba23b5d9bf8869 100644
--- a/docs/developers-guide.md
+++ b/docs/developers-guide.md
@@ -36,7 +36,7 @@ Then run the HTTP server with
Check that the project can compile successfully with
- lein uberjar
+ ./build-uberjar
Run the linters with
diff --git a/lein_tasks/leiningen/npm.clj b/lein_tasks/leiningen/npm.clj
deleted file mode 100644
index 79f9e4d93bda5b699dc5ec61c851010292c2835e..0000000000000000000000000000000000000000
--- a/lein_tasks/leiningen/npm.clj
+++ /dev/null
@@ -1,11 +0,0 @@
-(ns leiningen.npm
- (:use clojure.java.shell))
-
-
-(defn npm [projects & args]
- ;; TODO - some better validations such as checking if `npm` is available
- (println "Running `npm install` to download javascript dependencies")
- (let [result (sh "npm" "install")]
- (if (= 0 (:exit result))
- (println (:out result))
- (println (:err result)))))
\ No newline at end of file
diff --git a/lein_tasks/leiningen/webpack.clj b/lein_tasks/leiningen/webpack.clj
deleted file mode 100644
index 3bc9aa3314de60dd2cdd5542ac402d34b4591cb2..0000000000000000000000000000000000000000
--- a/lein_tasks/leiningen/webpack.clj
+++ /dev/null
@@ -1,12 +0,0 @@
-(ns leiningen.webpack
- (:require [clojure.java.shell :refer :all]))
-
-;; Set the CI_DISABLE_WEBPACK_MINIFICATION environment variable to skip minification which takes ~6+ minutes on CircleCI
-(defn webpack [projects & args]
- ;; TODO - some better validations such as checking that we have webpack available
- (println "Running `webpack -p` to assemble and minify frontend assets")
- (let [result (sh (str (:root projects) "/node_modules/webpack/bin/webpack.js") (if (System/getenv "CI_DISABLE_WEBPACK_MINIFICATION") ""
- "-p"))]
- (if (= 0 (:exit result))
- (println (:out result))
- (println (:err result)))))
diff --git a/package.json b/package.json
index d9fc9c4f7b75cbbd2018fadd6e47df08a1e8d914..826a3a93ed62ad0127ea32cb19a47da9bb1220a1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
"ace-builds": "git://github.com/ajaxorg/ace-builds",
"angular": "1.2.28",
"angular-animate": "1.2.28",
- "angular-bootstrap": "0.12.0",
"angular-cookie": "git://github.com/ivpusic/angular-cookie#v4.0.6",
"angular-cookies": "1.2.28",
"angular-gridster": "0.11.7",
@@ -23,20 +22,23 @@
"angular-route": "1.2.28",
"angular-sanitize": "1.2.28",
"angular-ui-ace": "0.2.3",
+ "angular-ui-bootstrap": "^0.12.1",
"angular-xeditable": "git://github.com/vitalets/angular-xeditable#0.1.9",
"angularytics": "0.3.0",
+ "classnames": "^2.1.3",
"crossfilter": "1.3.11",
"d3": "3.5.3",
"d3-tip": "^0.6.7",
"dc": "2.0.0-beta.1",
"fixed-data-table": "0.2.0",
+ "humanize-plus": "1.5.0",
+ "inflection": "1.7.1",
"jquery": "2.1.4",
"moment": "2.9.0",
"ng-sortable": "1.2.0",
"ngreact": "0.1.5",
"react": "0.12.2",
- "react-datepicker": "0.5.1",
- "react-onclickoutside": "0.2.2",
+ "react-onclickoutside": "0.2.4",
"tether": "0.6.5",
"underscore": "1.8.3"
},
@@ -53,9 +55,11 @@
"eslint-plugin-react": "^2.5.0",
"extract-text-webpack-plugin": "^0.8.1",
"glob": "^5.0.10",
+ "html-webpack-plugin": "git://github.com/tlrobinson/html-webpack-plugin.git#562acca0363224f156c0bcc87d064a1e2f72611c",
"istanbul-instrumenter-loader": "^0.1.3",
"jasmine-core": "^2.3.4",
"karma": "^0.12.36",
+ "karma-chrome-launcher": "^0.2.0",
"karma-coverage": "^0.4.2",
"karma-jasmine": "^0.3.5",
"karma-webpack": "^1.5.1",
diff --git a/project.clj b/project.clj
index 3454e3ac94e875bff0876ab9ef96d05ed67d7080..9d2a02ee719147fdb8e1de7b8b4d5b1dd02f5cff 100644
--- a/project.clj
+++ b/project.clj
@@ -5,32 +5,31 @@
:description "Metabase Community Edition"
:url "http://metabase.com/"
:min-lein-version "2.5.0"
- :aliases {"test" ["with-profile" "+expectations" "expectations"]}
- :dependencies [[org.clojure/clojure "1.6.0"]
- [org.clojure/core.async "LATEST"] ; facilities for async programming + communication (using 'LATEST' because this is an alpha library)
+ :aliases {"test" ["with-profile" "+expectations" "expectations"]
+ "generate-sample-dataset" ["with-profile" "+generate-sample-dataset" "run"]}
+ :dependencies [[org.clojure/clojure "1.7.0"]
+ [org.clojure/core.logic "0.8.10"]
[org.clojure/core.match "0.3.0-alpha4"] ; optimized pattern matching library for Clojure
- [org.clojure/math.numeric-tower "0.0.4"] ; math functions like `ceil`
[org.clojure/core.memoize "0.5.7"] ; needed by core.match; has useful FIFO, LRU, etc. caching mechanisms
[org.clojure/data.csv "0.1.2"] ; CSV parsing / generation
- [org.clojure/data.json "0.2.6"] ; JSON parsing / generation
[org.clojure/java.classpath "0.2.2"]
- [org.clojure/java.jdbc "0.3.7"] ; basic jdbc access from clojure
+ [org.clojure/java.jdbc "0.4.1"] ; basic jdbc access from clojure
+ [org.clojure/math.numeric-tower "0.0.4"] ; math functions like `ceil`
[org.clojure/tools.logging "0.3.1"] ; logging framework
[org.clojure/tools.macro "0.1.5"] ; tools for writing macros
[org.clojure/tools.namespace "0.2.10"]
[org.clojure/tools.reader "0.9.2"] ; Need to explictly specify this dep otherwise expectations doesn't seem to work right :'(
- [org.clojure/tools.trace "0.7.8"] ; "tracing macros/fns to help you see what your code is doing"
[amalloy/ring-gzip-middleware "0.1.3"] ; Ring middleware to GZIP responses if client can handle it
[cheshire "5.5.0"] ; fast JSON encoding (used by Ring JSON middleware)
[clj-http-lite "0.2.1"] ; HTTP client; lightweight version of clj-http that uses HttpURLConnection instead of Apache
- [clj-time "0.9.0"] ; library for dealing with date/time
+ [clj-time "0.10.0"] ; library for dealing with date/time
[colorize "0.1.1" :exclusions [org.clojure/clojure]] ; string output with ANSI color codes (for logging)
[com.cemerick/friend "0.2.1"] ; auth library
[com.draines/postal "1.11.3"] ; SMTP library
[com.h2database/h2 "1.4.187"] ; embedded SQL database
- [com.mattbertolini/liquibase-slf4j "1.2.1"]
- [com.novemberain/monger "2.1.0"] ; MongoDB Driver
- [compojure "1.3.4"] ; HTTP Routing library built on Ring
+ [com.mattbertolini/liquibase-slf4j "1.2.1"] ; Java Migrations lib
+ [com.novemberain/monger "3.0.0"] ; MongoDB Driver
+ [compojure "1.4.0"] ; HTTP Routing library built on Ring
[environ "1.0.0"] ; easy environment management
[hiccup "1.0.5"] ; HTML templating
[korma "0.4.2"] ; SQL lib
@@ -39,13 +38,15 @@
javax.jms/jms
com.sun.jdmk/jmxtools
com.sun.jmx/jmxri]]
- [medley "0.6.0"] ; lightweight lib of useful functions
- [org.liquibase/liquibase-core "3.3.5"] ; migration management (Java lib)
+ [medley "0.7.0"] ; lightweight lib of useful functions
+ [mysql/mysql-connector-java "5.1.36"] ; MySQL JDBC driver
+ [org.liquibase/liquibase-core "3.4.0"] ; migration management (Java lib)
[org.slf4j/slf4j-log4j12 "1.7.12"]
[org.yaml/snakeyaml "1.15"] ; YAML parser (required by liquibase)
[postgresql "9.3-1102.jdbc41"] ; Postgres driver
- [ring/ring-jetty-adapter "1.3.2"] ; Ring adapter using Jetty webserver (used to run a Ring server for unit tests)
+ [ring/ring-jetty-adapter "1.4.0"] ; Ring adapter using Jetty webserver (used to run a Ring server for unit tests)
[ring/ring-json "0.3.1"] ; Ring middleware for reading/writing JSON automatically
+ [stencil "0.4.0"] ; Mustache templates for Clojure
[swiss-arrows "1.0.0"]] ; 'Magic wand' macro -<>, etc.
:plugins [[lein-environ "1.0.0"] ; easy access to environment variables
[lein-ring "0.9.3"]] ; start the HTTP server with 'lein ring server'
@@ -59,32 +60,40 @@
:init metabase.core/init}
:eastwood {:exclude-namespaces [:test-paths]
:add-linters [:unused-private-vars]
- :exclude-linters [:constant-test]} ; korma macros generate some formats with if statements that are always logically true or false
+ :exclude-linters [:constant-test ; korma macros generate some forms with if statements that are always logically true or false
+ :suspicious-expression ; core.match macros generate some forms like (and expr) which is "suspicious"
+ :unused-ret-vals]} ; gives too many false positives for functions with side-effects like conj!
:profiles {:dev {:dependencies [[org.clojure/tools.nrepl "0.2.10"] ; REPL <3
- [expectations "2.1.1"] ; unit tests
+ [expectations "2.1.2"] ; unit tests
[marginalia "0.8.0"] ; for documentation
[ring/ring-mock "0.2.0"]]
- :plugins [[cider/cider-nrepl "0.9.0"] ; Interactive development w/ cider NREPL in Emacs
+ :plugins [[cider/cider-nrepl "0.9.1"] ; Interactive development w/ cider NREPL in Emacs
[jonase/eastwood "0.2.1"] ; Linting
- [lein-ancient "0.6.5"] ; Check project for outdated dependencies + plugins w/ 'lein ancient'
+ [lein-ancient "0.6.7"] ; Check project for outdated dependencies + plugins w/ 'lein ancient'
[lein-bikeshed "0.2.0"] ; Linting
[lein-environ "1.0.0"] ; Specify env-vars in project.clj
[lein-expectations "0.0.8"] ; run unit tests with 'lein expectations'
- [lein-instant-cheatsheet "2.1.1"] ; use awesome instant cheatsheet created by yours truly w/ 'lein instant-cheatsheet'
+ [lein-instant-cheatsheet "2.1.4"] ; use awesome instant cheatsheet created by yours truly w/ 'lein instant-cheatsheet'
[lein-marginalia "0.8.0"] ; generate documentation with 'lein marg'
- [refactor-nrepl "1.1.0-SNAPSHOT"]] ; support for advanced refactoring in Emacs/LightTable
+ [refactor-nrepl "1.1.0"]] ; support for advanced refactoring in Emacs/LightTable
:global-vars {*warn-on-reflection* true} ; Emit warnings on all reflection calls
:jvm-opts ["-Dlogfile.path=target/log"
"-Xms1024m" ; give JVM a decent heap size to start with
"-Xmx2048m" ; hard limit of 2GB so we stop hitting the 4GB container limit on CircleCI
"-XX:+CMSClassUnloadingEnabled" ; let Clojure's dynamically generated temporary classes be GC'ed from PermGen
"-XX:+UseConcMarkSweepGC"]} ; Concurrent Mark Sweep GC needs to be used for Class Unloading (above)
- :expectations {:injections [(require 'metabase.test-setup)]
+ :expectations {:global-vars {*warn-on-reflection* false}
+ :injections [(require 'metabase.test-setup)]
:resource-paths ["test_resources"]
:env {:mb-test-setting-1 "ABCDEFG"}
- :jvm-opts ["-Dmb.db.file=target/metabase-test"
+ :jvm-opts ["-Dmb.db.in.memory=true"
"-Dmb.jetty.join=false"
- "-Dmb.jetty.port=3001"
- "-Dmb.api.key=test-api-key"]}
- :uberjar {:aot :all
- :prep-tasks ^:replace ["npm" "webpack" "javac" "compile"]}})
+ "-Dmb.jetty.port=3010"
+ "-Dmb.api.key=test-api-key"
+ "-Xverify:none"]} ; disable bytecode verification when running tests so they start slightly faster
+ :uberjar {:aot :all}
+ :generate-sample-dataset {:dependencies [[faker "0.2.2"] ; Fake data generator -- port of Perl/Ruby
+ [incanter/incanter-core "1.5.6"]] ; Satistical functions like normal distibutions}})
+ :source-paths ["sample_dataset"]
+ :global-vars {*warn-on-reflection* false}
+ :main ^:skip-aot metabase.sample-dataset.generate}})
diff --git a/resources/frontend_client/app/admin/databases/databases.controllers.js b/resources/frontend_client/app/admin/databases/databases.controllers.js
index c18fc9fb9f17c467e186d7627b74321365aeb098..b91682c686b86fb6986b8e9cb40c6741724238f5 100644
--- a/resources/frontend_client/app/admin/databases/databases.controllers.js
+++ b/resources/frontend_client/app/admin/databases/databases.controllers.js
@@ -3,7 +3,9 @@
var DatabasesControllers = angular.module('corvusadmin.databases.controllers', ['corvus.metabase.services']);
-DatabasesControllers.controller('DatabaseList', ['$scope', 'Metabase', function($scope, Metabase) {
+DatabasesControllers.controller('DatabaseList', ['$scope', 'Metabase', 'CorvusCore', function($scope, Metabase, CorvusCore) {
+
+ $scope.ENGINES = CorvusCore.ENGINES;
$scope.databases = [];
@@ -121,6 +123,16 @@ DatabasesControllers.controller('DatabaseEdit', ['$scope', '$routeParams', '$loc
return call.$promise;
};
+ $scope.delete = function() {
+ Metabase.db_delete({
+ 'dbId': $scope.database.id
+ }, function(result) {
+ $location.path('/admin/databases/');
+ }, function(error) {
+ console.log('error deleting database', error);
+ });
+ };
+
// load our form input data
Metabase.db_form_input(function(form_input) {
$scope.form_input = form_input;
@@ -154,349 +166,3 @@ DatabasesControllers.controller('DatabaseEdit', ['$scope', '$routeParams', '$loc
}
}
]);
-
-DatabasesControllers.controller('DatabaseMasterDetail', ['$scope', '$route', '$routeParams',
- function($scope, $route, $routeParams) {
- $scope.pane = 'settings';
-
- // mildly hacky way to prevent reloading controllers as the URL changes
- var lastRoute = $route.current;
- $scope.$on('$locationChangeSuccess', function (event) {
- if ($route.current.$$route.controller === 'DatabaseMasterDetail') {
- var params = $route.current.params;
- $route.current = lastRoute;
- angular.forEach(params, function(value, key) {
- $route.current.params[key] = value;
- $routeParams[key] = value;
- });
- }
- });
-
- $scope.routeParams = $routeParams;
- $scope.$watch('routeParams', function() {
- $scope.pane = $routeParams.mode;
- }, true);
- }
-]);
-
-DatabasesControllers.controller('DatabaseTables', ['$scope', '$routeParams', '$location', '$q', 'Metabase',
- function($scope, $routeParams, $location, $q, Metabase) {
- $scope.tableFields = {};
-
- $scope.routeParams = $routeParams;
- $scope.$watch('routeParams', function() {
- loadData();
- }, true);
-
- function loadData() {
- return loadDatabase()
- .then(function() {
- return updateTable();
- })
- .catch(function(error) {
- console.log('error loading data', error);
- if (error.status == 404) {
- $location.path('/admin/databases');
- }
- });
- }
-
- function loadDatabase() {
- if ($scope.$parent.database && $scope.$parent.database.id == $routeParams.databaseId) {
- return $q.all([]); // just return an empty promise if we already loaded this db
- } else {
- return $q.all([
- Metabase.db_get({ 'dbId': $routeParams.databaseId }).$promise
- .then(function(database) {
- $scope.$parent.database = database;
- }),
- Metabase.db_tables({ 'dbId': $routeParams.databaseId }).$promise
- .then(function(tables) {
- $scope.tables = tables;
- })
- ]);
- }
- }
-
- function updateTable() {
- if ($routeParams.tableId !== undefined) {
- $scope.$parent.table = $scope.tables.filter(function(t) { return $routeParams.tableId == t.id; })[0];
- if (!$scope.$parent.table) {
- $location.path('/admin/databases/'+$routeParams.databaseId+'/tables');
- }
- }
- }
- }
-]);
-
-
-DatabasesControllers.controller('DatabaseTable', ['$scope', '$routeParams', '$location', 'Metabase', 'ForeignKey',
- function($scope, $routeParams, $location, Metabase, ForeignKey) {
- $scope.routeParams = $routeParams;
- $scope.$watch('routeParams', function() {
- loadData();
- }, true);
-
- function loadData() {
- Metabase.table_query_metadata({
- 'tableId': $routeParams.tableId,
- 'include_sensitive_fields': true
- }, function(result) {
- $scope.table = result;
- $scope.getIdFields();
- $scope.decorateWithTargets();
- }, function(error) {
- console.log(error);
- if (error.status == 404) {
- $location.path('/');
- }
- });
- }
-
- $scope.getIdFields = function() {
- // fetch the ID fields
- Metabase.db_idfields({
- 'dbId': $scope.table.db.id
- }, function(result) {
- if (result && !result.error) {
- $scope.idfields = result;
- result.forEach(function(field) {
- field.displayName = field.table.name + '.' + field.name;
- });
- } else {
- console.log(result);
- }
- });
-
- };
-
- $scope.decorateWithTargets = function() {
- $scope.table.fields.forEach(function(field) {
- if (field.target) {
- field.target_id = field.target.id;
- }
- });
- };
-
- $scope.syncMetadata = function() {
- Metabase.table_sync_metadata({
- 'tableId': $routeParams.tableId
- }, function(result) {
- // nothing to do here really
- }, function(error) {
- console.log('error doing metabase sync', error);
- });
- };
-
- $scope.inlineSave = function() {
- if ($scope.table) {
- Metabase.table_update($scope.table, function(result) {
- // there is a difference between the output of table/:id and table/:id/query_metadata
- // so we don't actually want to overwrite $scope.table with this data in this case
- //$scope.table = result;
- }, function(error) {
- console.log('error updating table', error);
- });
- }
- };
-
- $scope.inlineSpecialTypeChange = function(idx) {
- // If we are changing the field from a FK to something else, we should delete any FKs present
- var field = $scope.table.fields[idx];
- if (field.target_id && field.special_type != "fk") {
- // we have something that used to be an FK and is now not an FK
- // Let's delete its foreign keys
- var fks = Metabase.field_foreignkeys({
- 'fieldId': field.id
- }, function(result) {
- fks.forEach(function(fk) {
- console.log("deleting ", fk);
- ForeignKey.delete({
- 'fkID': fks[0].id
- }, function(result) {
- console.log("deleted fk");
- }, function(error) {
- console.log("error deleting fk");
- });
- });
- });
- // clean up after ourselves
- field.target = null;
- field.target_id = null;
- }
- // save the field
- $scope.inlineSaveField(idx);
- };
-
- $scope.inlineSaveField = function(idx) {
- if ($scope.table.fields && $scope.table.fields[idx]) {
- Metabase.field_update($scope.table.fields[idx], function(result) {
- if (result && !result.error) {
- $scope.table.fields[idx] = result;
- } else {
- console.log(result);
- }
- });
- }
- };
-
- $scope.inlineChangeFKTarget = function(idx) {
- // This function notes a change in the target of the target of a foreign key
- // If there is already a target, we should delete that FK and create a new one
- // This is meant to be transitional until we add an FK modify function to the API
- // If there was not a target, we should create a new FK
- if ($scope.table.fields && $scope.table.fields[idx]) {
- var field = $scope.table.fields[idx];
- var new_target_id = field.target_id;
-
- var fks = Metabase.field_foreignkeys({
- 'fieldId': field.id
- });
-
- if (fks.length > 0) {
- // delete this key
- var relationship_id = 0;
- ForeignKey.delete({
- 'fkID': fks[0].id
- }, function(result) {
- console.log("Deleted FK");
- Metabase.field_addfk({
- "db": $scope.table.db.id,
- "fieldId": field.id,
- 'target_field': new_target_id,
- "relationship": "Mt1"
- });
-
- }, function(error) {
- console.log('Error deleting key ', error);
- });
- } else {
- Metabase.field_addfk({
- "db": $scope.table.db.id,
- "fieldId": field.id,
- 'target_field': new_target_id,
- "relationship": "Mt1"
- });
- }
- }
- };
-
- $scope.deleteTarget = function(field, target) {
-
- };
-
- $scope.dragControlListeners = {
- containment: '.EntityGroup',
- orderChanged: function(event) {
- // Change order here
- var new_order = _.map($scope.table.fields, function(field) {
- return field.id;
- });
- Metabase.table_reorder_fields({
- 'tableId': $routeParams.tableId,
- 'new_order': new_order
- });
- }
- };
- }
-]);
-
-
-
-DatabasesControllers.controller('DatabaseTableField', ['$scope', '$routeParams', '$location', 'Metabase', 'ForeignKey',
- function($scope, $routeParams, $location, Metabase, ForeignKey) {
-
- $scope.inlineSave = function() {
- console.log($scope.field);
- if ($scope.field) {
- Metabase.field_update($scope.field, function(result) {
- if (result && !result.error) {
- $scope.field = result;
- } else {
- console.log(result);
- }
- });
- }
- };
-
- $scope.updateMappedValues = function() {
- Metabase.field_value_map_update({
- 'fieldId': $routeParams.fieldId,
- 'values_map': $scope.field_values.human_readable_values
- }, function(result) {
- // nothing to do
- }, function(error) {
- console.log('Error');
- });
- };
-
- $scope.toggleAddRelationshipModal = function() {
- // toggle display
- $scope.modalShown = !$scope.modalShown;
- };
-
- $scope.relationshipAdded = function(relationship) {
- // this is here to clone the original array so that we can modify it
- // by default the deserialized data from an api response is immutable
- $scope.fks = $scope.fks.slice(0);
- $scope.fks.push(relationship);
- };
-
- $scope.deleteRelationship = function(relationship_id) {
- // this is here to clone the original array so that we can modify it
- // by default the deserialized data from an api response is immutable
- ForeignKey.delete({
- 'fkID': relationship_id
- }, function(result) {
- $scope.fks = _.reject($scope.fks, function(fk) {
- return fk.id == relationship_id;
- });
- }, function(error) {
- console.log('Error deleting key ', error);
- });
- };
-
- // $scope.field
- // $scope.pivots
- // $scope.fks
- $scope.modalShown = false;
-
- Metabase.field_get({
- 'fieldId': $routeParams.fieldId
- }, function(result) {
- $scope.field = result;
-
- // grab where this field is foreign keyed to
- Metabase.field_foreignkeys({
- 'fieldId': $routeParams.fieldId
- }, function(result) {
- $scope.fks = result;
- }, function(error) {
- console.log('error getting fks for field', error);
- });
-
- // grab summary data about our field
- Metabase.field_summary({
- 'fieldId': $routeParams.fieldId
- }, function(result) {
- $scope.field_summary = result;
- }, function(error) {
- console.log('error gettting field summary', error);
- });
-
- // grab our field values
- Metabase.field_values({
- 'fieldId': $routeParams.fieldId
- }, function(result) {
- $scope.field_values = result;
- }, function(error) {
- console.log('error getting field values', error);
- });
- }, function(error) {
- console.log(error);
- if (error.status == 404) {
- $location.path('/');
- }
- });
- }
-]);
diff --git a/resources/frontend_client/app/admin/databases/databases.module.js b/resources/frontend_client/app/admin/databases/databases.module.js
index 46b0fc9d2235592a3d37145dd465a01d42518a8a..9955d4f75e27d25688c595a9018f8936f6daca08 100644
--- a/resources/frontend_client/app/admin/databases/databases.module.js
+++ b/resources/frontend_client/app/admin/databases/databases.module.js
@@ -13,17 +13,8 @@ AdminDatabases.config(['$routeProvider', function ($routeProvider) {
templateUrl: '/app/admin/databases/partials/database_edit.html',
controller: 'DatabaseEdit'
});
-
$routeProvider.when('/admin/databases/:databaseId', {
- redirectTo: '/admin/databases/:databaseId/tables'
- });
- $routeProvider.when('/admin/databases/:databaseId/:mode', {
- templateUrl: '/app/admin/databases/partials/database_master_detail.html',
- controller: 'DatabaseMasterDetail'
- });
- $routeProvider.when('/admin/databases/:databaseId/:mode/:tableId', {
- templateUrl: '/app/admin/databases/partials/database_master_detail.html',
- controller: 'DatabaseMasterDetail'
+ templateUrl: '/app/admin/databases/partials/database_edit.html',
+ controller: 'DatabaseEdit'
});
-
}]);
diff --git a/resources/frontend_client/app/admin/databases/partials/database_edit.html b/resources/frontend_client/app/admin/databases/partials/database_edit.html
index c7c5f00f0b6907e9ebb07e18a0dd71f50f4b1f2c..ad1883ca6a7563092ea8e35bdd871e8ce96bb195 100644
--- a/resources/frontend_client/app/admin/databases/partials/database_edit.html
+++ b/resources/frontend_client/app/admin/databases/partials/database_edit.html
@@ -6,6 +6,6 @@
<h2 class="Breadcrumb Breadcrumb--page" ng-if="database.id">{{database.name}}</h2>
</section>
- <section class="Grid Grid--gutters Grid--full" ng-include="'/app/admin/databases/partials/database_edit_pane.html'" >
+ <section class="Grid Grid--gutters Grid--2-of-3" ng-include="'/app/admin/databases/partials/database_edit_pane.html'" >
</section>
</div>
diff --git a/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html b/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html
index 3b498823bf6d2ec3da281362622fd435da0d7234..742c246c4a1af38ca5989a0813c79d3912fc95ad 100644
--- a/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html
+++ b/resources/frontend_client/app/admin/databases/partials/database_edit_forms.html
@@ -2,21 +2,11 @@
<!-- DB Engine (database.engine) -->
<div class="Form-field" mb-form-field="engine">
<mb-form-label display-name="Database type" field-name="engine"></mb-form-label>
- <ul class="Form-offset full mt2" ng-show="!database.engine">
- <li class="DatabaseEngine" ng-repeat="(type, properties) in ENGINES">
- <mb-icon name="check" class="DatabaseEngine-check" width="16px" height="16px"></mb-icon>
- <div ng-click="database.engine = type">
- {{properties.name}}
- </div>
- </li>
- </ul>
- <div class="Form-offset mr4" ng-show="database.engine">
- <div class="DatabaseEngine DatabaseEngine--selected flex align-center">
- <mb-icon name="check" class="DatabaseEngine-check" width="16px" height="16px"></mb-icon>
- <span class="flex-full">{{database.engine}}</span>
- <mb-icon name="close" width="16px" height="16px" ng-click="database.engine = null"></mb-icon>
- </div>
- </div>
+ <label class="Select Form-offset mt1">
+ <select class="Select" ng-model="database.engine" ng-options="type as properties.name for (type, properties) in ENGINES">
+ <option value="" disabled selected>Select a database type</option>
+ </select>
+ </label>
</div>
<!-- DB Nickname (database.name) -->
@@ -33,8 +23,9 @@
Otherwise we'll default to showing every field. This way we can hide 'advanced options' like SSL during the setup process -->
<div class="Form-field" ng-repeat="field in ENGINES[database.engine].fields" mb-form-field="{{field.fieldName}}" ng-if="!hiddenFields[field.fieldName]">
<mb-form-label display-name="{{field.displayName}}" field-name="{{field.fieldName}}"></mb-form-label>
+
<!-- Multiple-Choice Field -->
- <div ng-if="field.choices" class="Form-input Form-offset full Button-group">
+ <div ng-if="field.type == 'select'" class="Form-input Form-offset full Button-group">
<button ng-repeat="choice in field.choices" class="Button"
ng-class="details[field.fieldName] === choice.value ? {active: 'Button--active',
danger: 'Button--danger'}[choice.selectionAccent] : null"
@@ -42,8 +33,13 @@
{{choice.name}}
</button>
</div>
+
+ <!-- Password Field -->
+ <input ng-if="field.type == 'password'" type="password" class="Form-input Form-offset full" name="{{field.fieldName}}" placeholder="{{field.placeholder}}"
+ ng-model="details[field.fieldName]" ng-required="field.required" />
+
<!-- String Field (default) -->
- <input ng-if="!field.choices" class="Form-input Form-offset full" name="{{field.fieldName}}" placeholder="{{field.placeholder}}"
+ <input ng-if="field.type == 'text'" class="Form-input Form-offset full" name="{{field.fieldName}}" placeholder="{{field.placeholder}}"
ng-model="details[field.fieldName]" ng-required="field.required" />
<span class="Form-charm"></span>
</div>
diff --git a/resources/frontend_client/app/admin/databases/partials/database_edit_pane.html b/resources/frontend_client/app/admin/databases/partials/database_edit_pane.html
index b2444dbb04315160be66d652d60fedd4a2f0c3e3..95608c68809dcc4534853c6c14d68863a0de5ab7 100644
--- a/resources/frontend_client/app/admin/databases/partials/database_edit_pane.html
+++ b/resources/frontend_client/app/admin/databases/partials/database_edit_pane.html
@@ -14,7 +14,7 @@
</div>
<!-- Sidebar Actions -->
-<div class="Grid-cell" ng-if="database.id">
+<div class="Grid-cell Cell--1of3" ng-if="database.id">
<div class="Actions bordered rounded shadowed">
<h3>Actions</h3>
<div class="Actions-group">
@@ -24,7 +24,7 @@
<div class="Actions-group Actions--dangerZone">
<label class="Actions-groupLabel block">Danger Zone:</label>
<!-- TODO: this doesn't do anything because its unclear if its really safe to delete dbs -->
- <button class="Button Button--danger">Remove this database</button>
+ <button class="Button Button--danger" ng-click="delete()" delete-confirm>Remove this database</button>
</div>
</div>
</div>
diff --git a/resources/frontend_client/app/admin/databases/partials/database_list.html b/resources/frontend_client/app/admin/databases/partials/database_list.html
index 224c217c1785806b12d66aefb6a97fbf6459e534..a209711625dd44f32173d4c3eb16040a7d69f384 100644
--- a/resources/frontend_client/app/admin/databases/partials/database_list.html
+++ b/resources/frontend_client/app/admin/databases/partials/database_list.html
@@ -22,10 +22,10 @@
</tr>
<tr ng-repeat="database in databases">
<td>
- <a class="text-bold link" href="/admin/databases/{{database.id}}/tables">{{database.name}}</a>
+ <a class="text-bold link" href="/admin/databases/{{database.id}}">{{database.name}}</a>
</td>
<td>
- {{database.engine}}
+ {{ENGINES[database.engine].name}}
</td>
<td class="Table-actions">
<!-- TODO: sync now button? -->
diff --git a/resources/frontend_client/app/admin/databases/partials/database_master_detail.html b/resources/frontend_client/app/admin/databases/partials/database_master_detail.html
deleted file mode 100644
index 0e282931db5cda7e8309be89080577cbf720fc11..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/admin/databases/partials/database_master_detail.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="wrapper full-height flex flex-column">
- <section class="my3 flex align-center">
- <h3 class="py2">{{database.name}}</h2>
- <div class="py2 flex-align-right">
- <div class="Button-group Button-group--blue text-uppercase text-bold">
- <a class="Button AdminHoverItem" ng-class="{ 'Button--active': pane == 'tables' }" href="/admin/databases/{{database.id}}/tables/{{table.id}}">Data</a>
- <a class="Button AdminHoverItem" ng-class="{ 'Button--active': pane == 'settings' }" href="/admin/databases/{{database.id}}/settings">Connection Details</a>
- </div>
- </div>
- </section>
-
- <section class="DatabaseTablesAdmin Grid bordered rounded shadowed flex-full mb4" ng-show="pane == 'tables'">
- <div class="DatabaseTablesAdminSidebar relative Grid-cell Cell--1of3 border-right" ng-controller="DatabaseTables" ng-include="'/app/admin/databases/partials/database_table_list.html'">
- </div>
-
- <div class="DatabaseTableAdmin relative Grid-cell" ng-controller="DatabaseTable" ng-if="table" ng-include="'/app/admin/databases/partials/database_table_detail.html'">
- </div>
- <div class="Grid-cell flex layout-centered relative" ng-if="!table">
- <h2 class="text-grey-3">Select any table to see its schema and add or edit metadata.</h2>
- </div>
- </section>
-
- <section ng-show="pane == 'settings'" ng-controller="DatabaseEdit">
- <div class="Grid Grid--gutters Grid--full md-Grid--1of2" ng-include="'/app/admin/databases/partials/database_edit_pane.html'" >
- </div>
- </section>
-</div>
diff --git a/resources/frontend_client/app/admin/databases/partials/database_table_detail.html b/resources/frontend_client/app/admin/databases/partials/database_table_detail.html
deleted file mode 100644
index 50895f3dfaa63c9b0a067389cc823d1f7ddb9302..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/admin/databases/partials/database_table_detail.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="TableField py4 pr4">
- <label class="Select Select--small float-right">
- <select ng-class="{CustomTypeApplied: table.entity_type, 'Select--unselected': !table.entity_type }" ng-model="table.entity_type" ng-change="inlineSave()" ng-options="ent_type.id as ent_type.name for ent_type in utils.table_entity_types"></select>
- </label>
- <div>
- <span class="h2 text-bold" editable-text="table.entity_name" e-form="tableNameForm" onaftersave="inlineSave()">
- {{table.entity_name || table.name}}
- </span>
- <span class="h5" ng-click="tableNameForm.$show()" ng-hide="tableNameForm.$visible">
- Rename
- </span>
- </div>
- <div class="mt2 full">
- <a e-class="full" href="#" ng-class="{EditedEntity: table.description }" editable-text="table.description" onaftersave="inlineSave()">
- {{table.description || "Add a description..."}}
- </a>
- </div>
-</div>
-<div class="TableFieldList" mb-scroll-shadow>
- <ul as-sortable="dragControlListeners" ng-model="table.fields">
- <li class="TableField AdminHoverItem py2 pr4 relative" ng-repeat="field in table.fields track by field.id" as-sortable-item>
- <div class="Drag-handle" title="Reorder" as-sortable-item-handle>
- <svg width="9" height="36">
- <rect class="Dragger" fill="url(#dragger)" width="6" height="42">
- </svg>
- </div>
- <div class="Grid">
- <div class="Grid-cell">
- <input ng-model="field.preview_display" type="checkbox" ng-change="inlineSaveField($index)">
-
- <h3 class="TableField-name inline-block">
- {{field.name}}
- </h3>
- <span class="EntityOriginalType inline-block">{{field.base_type}}</span>
-
- <div class="full">
- <a e-class="full" href="#" ng-class="{EditedEntity: field.description }" editable-text="field.description" onaftersave="inlineSaveField($index)">
- {{field.description || "Add a description..."}}
- </a>
- </div>
- </div>
-
- <div class="Grid Grid-cell Cell--1of3 py1 flex align-start">
- <label class="Grid-cell mx2 Select Select--small Select--blue">
- <select ng-model="field.field_type" ng-change="inlineSaveField($index)" ng-options="spec_type.id as spec_type.name for spec_type in utils.field_field_types">
- </select>
- </label>
- <div class="Grid-cell flex flex-column">
- <label class="Select flex-full Select--small Select--purple">
- <select ng-model="field.special_type" ng-change="inlineSpecialTypeChange($index)" ng-options="spec_type.id as spec_type.name for spec_type in utils.field_special_types">
- </select>
- </label>
- <label class="Select Select--small mt1" ng-if="field.special_type=='fk'">
- <select ng-model="field.target_id" ng-change="inlineChangeFKTarget($index)" ng-options="idf.id as idf.displayName for idf in idfields">
- <option value="" disabled selected>Target Field</option>
- </select>
- </label>
- </div>
- </div>
- </div>
- </li>
- </ul>
-</div>
diff --git a/resources/frontend_client/app/admin/databases/partials/database_table_list.html b/resources/frontend_client/app/admin/databases/partials/database_table_list.html
deleted file mode 100644
index c2aa47c4963ca279ab787862003016dbbb8ddda6..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/admin/databases/partials/database_table_list.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="border-bottom py1">
- <mb-icon name="search" class="ml2 text-grey-2" width="18" height="18"></mb-icon>
- <input class="Form-input Form-input--medium mx1" type="text" placeholder="Search for a table name" value="" ng-model="tableSearchText" autofocus>
-</div>
-<div class="DatabaseList" mb-scroll-shadow>
- <ul class="p2">
- <li class="flex flex-column layout-centered full-height text-grey-3" ng-show="!tables">
- <cv-loading-icon class="text-brand"></cv-loading-icon>
- <h3>Loading ...</h3>
- </li>
- <li class="DatabaseListItem AdminHoverItem rounded py1 px2 text-grey-4" ng-class="{ 'DatabaseListItem--active': t.id == table.id }" ng-repeat="t in tables | filter:tableSearchText">
- <a class="link link--nohover text-current" href="/admin/databases/{{database.id}}/tables/{{t.id}}">
- <h4>{{t.name}}</h4>
- </a>
- </li>
- </ul>
-</div>
diff --git a/resources/frontend_client/app/admin/metadata/components/Input.react.js b/resources/frontend_client/app/admin/metadata/components/Input.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1b74c73ab86050d7b7ac5f52416a09870eef58c
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/Input.react.js
@@ -0,0 +1,43 @@
+"use strict";
+
+export default React.createClass({
+ displayName: "Input",
+ propTypes: {
+ type: React.PropTypes.string,
+ value: React.PropTypes.string,
+ placeholder: React.PropTypes.string,
+ onChange: React.PropTypes.func,
+ onBlurChange: React.PropTypes.func
+ },
+
+ getDefaultProps: function() {
+ return {
+ type: "text"
+ };
+ },
+
+ getInitialState: function() {
+ return { value: this.props.value };
+ },
+
+ componentWillReceiveProps: function(newProps) {
+ this.setState({ value: newProps.value });
+ },
+
+ onChange: function(event) {
+ this.setState({ value: event.target.value });
+ if (this.props.onChange) {
+ this.props.onChange(event);
+ }
+ },
+
+ onBlur: function(event) {
+ if (this.props.onBlurChange && (this.props.value || "") !== event.target.value) {
+ this.props.onBlurChange(event);
+ }
+ },
+
+ render: function() {
+ return <input {...this.props} value={this.state.value} onBlur={this.onBlur} onChange={this.onChange} />
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/MetadataEditor.react.js b/resources/frontend_client/app/admin/metadata/components/MetadataEditor.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..16e32c090483a7ea1ce0bbea915ceea63c0369bc
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/MetadataEditor.react.js
@@ -0,0 +1,106 @@
+'use strict';
+/*global _*/
+
+import MetadataHeader from './MetadataHeader.react';
+import MetadataTableList from './MetadataTableList.react';
+import MetadataTable from './MetadataTable.react';
+import MetadataSchema from './MetadataSchema.react';
+
+export default React.createClass({
+ displayName: "MetadataEditor",
+ propTypes: {
+ databaseId: React.PropTypes.number,
+ databases: React.PropTypes.array.isRequired,
+ selectDatabase: React.PropTypes.func.isRequired,
+ tableId: React.PropTypes.number,
+ tables: React.PropTypes.object.isRequired,
+ selectTable: React.PropTypes.func.isRequired,
+ idfields: React.PropTypes.array.isRequired,
+ updateTable: React.PropTypes.func.isRequired,
+ updateField: React.PropTypes.func.isRequired,
+ updateFieldSpecialType: React.PropTypes.func.isRequired,
+ updateFieldTarget: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ isShowingSchema: false
+ }
+ },
+
+ toggleShowSchema: function() {
+ this.setState({ isShowingSchema: !this.state.isShowingSchema });
+ },
+
+ handleSaveResult: function(promise) {
+ this.refs.header.setSaving();
+ promise.then(() => {
+ this.refs.header.setSaved();
+ }, (error) => {
+ this.refs.header.setSaveError(error.data);
+ });
+ },
+
+ updateTable: function(table) {
+ this.handleSaveResult(this.props.updateTable(table));
+ },
+
+ updateField: function(field) {
+ this.handleSaveResult(this.props.updateField(field));
+ },
+
+ updateFieldSpecialType: function(field) {
+ this.handleSaveResult(this.props.updateFieldSpecialType(field));
+ },
+
+ updateFieldTarget: function(field) {
+ this.handleSaveResult(this.props.updateFieldTarget(field));
+ },
+
+ render: function() {
+ var table = this.props.tables[this.props.tableId];
+ var content;
+ if (table) {
+ if (this.state.isShowingSchema) {
+ content = (<MetadataSchema table={table} />);
+ } else {
+ content = (
+ <MetadataTable
+ table={table}
+ idfields={this.props.idfields}
+ updateTable={this.updateTable}
+ updateField={this.updateField}
+ updateFieldSpecialType={this.updateFieldSpecialType}
+ updateFieldTarget={this.updateFieldTarget}
+ />
+ );
+ }
+ } else {
+ content = (
+ <div className="flex flex-full layout-centered">
+ <h2 className="text-grey-3">Select any table to see its schema and add or edit metadata.</h2>
+ </div>
+ );
+ }
+ return (
+ <div className="MetadataEditor flex flex-column flex-full p3">
+ <MetadataHeader
+ ref="header"
+ databaseId={this.props.databaseId}
+ databases={this.props.databases}
+ selectDatabase={this.props.selectDatabase}
+ isShowingSchema={this.state.isShowingSchema}
+ toggleShowSchema={this.toggleShowSchema}
+ />
+ <div className="MetadataEditor-main flex flex-row flex-full mt2">
+ <MetadataTableList
+ tableId={this.props.tableId}
+ tables={this.props.tables}
+ selectTable={this.props.selectTable}
+ />
+ {content}
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/MetadataField.react.js b/resources/frontend_client/app/admin/metadata/components/MetadataField.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ba0c889b930a188b4a20c01781f168906c17348
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/MetadataField.react.js
@@ -0,0 +1,90 @@
+"use strict";
+/*global _*/
+
+import Input from "./Input.react";
+import Select from "./Select.react";
+import Icon from '../../../query_builder/icon.react';
+
+import MetabaseCore from 'metabase/lib/core';
+
+export default React.createClass({
+ displayName: "MetadataField",
+ propTypes: {
+ field: React.PropTypes.object,
+ idfields: React.PropTypes.array.isRequired,
+ updateField: React.PropTypes.func.isRequired,
+ updateFieldSpecialType: React.PropTypes.func.isRequired,
+ updateFieldTarget: React.PropTypes.func.isRequired
+ },
+
+ updateProperty: function(name, value) {
+ this.props.field[name] = value;
+ this.props.updateField(this.props.field);
+ },
+
+ onNameChange: function(event) {
+ this.updateProperty("display_name", event.target.value);
+ },
+
+ onDescriptionChange: function(event) {
+ this.updateProperty("description", event.target.value);
+ },
+
+ onTypeChange: function(type) {
+ this.updateProperty("field_type", type.id);
+ },
+
+ onSpecialTypeChange: function(special_type) {
+ this.props.field.special_type = special_type.id;
+ this.props.updateFieldSpecialType(this.props.field);
+ },
+
+ onTargetChange: function(target_field) {
+ this.props.field.target_id = target_field.id;
+ this.props.updateFieldTarget(this.props.field);
+ },
+
+ render: function() {
+ var targetSelect;
+ if (this.props.field.special_type === "fk") {
+ targetSelect = (
+ <Select
+ className="TableEditor-field-target block"
+ placeholder="Select a target"
+ value={this.props.field.target && _.find(this.props.idfields, (field) => field.id === this.props.field.target.id)}
+ options={this.props.idfields}
+ optionNameFn={(field) => field.displayName}
+ onChange={this.onTargetChange}
+ />
+ );
+ }
+
+ return (
+ <li className="my1 flex">
+ <div className="MetadataTable-title flex flex-column flex-full bordered rounded mr1">
+ <Input className="AdminInput TableEditor-field-name text-bold border-bottom rounded-top" type="text" value={this.props.field.display_name} onBlurChange={this.onNameChange}/>
+ <Input className="AdminInput TableEditor-field-description rounded-bottom" type="text" value={this.props.field.description} onBlurChange={this.onDescriptionChange} placeholder="No table description yet" />
+ </div>
+ <div className="flex-half px1">
+ <Select
+ className="TableEditor-field-type block"
+ placeholder="Select a field type"
+ value={_.find(MetabaseCore.field_field_types, (type) => type.id === this.props.field.field_type)}
+ options={MetabaseCore.field_field_types}
+ onChange={this.onTypeChange}
+ />
+ </div>
+ <div className="flex-half flex flex-column justify-between px1">
+ <Select
+ className="TableEditor-field-special-type block"
+ placeholder="Select a special type"
+ value={_.find(MetabaseCore.field_special_types, (type) => type.id === this.props.field.special_type)}
+ options={MetabaseCore.field_special_types}
+ onChange={this.onSpecialTypeChange}
+ />
+ {targetSelect}
+ </div>
+ </li>
+ )
+ }
+})
diff --git a/resources/frontend_client/app/admin/metadata/components/MetadataHeader.react.js b/resources/frontend_client/app/admin/metadata/components/MetadataHeader.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad948b7aa5597a0e6939d764ba62ab0a9a94f24c
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/MetadataHeader.react.js
@@ -0,0 +1,82 @@
+'use strict';
+
+import SaveStatus from './SaveStatus.react';
+import Toggle from './Toggle.react';
+
+import PopoverWithTrigger from '../../../query_builder/popover_with_trigger.react';
+import ColumnarSelector from '../../../query_builder/columnar_selector.react';
+import Icon from '../../../query_builder/icon.react';
+
+export default React.createClass({
+ displayName: "MetadataHeader",
+ propTypes: {
+ databaseId: React.PropTypes.number,
+ databases: React.PropTypes.array.isRequired,
+ selectDatabase: React.PropTypes.func.isRequired,
+ isShowingSchema: React.PropTypes.bool.isRequired,
+ toggleShowSchema: React.PropTypes.func.isRequired,
+ },
+
+ setSaving: function() {
+ this.refs.status.setSaving.apply(this, arguments);
+ },
+
+ setSaved: function() {
+ this.refs.status.setSaved.apply(this, arguments);
+ },
+
+ setSaveError: function() {
+ this.refs.status.setSaveError.apply(this, arguments);
+ },
+
+ renderDbSelector: function() {
+ var database = this.props.databases.filter((db) => db.id === this.props.databaseId)[0];
+ if (database) {
+ var columns = [{
+ selectedItem: database,
+ items: this.props.databases,
+ itemTitleFn: (db) => db.name,
+ itemSelectFn: (db) => {
+ this.props.selectDatabase(db)
+ this.refs.databasePopover.toggleModal();
+ }
+ }];
+ var tetherOptions = {
+ attachment: 'top center',
+ targetAttachment: 'bottom center',
+ targetOffset: '10px 0'
+ };
+ var triggerElement = (
+ <span className="text-bold cursor-pointer text-default">
+ {database.name}
+ <Icon className="ml1" name="chevrondown" width="8px" height="8px"/>
+ </span>
+ );
+ return (
+ <PopoverWithTrigger
+ ref="databasePopover"
+ className="PopoverBody PopoverBody--withArrow"
+ tetherOptions={tetherOptions}
+ triggerElement={triggerElement}
+ >
+ <ColumnarSelector columns={columns}/>
+ </PopoverWithTrigger>
+ );
+ }
+ },
+
+ render: function() {
+ return (
+ <div className="MetadataEditor-header flex align-center">
+ <div className="MetadataEditor-headerSection h2">
+ <span className="text-grey-4">Edit Metadata for</span> {this.renderDbSelector()}
+ </div>
+ <div className="MetadataEditor-headerSection flex-align-right flex align-center">
+ <SaveStatus ref="status" />
+ <span className="mr1">Show original schema</span>
+ <Toggle value={this.props.isShowingSchema} onChange={this.props.toggleShowSchema} />
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/MetadataSchema.react.js b/resources/frontend_client/app/admin/metadata/components/MetadataSchema.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..dfcff56e956033a6bada901b563fff4cd2a2f6cb
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/MetadataSchema.react.js
@@ -0,0 +1,54 @@
+'use strict';
+/*global _*/
+
+import Input from "./Input.react";
+import MetadataField from "./MetadataField.react";
+
+import cx from "classnames";
+
+export default React.createClass({
+ displayName: "MetadataSchema",
+ propTypes: {
+ table: React.PropTypes.object
+ },
+
+ render: function() {
+ var table = this.props.table;
+ if (!table) {
+ return false;
+ }
+
+ var fields = this.props.table.fields.map((field) => {
+ return (
+ <li key={field.id} className="px1 py2 flex border-bottom">
+ <div className="flex-full flex flex-column mr1">
+ <span className="TableEditor-field-name text-bold">{field.name}</span>
+ </div>
+ <div className="flex-half">
+ <span className="text-bold">{field.base_type}</span>
+ </div>
+ <div className="flex-half">
+ </div>
+ </li>
+ );
+ });
+
+ return (
+ <div className="MetadataTable px2 flex-full">
+ <div className="flex flex-column px1">
+ <div className="TableEditor-table-name text-bold">{this.props.table.name}</div>
+ </div>
+ <div className="mt2 ">
+ <div className="text-uppercase text-grey-3 py1 flex">
+ <div className="flex-full px1">Column</div>
+ <div className="flex-half px1">Data Type</div>
+ <div className="flex-half px1">Additional Info</div>
+ </div>
+ <ol className="border-top border-bottom scroll-y">
+ {fields}
+ </ol>
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/MetadataTable.react.js b/resources/frontend_client/app/admin/metadata/components/MetadataTable.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..3445d7d795470cd722db622cac96e725f4bf6e70
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/MetadataTable.react.js
@@ -0,0 +1,112 @@
+'use strict';
+/*global _*/
+
+import Input from "./Input.react";
+import MetadataField from "./MetadataField.react";
+import ProgressBar from "./ProgressBar.react";
+
+import cx from "classnames";
+
+export default React.createClass({
+ displayName: "MetadataTable",
+ propTypes: {
+ table: React.PropTypes.object,
+ idfields: React.PropTypes.array.isRequired,
+ updateTable: React.PropTypes.func.isRequired,
+ updateField: React.PropTypes.func.isRequired,
+ updateFieldSpecialType: React.PropTypes.func.isRequired,
+ updateFieldTarget: React.PropTypes.func.isRequired
+ },
+
+ isHidden: function() {
+ return !!this.props.table.visibility_type;
+ },
+
+ updateProperty: function(name, value) {
+ this.props.table[name] = value;
+ this.setState({ saving: true });
+ this.props.updateTable(this.props.table);
+ },
+
+ onNameChange: function(event) {
+ this.updateProperty("display_name", event.target.value);
+ },
+
+ onDescriptionChange: function(event) {
+ this.updateProperty("description", event.target.value);
+ },
+
+ renderVisibilityType: function(text, type, any) {
+ var classes = cx("mx1", "text-bold", "text-brand-hover", "cursor-pointer", "text-default", {
+ "text-brand": this.props.table.visibility_type === type || (any && this.props.table.visibility_type)
+ });
+ return <span className={classes} onClick={this.updateProperty.bind(null, "visibility_type", type)}>{text}</span>;
+ },
+
+ renderVisibilityWidget: function() {
+ var subTypes;
+ if (this.props.table.visibility_type) {
+ subTypes = (
+ <span className="border-left mx2">
+ <span className="mx2 text-uppercase text-grey-3">Why Hide?</span>
+ {this.renderVisibilityType("Technical Data", "technical")}
+ {this.renderVisibilityType("Irrellevant/Cruft", "cruft")}
+ </span>
+ );
+ }
+ return (
+ <span>
+ {this.renderVisibilityType("Queryable", null)}
+ {this.renderVisibilityType("Hidden", "hidden", true)}
+ {subTypes}
+ </span>
+ );
+ },
+
+ render: function() {
+ var table = this.props.table;
+ if (!table) {
+ return false;
+ }
+
+ var fields = this.props.table.fields.map((field) => {
+ return (
+ <MetadataField
+ key={field.id}
+ field={field}
+ idfields={this.props.idfields}
+ updateField={this.props.updateField}
+ updateFieldSpecialType={this.props.updateFieldSpecialType}
+ updateFieldTarget={this.props.updateFieldTarget}
+ />
+ );
+ });
+
+ return (
+ <div className="MetadataTable px2 flex-full">
+ <div className="MetadataTable-title flex flex-column bordered rounded">
+ <Input className="AdminInput TableEditor-table-name text-bold border-bottom rounded-top" type="text" value={this.props.table.display_name} onBlurChange={this.onNameChange}/>
+ <Input className="AdminInput TableEditor-table-description rounded-bottom" type="text" value={this.props.table.description} onBlurChange={this.onDescriptionChange} placeholder="No table description yet" />
+ </div>
+ <div className="MetadataTable-header flex align-center py2 text-grey-3">
+ <span className="mx1 text-uppercase">Visibility</span>
+ {this.renderVisibilityWidget()}
+ <span className="flex-align-right flex align-center">
+ <span className="text-uppercase mr1">Metadata Strength</span>
+ <ProgressBar percentage={table.metadataStrength} />
+ </span>
+ </div>
+ <div className={"mt2 " + (this.isHidden() ? "disabled" : "")}>
+ <div className="text-uppercase text-grey-3 py1 flex">
+ <div className="flex-full px1">Column</div>
+ <div className="flex-half px1">Type</div>
+ <div className="flex-half px1">Details</div>
+ </div>
+ <ol className="border-top border-bottom scroll-y">
+ {fields}
+ </ol>
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/MetadataTableList.react.js b/resources/frontend_client/app/admin/metadata/components/MetadataTableList.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..520b811fc7c7e007b93dc0c2004612886f734289
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/MetadataTableList.react.js
@@ -0,0 +1,93 @@
+'use strict';
+/*global _*/
+
+import ProgressBar from './ProgressBar.react';
+import Icon from '../../../query_builder/icon.react';
+
+import cx from 'classnames';
+import Humanize from 'humanize';
+
+export default React.createClass({
+ displayName: "MetadataTableList",
+ propTypes: {
+ tableId: React.PropTypes.number,
+ tables: React.PropTypes.object.isRequired,
+ selectTable: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ searchText: null,
+ searchRegex: null
+ };
+ },
+
+ updateSearchText: function(event) {
+ this.setState({
+ searchText: event.target.value,
+ searchRegex: event.target.value ? new RegExp(RegExp.escape(event.target.value), "i") : null
+ });
+ },
+
+ render: function() {
+ var queryableTablesHeader, hiddenTablesHeader;
+ var queryableTables = [];
+ var hiddenTables = [];
+
+ if (this.props.tables) {
+ var tables = _.sortBy(this.props.tables, "display_name");
+ _.each(tables, (table) => {
+ var classes = cx("AdminList-item", "flex", "align-center", "no-decoration", {
+ "selected": this.props.tableId === table.id
+ });
+ var row = (
+ <li key={table.id}>
+ <a href="#" className={classes} onClick={this.props.selectTable.bind(null, table)}>
+ {table.display_name}
+ <ProgressBar className="ProgressBar ProgressBar--mini flex-align-right" percentage={table.metadataStrength} />
+ </a>
+ </li>
+ );
+ var regex = this.state.searchRegex;
+ if (!regex || regex.test(table.display_name) || regex.test(table.name)) {
+ if (table.visibility_type) {
+ hiddenTables.push(row);
+ } else {
+ queryableTables.push(row);
+ }
+ }
+ });
+ }
+
+ if (queryableTables.length > 0) {
+ queryableTablesHeader = <li className="AdminList-section">{queryableTables.length} Queryable {Humanize.pluralize(queryableTables.length, "Table")}</li>;
+ }
+ if (hiddenTables.length > 0) {
+ hiddenTablesHeader = <li className="AdminList-section">{hiddenTables.length} Hidden {Humanize.pluralize(hiddenTables.length, "Table")}</li>;
+ }
+ if (queryableTables.length === 0 && hiddenTables.length === 0) {
+ queryableTablesHeader = <li className="AdminList-section">0 Tables</li>;
+ }
+
+ return (
+ <div className="MetadataEditor-table-list AdminList">
+ <div className="AdminList-search">
+ <Icon name="search" width="16" height="16"/>
+ <input
+ className="AdminInput pl4 border-bottom"
+ type="text"
+ placeholder="Find a table"
+ value={this.state.searchText}
+ onChange={this.updateSearchText}
+ />
+ </div>
+ <ul className="AdminList-items">
+ {queryableTablesHeader}
+ {queryableTables}
+ {hiddenTablesHeader}
+ {hiddenTables}
+ </ul>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/ProgressBar.react.js b/resources/frontend_client/app/admin/metadata/components/ProgressBar.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea671f0a5e036a5302d900fc44a5385a199f8cc0
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/ProgressBar.react.js
@@ -0,0 +1,22 @@
+'use strict';
+
+export default React.createClass({
+ displayName: "ProgressBar",
+ propTypes: {
+ percentage: React.PropTypes.number.isRequired
+ },
+
+ getDefaultProps: function() {
+ return {
+ className: "ProgressBar"
+ };
+ },
+
+ render: function() {
+ return (
+ <div className={this.props.className}>
+ <div className="ProgressBar-progress" style={{"width": (this.props.percentage * 100) + "%"}}></div>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/SaveStatus.react.js b/resources/frontend_client/app/admin/metadata/components/SaveStatus.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..bbc468ae53901ea20f1a16d22f243d77e15d3a0c
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/SaveStatus.react.js
@@ -0,0 +1,48 @@
+'use strict';
+
+import Icon from '../../../query_builder/icon.react';
+import LoadingIcon from '../../../components/icons/loading.react';
+
+export default React.createClass({
+ displayName: "SaveStatus",
+
+ getInitialState: function() {
+ return {
+ saving: false,
+ recentlySavedTimeout: null,
+ error: null
+ }
+ },
+
+ setSaving: function() {
+ clearTimeout(this.state.recentlySavedTimeout);
+ this.setState({ saving: true, recentlySavedTimeout: null, error: null });
+ },
+
+ setSaved: function() {
+ clearTimeout(this.state.recentlySavedTimeout);
+ var recentlySavedTimeout = setTimeout(() => this.setState({ recentlySavedTimeout: null }), 5000);
+ this.setState({ saving: false, recentlySavedTimeout: recentlySavedTimeout, error: null });
+ },
+
+ setSaveError: function(error) {
+ this.setState({ saving: false, recentlySavedTimeout: null, error: error });
+ },
+
+ render: function() {
+ if (this.state.saving) {
+ return (<div className="SaveStatus mx2 px2 border-right"><LoadingIcon width="24" height="24" /></div>);
+ } else if (this.state.error) {
+ return (<div className="SaveStatus mx2 px2 border-right text-error">Error: {this.state.error}</div>)
+ } else if (this.state.recentlySavedTimeout != null) {
+ return (
+ <div className="SaveStatus mx2 px2 border-right flex align-center text-success">
+ <Icon name="check" width="16" height="16" />
+ <div className="ml1 h3 text-bold">Saved</div>
+ </div>
+ )
+ } else {
+ return <span />;
+ }
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/Select.react.js b/resources/frontend_client/app/admin/metadata/components/Select.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..0d39598eb3fff61f930bef9b1c2f4432ec73420d
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/Select.react.js
@@ -0,0 +1,79 @@
+"use strict";
+
+import ColumnarSelector from '../../../query_builder/columnar_selector.react';
+import Icon from '../../../query_builder/icon.react';
+import PopoverWithTrigger from '../../../query_builder/popover_with_trigger.react';
+
+export default React.createClass({
+ displayName: "Select",
+ propTypes: {
+ value: React.PropTypes.any,
+ options: React.PropTypes.array.isRequired,
+ placeholder: React.PropTypes.string,
+ onChange: React.PropTypes.func,
+ optionNameFn: React.PropTypes.func,
+ optionValueFn: React.PropTypes.func
+ },
+
+ getDefaultProps: function() {
+ return {
+ isInitiallyOpen: false,
+ placeholder: "",
+ optionNameFn: (option) => option.name,
+ optionValueFn: (option) => option
+ };
+ },
+
+ toggleModal: function() {
+ this.refs.popover.toggleModal();
+ },
+
+ render: function() {
+ var selectedName = this.props.value ? this.props.optionNameFn(this.props.value) : this.props.placeholder;
+
+ var triggerElement = (
+ <div className={"flex align-center " + (!this.props.value ? " text-grey-3" : "")}>
+ <span className="mr1">{selectedName}</span>
+ <Icon className="flex-align-right" name="chevrondown" width="10" height="10"/>
+ </div>
+ );
+
+ var sections = {};
+ this.props.options.forEach(function (option) {
+ var sectionName = option.section || "";
+ sections[sectionName] = sections[sectionName] || { title: sectionName || undefined, items: [] };
+ sections[sectionName].items.push(option);
+ });
+ sections = Object.keys(sections).map((sectionName) => sections[sectionName]);
+
+ var columns = [
+ {
+ selectedItem: this.props.value,
+ sections: sections,
+ itemTitleFn: this.props.optionNameFn,
+ itemDescriptionFn: (item) => item.description,
+ itemSelectFn: (item) => {
+ this.props.onChange(this.props.optionValueFn(item))
+ this.toggleModal();
+ }
+ }
+ ];
+
+ var tetherOptions = {
+ attachment: 'top center',
+ targetAttachment: 'bottom center',
+ targetOffset: '5px 0'
+ };
+
+ return (
+ <PopoverWithTrigger ref="popover"
+ className={"PopoverBody PopoverBody--withArrow " + (this.props.className || "")}
+ tetherOptions={tetherOptions}
+ triggerElement={triggerElement}
+ triggerClasses={"AdminSelect " + (this.props.className || "")}>
+ <ColumnarSelector columns={columns}/>
+ </PopoverWithTrigger>
+ );
+ }
+
+});
diff --git a/resources/frontend_client/app/admin/metadata/components/Toggle.react.js b/resources/frontend_client/app/admin/metadata/components/Toggle.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b065b1945c354e40462ca1e3ec6a9552ee38118
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/components/Toggle.react.js
@@ -0,0 +1,23 @@
+"use strict";
+
+import cx from "classnames";
+
+export default React.createClass({
+ displayName: "Toggle",
+ propTypes: {
+ value: React.PropTypes.bool.isRequired,
+ onChange: React.PropTypes.func
+ },
+
+ onClick: function() {
+ if (this.props.onChange) {
+ this.props.onChange(!this.props.value);
+ }
+ },
+
+ render: function() {
+ return (
+ <a href="#" className={cx("Toggle", "no-decoration", { selected: this.props.value })} onClick={this.onClick} />
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/metadata/metadata.controllers.js b/resources/frontend_client/app/admin/metadata/metadata.controllers.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5db85816781dc6985d679acc7db05f993838252
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/metadata.controllers.js
@@ -0,0 +1,176 @@
+'use strict';
+/*global _*/
+
+import MetadataEditor from './components/MetadataEditor.react';
+
+angular
+.module('metabase.admin.metadata.controllers', [
+ 'corvus.services',
+ 'corvus.directives',
+ 'metabase.forms'
+])
+.controller('MetadataEditor', ['$scope', '$route', '$routeParams', '$location', '$q', '$timeout', 'databases', 'Metabase', 'ForeignKey',
+function($scope, $route, $routeParams, $location, $q, $timeout, databases, Metabase, ForeignKey) {
+ // inject the React component to be rendered
+ $scope.MetadataEditor = MetadataEditor;
+
+ $scope.metabaseApi = Metabase;
+
+ $scope.databaseId = null;
+ $scope.databases = databases;
+
+ $scope.tableId = null;
+ $scope.tables = {};
+
+ $scope.idfields = [];
+
+ // mildly hacky way to prevent reloading controllers as the URL changes
+ var lastRoute = $route.current;
+ $scope.$on('$locationChangeSuccess', function (event) {
+ if ($route.current.$$route.controller === 'MetadataEditor') {
+ var params = $route.current.params;
+ $route.current = lastRoute;
+ angular.forEach(params, function(value, key) {
+ $route.current.params[key] = value;
+ $routeParams[key] = value;
+ });
+ }
+ });
+
+ $scope.routeParams = $routeParams;
+ $scope.$watch('routeParams', function() {
+ $scope.databaseId = $routeParams.databaseId ? parseInt($routeParams.databaseId) : null
+ $scope.tableId = $routeParams.tableId ? parseInt($routeParams.tableId) : null
+
+ // default to the first database
+ if ($scope.databaseId == null && $scope.databases.length > 0) {
+ $scope.selectDatabase($scope.databases[0]);
+ }
+ }, true);
+
+ $scope.$watch('databaseId', async function() {
+ $scope.tables = {};
+ if ($scope.databaseId != null) {
+ try {
+ await loadTableMetadata();
+ await loadIdFields();
+ $timeout(() => $scope.$digest());
+ } catch (error) {
+ console.warn("error loading tables", error)
+ }
+ }
+ }, true);
+
+ async function loadTableMetadata() {
+ var tables = await Metabase.db_tables({ 'dbId': $scope.databaseId }).$promise;
+ await* tables.map(async function(table) {
+ $scope.tables[table.id] = await Metabase.table_query_metadata({
+ 'tableId': table.id,
+ 'include_sensitive_fields': true
+ }).$promise;
+ computeMetadataStrength($scope.tables[table.id]);
+ });
+ }
+
+ async function loadIdFields() {
+ var result = await Metabase.db_idfields({ 'dbId': $scope.databaseId }).$promise;
+ if (result && !result.error) {
+ $scope.idfields = result.map(function(field) {
+ field.displayName = field.table.display_name + " → " + field.display_name;
+ return field;
+ });
+ } else {
+ console.warn(result);
+ }
+ }
+
+ $scope.selectDatabase = function(db) {
+ $location.path('/admin/metadata/'+db.id);
+ };
+
+ $scope.selectTable = function(table) {
+ $location.path('/admin/metadata/'+table.db_id+'/table/'+table.id);
+ };
+
+ $scope.updateTable = function(table) {
+ return Metabase.table_update(table).$promise.then(function(result) {
+ _.each(result, (value, key) => { if (key.charAt(0) !== "$") { table[key] = value } });
+ computeMetadataStrength($scope.tables[table.id]);
+ $timeout(() => $scope.$digest());
+ });
+ };
+
+ $scope.updateField = function(field) {
+ return Metabase.field_update(field).$promise.then(function(result) {
+ _.each(result, (value, key) => { if (key.charAt(0) !== "$") { field[key] = value } });
+ computeMetadataStrength($scope.tables[field.table_id]);
+ return loadIdFields();
+ }).then(function() {
+ $timeout(() => $scope.$digest());
+ });
+ };
+
+ function computeMetadataStrength(table) {
+ var total = 0;
+ var completed = 0;
+ function score(value) {
+ total++;
+ if (value) { completed++; }
+ }
+
+ score(table.description);
+ table.fields.forEach(function(field) {
+ score(field.description);
+ score(field.special_type);
+ if (field.special_type === "fk") {
+ score(field.target);
+ }
+ });
+
+ table.metadataStrength = completed / total;
+ }
+
+ $scope.updateFieldSpecialType = async function(field) {
+ // If we are changing the field from a FK to something else, we should delete any FKs present
+ if (field.target && field.target.id != null && field.special_type !== "fk") {
+ // we have something that used to be an FK and is now not an FK
+ // Let's delete its foreign keys
+ try {
+ await deleteAllFieldForeignKeys(field);
+ } catch (e) {
+ console.warn("Errpr deleting foreign keys", e);
+ }
+ // clean up after ourselves
+ field.target = null;
+ field.target_id = null;
+ }
+ // save the field
+ return $scope.updateField(field);
+ };
+
+ $scope.updateFieldTarget = async function(field) {
+ // This function notes a change in the target of the target of a foreign key
+ // If there is already a target, we should delete that FK and create a new one
+ // This is meant to be transitional until we add an FK modify function to the API
+ // If there was not a target, we should create a new FK
+ try {
+ await deleteAllFieldForeignKeys(field);
+ } catch (e) {
+ console.warn("Error deleting foreign keys", e);
+ }
+ var result = await Metabase.field_addfk({
+ "db": $scope.databaseId,
+ "fieldId": field.id,
+ 'target_field': field.target_id,
+ "relationship": "Mt1"
+ }).$promise;
+ field.target = result.destination;
+ };
+
+ async function deleteAllFieldForeignKeys(field) {
+ var fks = await Metabase.field_foreignkeys({ 'fieldId': field.id }).$promise;
+ return await* fks.map(function(fk) {
+ return ForeignKey.delete({ 'fkID': fk.id }).$promise;
+ });
+ }
+}]);
diff --git a/resources/frontend_client/app/admin/metadata/metadata.module.js b/resources/frontend_client/app/admin/metadata/metadata.module.js
new file mode 100644
index 0000000000000000000000000000000000000000..d0d4f3d0a687924f48120f9f3b7acd16d8f5c734
--- /dev/null
+++ b/resources/frontend_client/app/admin/metadata/metadata.module.js
@@ -0,0 +1,23 @@
+'use strict';
+/*global require*/
+
+angular
+.module('metabase.admin.metadata', [
+ 'metabase.admin.metadata.controllers'
+])
+.config(['$routeProvider', function ($routeProvider) {
+ var metadataRoute = {
+ template: '<div class="flex flex-column flex-full" mb-react-component="MetadataEditor"></div>',
+ controller: 'MetadataEditor',
+ resolve: {
+ databases: ['Metabase', function(Metabase) {
+ return Metabase.db_list().$promise
+ }]
+ }
+ };
+
+ $routeProvider.when('/admin/metadata', metadataRoute);
+ $routeProvider.when('/admin/metadata/:databaseId', metadataRoute);
+ $routeProvider.when('/admin/metadata/:databaseId/:mode', metadataRoute);
+ $routeProvider.when('/admin/metadata/:databaseId/:mode/:tableId', metadataRoute);
+}]);
diff --git a/resources/frontend_client/app/admin/settings/components/SettingsEditor.react.js b/resources/frontend_client/app/admin/settings/components/SettingsEditor.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..40f6b90e5e1416327f71fd8ba49d57e0f43911b1
--- /dev/null
+++ b/resources/frontend_client/app/admin/settings/components/SettingsEditor.react.js
@@ -0,0 +1,85 @@
+'use strict';
+/*global _*/
+
+import SettingsHeader from "./SettingsHeader.react";
+import SettingsSetting from "./SettingsSetting.react";
+
+import cx from 'classnames';
+
+export default React.createClass({
+ displayName: "SettingsEditor",
+ propTypes: {
+ sections: React.PropTypes.object.isRequired,
+ updateSetting: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ currentSection: Object.keys(this.props.sections)[0]
+ };
+ },
+
+ selectSection: function(section) {
+ this.setState({ currentSection: section });
+ },
+
+ updateSetting: function(setting, value) {
+ this.refs.header.refs.status.setSaving();
+ setting.value = value;
+ this.props.updateSetting(setting).then(() => {
+ this.refs.header.refs.status.setSaved();
+ }, (error) => {
+ this.refs.header.refs.status.setSaveError(error.data);
+ });
+ },
+
+ handleChangeEvent: function(setting, event) {
+ this.updateSetting(setting, event.target.value);
+ },
+
+ renderSettingsPane: function() {
+ var section = this.props.sections[this.state.currentSection];
+ var settings = section.map((setting, index) => {
+ return <SettingsSetting key={setting.key} setting={setting} updateSetting={this.updateSetting} handleChangeEvent={this.handleChangeEvent} autoFocus={index === 0}/>
+ });
+ return (
+ <div className="MetadataTable px2 flex-full">
+ <ul>{settings}</ul>
+ </div>
+ );
+ },
+
+ renderSettingsSections: function() {
+ var sections = _.map(this.props.sections, (section, sectionName, sectionIndex) => {
+ var classes = cx("AdminList-item", "flex", "align-center", "no-decoration", {
+ "selected": this.state.currentSection === sectionName
+ });
+ return (
+ <li key={sectionName}>
+ <a href="#" className={classes} onClick={this.selectSection.bind(null, sectionName)}>
+ {sectionName}
+ </a>
+ </li>
+ );
+ });
+ return (
+ <div className="MetadataEditor-table-list AdminList">
+ <ul className="AdminList-items pt1">
+ {sections}
+ </ul>
+ </div>
+ );
+ },
+
+ render: function() {
+ return (
+ <div className="MetadataEditor flex flex-column flex-full p4">
+ <SettingsHeader ref="header" />
+ <div className="MetadataEditor-main flex flex-row flex-full mt2">
+ {this.renderSettingsSections()}
+ {this.renderSettingsPane()}
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/admin/settings/components/SettingsHeader.react.js b/resources/frontend_client/app/admin/settings/components/SettingsHeader.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..0991fb6405b1c70e54d7b20b7086992311a8c688
--- /dev/null
+++ b/resources/frontend_client/app/admin/settings/components/SettingsHeader.react.js
@@ -0,0 +1,20 @@
+"use strict";
+
+import SaveStatus from "../../metadata/components/SaveStatus.react";
+
+export default React.createClass({
+ displayName: "SettingsHeader",
+
+ render: function() {
+ return (
+ <div className="MetadataEditor-header flex align-center relative">
+ <div className="MetadataEditor-headerSection h2 text-grey-4">
+ Settings
+ </div>
+ <div className="MetadataEditor-headerSection absolute right top bottom flex layout-centered">
+ <SaveStatus ref="status" />
+ </div>
+ </div>
+ );
+ },
+});
diff --git a/resources/frontend_client/app/admin/settings/components/SettingsSetting.react.js b/resources/frontend_client/app/admin/settings/components/SettingsSetting.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0ec96767a54058fd03f6579aacea25ca9b60232
--- /dev/null
+++ b/resources/frontend_client/app/admin/settings/components/SettingsSetting.react.js
@@ -0,0 +1,91 @@
+"use strict";
+/*global _*/
+
+import Input from "../../metadata/components/Input.react";
+import Select from "../../metadata/components/Select.react";
+import Toggle from "../../metadata/components/Toggle.react";
+
+import cx from "classnames";
+
+export default React.createClass({
+ displayName: "SettingsSetting",
+ propTypes: {
+ setting: React.PropTypes.object.isRequired,
+ updateSetting: React.PropTypes.func.isRequired,
+ handleChangeEvent: React.PropTypes.func.isRequired,
+ autoFocus: React.PropTypes.bool
+ },
+
+ renderStringInput: function(setting, type="text") {
+ var className = type === "password" ? "SettingsPassword" : "SettingsInput";
+ return (
+ <Input
+ className={className + " AdminInput bordered rounded h3"}
+ type={type}
+ value={setting.value}
+ placeholder={setting.placeholder}
+ onBlurChange={this.props.handleChangeEvent.bind(null, setting)}
+ autoFocus={this.props.autoFocus}
+ />
+ );
+ },
+
+ renderRadioInput: function(setting) {
+ var options = _.map(setting.options, (name, value) => {
+ var classes = cx("h3", "text-bold", "text-brand-hover", "no-decoration", { "text-brand": setting.value === value });
+ return (
+ <li className="mr3" key={value}>
+ <a className={classes} href="#" onClick={this.props.updateSetting.bind(null, setting, value)}>{name}</a>
+ </li>
+ );
+ });
+ return <ul className="flex text-grey-4">{options}</ul>
+ },
+
+ renderSelectInput: function(setting) {
+ return (
+ <Select
+ className="full-width"
+ placeholder={setting.placeholder}
+ value={setting.value}
+ options={setting.options}
+ onChange={this.props.updateSetting.bind(null, setting)}
+ optionNameFn={option => option}
+ optionValueFn={option => option}
+ />
+ );
+ },
+
+ renderToggleInput: function(setting) {
+ var on = (setting.value == null ? setting.default : setting.value) === "true";
+ return (
+ <div className="flex align-center pt1">
+ <Toggle value={on} onChange={this.props.updateSetting.bind(null, setting, on ? "false" : "true")}/>
+ <span className="text-bold mx1">{on ? "Enabled" : "Disabled"}</span>
+ </div>
+ );
+ },
+
+ render: function() {
+ var setting = this.props.setting;
+ var control;
+ switch (setting.type) {
+ case "string": control = this.renderStringInput(setting); break;
+ case "password": control = this.renderStringInput(setting, "password"); break;
+ case "select": control = this.renderSelectInput(setting); break;
+ case "radio": control = this.renderRadioInput(setting); break;
+ case "boolean": control = this.renderToggleInput(setting); break;
+ default:
+ console.warn("No render method for setting type " + setting.type + ", defaulting to string input.");
+ control = this.renderStringInput(setting);
+ }
+ return (
+ <li className="m2 mb4">
+ <div className="text-grey-4 text-bold text-uppercase">{setting.display_name}</div>
+ <div className="text-grey-4 my1">{setting.description}</div>
+ <div className="flex">{control}</div>
+ </li>
+ );
+ }
+
+});
diff --git a/resources/frontend_client/app/admin/settings/partials/settings.html b/resources/frontend_client/app/admin/settings/partials/settings.html
deleted file mode 100644
index 21925e800d7fa7eb464c6bc29f7bb36b0e7fe19d..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/admin/settings/partials/settings.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="wrapper">
- <section class="PageHeader">
- <h2 class="PageTitle">Global Settings</h2>
- </section>
-
- <section>
- <table class="ContentTable">
- <thead>
- <tr>
- <th>Name</th>
- <th>Description</th>
- <th>Value</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr ng-show="!settings">
- <td colspan=4>
- <mb-loading-icon></mb-loading-icon>
- <h3>Loading ...</h3>
- </td>
- </tr>
- <tr ng-repeat="setting in settings">
- <td>{{setting.key}}</td>
- <td>{{setting.description}}</td>
- <td>
- <input class="input block full" type="text" placeholder="{{setting.default}}" ng-model="setting.value"></input>
- </td>
- <td class="Table-actions">
- <button class="Button Button--primary" ng-click="saveSetting(setting)" ng-disabled="!setting.value || setting.value === setting.originalValue">Save</button>
- <button class="mx2 Button" ng-class="{'Button--danger': setting.originalValue !== null}" ng-click="deleteSetting(setting)" ng-disabled="!setting.originalValue">Clear</button>
- </td>
- </tr>
- </tbody>
- </table>
- </section>
-</div>
diff --git a/resources/frontend_client/app/admin/settings/settings.controllers.js b/resources/frontend_client/app/admin/settings/settings.controllers.js
index a5e903302d66fab4a4c98c6773adf8e3d72d7769..5be76f9e8428e0a28744d39b4445e418cc5cb839 100644
--- a/resources/frontend_client/app/admin/settings/settings.controllers.js
+++ b/resources/frontend_client/app/admin/settings/settings.controllers.js
@@ -1,40 +1,59 @@
'use strict';
/*global _*/
+import SettingsEditor from './components/SettingsEditor.react';
+
+import Humanize from "humanize";
+
var SettingsAdminControllers = angular.module('corvusadmin.settings.controllers', ['corvusadmin.settings.services']);
-SettingsAdminControllers.controller('SettingsAdminController', ['$scope', 'SettingsAdminServices',
- function($scope, SettingsAdminServices) {
- $scope.settings = [];
-
- SettingsAdminServices.list(function(results) {
- $scope.settings = _.map(results, function(result) {
- result.originalValue = result.value;
- return result;
- });
- }, function(error) {
- console.log("Error fetching settings list: ", error);
- });
-
- $scope.saveSetting = function(setting) {
- SettingsAdminServices.put({
- key: setting.key
- }, setting, function() {
- setting.originalValue = setting.value;
- }, function(error) {
- console.log("Error saving setting: ", error);
- });
- };
-
- $scope.deleteSetting = function(setting) {
- SettingsAdminServices.delete({
- key: setting.key
- }, function() {
- setting.value = null;
- setting.originalValue = null;
- }, function(error) {
- console.log("Error deleting setting: ", error);
- });
- };
+// from common.clj
+var TIMEZONES = [
+ "GMT",
+ "UTC",
+ "US/Alaska",
+ "US/Arizona",
+ "US/Central",
+ "US/Eastern",
+ "US/Hawaii",
+ "US/Mountain",
+ "US/Pacific",
+ "America/Costa_Rica",
+];
+
+// temporary hardcoded metadata
+var EXTRA_SETTINGS_METADATA = {
+ "site-name": { display_name: "Site Name", section: "General", index: 0, type: "string" },
+ "-site-url": { display_name: "Site URL", section: "General", index: 1, type: "string" },
+ "report-timezone": { display_name: "Report Timezone", section: "General", index: 2, type: "select", options: TIMEZONES, placeholder: "Select a timezone" },
+ "anon-tracking-enabled":{ display_name: "Anonymous Tracking", section: "General", index: 3, type: "boolean" },
+ "email-smtp-host": { display_name: "SMTP Host", section: "Email", index: 0, type: "string" },
+ "email-smtp-port": { display_name: "SMTP Port", section: "Email", index: 1, type: "string" },
+ "email-smtp-security": { display_name: "SMTP Security", section: "Email", index: 2, type: "radio", options: { none: "None", tls: "TLS", ssl: "SSL" } },
+ "email-smtp-username": { display_name: "SMTP Username", section: "Email", index: 3, type: "string" },
+ "email-smtp-password": { display_name: "SMTP Password", section: "Email", index: 4, type: "password" },
+ "email-from-address": { display_name: "From Address", section: "Email", index: 5, type: "string" },
+};
+
+SettingsAdminControllers.controller('SettingsEditor', ['$scope', 'SettingsAdminServices', 'AppState', 'settings', function($scope, SettingsAdminServices, AppState, settings) {
+ $scope.SettingsEditor = SettingsEditor;
+
+ $scope.updateSetting = async function(setting) {
+ await SettingsAdminServices.put({ key: setting.key }, setting).$promise;
+ AppState.refreshSiteSettings();
+ }
+
+ $scope.sections = {};
+ settings.forEach(function(setting) {
+ var defaults = { display_name: keyToDisplayName(setting.key), placeholder: setting.default };
+ setting = _.extend(defaults, EXTRA_SETTINGS_METADATA[setting.key], setting);
+ var sectionName = setting.section || "Other";
+ $scope.sections[sectionName] = $scope.sections[sectionName] || [];
+ $scope.sections[sectionName].push(setting);
+ });
+ _.each($scope.sections, (section) => section.sort((a, b) => a.index - b.index))
+
+ function keyToDisplayName(key) {
+ return Humanize.capitalizeAll(key.replace(/-/g, " ")).trim();
}
-]);
+}]);
diff --git a/resources/frontend_client/app/admin/settings/settings.module.js b/resources/frontend_client/app/admin/settings/settings.module.js
index b07e4eac24b9c6b03b91559bee0e149c28a1b994..6571f3c5c4b7e2b15ab8ce5f5d2195e07b81f7e1 100644
--- a/resources/frontend_client/app/admin/settings/settings.module.js
+++ b/resources/frontend_client/app/admin/settings/settings.module.js
@@ -7,7 +7,16 @@ var SettingsAdmin = angular.module('corvusadmin.settings', [
SettingsAdmin.config(['$routeProvider', function($routeProvider) {
$routeProvider.when('/admin/settings/', {
- templateUrl: '/app/admin/settings/partials/settings.html',
- controller: 'SettingsAdminController'
+ template: '<div class="flex flex-column flex-full" mb-react-component="SettingsEditor"></div>',
+ controller: 'SettingsEditor',
+ resolve: {
+ settings: ['SettingsAdminServices', async function(SettingsAdminServices) {
+ var settings = await SettingsAdminServices.list().$promise
+ return settings.map(function(setting) {
+ setting.originalValue = setting.value;
+ return setting;
+ });
+ }]
+ }
});
}]);
diff --git a/resources/frontend_client/app/app.js b/resources/frontend_client/app/app.js
index 17ae7fc075139c4b2a0e0faf1ae1ed8f1b7e6ee3..db25a50a539e38c9aa2eb98e73af0fa55b71b030 100644
--- a/resources/frontend_client/app/app.js
+++ b/resources/frontend_client/app/app.js
@@ -8,7 +8,6 @@ var Corvus = angular.module('corvus', [
'ngCookies',
'ngSanitize',
'xeditable', // inplace editing capabilities
- 'angularytics', // google analytics
'ui.bootstrap', // bootstrap LIKE widgets via angular directives
'gridster', // used for dashboard grids
'ui.sortable',
@@ -22,13 +21,12 @@ var Corvus = angular.module('corvus', [
'corvus.dashboard',
'corvus.explore',
'corvus.home',
- 'corvus.operator', // this is a short term hack
- 'corvus.reserve',
'corvus.user',
'corvus.setup',
'corvusadmin.databases',
'corvusadmin.people',
'corvusadmin.settings',
+ 'metabase.admin.metadata',
]);
Corvus.config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
$locationProvider.html5Mode({
@@ -55,7 +53,8 @@ Corvus.config(['$routeProvider', '$locationProvider', function($routeProvider, $
// TODO: we need an appropriate homepage or something to show in this situation
$routeProvider.otherwise({
- redirectTo: '/user/edit_current'
+ templateUrl: '/app/not_found.html',
+ controller: 'NotFound'
});
}]);
@@ -70,13 +69,3 @@ Corvus.run(["AppState", "editableOptions", "editableThemes", function(AppState,
editableThemes['default'].submitTpl = '<button class="Button Button--primary" type="submit">Save</button>';
editableThemes['default'].cancelTpl = '<button class="Button" ng-click="$form.$cancel()">cancel</button>';
}]);
-
-
-if (document.location.hostname != "localhost") {
- // Only set up logging in production
- Corvus.config(["AngularyticsProvider", function(AngularyticsProvider) {
- AngularyticsProvider.setEventHandlers(['Console', 'GoogleUniversal']);
- }]).run(["Angularytics", function(Angularytics) {
- Angularytics.init();
- }]);
-}
diff --git a/resources/frontend_client/app/auth/auth.controllers.js b/resources/frontend_client/app/auth/auth.controllers.js
index c59b37310bb80913b3afcbf3d82d21cd3ddd3eeb..2ff262cd1adf6e9a155d8069dcc8972ef2a48f60 100644
--- a/resources/frontend_client/app/auth/auth.controllers.js
+++ b/resources/frontend_client/app/auth/auth.controllers.js
@@ -4,13 +4,14 @@
/*global _*/
var AuthControllers = angular.module('corvus.auth.controllers', [
+ 'corvus.auth.services',
'ipCookie',
'corvus.services',
'metabase.forms'
]);
-AuthControllers.controller('Login', ['$scope', '$location', '$timeout', 'ipCookie', 'Session', 'AppState',
- function($scope, $location, $timeout, ipCookie, Session, AppState) {
+AuthControllers.controller('Login', ['$scope', '$location', '$timeout', 'AuthUtil', 'Session', 'AppState',
+ function($scope, $location, $timeout, AuthUtil, Session, AppState) {
var formFields = {
email: 'email',
@@ -35,15 +36,7 @@ AuthControllers.controller('Login', ['$scope', '$location', '$timeout', 'ipCooki
'password': password
}, function (new_session) {
// set a session cookie
- var isSecure = ($location.protocol() === "https") ? true : false;
- ipCookie('metabase.SESSION_ID', new_session.id, {
- path: '/',
- expires: 14,
- secure: isSecure
- });
-
- // send a login notification event
- $scope.$emit('appstate:login', new_session.id);
+ AuthUtil.setSession(new_session.id);
// this is ridiculously stupid. we have to wait (300ms) for the cookie to actually be set in the browser :(
$timeout(function() {
@@ -56,8 +49,8 @@ AuthControllers.controller('Login', ['$scope', '$location', '$timeout', 'ipCooki
};
// do a quick check if the user is already logged in. if so then send them somewhere better.
- if (AppState.model.currentUser && AppState.model.currentUser.memberOf().length > 0) {
- $location.path('/' + AppState.model.currentUser.memberOf()[0].slug + '/');
+ if (AppState.model.currentUser) {
+ $location.path('/');
}
}
]);
@@ -104,9 +97,10 @@ AuthControllers.controller('ForgotPassword', ['$scope', '$cookies', '$location',
}]);
-AuthControllers.controller('PasswordReset', ['$scope', '$routeParams', '$location', 'Session', function($scope, $routeParams, $location, Session) {
+AuthControllers.controller('PasswordReset', ['$scope', '$routeParams', '$location', 'AuthUtil', 'Session', function($scope, $routeParams, $location, AuthUtil, Session) {
$scope.resetSuccess = false;
+ $scope.newUserJoining = ($location.hash() === 'new');
$scope.resetPassword = function(password) {
$scope.$broadcast("form:reset");
@@ -121,6 +115,12 @@ AuthControllers.controller('PasswordReset', ['$scope', '$routeParams', '$locatio
'password': password
}, function (result) {
$scope.resetSuccess = true;
+
+ // we should have a valid session that we can use immediately now!
+ if (result.session_id) {
+ AuthUtil.setSession(result.session_id);
+ }
+
}, function (error) {
$scope.$broadcast("form:api-error", error);
});
diff --git a/resources/frontend_client/app/auth/auth.module.js b/resources/frontend_client/app/auth/auth.module.js
index e7c96722a324393ecc9112ab11aa3f0710b40636..e95038ee34fb966c4c46fbaa556e5fd2f338d451 100644
--- a/resources/frontend_client/app/auth/auth.module.js
+++ b/resources/frontend_client/app/auth/auth.module.js
@@ -22,4 +22,4 @@ Auth.config(['$routeProvider', function($routeProvider) {
templateUrl: '/app/auth/partials/password_reset.html',
controller: 'PasswordReset'
});
-}]);
\ No newline at end of file
+}]);
diff --git a/resources/frontend_client/app/auth/auth.services.js b/resources/frontend_client/app/auth/auth.services.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5b545f1ea439740158961675bf0e178cf47affc
--- /dev/null
+++ b/resources/frontend_client/app/auth/auth.services.js
@@ -0,0 +1,20 @@
+'use strict';
+
+var AuthServices = angular.module('corvus.auth.services', []);
+
+AuthServices.service('AuthUtil', ['$rootScope', '$location', 'ipCookie', function($rootScope, $location, ipCookie) {
+
+ this.setSession = function(sessionId) {
+ // set a session cookie
+ var isSecure = ($location.protocol() === "https") ? true : false;
+ ipCookie('metabase.SESSION_ID', sessionId, {
+ path: '/',
+ expires: 14,
+ secure: isSecure
+ });
+
+ // send a login notification event
+ $rootScope.$broadcast('appstate:login', sessionId);
+ };
+
+}]);
\ No newline at end of file
diff --git a/resources/frontend_client/app/auth/partials/auth_scene.html b/resources/frontend_client/app/auth/partials/auth_scene.html
index 44316acdc13445c8e3acc2b6af3eaf087191f54f..a712e6a95949f47505f1957381237789f49dd72f 100644
--- a/resources/frontend_client/app/auth/partials/auth_scene.html
+++ b/resources/frontend_client/app/auth/partials/auth_scene.html
@@ -1,11 +1,13 @@
<section class="brand-scene absolute bottom left right">
- <svg class="brand-boat" width="27px" height="28px" viewBox="0 0 27 28">
- <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g transform="translate(-52.000000, -49.000000)" fill="#fff">
- <path d="M56.9966734,62.0821591 C56.9548869,62.5960122 56.5246217,63 56,63 C55.4477153,63 55,62.5522847 55,62 C55,61.4477153 55.4477153,61 56,61 C56.1542427,61 56.3003292,61.0349209 56.4307846,61.0972878 C56.4365546,60.9708421 56.4672874,60.8469847 56.5249064,60.738086 L60.591292,53.0527085 C60.6128147,53.0120312 60.6340855,52.9741034 60.6550548,52.9389125 C60.2727349,52.7984089 60,52.4310548 60,52 C60,51.4477153 60.4477153,51 61,51 C61.5522847,51 62,51.4477153 62,52 C62,52.4778316 61.6648606,52.8773872 61.2168176,52.9764309 C61.2239494,53.0443316 61.2276783,53.1212219 61.2276783,53.2070193 L61.2276783,64.6460667 C61.2276783,64.7905295 61.2109404,64.9142428 61.1799392,65.0161455 C61.6463447,65.1008929 62,65.5091461 62,66 C62,66.5522847 61.5522847,67 61,67 C60.4477153,67 60,66.5522847 60,66 C60,65.6775356 60.1526298,65.3907197 60.3895873,65.2078547 C60.3353792,65.1698515 60.2797019,65.1246206 60.2229246,65.0720038 L56.9966734,62.0821591 Z M66.1768361,51.0536808 L76.3863147,62.9621534 C76.6248381,62.7575589 76.9348843,62.6339439 77.2738087,62.6339439 C78.0269541,62.6339439 78.6374991,63.2443563 78.6374991,63.9973383 C78.6374991,64.7503202 78.0269541,65.3607327 77.2738087,65.3607327 C76.7179077,65.3607327 76.2396954,65.0281798 76.0273418,64.5512033 L76.0273418,64.5512033 L66.2470617,68.8970508 L66.2470617,68.8970508 C66.3224088,69.0662913 66.3642852,69.2537142 66.3642852,69.4509158 C66.3642852,70.2038977 65.7537402,70.8143102 65.0005948,70.8143102 C64.2474494,70.8143102 63.6369043,70.2038977 63.6369043,69.4509158 C63.6369043,68.6979339 64.2474494,68.0875214 65.0005948,68.0875214 L65.0005948,51.7267888 C64.2474494,51.7267888 63.6369043,51.1163763 63.6369043,50.3633944 C63.6369043,49.6104125 64.2474494,49 65.0005948,49 C65.7537402,49 66.3642852,49.6104125 66.3642852,50.3633944 C66.3642852,50.6152816 66.2959632,50.8512148 66.1768361,51.0536808 L66.1768361,51.0536808 Z M74.9589487,72 C76.0592735,72 76.2934239,72.6072543 75.4783436,73.3596586 L73.4702868,75.2133052 C72.656816,75.9642239 71.1011127,76.5729638 69.999426,76.5729638 L57.9641665,76.5729638 C56.8607339,76.5729638 55.3083859,75.9657095 54.4933056,75.2133052 L52.4852488,73.3596586 C51.6717779,72.6087399 51.9052063,72 53.0046438,72 L74.9589487,72 Z" id="boat" sketch:type="MSShapeGroup"></path>
+ <div class="brand-boat-container">
+ <svg class="brand-boat" width="27px" height="28px" viewBox="0 0 27 28">
+ <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g transform="translate(-52.000000, -49.000000)" fill="#fff">
+ <path d="M56.9966734,62.0821591 C56.9548869,62.5960122 56.5246217,63 56,63 C55.4477153,63 55,62.5522847 55,62 C55,61.4477153 55.4477153,61 56,61 C56.1542427,61 56.3003292,61.0349209 56.4307846,61.0972878 C56.4365546,60.9708421 56.4672874,60.8469847 56.5249064,60.738086 L60.591292,53.0527085 C60.6128147,53.0120312 60.6340855,52.9741034 60.6550548,52.9389125 C60.2727349,52.7984089 60,52.4310548 60,52 C60,51.4477153 60.4477153,51 61,51 C61.5522847,51 62,51.4477153 62,52 C62,52.4778316 61.6648606,52.8773872 61.2168176,52.9764309 C61.2239494,53.0443316 61.2276783,53.1212219 61.2276783,53.2070193 L61.2276783,64.6460667 C61.2276783,64.7905295 61.2109404,64.9142428 61.1799392,65.0161455 C61.6463447,65.1008929 62,65.5091461 62,66 C62,66.5522847 61.5522847,67 61,67 C60.4477153,67 60,66.5522847 60,66 C60,65.6775356 60.1526298,65.3907197 60.3895873,65.2078547 C60.3353792,65.1698515 60.2797019,65.1246206 60.2229246,65.0720038 L56.9966734,62.0821591 Z M66.1768361,51.0536808 L76.3863147,62.9621534 C76.6248381,62.7575589 76.9348843,62.6339439 77.2738087,62.6339439 C78.0269541,62.6339439 78.6374991,63.2443563 78.6374991,63.9973383 C78.6374991,64.7503202 78.0269541,65.3607327 77.2738087,65.3607327 C76.7179077,65.3607327 76.2396954,65.0281798 76.0273418,64.5512033 L76.0273418,64.5512033 L66.2470617,68.8970508 L66.2470617,68.8970508 C66.3224088,69.0662913 66.3642852,69.2537142 66.3642852,69.4509158 C66.3642852,70.2038977 65.7537402,70.8143102 65.0005948,70.8143102 C64.2474494,70.8143102 63.6369043,70.2038977 63.6369043,69.4509158 C63.6369043,68.6979339 64.2474494,68.0875214 65.0005948,68.0875214 L65.0005948,51.7267888 C64.2474494,51.7267888 63.6369043,51.1163763 63.6369043,50.3633944 C63.6369043,49.6104125 64.2474494,49 65.0005948,49 C65.7537402,49 66.3642852,49.6104125 66.3642852,50.3633944 C66.3642852,50.6152816 66.2959632,50.8512148 66.1768361,51.0536808 L66.1768361,51.0536808 Z M74.9589487,72 C76.0592735,72 76.2934239,72.6072543 75.4783436,73.3596586 L73.4702868,75.2133052 C72.656816,75.9642239 71.1011127,76.5729638 69.999426,76.5729638 L57.9641665,76.5729638 C56.8607339,76.5729638 55.3083859,75.9657095 54.4933056,75.2133052 L52.4852488,73.3596586 C51.6717779,72.6087399 51.9052063,72 53.0046438,72 L74.9589487,72 Z" id="boat" sketch:type="MSShapeGroup"></path>
+ </g>
</g>
- </g>
- </svg>
+ </svg>
+ </div>
<div class="brand-illustration">
<!-- mountain 1 -->
<div class="brand-mountain-1">
diff --git a/resources/frontend_client/app/auth/partials/forgot_password.html b/resources/frontend_client/app/auth/partials/forgot_password.html
index badc43fcda0eef802282ae5af3ea444d08eb7834..5048ebd61bda6c228cdff3c0720329faff8cad9d 100644
--- a/resources/frontend_client/app/auth/partials/forgot_password.html
+++ b/resources/frontend_client/app/auth/partials/forgot_password.html
@@ -1,4 +1,4 @@
-<div class="bg-white flex flex-column md-layout-centered full-height">
+<div class="bg-white flex flex-column flex-full md-layout-centered">
<div class="wrapper">
<div class="Login-wrapper Grid Grid--full md-Grid--1of2">
<div class="Grid-cell flex layout-centered text-brand">
diff --git a/resources/frontend_client/app/auth/partials/login.html b/resources/frontend_client/app/auth/partials/login.html
index 91ca4b322e4fdf7e46f8a3f900e1e99fd8153e12..9ef2e691c80a1899a148c84f9e93ecc76420bd6c 100644
--- a/resources/frontend_client/app/auth/partials/login.html
+++ b/resources/frontend_client/app/auth/partials/login.html
@@ -1,4 +1,4 @@
-<div class="bg-white flex flex-column md-layout-centered full-height">
+<div class="bg-white flex flex-full flex-column md-layout-centered">
<div class="wrapper">
<div class="Login-wrapper Grid Grid--full md-Grid--1of2">
<div class="Grid-cell flex layout-centered text-brand">
@@ -23,7 +23,7 @@
</div>
<div class="Form-field">
- <ul class="Checkbox-group Form-offset">
+ <ul class="Form-offset">
<input name="remember" type="checkbox" ng-init="remember_me = true" ng-model="remember_me" checked> <label class="inline-block">Remember Me:</label>
</ul>
</div>
diff --git a/resources/frontend_client/app/auth/partials/password_reset.html b/resources/frontend_client/app/auth/partials/password_reset.html
index b7685e67974eade9f03384baa9eef02bdbb9ed85..49f8901dcc3cf5c7a4cb76bf5972d2add2dc5f9d 100644
--- a/resources/frontend_client/app/auth/partials/password_reset.html
+++ b/resources/frontend_client/app/auth/partials/password_reset.html
@@ -1,4 +1,4 @@
-<div class="bg-white flex flex-column layout-centered full-height">
+<div class="bg-white flex flex-column flex-full layout-centered">
<div class="wrapper">
<div class="Login-wrapper Grid Grid--fit md-Grid--1of2">
<div class="Grid-cell flex layout-centered text-brand">
@@ -37,7 +37,10 @@
<mb-icon name="check"></mb-icon>
</div>
<p>Your password has been reset.</p>
- <p><a href="/" class="Button Button--primary">Sign in with your new password</a></p>
+ <p>
+ <a ng-if="newUserJoining" href="/?new" class="Button Button--primary">Sign in with your new password</a>
+ <a ng-if="!newUserJoining" href="/" class="Button Button--primary">Sign in with your new password</a>
+ </p>
</div>
</div>
</div>
diff --git a/resources/frontend_client/app/card/card.charting.js b/resources/frontend_client/app/card/card.charting.js
index 6ad5656ecfb5aa5a540c9dfb8608f08c12893b42..b0d9b6586c8a40afd5ea957fd2e3811b9c69000f 100644
--- a/resources/frontend_client/app/card/card.charting.js
+++ b/resources/frontend_client/app/card/card.charting.js
@@ -44,6 +44,19 @@ var MIN_PIXELS_PER_TICK = {
y: 50
};
+var precisionNumberFormatter = d3.format(".2r");
+var fixedNumberFormatter = d3.format(",.f");
+
+function formatNumber(number) {
+ if (number > -1 && number < 1) {
+ // numbers between 1 and -1 round to 2 significant digits with extra 0s stripped off
+ return precisionNumberFormatter(number).replace(/\.?0+$/, "");
+ } else {
+ // anything else rounds to at most 2 decimal points
+ return fixedNumberFormatter(d3.round(number, 2));
+ }
+}
+
/// return pair of [min, max] values from items in array DATA, using VALUEACCESSOR to retrieve values for each item
/// VALUEACCESSOR may be an accessor function like fn(ITEM) or can be a string/integer key/index into ITEM which will
/// use a function like fn(item) { return item(KEY); }
@@ -311,9 +324,10 @@ function applyChartOrdinalXAxis(chart, card, coldefs, data, minPixelsPerTick) {
xAxis.tickValues(visibleKeys);
}
+ xAxis.tickFormat((d) => d == null ? '[unset]' : d);
} else {
xAxis.ticks(0);
- xAxis.tickFormat(function(d) { return ""; });
+ xAxis.tickFormat('');
}
chart.x(d3.scale.ordinal().domain(keys))
@@ -367,17 +381,18 @@ function applyChartTooltips(dcjsChart, card, cols) {
// We should only ever have one tooltip on screen, right?
Array.prototype.forEach.call(document.querySelectorAll('.ChartTooltip'), (t) => t.parentNode.removeChild(t));
- var valueFormatter = d3.format(',.0f');
-
var tip = d3.tip()
.attr('class', 'ChartTooltip')
.direction('n')
.offset([-10, 0])
.html(function(d) {
- return (
- '<div><span class="ChartTooltip-key">' + cols[0].name + '</span> <span class="ChartTooltip-value">' + d.data.key + '</span></div>' +
- '<div><span class="ChartTooltip-key">' + cols[1].name + '</span> <span class="ChartTooltip-value">' + valueFormatter(d.data.value) + '</span></div>'
- );
+ var values = formatNumber(d.data.value);
+ if (card.display === 'pie') {
+ // TODO: this is not the ideal way to calculate the percentage, but it works for now
+ values += " (" + formatNumber((d.endAngle - d.startAngle) / Math.PI * 50) + '%)'
+ }
+ return '<div><span class="ChartTooltip-name">' + d.data.key + '</span></div>' +
+ '<div><span class="ChartTooltip-value">' + values + '</span></div>';
});
chart.selectAll('rect.bar,circle.dot,g.pie-slice path,circle.bubble,g.row rect')
@@ -796,6 +811,9 @@ export var CardRenderer = {
var index = _.indexOf(keys, d.key);
return settings.pie.colors[index % settings.pie.colors.length];
})
+ .label(function(row) {
+ return row.key == null ? '[unset]' : row.key;
+ })
.title(function(d) {
// ghetto rounding to 1 decimal digit since Math.round() doesn't let
// you specify a precision and always rounds to int
@@ -803,6 +821,8 @@ export var CardRenderer = {
return d.key + ': ' + d.value + ' (' + percent + '%)';
});
+ // disables ability to select slices
+ chart.filter = function() {};
applyChartTooltips(chart, card, result.cols);
@@ -876,7 +896,7 @@ export var CardRenderer = {
// for chart types that have an 'interpolate' option (line/area charts), enable based on settings
if (chart.interpolate && card.visualization_settings.line.step) chart.interpolate('step');
- chart.barPadding(0.5); // amount of padding between bars relative to bar size [0 - 1.0]. Default = 0
+ chart.barPadding(0.2); // amount of padding between bars relative to bar size [0 - 1.0]. Default = 0
chart.render();
// apply any on-rendering functions
@@ -999,10 +1019,10 @@ export var CardRenderer = {
var chartData = _.map(result.rows, function(value) {
// Does this actually make sense? If country is > 2 characters just use the first 2 letters as the country code ?? (WTF)
var countryCode = value[0];
- if (countryCode) {
- if (countryCode.length > 2) countryCode = countryCode.substring(0, 2);
- countryCode = countryCode.toUpperCase();
+ if (typeof countryCode === "string") {
+ countryCode = countryCode.substring(0, 2).toUpperCase();
}
+
return {
code: countryCode,
value: value[1]
diff --git a/resources/frontend_client/app/card/card.controllers.js b/resources/frontend_client/app/card/card.controllers.js
index bd484697a157f4ceb36bdc0788e9d025310f34d9..dcc33a9c4cc7ef81c17d868915c2e18405fe9468 100644
--- a/resources/frontend_client/app/card/card.controllers.js
+++ b/resources/frontend_client/app/card/card.controllers.js
@@ -1,11 +1,18 @@
'use strict';
/*global _, document, confirm*/
+import MetabaseAnalytics from '../lib/analytics';
+
+import DataReference from '../query_builder/data_reference.react';
import GuiQueryEditor from '../query_builder/gui_query_editor.react';
import NativeQueryEditor from '../query_builder/native_query_editor.react';
import QueryHeader from '../query_builder/header.react';
import QueryVisualization from '../query_builder/visualization.react';
+import Query from "metabase/lib/query";
+import { serializeCardForUrl, deserializeCardFromUrl, cleanCopyCard, urlForCardState } from './card.util';
+
+
// Card Controllers
var CardControllers = angular.module('corvus.card.controllers', []);
@@ -65,8 +72,14 @@ CardControllers.controller('CardList', ['$scope', '$location', 'Card', function(
}]);
CardControllers.controller('CardDetail', [
- '$rootScope', '$scope', '$routeParams', '$location', '$q', '$window', 'Card', 'Dashboard', 'CorvusFormGenerator', 'Metabase', 'VisualizationSettings', 'QueryUtils',
- function($rootScope, $scope, $routeParams, $location, $q, $window, Card, Dashboard, CorvusFormGenerator, Metabase, VisualizationSettings, QueryUtils) {
+ '$rootScope', '$scope', '$route', '$routeParams', '$location', '$q', '$window', '$timeout', 'Card', 'Dashboard', 'CorvusFormGenerator', 'Metabase', 'VisualizationSettings', 'QueryUtils',
+ function($rootScope, $scope, $route, $routeParams, $location, $q, $window, $timeout, Card, Dashboard, CorvusFormGenerator, Metabase, VisualizationSettings, QueryUtils) {
+ // promise helper
+ $q.resolve = function(object) {
+ var deferred = $q.defer();
+ deferred.resolve(object);
+ return deferred.promise;
+ }
// ===== Controller local objects
@@ -76,7 +89,7 @@ CardControllers.controller('CardDetail', [
type: "query",
query: {
source_table: null,
- aggregation: [null],
+ aggregation: ["rows"],
breakout: [],
filter: []
}
@@ -90,11 +103,14 @@ CardControllers.controller('CardDetail', [
}
};
+ $scope.isShowingDataReference = false;
+
var queryResult = null,
databases = null,
tables = null,
tableMetadata = null,
tableForeignKeys = null,
+ tableForeignKeyReferences = null,
isRunning = false,
isObjectDetail = false,
card = {
@@ -104,7 +120,9 @@ CardControllers.controller('CardDetail', [
visualization_settings: {},
dataset_query: {},
},
- cardJson = JSON.stringify(card);
+ savedCardSerialized = null;
+
+ resetDirty();
// ===== REACT component models
@@ -131,138 +149,50 @@ CardControllers.controller('CardDetail', [
return deferred.promise;
},
notifyCardCreatedFn: function(newCard) {
- cardJson = JSON.stringify(card);
+ setCard(newCard, { resetDirty: true, replaceState: true });
- // for new cards we redirect the user
- $location.path('/card/' + newCard.id);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Create Card', newCard.dataset_query.type);
},
notifyCardUpdatedFn: function(updatedCard) {
- cardJson = JSON.stringify(card);
+ setCard(updatedCard, { resetDirty: true, replaceState: true });
+
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Update Card', updatedCard.dataset_query.type);
},
setQueryModeFn: function(mode) {
if (!card.dataset_query.type || mode !== card.dataset_query.type) {
resetCardQuery(mode);
+ resetDirty();
+ updateUrl();
renderAll();
}
},
notifyCardDeletedFn: function () {
- $location.path('/')
- }
+ $location.path('/');
+ },
+ cloneCardFn: function() {
+ $scope.$apply(() => {
+ delete card.id;
+ setCard(card, { setDirty: true, replaceState: false })
+ });
+ },
+ toggleDataReferenceFn: toggleDataReference,
+ cardIsNewFn: cardIsNew,
+ cardIsDirtyFn: cardIsDirty
};
var editorModel = {
isRunning: false,
- isExpanded: true,
+ isShowingDataReference: null,
databases: null,
tables: null,
options: null,
tableForeignKeys: null,
- defaultQuery: null,
query: null,
- initialQuery: null,
- loadDatabaseInfoFn: function(databaseId) {
- tables = null;
- tableMetadata = null;
-
- // get tables for db
- Metabase.db_tables({
- 'dbId': databaseId
- }).$promise.then(function (tables_list) {
- tables = tables_list;
-
- renderAll();
- }, function (error) {
- console.log('error getting tables', error);
- });
- },
- loadTableInfoFn: function(tableId) {
- tableMetadata = null;
- tableForeignKeys = null;
-
- // get table details
- Metabase.table_query_metadata({
- 'tableId': tableId
- }).$promise.then(function (table) {
- // Decorate with valid operators
- // TODO: would be better if this was in our component
- var updatedTable = markupTableMetadata(table);
-
- tableMetadata = updatedTable;
-
- renderAll();
- }, function (error) {
- console.log('error getting table metadata', error);
- });
-
- // get table fks
- Metabase.table_fks({
- 'tableId': tableId
- }).$promise.then(function (fks) {
- tableForeignKeys = fks;
-
- renderAll();
- }, function (error) {
- console.log('error getting fks for table '+tableId, error);
- });
- },
- runFn: function(dataset_query) {
- isRunning = true;
- renderAll();
-
- // make our api call
- var firstRunNewCard = (queryResult === null && card.id === undefined);
- Metabase.dataset(dataset_query, function (result) {
- queryResult = result;
- isRunning = false;
-
- // do a quick test to see if we are meant to render and object detail view or normal results
- if(isObjectDetailQuery(card, queryResult.data)) {
- isObjectDetail = true;
- } else {
- isObjectDetail = false;
- }
-
- // try a little logic to pick a smart display for the data
- if (card.display !== "scalar" &&
- queryResult.data.rows &&
- queryResult.data.rows.length === 1 &&
- queryResult.data.columns.length === 1) {
- // if we have a 1x1 data result then this should always be viewed as a scalar
- card.display = "scalar";
-
- } else if (card.display === "scalar" &&
- queryResult.data.rows &&
- (queryResult.data.rows.length > 1 || queryResult.data.columns.length > 1)) {
- // any time we were a scalar and now have more than 1x1 data switch to table view
- card.display = "table";
-
- } else if (dataset_query.type === "query" &&
- dataset_query.query.aggregation &&
- dataset_query.query.aggregation.length > 0 &&
- dataset_query.query.aggregation[0] === "rows") {
- // if our query aggregation is "rows" then ALWAYS set the display to "table"
- card.display = "table";
- }
-
- renderAll();
-
- }, function (error) {
- isRunning = false;
- // TODO: we should update the api so that we get better error messaging from the api on query fails
- queryResult = {
- error: "Oh snap! Something went wrong running your query :sad:"
- };
-
- renderAll();
- });
- },
- notifyQueryModifiedFn: function(dataset_query) {
- // we are being told that the query has been modified
- card.dataset_query = dataset_query;
- renderAll();
- },
+ setQueryFn: setQuery,
+ setDatabaseFn: setDatabase,
+ setSourceTableFn: setSourceTable,
autocompleteResultsFn: function(prefix) {
var apiCall = Metabase.db_autocomplete_suggestions({
dbId: card.dataset_query.database,
@@ -281,13 +211,11 @@ CardControllers.controller('CardDetail', [
card: null,
result: null,
tableForeignKeys: null,
+ tableForeignKeyReferences: null,
isRunning: false,
+ runQueryFn: runQuery,
isObjectDetail: false,
- setDisplayFn: function(type) {
- card.display = type;
-
- renderAll();
- },
+ setDisplayFn: setDisplay,
setChartColorFn: function(color) {
var vizSettings = card.visualization_settings;
@@ -340,7 +268,7 @@ CardControllers.controller('CardDetail', [
card.dataset_query.query.order_by = [sortClause];
// run updated query
- editorModel.runFn(card.dataset_query);
+ runQuery(card.dataset_query);
}
},
cellIsClickableFn: function(rowIndex, columnIndex) {
@@ -358,7 +286,7 @@ CardControllers.controller('CardDetail', [
return false;
}
},
- cellClickedFn: function(rowIndex, columnIndex) {
+ cellClickedFn: function(rowIndex, columnIndex, filter) {
if (!queryResult) return false;
// lookup the coldef and cell value of the cell we are taking action on
@@ -374,7 +302,7 @@ CardControllers.controller('CardDetail', [
card.dataset_query.query.filter = ["AND", ["=", coldef.id, value]];
// run it
- editorModel.runFn(card.dataset_query);
+ runQuery(card.dataset_query);
} else if (coldef.special_type === "fk") {
// action is on an FK column
@@ -385,11 +313,15 @@ CardControllers.controller('CardDetail', [
card.dataset_query.query.filter = ["AND", ["=", coldef.target.id, value]];
// load table metadata now that we are switching to a new table
- editorModel.loadTableInfoFn(card.dataset_query.query.source_table);
+ loadTableInfo(card.dataset_query.query.source_table);
// run it
- editorModel.runFn(card.dataset_query);
- }
+ runQuery(card.dataset_query);
+ } else {
+ Query.addFilter(card.dataset_query.query);
+ Query.updateFilter(card.dataset_query.query, card.dataset_query.query.filter.length - 1, [filter, coldef.id, value]);
+ runQuery(card.dataset_query);
+ }
},
followForeignKeyFn: function(fk) {
if (!queryResult || !fk) return false;
@@ -410,19 +342,30 @@ CardControllers.controller('CardDetail', [
card.dataset_query.query.filter = ["AND", ["=", fk.origin.id, originValue]];
// load table metadata now that we are switching to a new table
- editorModel.loadTableInfoFn(card.dataset_query.query.source_table);
+ loadTableInfo(card.dataset_query.query.source_table);
// run it
- editorModel.runFn(card.dataset_query);
+ runQuery(card.dataset_query);
}
};
+ var dataReferenceModel = {
+ Metabase: Metabase,
+ closeFn: toggleDataReference,
+ runQueryFn: runQuery,
+ setQueryFn: setQuery,
+ setDatabaseFn: setDatabase,
+ setSourceTableFn: setSourceTable,
+ setDisplayFn: setDisplay,
+ loadTableFn: loadTable
+ };
// ===== REACT render functions
- var renderHeader = function() {
+ function renderHeader() {
// ensure rendering model is up to date
headerModel.card = angular.copy(card);
+ headerModel.isShowingDataReference = $scope.isShowingDataReference;
if (queryResult && !queryResult.error) {
headerModel.downloadLink = '/api/meta/dataset/csv?query=' + encodeURIComponent(JSON.stringify(card.dataset_query));
@@ -430,47 +373,268 @@ CardControllers.controller('CardDetail', [
headerModel.downloadLink = null;
}
- React.render(new QueryHeader(headerModel), document.getElementById('react_qb_header'));
- };
+ React.render(<QueryHeader {...headerModel}/>, document.getElementById('react_qb_header'));
+ }
- var renderEditor = function() {
+ function renderEditor() {
// ensure rendering model is up to date
editorModel.isRunning = isRunning;
+ editorModel.isShowingDataReference = $scope.isShowingDataReference;
editorModel.databases = databases;
editorModel.tables = tables;
editorModel.options = tableMetadata;
editorModel.tableForeignKeys = tableForeignKeys;
editorModel.query = card.dataset_query;
- editorModel.defaultQuery = angular.copy(newQueryTemplates[card.dataset_query.type]);
if (card.dataset_query && card.dataset_query.type === "native") {
- React.render(new NativeQueryEditor(editorModel), document.getElementById('react_qb_editor'));
+ React.render(<NativeQueryEditor {...editorModel}/>, document.getElementById('react_qb_editor'));
} else {
- React.render(new GuiQueryEditor(editorModel), document.getElementById('react_qb_editor'));
+ React.render(<GuiQueryEditor {...editorModel}/>, document.getElementById('react_qb_editor'));
}
- };
+ }
- var renderVisualization = function() {
+ function renderVisualization() {
// ensure rendering model is up to date
visualizationModel.card = angular.copy(card);
visualizationModel.result = queryResult;
+ visualizationModel.tableMetadata = tableMetadata;
visualizationModel.tableForeignKeys = tableForeignKeys;
+ visualizationModel.tableForeignKeyReferences = tableForeignKeyReferences;
visualizationModel.isRunning = isRunning;
visualizationModel.isObjectDetail = isObjectDetail;
- React.render(new QueryVisualization(visualizationModel), document.getElementById('react_qb_viz'));
- };
+ React.render(<QueryVisualization {...visualizationModel}/>, document.getElementById('react_qb_viz'));
+ }
+
+ function renderDataReference() {
+ dataReferenceModel.databases = databases;
+ dataReferenceModel.query = card.dataset_query;
+ React.render(<DataReference {...dataReferenceModel}/>, document.getElementById('react_data_reference'));
+ }
- var renderAll = function() {
+ var renderAll = _.debounce(function() {
renderHeader();
renderEditor();
renderVisualization();
- };
+ renderDataReference();
+ }, 10);
// ===== Local helper functions
- var isObjectDetailQuery = function(card, data) {
+ function runQuery(dataset_query) {
+ if (dataset_query.query) {
+ Query.cleanQuery(dataset_query.query);
+ }
+
+ isRunning = true;
+
+ updateUrl();
+
+ renderAll();
+
+ // make our api call
+ var firstRunNewCard = (queryResult === null && card.id === undefined);
+ Metabase.dataset(dataset_query, function (result) {
+ queryResult = result;
+ isRunning = false;
+
+ // do a quick test to see if we are meant to render and object detail view or normal results
+ if(isObjectDetailQuery(card, queryResult.data)) {
+ isObjectDetail = true;
+
+ // TODO: there are possible cases where running a query would not require refreshing this data, but
+ // skipping that for now because it's easier to just run this each time
+
+ // run a query on FK origin table where FK origin field = objectDetailIdValue
+ var fkReferences = {};
+ tableForeignKeys.map(function(fk) {
+ var fkQuery = angular.copy(newQueryTemplates["query"]);
+ fkQuery.database = card.dataset_query.database;
+ fkQuery.query.source_table = fk.origin.table_id;
+ fkQuery.query.aggregation = ["count"];
+ fkQuery.query.filter = ["AND", ["=", fk.origin.id, getObjectDetailIdValue(queryResult.data)]];
+
+ var info = {"status": 0, "value": null},
+ promise = Metabase.dataset(fkQuery).$promise;
+ promise.then(function(result) {
+ if (result && result.status === "completed" && result.data.rows.length > 0) {
+ info["value"] = result.data.rows[0][0];
+ } else {
+ info["value"] = "Unknown";
+ }
+ }).finally(function(result) {
+ info["status"] = 1;
+ renderAll();
+ });
+ fkReferences[fk.origin.id] = info;
+ });
+
+ tableForeignKeyReferences = fkReferences;
+
+ } else {
+ isObjectDetail = false;
+ }
+
+ // try a little logic to pick a smart display for the data
+ if (card.display !== "scalar" &&
+ queryResult.data.rows &&
+ queryResult.data.rows.length === 1 &&
+ queryResult.data.columns.length === 1) {
+ // if we have a 1x1 data result then this should always be viewed as a scalar
+ card.display = "scalar";
+
+ } else if (card.display === "scalar" &&
+ queryResult.data.rows &&
+ (queryResult.data.rows.length > 1 || queryResult.data.columns.length > 1)) {
+ // any time we were a scalar and now have more than 1x1 data switch to table view
+ card.display = "table";
+
+ } else if (dataset_query.type === "query" &&
+ dataset_query.query.aggregation &&
+ dataset_query.query.aggregation.length > 0 &&
+ dataset_query.query.aggregation[0] === "rows") {
+ // if our query aggregation is "rows" then ALWAYS set the display to "table"
+ card.display = "table";
+ }
+
+ renderAll();
+
+ }, function (error) {
+ isRunning = false;
+ // TODO: we should update the api so that we get better error messaging from the api on query fails
+ queryResult = {
+ error: "Oh snap! Something went wrong running your query :sad:"
+ };
+
+ renderAll();
+ });
+
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Run Query', dataset_query.type);
+ }
+
+ function getDefaultQuery() {
+ return angular.copy(newQueryTemplates[card.dataset_query.type]);
+ }
+
+ function loadTable(tableId) {
+ return $q.all([
+ Metabase.table_query_metadata({
+ 'tableId': tableId
+ }).$promise.then(function (table) {
+ // Decorate with valid operators
+ // TODO: would be better if this was in our component
+ table = markupTableMetadata(table);
+ // Load joinable tables
+ return $q.all(table.fields.filter((f) => f.target != null).map((field) => {
+ return Metabase.table_query_metadata({
+ 'tableId': field.target.table_id
+ }).$promise.then((targetTable) => {
+ field.target.table = markupTableMetadata(targetTable);
+ });
+ })).then(() => table);
+ }),
+ Metabase.table_fks({
+ 'tableId': tableId
+ }).$promise
+ ]).then(function(results) {
+ return {
+ metadata: results[0],
+ foreignKeys: results[1]
+ }
+ });
+ }
+
+ function loadTableInfo(tableId) {
+ if (tableMetadata && tableMetadata.id === tableId) {
+ return;
+ }
+
+ tableMetadata = null;
+ tableForeignKeys = null;
+
+ loadTable(tableId).then(function (results) {
+ tableMetadata = results.metadata;
+ tableForeignKeys = results.foreignKeys;
+ renderAll();
+ }, function (error) {
+ console.log('error getting table metadata', error);
+ });
+ }
+
+ function loadDatabaseInfo(databaseId) {
+ if (tables && tables[0] && tables[0].db_id === databaseId) {
+ return;
+ }
+
+ tables = null;
+ tableMetadata = null;
+
+ // get tables for db
+ Metabase.db_tables({
+ 'dbId': databaseId
+ }).$promise.then(function (tables_list) {
+ tables = tables_list;
+
+ renderAll();
+ }, function (error) {
+ console.log('error getting tables', error);
+ });
+ }
+
+ function setDatabase(databaseId) {
+ if (databaseId !== card.dataset_query.database) {
+ // reset to a brand new query
+ var query = getDefaultQuery();
+
+ // set our new database on the query
+ query.database = databaseId;
+
+ // carry over our previous query if we had one
+ if (card.dataset_query.native) {
+ query.native.query = card.dataset_query.native.query;
+ }
+
+ // TODO: should this clear the visualization as well?
+ setQuery(query);
+
+ // load rest of the data we need
+ loadDatabaseInfo(databaseId);
+ }
+ return card.dataset_query;
+ }
+
+ function setSourceTable(sourceTable) {
+ // this will either be the id or an object with an id
+ var tableId = sourceTable.id || sourceTable;
+ if (tableId !== card.dataset_query.query.source_table) {
+
+ // when the table changes we reset everything else in the query, except the database of course
+ // TODO: should this clear the visualization as well?
+ var query = getDefaultQuery();
+ query.database = card.dataset_query.database;
+ query.query.source_table = tableId;
+
+ setQuery(query);
+
+ loadTableInfo(tableId);
+ }
+ return card.dataset_query;
+ }
+
+ function setQuery(dataset_query) {
+ // we are being told that the query has been modified
+ card.dataset_query = dataset_query;
+ renderAll();
+ return card.dataset_query;
+ }
+
+ function setDisplay(type) {
+ card.display = type;
+ renderAll();
+ }
+
+ function isObjectDetailQuery(card, data) {
var response = false;
// "rows" type query w/ an '=' filter against the PK column
@@ -511,14 +675,33 @@ CardControllers.controller('CardDetail', [
}
return response;
- };
+ }
+
+ function getObjectDetailIdValue(data) {
+ for (var i=0; i < data.cols.length; i++) {
+ var coldef = data.cols[i];
+ if (coldef.special_type === "id") {
+ return data.rows[0][i];
+ }
+ }
+ }
- var markupTableMetadata = function(table) {
+ function markupTableMetadata(table) {
var updatedTable = CorvusFormGenerator.addValidOperatorsToFields(table);
return QueryUtils.populateQueryOptions(updatedTable);
- };
+ }
- var resetCardQuery = function(mode) {
+ function toggleDataReference() {
+ $scope.$apply(function() {
+ $scope.isShowingDataReference = !$scope.isShowingDataReference;
+ renderAll();
+ // render again after 500ms to wait for animation to complete
+ // FIXME: if previous render takes too long this is missed
+ window.setTimeout(renderAll, 500);
+ });
+ }
+
+ function resetCardQuery(mode) {
var queryTemplate = angular.copy(newQueryTemplates[mode]);
if (queryTemplate) {
@@ -538,117 +721,203 @@ CardControllers.controller('CardDetail', [
// clear out any visualization and reset to defaults
queryResult = null;
card.display = "table";
+
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Query Started', mode);
}
- };
+ }
- var loadCardAndRender = function(cardId, cloning) {
- Card.get({
- 'cardId': cardId
- }, function (result) {
- if (cloning) {
- result.id = undefined; // since it's a new card
- result.carddirty = true; // so it cand be saved right away
- } else {
- // when loading an existing card for viewing, mark when the card creator is our current user
- // TODO: there may be a better way to maintain this, but it seemed worse to inject currentUser
- // into a bunch of our react models and then bury this conditional in react component code
- if (result.creator_id === $scope.user.id) {
- result.is_creator = true;
+ function loadSavedCard(cardId) {
+ return Card.get({ 'cardId': cardId }).$promise;
+ }
+
+ function loadSerializedCard(serialized) {
+ var card = deserializeCardFromUrl(serialized);
+ // consider this since it's not saved:
+ card.dirty = true;
+ return $q.resolve(card);
+ }
+
+ function loadNewCard() {
+ // show data reference
+ // $scope.isShowingDataReference = true;
+
+ // this is just an easy way to ensure defaults are all setup
+ resetCardQuery("query");
+
+ // initialize the table & db from our query params, if we have them
+ if ($routeParams.db != undefined) {
+ card.dataset_query.database = parseInt($routeParams.db);
+ }
+ if ($routeParams.table != undefined && card.dataset_query.query) {
+ card.dataset_query.query.source_table = parseInt($routeParams.table);
+ }
+
+ resetDirty();
+
+ return $q.resolve(card);
+ }
+
+ function loadCard() {
+ if ($routeParams.cardId != undefined) {
+ return loadSavedCard($routeParams.cardId).then(function(result) {
+ if ($routeParams.serializedCard) {
+ return loadSerializedCard($routeParams.serializedCard).then(function(result2) {
+ return _.extend(result, result2);
+ });
+ } else {
+ return result;
}
- }
+ });
+ } else if ($routeParams.serializedCard != undefined) {
+ return loadSerializedCard($routeParams.serializedCard);
+ } else {
+ return loadNewCard();
+ }
+ }
+
+ function setCard(result, options = {}) {
+ // when loading an existing card for viewing, mark when the card creator is our current user
+ // TODO: there may be a better way to maintain this, but it seemed worse to inject currentUser
+ // into a bunch of our react models and then bury this conditional in react component code
+ if (result.creator_id === $scope.user.id) {
+ result.is_creator = true;
+ }
- // update our react models as needed
- card = result;
- cardJson = JSON.stringify(card);
+ // update our react models as needed
+ card = result;
- // load metadata
- editorModel.loadDatabaseInfoFn(card.dataset_query.database);
+ if (options.resetDirty) {
+ resetDirty();
+ }
+ if (options.setDirty) {
+ setDirty();
+ }
- if (card.dataset_query.type === "query" && card.dataset_query.query.source_table) {
- editorModel.loadTableInfoFn(card.dataset_query.query.source_table);
- }
+ updateUrl(options.replaceState);
- // run the query
- // TODO: is there a case where we wouldn't want this?
- editorModel.runFn(card.dataset_query);
+ // load metadata
+ loadDatabaseInfo(card.dataset_query.database);
- // trigger full rendering
- renderAll();
+ if (card.dataset_query.type === "query" && card.dataset_query.query.source_table) {
+ loadTableInfo(card.dataset_query.query.source_table);
+ }
+
+ // run the query
+ if (Query.canRun(card.dataset_query.query) || card.dataset_query.type === "native") {
+ runQuery(card.dataset_query);
+ }
+
+ // trigger full rendering
+ renderAll();
+ }
+ // meant to be called once on controller startup
+ function loadAndSetCard() {
+ loadCard().then(function (result) {
+ // HACK: dirty status passed in the object itself, delete it
+ var isDirty = result.dirty;
+ delete result.dirty;
+ return setCard(result, { setDirty: isDirty, resetDirty: !isDirty, replaceState: true });
}, function (error) {
if (error.status == 404) {
// TODO() - we should redirect to the card builder with no query instead of /
$location.path('/');
}
});
- };
+ }
- // meant to be called once on controller startup
- var initAndRender = function() {
- if ($routeParams.cardId) {
- loadCardAndRender($routeParams.cardId, false);
+ function cardIsNew() {
+ return !card.id;
+ }
- } else if ($routeParams.clone) {
- loadCardAndRender($routeParams.clone, true);
+ function cardIsDirty() {
+ var newCardSerialized = serializeCardForUrl(card);
- } else {
- // starting a new card
+ return newCardSerialized !== savedCardSerialized;
+ }
- // this is just an easy way to ensure defaults are all setup
- resetCardQuery("query");
+ function resetDirty() {
+ savedCardSerialized = serializeCardForUrl(card);
+ }
- // initialize the table & db from our query params, if we have them
- if ($routeParams.db !== undefined) {
- // do a quick validation that this user actually has access to the db from the url
- for (var i=0; i < databases.length; i++) {
- var databaseId = parseInt($routeParams.db);
- if (databases[i].id === databaseId) {
- card.dataset_query.database = databaseId;
+ function setDirty() {
+ savedCardSerialized = null;
+ }
- // load metadata
- editorModel.loadDatabaseInfoFn(card.dataset_query.database);
- }
- }
+ // needs to be performed asynchronously otherwise we get weird infinite recursion
+ var updateUrl = _.debounce(function(replaceState) {
+ var copy = cleanCopyCard(card);
+ var newState = {
+ card: copy,
+ cardId: copy.id,
+ serializedCard: serializeCardForUrl(copy)
+ };
- // if we initialized our database safely and we have a table, lets handle that now
- if (card.dataset_query.database !== null && $routeParams.table !== undefined) {
- // TODO: do we need a security check here? seems that if they have access to the db just use the table
- card.dataset_query.query.source_table = parseInt($routeParams.table);
+ if (angular.equals(window.history.state, newState)) {
+ return;
+ }
- // load table metadata
- editorModel.loadTableInfoFn(card.dataset_query.query.source_table);
- }
- }
+ var url = urlForCardState(newState, cardIsDirty());
- cardJson = JSON.stringify(card);
+ // if the serialized card is identical replace the previous state instead of adding a new one
+ // e.x. when saving a new card we want to replace the state and URL with one with the new card ID
+ if (replaceState || (window.history.state && window.history.state.serializedCard === newState.serializedCard)) {
+ window.history.replaceState(newState, null, url);
+ } else {
+ window.history.pushState(newState, null, url);
+ }
+ }, 0);
- renderAll();
+ function popStateListener(e) {
+ if (e.state && e.state.card) {
+ e.preventDefault();
+ setCard(e.state.card, {});
}
- };
+ }
+
+ // add popstate listener to support undo/redo via browser history
+ angular.element($window).on('popstate', popStateListener);
// When the window is resized we need to re-render, mainly so that our visualization pane updates
// Debounce the function to improve resizing performance.
- angular.element($window).bind('resize', _.debounce(function() {
- renderAll();
- }, 400));
-
- $scope.$on('$locationChangeStart', function (event) {
- // only ask for a confirmation on unsaved changes if the question is
- // saved already, indicated by a cardId
- if($routeParams.cardId) {
- if (cardJson !== JSON.stringify(card) && queryResult !== null) {
- if (!confirm('You have unsaved changes! Click OK to discard changes and leave the page.')) {
- event.preventDefault();
- return;
- }
- }
- }
+ var debouncedRenderAll = _.debounce(renderAll, 400);
+ angular.element($window).on('resize', debouncedRenderAll);
+
+ $scope.$on("$destroy", function() {
+ angular.element($window).off('popstate', popStateListener);
+ angular.element($window).off('resize', debouncedRenderAll);
// any time we route away from the query builder force unmount our react components to make sure they have a chance
// to fully clean themselves up and remove things like popover elements which may be on the screen
React.unmountComponentAtNode(document.getElementById('react_qb_header'));
React.unmountComponentAtNode(document.getElementById('react_qb_editor'));
React.unmountComponentAtNode(document.getElementById('react_qb_viz'));
+ React.unmountComponentAtNode(document.getElementById('react_data_reference'));
+ });
+
+
+ // mildly hacky way to prevent reloading controllers as the URL changes
+ var route = $route.current;
+ $scope.$on('$locationChangeSuccess', function (event) {
+ var newParams = $route.current.params;
+ var oldParams = route.params;
+
+ // reload the controller if:
+ // 1. not CardDetail
+ // 2. both serializedCard and cardId are not set (new card)
+ if ($route.current.$$route.controller === 'CardDetail' && (newParams.serializedCard || newParams.cardId)) {
+ var params = $route.current.params;
+ $route.current = route;
+
+ angular.forEach(oldParams, function(value, key) {
+ delete $route.current.params[key];
+ delete $routeParams[key];
+ });
+ angular.forEach(newParams, function(value, key) {
+ $route.current.params[key] = value;
+ $routeParams[key] = value;
+ });
+ }
});
// TODO: while we wait for the databases list we should put something on screen
@@ -662,7 +931,7 @@ CardControllers.controller('CardDetail', [
}
// finish initializing our page and render
- initAndRender();
+ loadAndSetCard();
}, function (error) {
console.log('error getting database list', error);
diff --git a/resources/frontend_client/app/card/card.module.js b/resources/frontend_client/app/card/card.module.js
index e9c79ab56899dfbb261469d6bcc44c8deea9ebc9..1612c770e10f12c71a6ea44661b5cf81f08777f2 100644
--- a/resources/frontend_client/app/card/card.module.js
+++ b/resources/frontend_client/app/card/card.module.js
@@ -14,7 +14,11 @@ var Card = angular.module('corvus.card', [
]);
Card.config(['$routeProvider', function($routeProvider) {
- $routeProvider.when('/card/create/', {
+ $routeProvider.when('/q', {
+ templateUrl: '/app/card/partials/card_detail.html',
+ controller: 'CardDetail'
+ });
+ $routeProvider.when('/q/:serializedCard', {
templateUrl: '/app/card/partials/card_detail.html',
controller: 'CardDetail'
});
@@ -22,4 +26,8 @@ Card.config(['$routeProvider', function($routeProvider) {
templateUrl: '/app/card/partials/card_detail.html',
controller: 'CardDetail'
});
+ $routeProvider.when('/card/:cardId/:serializedCard', {
+ templateUrl: '/app/card/partials/card_detail.html',
+ controller: 'CardDetail'
+ });
}]);
diff --git a/resources/frontend_client/app/card/card.services.js b/resources/frontend_client/app/card/card.services.js
index 8717f5fdece73464e7a209dc53bc279a7b01b2a8..b620aff85811635d6d2cfac2e144f2154bb3fb68 100644
--- a/resources/frontend_client/app/card/card.services.js
+++ b/resources/frontend_client/app/card/card.services.js
@@ -212,8 +212,6 @@ CardServices.service('QueryUtils', function() {
this.populateQueryOptions = function(table) {
// create empty objects to store our lookups
table.fields_lookup = {};
- table.aggregation_lookup = {};
- table.breakout_lookup = {};
_.each(table.fields, function(field) {
table.fields_lookup[field.id] = field;
@@ -223,14 +221,6 @@ CardServices.service('QueryUtils', function() {
});
});
- _.each(table.aggregation_options, function(agg) {
- table.aggregation_lookup[agg.short] = agg;
- });
-
- _.each(table.breakout_options, function(br) {
- table.breakout_lookup[br.short] = br;
- });
-
return table;
};
@@ -584,4 +574,4 @@ CardServices.service('VisualizationSettings', [function() {
}
};
-}]);
\ No newline at end of file
+}]);
diff --git a/resources/frontend_client/app/card/card.util.js b/resources/frontend_client/app/card/card.util.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d7b660f889bc4bd74e155eaf96548a0550eeb11
--- /dev/null
+++ b/resources/frontend_client/app/card/card.util.js
@@ -0,0 +1,45 @@
+"use strict";
+
+import Query from "metabase/lib/query";
+
+export function serializeCardForUrl(card) {
+ var dataset_query = angular.copy(card.dataset_query);
+ if (dataset_query.query) {
+ dataset_query.query = Query.cleanQuery(dataset_query.query);
+ }
+ var cardCopy = {
+ name: card.name,
+ description: card.description,
+ dataset_query: dataset_query,
+ display: card.display,
+ visualization_settings: card.visualization_settings
+ };
+ return btoa(JSON.stringify(cardCopy));
+}
+
+export function deserializeCardFromUrl(serialized) {
+ return JSON.parse(atob(serialized));
+}
+
+export function urlForCardState(state, dirty) {
+ var url;
+ if (state.cardId) {
+ url = "/card/" + state.cardId;
+ } else {
+ url = "/q";
+ }
+ if (state.serializedCard && (!state.cardId || dirty)) {
+ url += "/" + state.serializedCard;
+ }
+ return url;
+}
+
+export function cleanCopyCard(card) {
+ var cardCopy = {};
+ for (var name in card) {
+ if (name.charAt(0) !== "$") {
+ cardCopy[name] = card[name];
+ }
+ }
+ return cardCopy;
+}
diff --git a/resources/frontend_client/app/card/partials/_card_favorite.html b/resources/frontend_client/app/card/partials/_card_favorite.html
index 45ef1d5a0b3ea2aaad5fd2cfcdeb0b8139b420fb..9365d20151280589f5890244c25162d458759038 100644
--- a/resources/frontend_client/app/card/partials/_card_favorite.html
+++ b/resources/frontend_client/app/card/partials/_card_favorite.html
@@ -1,4 +1,4 @@
-<a href="#" class="animate-pop" ng-click="toggleFavorite()">
+<a href="#" title="Favorite This Question" class="animate-pop" ng-click="toggleFavorite()">
<mb-icon
name="star"
width="18px"
diff --git a/resources/frontend_client/app/card/partials/card_detail.html b/resources/frontend_client/app/card/partials/card_detail.html
index 8c661708787b8992875d1b49f9e1d4e96984ef86..ecce61cb1b5852f31bed191e3a5db632eec58976 100644
--- a/resources/frontend_client/app/card/partials/card_detail.html
+++ b/resources/frontend_client/app/card/partials/card_detail.html
@@ -1,5 +1,6 @@
-<div class="QueryBuilder mt2">
+<div class="QueryBuilder flex flex-column flex-full bg-white" ng-class="{ 'QueryBuilder--showDataReference': isShowingDataReference }">
<div id="react_qb_header"></div>
<div id="react_qb_editor"></div>
- <div class="QueryVisualization" id="react_qb_viz"></div>
+ <div id="react_qb_viz" class="flex flex-full"></div>
</div>
+<div class="DataReference flex flex-full" id="react_data_reference"></div>
diff --git a/resources/frontend_client/app/components/buttons/buttons.css b/resources/frontend_client/app/components/buttons/buttons.css
index 1237bff361e6f5aed53deced695fdc7b6191ec9d..f0f70b99161f51859e3ef59ffe16df401d837268 100644
--- a/resources/frontend_client/app/components/buttons/buttons.css
+++ b/resources/frontend_client/app/components/buttons/buttons.css
@@ -42,6 +42,11 @@
transition: border .3s linear;
}
+.Button--small {
+ padding: 0.4rem 0.75rem;
+ font-size: 0.6rem;
+}
+
.Button--primary {
color: #fff;
background: var(--primary-button-bg-color);
@@ -58,6 +63,12 @@
border-radius: 99px;
}
+.Button--white {
+ background-color: white;
+ color: color(var(--base-grey) shade(30%)) !important;
+ border-color: color(var(--base-grey) shade(30%));
+}
+
.Button-group {
display: inline-block;
border-radius: var(--default-button-border-radius);
@@ -98,6 +109,21 @@
color: rgb(74,144,226);
}
+.Button-group--brand {
+ border-color: white;
+}
+
+.Button-group--brand .Button {
+ border-color: white;
+ color: var(--brand-color);
+ background-color: #E5E5E5;
+}
+
+.Button-group--brand .Button--active {
+ background-color: var(--brand-color);
+ color: white;
+}
+
.Button:disabled {
opacity: 0.5;
cursor: not-allowed;
@@ -123,7 +149,7 @@
/* toggle button */
.Button-toggle {
- color: #797979;
+ color: var(--grey-text-color);
display: flex;
line-height: 1;
border: 1px solid #ddd;
@@ -156,3 +182,7 @@
border-color: var(--brand-color);
transition: background .2s linear .2s, border .2s linear .2s;
}
+
+.Button--withIcon {
+ line-height: 1;
+}
diff --git a/resources/frontend_client/app/components/calendar/calendar.css b/resources/frontend_client/app/components/calendar/calendar.css
new file mode 100644
index 0000000000000000000000000000000000000000..d428fc462db3d50d6031abdbb72409559b87d0be
--- /dev/null
+++ b/resources/frontend_client/app/components/calendar/calendar.css
@@ -0,0 +1,42 @@
+
+.Calendar {
+}
+
+.Calendar-week {
+ display: flex;
+}
+
+.Calendar-day {
+ flex: 1;
+ padding: 0.75em;
+ margin: 0.25em;
+ text-align: center;
+ color: color(var(--base-grey) shade(30%));
+ border-radius: 99px;
+ cursor: pointer;
+}
+
+.Calendar-day-name {
+ cursor: inherit;
+}
+
+.Calendar-day--this-month {
+ color: currentcolor;
+}
+
+.Calendar-day--today {
+ font-weight: 700;
+}
+
+.Calendar-day:hover {
+ color: var(--purple-color);
+}
+
+.Calendar-day-name {
+ color: inherit !important;
+}
+
+.Calendar-day--selected {
+ color: white !important;
+ background-color: var(--purple-light-color);
+}
diff --git a/resources/frontend_client/app/components/card/card.css b/resources/frontend_client/app/components/card/card.css
index cdd31a0dcdb53c08b2f967e55c0c767e662f5387..e5e477b36c0a6fe3765c8730c1a61214485a3bed 100644
--- a/resources/frontend_client/app/components/card/card.css
+++ b/resources/frontend_client/app/components/card/card.css
@@ -101,3 +101,7 @@
.Dash-card .Card {
overflow-y: scroll;
}
+
+.Card--scalar {
+ margin-left: 1em;
+}
diff --git a/resources/frontend_client/app/components/columnar_selector/columnar_selector.css b/resources/frontend_client/app/components/columnar_selector/columnar_selector.css
new file mode 100644
index 0000000000000000000000000000000000000000..9d5dc36e21e76687f62211a3f2fcf33973e55a0a
--- /dev/null
+++ b/resources/frontend_client/app/components/columnar_selector/columnar_selector.css
@@ -0,0 +1,92 @@
+
+.ColumnarSelector {
+ display: flex;
+ background-color: #FCFCFC;
+ font-weight: 700;
+
+ max-height: 600px;
+}
+
+.ColumnarSelector-column {
+ min-width: 180px;
+ min-height: 300px;
+ max-height: 450px;
+ overflow-y: scroll;
+ flex: 1;
+}
+
+.ColumnarSelector-rows {
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
+}
+
+.ColumnarSelector-title {
+ color: color(var(--base-grey) shade(30%));
+ text-transform: uppercase;
+ font-size: 10px;
+ font-weight: 700;
+ padding: var(--padding-1);
+ padding-left: var(--padding-3);
+}
+
+.ColumnarSelector-section:first-child .ColumnarSelector-title {
+ padding-top: var(--padding-3);
+}
+
+.ColumnarSelector-description {
+ margin-top: 0.5em;
+ color: color(var(--base-grey) shade(30%));
+ max-width: 270px;
+}
+
+.ColumnarSelector-row {
+ padding-top: 0.75rem;
+ padding-bottom: 0.75rem;
+ padding-left: var(--padding-3);
+ padding-right: var(--padding-3);
+ display: flex;
+ align-items: center;
+}
+
+.ColumnarSelector-row:hover {
+ background-color: var(--brand-color) !important;
+ color: white !important;
+}
+
+.ColumnarSelector-row:hover .ColumnarSelector-description {
+ color: rgba(255,255,255,0.50);
+}
+
+.ColumnarSelector-row--selected {
+ color: inherit !important;
+ background: white;
+ border-top: var(--border-size) var(--border-style) var(--border-color);
+ border-bottom: var(--border-size) var(--border-style) var(--border-color);
+}
+
+.ColumnarSelector-row .Icon-check {
+ margin-right: var(--margin-2);
+ visibility: hidden;
+}
+
+.ColumnarSelector-row.ColumnarSelector-row--selected .Icon-check {
+ visibility: visible;
+}
+
+.ColumnarSelector-column:first-child {
+ z-index: 1;
+}
+
+.ColumnarSelector-column:last-child {
+ background-color: white;
+ border-left: var(--border-size) var(--border-style) var(--border-color);
+ position: relative;
+ left: -1px;
+}
+
+.ColumnarSelector-column:last-child .ColumnarSelector-row--selected {
+ background: inherit;
+ border-top: none;
+ border-bottom: none;
+ color: var(--brand-color);
+}
diff --git a/resources/frontend_client/app/components/dashboard/dashboard.css b/resources/frontend_client/app/components/dashboard/dashboard.css
index 376230319aff8c8fb08e89f7bc55039aa159b88c..8179681d4ccb2c56552be8ffa7afc9f0834c53fa 100644
--- a/resources/frontend_client/app/components/dashboard/dashboard.css
+++ b/resources/frontend_client/app/components/dashboard/dashboard.css
@@ -1,3 +1,22 @@
+.Dashboard { background-color: #f9fbfc; }
+
+.Dash-wrapper {
+ width: 100%;
+}
+
+@media screen and (--breakpoint-min-sm) {
+ .Dash-wrapper { max-width: var(--sm-width); }
+}
+
+@media screen and (--breakpoint-min-md) {
+ .Dash-wrapper { max-width: var(--md-width); }
+}
+
+@media screen and (--breakpoint-min-lg) {
+ .Dash-wrapper { max-width: var(--lg-width); }
+}
+
+
.Dash-card {
position: relative;
background: #fff;
diff --git a/resources/frontend_client/app/components/dropdown/dropdown.css b/resources/frontend_client/app/components/dropdown/dropdown.css
index 86401c9e3c123b3a88b37178168f637cf7d02933..bf376ac434f443dd31a5fb684110ab38bf76e7d4 100644
--- a/resources/frontend_client/app/components/dropdown/dropdown.css
+++ b/resources/frontend_client/app/components/dropdown/dropdown.css
@@ -48,6 +48,7 @@
padding-bottom: 1rem;
padding-left: 2rem;
padding-right: 2rem;
+ line-height: 1;
}
.Dropdown .Dropdown-item .link:hover {
diff --git a/resources/frontend_client/app/components/icons/icons.js b/resources/frontend_client/app/components/icons/icons.js
index 1a162ab3e982fba03bce4f5661aab7d31354d7fb..c49bebc86b9a5d2074c782894a0ec89ec5d26446 100644
--- a/resources/frontend_client/app/components/icons/icons.js
+++ b/resources/frontend_client/app/components/icons/icons.js
@@ -1,6 +1,6 @@
'use strict';
-import ICON_PATHS from 'metabase/icon_paths';
+import { loadIcon } from 'metabase/icon_paths';
/*
GENERIC ICONS
@@ -15,20 +15,31 @@ angular.module('corvus.components')
return {
restrict: 'E',
- template: '<svg class="Icon" id="{{name}}" viewBox="0 0 32 32" ng-attr-width="{{width}}" ng-attr-height="{{height}}" fill="currentcolor"><path ng-attr-d="{{path}}" /></svg>',
+ // NOTE: can't use ng-attr-viewBox because Angular doesn't preserve the case pre-v1.3.7 :(
+ template: '<svg viewBox="0 0 32 32" ng-attr-class="{{className}}" ng-attr-width="{{width}}" ng-attr-height="{{height}}" ng-attr-fill="{{fill}}"><path ng-attr-d="{{path}}" /></svg>',
scope: {
width: '@?', // a value in PX to define the width of the icon
height: '@?', // a value in PX to define the height of the icon
name: '@', // the name of the icon to be referended from the ICON_PATHS object
- path: '@'
+ path: '@',
+ className: '@',
+ viewBox: '@',
+ fill: '@'
},
compile: function (element, attrs) {
- var icon = ICON_PATHS[attrs.name];
+ var icon = loadIcon(attrs.name);
- // set defaults for width/height in case no width or height are specified
- attrs.width = attrs.width || '32px';
- attrs.height = attrs.height || '32px';
- attrs.path = icon;
+ if (icon.svg) {
+ console.warn("mbIcon does not yet support raw SVG");
+ } else if (icon.path) {
+ attrs.path = attrs.path || icon.path;
+ }
+
+ for (var attr in icon.attrs) {
+ if (attrs[attr] == undefined) {
+ attrs[attr] = icon.attrs[attr];
+ }
+ }
}
};
});
diff --git a/resources/frontend_client/app/components/icons/loading.react.js b/resources/frontend_client/app/components/icons/loading.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..89d239d1b0cb235da006e6629293b79eb0995bbd
--- /dev/null
+++ b/resources/frontend_client/app/components/icons/loading.react.js
@@ -0,0 +1,29 @@
+'use strict';
+
+/* just a spinner, sitting here, spinning endlessly */
+
+var LoadingSpinner = React.createClass({
+ displayName: 'LoadingSpinner',
+ getDefaultProps: function () {
+ return {
+ width: '32px',
+ height: '32px',
+ fill: 'currentcolor',
+ spinnerClass: 'Loading-indicator',
+ }
+ },
+ render: function () {
+ var props = this.props;
+ var animate = '<animateTransform attributeName="transform" type="rotate" from="0 16 16" to="360 16 16" dur="0.8s" repeatCount="indefinite" />';
+ return (
+ <div className={props.spinnerClass}>
+ <svg viewBox="0 0 32 32" {...props}>
+ <path opacity=".25" d="M16 0 A16 16 0 0 0 16 32 A16 16 0 0 0 16 0 M16 4 A12 12 0 0 1 16 28 A12 12 0 0 1 16 4"/>
+ <path d="M16 0 A16 16 0 0 1 32 16 L28 16 A12 12 0 0 0 16 4z" dangerouslySetInnerHTML={{__html: animate}}></path>
+ </svg>
+ </div>
+ );
+ }
+});
+
+export default LoadingSpinner;
diff --git a/resources/frontend_client/app/components/popover/popover.css b/resources/frontend_client/app/components/popover/popover.css
index 5794447437de1ed2c501d02858aa718a561cd38f..7c8d5d4a89b31d3a652a9b1042df274af29ae353 100644
--- a/resources/frontend_client/app/components/popover/popover.css
+++ b/resources/frontend_client/app/components/popover/popover.css
@@ -10,7 +10,7 @@
.PopoverBody {
position: relative;
- min-width: 25em; /* ewwwwwwww */
+ min-width: 1em; /* ewwwwwwww */
border: 1px solid #ddd;
box-shadow: 0 1px 7px rgba(0, 0, 0, .18);
background-color: #fff;
@@ -31,20 +31,111 @@
border-bottom: 10px solid transparent;
}
-/* create a slightly larger arrow for border purposes */
-.PopoverBody--withArrow:before {
+.PopoverBody .Form-input {
+ font-size: 1rem;
+}
+
+.PopoverBody .Form-field {
+ margin-bottom: 0.75rem;
+}
+
+.PopoverHeader {
+ display: flex;
+ border-bottom: 1px solid var(--border-color);
+ min-width: 400px;
+}
+
+.PopoverHeader-item {
+ flex: 1;
+ position: relative;
+ top: 1px; /* to overlap bottom border */
+ text-align: center;
+ padding: 1em;
+
+ text-transform: uppercase;
+ font-size: 0.8em;
+ font-weight: 700;
+ color: color(var(--base-grey) shade(30%));
+ border-bottom: 2px solid transparent;
+}
+
+.PopoverHeader-item.selected {
+ color: currentcolor;
+ border-color: currentcolor;
+}
+
+.PopoverHeader-item--withArrow {
+ margin-right: 8px;
+}
+
+.PopoverHeader-item--withArrow:before,
+.PopoverHeader-item--withArrow:after {
+ position: absolute;
+ content: '';
+ display: block;
+ border-left: 8px solid transparent;
+ border-right: 8px solid transparent;
+ border-top: 8px solid transparent;
+ border-bottom: 8px solid transparent;
+ top: 50%;
+ margin-top: -8px;
+}
+
+/* create a slightly larger arrow on the right for border purposes */
+.PopoverHeader-item--withArrow:before {
+ right: -16px;
+ border-left-color: #ddd;
+}
+
+/* create a smaller inset arrow on the right */
+.PopoverHeader-item--withArrow:after {
+ right: -15px;
+ border-left-color: #fff;
+}
+
+/* create a slightly larger arrow on the top for border purposes */
+.tether-element-attached-top .PopoverBody--withArrow:before {
top: -20px;
border-bottom-color: #ddd;
}
-/* create a smaller inset arrow */
-.PopoverBody:after {
+/* create a smaller inset arrow on the top */
+.tether-element-attached-top .PopoverBody--withArrow:after {
top: -18px;
border-bottom-color: #fff;
}
+/* create a slightly larger arrow on the bottom for border purposes */
+.tether-element-attached-bottom .PopoverBody--withArrow:before {
+ bottom: -20px;
+ border-top-color: #ddd;
+}
+
+/* create a smaller inset arrow on the bottom */
+.tether-element-attached-bottom .PopoverBody--withArrow:after {
+ bottom: -18px;
+ border-top-color: #fff;
+}
+
/* if the tether element is attached right, move our arrows right */
.tether-target-attached-right .PopoverBody--withArrow:before,
.tether-target-attached-right .PopoverBody--withArrow:after {
right: 12px;
}
+
+/* if the tether element is attached center, move our arrows to the center */
+.tether-element-attached-center .PopoverBody--withArrow:before,
+.tether-element-attached-center .PopoverBody--withArrow:after {
+ margin-left: 50%;
+ left: -10px;
+}
+
+.tether-element-attached-right .PopoverBody--withArrow:before,
+.tether-element-attached-right .PopoverBody--withArrow:after {
+ right: 12px;
+}
+
+.tether-element-attached-left .PopoverBody--withArrow:before,
+.tether-element-attached-left .PopoverBody--withArrow:after {
+ left: 12px;
+}
diff --git a/resources/frontend_client/app/components/tooltip/tooltip.css b/resources/frontend_client/app/components/tooltip/tooltip.css
index a1b39666a60fcbc855bd2596834118d1cd14f9f6..0d5afcb438b46819ae304d3f4e51b63e5d7b387b 100644
--- a/resources/frontend_client/app/components/tooltip/tooltip.css
+++ b/resources/frontend_client/app/components/tooltip/tooltip.css
@@ -1,13 +1,14 @@
/* based on https://rawgit.com/Caged/d3-tip/master/examples/example-styles.css */
.ChartTooltip {
- width: 200px;
- line-height: 1;
+ min-width: 100px;
+ line-height: 1.3;
padding: 12px;
background: rgba(0, 0, 0, 0.8);
color: #fff;
pointer-events: none;
border-radius: 4px;
+ z-index: 100000;
}
/* Creates a small triangle extender for the tooltip */
@@ -56,9 +57,6 @@
left: 100%;
}
-.ChartTooltip-key {
+.ChartTooltip-name {
font-weight: bold;
}
-.ChartTooltip-key:after {
- content: ":";
-}
diff --git a/resources/frontend_client/app/controllers.js b/resources/frontend_client/app/controllers.js
index 8c8dfab50e9638a2dfbe81387fbae0569b36dda4..83f2632cbde4fc000676daeab2e2c244dd551a67 100644
--- a/resources/frontend_client/app/controllers.js
+++ b/resources/frontend_client/app/controllers.js
@@ -63,11 +63,12 @@ CorvusControllers.controller('Unauthorized', ['$scope', '$location', function($s
}]);
+CorvusControllers.controller('NotFound', ['AppState', function(AppState) {
+ AppState.setAppContext('none');
+}]);
CorvusControllers.controller('Nav', ['$scope', '$routeParams', '$location', 'AppState', function($scope, $routeParams, $location, AppState) {
- $scope.activeClass = 'is--selected';
-
$scope.isActive = function(location) {
return $location.path().indexOf(location) >= 0;
};
@@ -80,6 +81,12 @@ CorvusControllers.controller('Nav', ['$scope', '$routeParams', '$location', 'App
case "setup":
$scope.nav = 'setup';
break;
+ case "auth":
+ $scope.nav = 'auth';
+ break;
+ case "none":
+ $scope.nav = 'none';
+ break;
default:
$scope.nav = 'main';
}
diff --git a/resources/frontend_client/app/css/admin.css b/resources/frontend_client/app/css/admin.css
index a2ae5ad4e8eda22001c61d13686fae38fd383f76..81f3cb2f426e0f0680c66e7ec8b0b41c32866a79 100644
--- a/resources/frontend_client/app/css/admin.css
+++ b/resources/frontend_client/app/css/admin.css
@@ -19,11 +19,6 @@
}
.AdminNav .NavItem {
- /* cancel out padding as .AdminNav + flex will allow for proper centering */
- padding-top: 0;
- padding-bottom: 0;
- padding-left: 1.25rem;
- padding-right: 1.25rem;
color: var(--admin-nav-item-text-color);
}
@@ -38,6 +33,16 @@
display: none;
}
+
+.AdminNav .NavDropdown.open .NavDropdown-button,
+.AdminNav .NavDropdown .NavDropdown-content-layer {
+ background-color: #8993A1;
+}
+
+.AdminNav .Dropdown-item:hover {
+ background-color: #6F7A8B;
+}
+
/* utility to get a simple common hover state for admin items */
.HoverItem:hover,
.AdminHoverItem:hover {
@@ -205,5 +210,218 @@
.ScrollShadow {
border-top: 1px solid rgba(0, 0, 0, .05);
- box-shadow: 0 -1px 0 rgba(0, 0, 0, .12);
+}
+
+
+.AdminList {
+ background-color: #F9FBFC;
+ border: var(--border-size) var(--border-style) var(--border-color);
+ border-radius: var(--default-border-radius);
+ width: 266px;
+ box-shadow: inset -1px -1px 3px rgba(0,0,0,0.05);
+ padding-bottom: 0.75em;
+}
+
+.AdminList-search {
+ position: relative;
+}
+
+.AdminList-search .Icon {
+ position: absolute;
+ margin-top: auto;
+ margin-bottom: auto;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+ margin-left: 1em;
+ color: #C0C0C0;
+}
+
+.AdminList-search .AdminInput {
+ padding: 0.5em;
+ padding-left: 2em;
+ font-size: 18px;
+ width: 100%;
+ border-top-left-radius: var(--default-border-radius);
+ border-top-right-radius: var(--default-border-radius);
+ border-bottom-color: var(--border-color);
+}
+
+.AdminList-item {
+ padding: 0.75em 1em 0.75em 1em;
+ border: var(--border-size) var(--border-style) transparent;
+ border-radius: var(--default-border-radius);
+ margin-bottom: 0.25em;
+}
+
+.AdminList-item.selected {
+ color: var(--brand-color);
+}
+
+.AdminList-item.selected,
+.AdminList-item:hover {
+ background-color: white;
+ border-color: var(--border-color);
+ margin-left: -0.5em;
+ margin-right: -0.5em;
+ padding-left: 1.5em;
+ padding-right: 1.5em;
+ box-shadow: 0 1px 2px rgba(0,0,0,0.1);
+}
+
+.AdminList-section {
+ margin-top: 1em;
+ padding: 0.5em 1em 0.5em 1em;
+ text-transform: uppercase;
+ color: color(var(--base-grey) shade(20%));
+ font-weight: 700;
+ font-size: smaller;
+}
+
+.AdminList-item .ProgressBar {
+ opacity: 0.2;
+}
+
+.AdminList-item.selected .ProgressBar {
+ opacity: 1.0;
+}
+
+.AdminInput {
+ color: var(--default-font-color);
+ padding: 0.5em;
+ background-color: transparent;
+ border: 1px solid transparent;
+}
+.AdminInput:focus {
+ border-color: var(--brand-color);
+ box-shadow: none;
+ outline: 0;
+}
+
+.AdminSelect {
+ display: inline-block;
+ padding: 0.6em;
+ border: 1px solid var(--border-color);
+ border-radius: var(--default-border-radius);
+ font-size: 14px;
+ font-weight: 700;
+ margin-bottom: 3px;
+ min-width: 90px;
+}
+
+
+.MetadataTable-title {
+ background-color: #FCFCFC;
+}
+
+.TableEditor-table-name {
+ font-size: 24px;
+}
+
+.TableEditor-field-name {
+ font-size: 16px;
+}
+
+.TableEditor-table-description,
+.TableEditor-field-description {
+ font-size: 14px;
+}
+
+.TableEditor-field-type {
+ color: var(--purple-color);
+}
+
+.TableEditor-field-type .ColumnarSelector-row:hover {
+ background-color: var(--purple-color) !important;
+ color: white !important;
+}
+
+.TableEditor-field-special-type,
+.TableEditor-field-target {
+ color: var(--green-color);
+}
+
+.TableEditor-field-special-type .ColumnarSelector-row:hover,
+.TableEditor-field-target .ColumnarSelector-row:hover {
+ background-color: var(--green-color) !important;
+ color: white !important;
+}
+
+.Toggle {
+ box-sizing: border-box;
+ width: 48px;
+ height: 24px;
+ border-radius: 99px;
+ border: 1px solid #EAEAEA;
+ background-color: #F7F7F7;
+ position: relative;
+ transition: all 0.3s;
+}
+
+.Toggle.selected {
+ background-color: #33A2FF;
+}
+
+.Toggle:after {
+ content: "";
+ width: 20px;
+ height: 20px;
+ border-radius: 99px;
+ position: absolute;
+ top: 1px;
+ left: 1px;
+ background-color: #D9D9D9;
+ transition: all 0.3s;
+}
+
+.Toggle.selected:after {
+ content: "";
+ width: 20px;
+ height: 20px;
+ border-radius: 99px;
+ position: absolute;
+ top: 1px;
+ left: 25px;
+
+ background-color: white;
+}
+
+.ProgressBar {
+ position: relative;
+ border: 1px solid #6F7A8B;
+
+ width: 55px;
+ height: 10px;
+ border-radius: 99px;
+}
+.ProgressBar--mini {
+ width: 17px;
+ height: 8px;
+ border-radius: 2px;
+}
+.ProgressBar-progress {
+ background-color: #6F7A8B;
+ position: absolute;
+ height: 100%;
+ top: 0px;
+ left: 0px;
+ border-radius: inherit;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+}
+
+.SaveStatus {
+ line-height: 1;
+}
+
+.SaveStatus:last-child {
+ border-right: none !important;
+}
+
+.SettingsInput {
+ width: 400px;
+}
+
+.SettingsPassword {
+ width: 200px;
}
diff --git a/resources/frontend_client/app/css/core/arrow.css b/resources/frontend_client/app/css/core/arrow.css
new file mode 100644
index 0000000000000000000000000000000000000000..facacae3f7276eea3ccd21dceb0033b205831263
--- /dev/null
+++ b/resources/frontend_client/app/css/core/arrow.css
@@ -0,0 +1,37 @@
+
+/* TODO: based on popover.css, combine them? */
+/* TODO: other arrow directions */
+
+.arrow-right {
+ position: relative; /* TODO: should it be up to the consumer to set a non-static positioning? */
+}
+
+/* shared arrow styles */
+.arrow-right:before,
+.arrow-right:after {
+ position: absolute;
+ content: '';
+ display: block;
+ border-left: 10px solid transparent;
+ border-right: 10px solid transparent;
+ border-top: 10px solid transparent;
+ border-bottom: 10px solid transparent;
+}
+
+/* create a slightly larger arrow on the right for border purposes */
+.arrow-right:before {
+ right: -20px;
+ border-left-color: #ddd;
+}
+
+/* create a smaller inset arrow on the right */
+.arrow-right:after {
+ right: -19px;
+ border-left-color: #fff;
+}
+
+/* move our arrows to the center */
+.arrow-right:before, .arrow-right:after {
+ top: 50%;
+ margin-top: -10px;
+}
diff --git a/resources/frontend_client/app/css/core/base.css b/resources/frontend_client/app/css/core/base.css
index f6bfd5f0d4ebdb8bc37949fb50654b014a09bde2..c70c23aa79d4409e3b29fa29da247f2b923954c1 100644
--- a/resources/frontend_client/app/css/core/base.css
+++ b/resources/frontend_client/app/css/core/base.css
@@ -42,6 +42,14 @@ button {
outline: none;
}
+a {
+ color: inherit;
+}
+
+input {
+ font-family: var(--default-font-family), "Helvetica Neue", Helvetica, sans-serif;
+}
+
.disabled {
pointer-events: none;
opacity: 0.4;
diff --git a/resources/frontend_client/app/css/core/bordered.css b/resources/frontend_client/app/css/core/bordered.css
index f83a42c2f06191c2ab4514734f98ec5a07a14466..2eca0bb90e2499f53e8f9f6f059a2751d57c2418 100644
--- a/resources/frontend_client/app/css/core/bordered.css
+++ b/resources/frontend_client/app/css/core/bordered.css
@@ -8,6 +8,10 @@
border: var(--border-size) var(--border-style) var(--border-color);
}
+.border-brand-hover:hover {
+ border-color: var(--brand-color);
+}
+
.border-bottom {
border-bottom: var(--border-size) var(--border-style) var(--border-color);
}
@@ -26,6 +30,22 @@
border-top: none;
}
+.border-column-divider {
+ border-right: var(--border-size) var(--border-style) var(--border-color);
+}
+
+.border-column-divider:last-child {
+ border-right: none;
+}
+
+.border-row-divider {
+ border-bottom: var(--border-size) var(--border-style) var(--border-color);
+}
+
+.border-row-divider:last-child {
+ border-bottom: none;
+}
+
.border-right {
border-right: var(--border-size) var(--border-style) var(--border-color);
}
@@ -34,6 +54,14 @@
border-left: var(--border-size) var(--border-style) var(--border-color);
}
+.border-light {
+ border-color: rgba(255,255,255,0.2) !important;
+}
+
+.border-dark {
+ border-color: rgba(0,0,0,0.2) !important;
+}
+
/* BORDERLESS IS THE DEFAULT */
/* ONLY USE IF needing to override an existing border! */
/* ensure there is no border via important */
diff --git a/resources/frontend_client/app/css/core/colors.css b/resources/frontend_client/app/css/core/colors.css
index 9a38bfad4d2a3eba022a41d28dd3851b742351cd..a0d95708801f8331678d278bb58470061a25d109 100644
--- a/resources/frontend_client/app/css/core/colors.css
+++ b/resources/frontend_client/app/css/core/colors.css
@@ -1,19 +1,31 @@
:root {
--brand-color: #509EE3;
+ --brand-light-color: #CDE3F8;
--base-grey: #f8f8f8;
+
+ --grey-text-color: #797979;
+ --alt-color: #F5F7F9;
--alt-bg-color: #F4F6F8;
--success-color: #9CC177;
--headsup-color: #F5A623;
--gold-color: #F9D45C;
-
+ --purple-color: #A989C5;
+ --purple-light-color: #C5ABDB;
+ --green-color: #9CC177;
+ --dark-color: #4C545B;
--error-color: #EF8C8C;
}
+.text-default {
+ color: var(--default-font-color) !important;
+}
+
/* white */
-.text-white { color: #fff; }
+.text-white,
+.text-white-hover:hover { color: #fff; }
.bg-white { background-color: #fff; }
@@ -25,10 +37,16 @@
.text-brand-darken,
.text-brand-darken-hover:hover {
- color: color(var(--brand-color) shade(20%));
+ color: color(var(--brand-color) shade(20%)) !important;
}
-.bg-brand { background-color: var(--brand-color); }
+.text-brand-light,
+.text-brand-light-hover:hover {
+ color: var(--brand-light-color) !important;
+}
+
+.bg-brand,
+.bg-brand-hover:hover { background-color: var(--brand-color); }
/* success */
@@ -57,10 +75,26 @@
color: var(--gold-color);
}
-.bg-gold {
- background-color: var(--gold-color);
+.text-purple,
+.text-purple-hover:hover {
+ color: var(--purple-color);
}
+.text-purple-light,
+.text-purple-light-hover:hover {
+ color: var(--purple-light-color);
+}
+
+.text-green,
+.text-green-hover:hover {
+ color: var(--green-color);
+}
+
+.bg-gold { background-color: var(--gold-color); }
+
+/* alt */
+.bg-alt { background-color: var(--alt-color); }
+
/* grey */
.text-grey-1,
@@ -80,5 +114,4 @@
.bg-grey-3 { background-color: color(var(--base-grey) shade(30%)) }
.bg-grey-4 { background-color: color(var(--base-grey) shade(40%)) }
-
-.text-dark { color: #797979; }
+.text-dark { color: var(--dark-color); }
diff --git a/resources/frontend_client/app/css/core/flex.css b/resources/frontend_client/app/css/core/flex.css
index 731fec15e2fe2728515f13b0003897f866b9283c..d99368b9c9ada0705f42e6a04203da634eb41a95 100644
--- a/resources/frontend_client/app/css/core/flex.css
+++ b/resources/frontend_client/app/css/core/flex.css
@@ -8,6 +8,10 @@
flex: 1;
}
+.flex-half {
+ flex: 0.5;
+}
+
.align-center {
align-items: center;
}
@@ -16,6 +20,10 @@
justify-content: center;
}
+.justify-between {
+ justify-content: space-between;
+}
+
.align-start {
align-items: flex-start;
}
diff --git a/resources/frontend_client/app/css/core/grid.css b/resources/frontend_client/app/css/core/grid.css
index a479eccc3d71fa96dfa98587195e008c038ffd85..c40d454afdbf0f02e08bc1c854abcd2b4410c095 100644
--- a/resources/frontend_client/app/css/core/grid.css
+++ b/resources/frontend_client/app/css/core/grid.css
@@ -166,6 +166,9 @@
.small-Grid--guttersXl > .Grid-cell {
padding: 2em 0 0 2em;
}
+ .sm-Grid--normal > .Grid-cell {
+ flex: 1;
+ }
}
@media (--breakpoint-min-md) {
diff --git a/resources/frontend_client/app/css/core/rounded.css b/resources/frontend_client/app/css/core/rounded.css
index 915a6a9025a2f2f5e3e2fbfbc9dc93488f545032..ed95a6e6221bea6b36dbcaa3f6e030f9d0250ccc 100644
--- a/resources/frontend_client/app/css/core/rounded.css
+++ b/resources/frontend_client/app/css/core/rounded.css
@@ -24,3 +24,7 @@
border-top-right-radius: var(--default-border-radius);
border-bottom-right-radius: var(--default-border-radius);
}
+
+.circular {
+ border-radius: 99px !important;
+}
diff --git a/resources/frontend_client/app/css/core/spacing.css b/resources/frontend_client/app/css/core/spacing.css
index 1653a14bedf40354158626cf5d9e4db04101a9ba..44f2d54b6223f527cf2d8d6814f6391319db041d 100644
--- a/resources/frontend_client/app/css/core/spacing.css
+++ b/resources/frontend_client/app/css/core/spacing.css
@@ -10,6 +10,9 @@
--margin-4: 2rem;
}
+.ml-auto { margin-left: auto; }
+.mr-auto { margin-right: auto; }
+
/* padding */
/* 0 */
@@ -127,7 +130,7 @@
/* 2 */
-.m2 { margin: var(--margin-2) };
+.m2 { margin: var(--margin-2); }
.mx2 {
margin-left: var(--margin-2);
diff --git a/resources/frontend_client/app/css/core/text.css b/resources/frontend_client/app/css/core/text.css
index d72a744fd499e33ec9d85ef86529b00aba9ebd1e..ba135c7a48e1899587bdc2cde16bbee3da8be539 100644
--- a/resources/frontend_client/app/css/core/text.css
+++ b/resources/frontend_client/app/css/core/text.css
@@ -65,6 +65,10 @@
text-transform: uppercase;
}
+.text-lowercase {
+ text-transform: lowercase;
+}
+
/* text weight */
.text-light {
font-weight: 100;
diff --git a/resources/frontend_client/app/css/external/datepicker.css b/resources/frontend_client/app/css/external/datepicker.css
deleted file mode 100644
index 3f9d62856effc67267382c64ce18c3844a35f4e3..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/css/external/datepicker.css
+++ /dev/null
@@ -1,80 +0,0 @@
-/* styling for the datepicker used in the query builder */
-
-.datepicker {
- border: 1px solid #ddd;
- font-family: "Lato";
- font-size: 0.75em;
- box-shadow: 0 1px 4px rgba(0, 0, 0, .18);
-}
-
-.datepicker__day {
- color: #999;
- padding: 1em;
- width: 4em;
- border-radius: 99px;
-}
-
-.datepicker__month {
- display: flex;
- flex-direction: column;
-}
-
-.datepicker__header > div,
-.datepicker__month > div {
- display: flex;
- flex: 1;
- flex-direction: row;
- flex-wrap: wrap;
-}
-
-.datepicker__day {
- flex: 1;
- width: auto;
- line-height: normal;
-}
-
-/* triangles? we don't need no stinking triangles */
-.datepicker__triangle {
- display: none;
-}
-
-.datepicker__day--this-month {
- color: #252525;
-}
-
-.datepicker__day:hover {
- border-radius: 99px;
- color: #A8C28e;
- background: transparent;
-}
-
-.datepicker__header {
- padding: 1em 1em 0.25em;
- background: #fff;
-}
-
-.datepicker__day--selected {
- color: #fff;
- background-color: #A8C28e;
- box-shadow: 0 1px 1px rgba(0, 0, 0, .12);
-}
-
-.datepicker__day--selected:hover {
- background-color: #A8C28e;
- color: #fff;
-}
-
-.datepicker__input,
-.datepicker__input:focus {
- border: none;
- box-shadow: none;
- outline: none;
-}
-
-.datepicker__month {
- padding: 1em;
-}
-
-.datepicker__header {
- border-bottom: 1px solid #ddd;
-}
diff --git a/resources/frontend_client/app/css/home.css b/resources/frontend_client/app/css/home.css
index 3012d73aa7afea0e96f5752173fd5f220eb25741..d0d1bb1a400e444729c5feb5fd55324fa3b15d06 100644
--- a/resources/frontend_client/app/css/home.css
+++ b/resources/frontend_client/app/css/home.css
@@ -1,3 +1,12 @@
+.Nav {
+ z-index: 2;
+}
+
+.Main {
+ z-index: 1;
+ position: relative;
+}
+
.NavItem {
border-radius: 8px;
}
@@ -18,40 +27,122 @@
}
}
-.Greeting-subtitle {
- opacity: 0.575;
-}
-
-/* on the homepage, the wrapper should only be as wide as our largest size */
-.Home .wrapper {
- max-width: var(--xl-width);
- margin: 0 auto;
-}
-
.HomeTab {
+ background-color: rgba(255, 255, 255, 0.2);
+ border-radius: 4px 4px 0 0;
text-decoration: none;
- border: 1px solid #fff;
- color: #fff;
+ padding: 0.55rem 1rem 0.65rem;
+ transition: background .15s linear;
+}
+
+@media screen and (--breakpoint-min-sm) {
+ .HomeTab {
+ padding: 0.65rem 1.35rem 0.75rem;
+ }
}
.HomeTab:hover {
- background-color: rgba(255, 255, 255, 0.2);
+ background-color: rgba(255, 255, 255, 0.4);
cursor: pointer;
}
.HomeTab.HomeTab--active {
background-color: #fff;
- color: var(--brand-color);
- transition: background .3s linear;
}
-.DashboardDropdown .Dropdown-content {
- min-width: 20em;
+.bullet {
+ position: relative;
+ margin-left: 1.2em;
+}
+.bullet:before {
+ content: "\2022";
+ color: #6FB0EB;
+ position: absolute;
+ top: 0;
+ margin-top: 16px;
+ left: -0.85em;
+}
+
+.NavDropdown {
+ position: relative;
+}
+.NavDropdown.open {
+ z-index: 100;
+}
+.NavDropdown .NavDropdown-content {
+ display: none;
+}
+.NavDropdown.open .NavDropdown-content {
+ display: inherit;
+}
+.NavDropdown .NavDropdown-button {
+ position: relative;
+ border-radius: 8px;
+}
+.NavDropdown .NavDropdown-content {
+ position: absolute;
+ border-radius: 4px;
+ top: 38px;
+ min-width: 200px;
+}
+.NavDropdown .NavDropdown-button:before,
+.NavDropdown .NavDropdown-content:before {
+ content:"";
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ box-shadow: 0 0 4px rgba(0, 0, 0, .12);
+ background-clip: padding-box;
+}
+
+.NavDropdown .NavDropdown-content:before {
+ z-index: -2;
+ border-radius: 4px;
+}
+.NavDropdown .NavDropdown-button:before {
+ z-index: -1;
+ border-radius: 8px;
+}
+.NavDropdown .NavDropdown-content-layer {
+ position: relative;
+ z-index: 1;
+ overflow: hidden;
+}
+.NavDropdown .NavDropdown-button-layer {
+ position: relative;
+ z-index: 2;
+}
+
+.NavDropdown.open .NavDropdown-button,
+.NavDropdown .NavDropdown-content-layer {
+ background-color: #6FB0EB;
+}
+
+.NavDropdown .NavDropdown-content-layer {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ border-radius: 4px;
+}
+
+.NavDropdown .DashboardList {
+ min-width: 332px;
+}
+
+.QuestionCircle {
+ display: inline-block;
+ font-size: 3.25rem;
+ width: 73px;
+ height: 73px;
+ border-radius: 99px;
+ border: 3px solid white;
+ text-align: center;
}
.Entity-title {
font-size: 1.24em;
- color: #797979;
+ color: var(--grey-text-color);
}
.Entity-attribution {
@@ -88,11 +179,6 @@
cursor: pointer;
}
-.HomeTabs {
- background-color: rgba(0, 0, 0, 0.05);
- border-radius:6px;
-}
-
.tooltip {
position: absolute;
background-color: #fff;
@@ -100,3 +186,8 @@
box-shadow: 1px 1px 1px rgba(0, 0, 0, .12);
color: #ddd;
}
+
+.TableDescription {
+ max-width: 42rem;
+ line-height: 1.4;
+}
diff --git a/resources/frontend_client/app/css/login.css b/resources/frontend_client/app/css/login.css
index 799e229b3f8f4fdb327e970a715db2949e54e5aa..833fc4f2e9d53835e7ba5c35b38cd4e71b53a214 100644
--- a/resources/frontend_client/app/css/login.css
+++ b/resources/frontend_client/app/css/login.css
@@ -20,7 +20,7 @@
height: 180px;
}
-.brand-boat {
+.brand-boat-container {
position: absolute;
bottom: 0;
z-index: 6;
@@ -28,7 +28,13 @@
margin-bottom: 0.5em;
}
-@-webkit-keyframes boat_trip {
+.brand-boat {
+ transform-origin: 50% bottom;
+ animation: boat_rock 2s ease-in-out infinite;
+ animation-direction: alternate;
+}
+
+@keyframes boat_trip {
0% {
margin-left: -2%;
}
@@ -41,6 +47,38 @@
}
}
+@keyframes boat_lost {
+ 0% {
+ margin-left: 40%;
+ transform: rotateY(0deg);
+ }
+ 45% {
+ margin-left: 60%;
+ transform: rotateY(0deg);
+ }
+ 50% {
+ margin-left: 60%;
+ transform: rotateY(180deg);
+ }
+ 95% {
+ margin-left: 40%;
+ transform: rotateY(180deg);
+ }
+ 100% {
+ margin-left: 40%;
+ transform: rotateY(0deg);
+ }
+}
+
+@keyframes boat_rock {
+ from {
+ transform: rotate(-10deg);
+ }
+ to {
+ transform: rotate(10deg);
+ }
+}
+
.brand-illustration {
height: 180px;
position: absolute;
@@ -59,6 +97,17 @@
z-index: 50;
}
+.NotFoundScene .brand-bridge,
+.NotFoundScene .brand-mountain-1,
+.NotFoundScene .brand-mountain-1,
+.NotFoundScene .brand-illustration {
+ display: none;
+}
+
+.NotFoundScene .brand-boat-container {
+ animation: boat_lost 30s linear infinite;
+}
+
/* flip the second mountain around */
.brand-mountain-2 {
-moz-transform: scaleX(-1);
diff --git a/resources/frontend_client/app/css/query_builder.css b/resources/frontend_client/app/css/query_builder.css
index fda4a22fea609d9315f5fc3aed0ba088cb23b339..f214ea93825106036f962d7d4caa9b9957f9c919 100644
--- a/resources/frontend_client/app/css/query_builder.css
+++ b/resources/frontend_client/app/css/query_builder.css
@@ -1,15 +1,25 @@
:root {
--selection-color: #ccdff6;
}
+
+#react_qb_editor {
+ z-index: 2;
+}
+
+#react_qb_viz {
+ z-index: 1;
+}
+
/* @layout */
.QueryBuilder {
- display: flex;
- flex-direction: column;
- height: 100%;
+ transition: margin-right 0.35s;
+ }
+
+.QueryBuilder--showDataReference {
+ margin-right: 300px;
}
-.QueryHeader-details,
-.QueryHeader-actions {
+.QueryHeader-details {
display: flex;
align-items: center;
}
@@ -36,11 +46,6 @@
justify-content: flex-end;
}
-.QueryVisualization {
- display: flex;
- flex: 1;
-}
-
.QueryName {
font-weight: 200;
margin-top: 0;
@@ -49,20 +54,30 @@
}
.Query-label {
- min-width: 7rem;
- display: inline-block;
+ text-transform: uppercase;
+ font-size: 10px;
+ font-weight: 700;
+ color: color(var(--base-grey) shade(30%));
}
.Query-filters {
display: flex;
- flex-wrap: wrap;
- align-items: center;
- width: 100%;
+ overflow-x: scroll;
+ max-width: 400px;
+ white-space: nowrap;
}
.Query-filter {
display: flex;
align-items: center;
+ font-size: 0.75em;
+ height: 56px;
+ border: 2px solid transparent;
+ border-radius: var(--default-border-radius);
+}
+
+.Query-filter.selected {
+ border-color: var(--purple-light-color);
}
.Filter-section {
@@ -72,12 +87,11 @@
.Query-filter .input {
border-radius: 0;
- border-color: var(--selection-color);
-}
-
-.Query-filter .Icon-close {
- margin-left: 1rem;
- margin-right: 1rem;
+ border: none;
+ font-size: inherit;
+ background-color: transparent;
+ width: 150px;
+ padding: 0;
}
.QueryTable-wrapper {
@@ -94,34 +108,31 @@
color: var(--brand-color);
}
+.SelectionList {
+ padding-top: 5px;
+}
+
.SelectionItems {
- opacity: 0;
- pointer-events: none;
- position: absolute;
- top: 2.75rem;
- border: 1px solid #ddd;
- box-shadow: 0 1px 4px rgba(0, 0, 0, .18);
- border-radius: 4px;
- background: #fff;
- z-index: 3;
- left: 0;
- right: 0;
overflow-y: scroll;
max-height: 340px;
- min-width: 320px;
+ max-width: 320px;
}
-.SelectionItems.open {
+.SelectionItems.SelectionItems--open {
opacity: 1;
transition: opacity .3s linear;
pointer-events: all;
}
+.SelectionItems.SelectionItems--expanded {
+ max-height: inherit;
+}
+
.SelectionItem {
display: flex;
align-items: center;
cursor: pointer;
- padding: 0.75rem;
+ padding: 0.75rem 1.5rem 0.75rem 0.75rem;
background-color: #fff;
}
@@ -129,37 +140,47 @@
background-color: currentColor;
}
+.SelectionItem .Icon {
+ margin-left: 0.5rem;
+ margin-right: 0.75rem;
+ color: currentcolor;
+}
+
.SelectionItem .Icon-check {
opacity: 0;
- color: #fff;
- margin-left: 0.5rem;
- margin-right: 0.5rem;
}
-.SelectionItem:hover .Icon-check {
+.SelectionItem .Icon-chevrondown {
opacity: 1;
+ }
+
+.SelectionItem:hover .Icon {
+ color: #fff !important;
}
.SelectionItem:hover .SelectionModule-display {
color: #fff;
}
-.SelectionItem.SelectionItem--selected .Icon-check {
- opacity: 1;
- color: var(--brand-color);
+.SelectionItem:hover .SelectionModule-description {
+ color: #fff;
}
-.SelectionModule.open .SelectionItems {
+.SelectionItem.SelectionItem--selected .Icon-check {
opacity: 1;
- pointer-events: all;
}
.SelectionModule-display {
color: currentColor;
+ margin-bottom: 0.25em;
+}
+
+.SelectionModule-description {
+ color: color(var(--base-grey) shade(40%));
+ font-size: 0.8rem;
}
.Visualization {
- overflow-y: scroll;
transition: background .3s linear;
}
@@ -182,16 +203,7 @@
display: flex;
align-items: center;
justify-content: center;
-}
-
-.VisualizationSettings {
- padding-bottom: 1em;
- padding-top: 1em;
- background-color: #fff;
-}
-
-.VisualizationSettings .Select select {
- padding: 0.5rem;
+ overflow: hidden;
}
.Loading {
@@ -245,87 +257,336 @@
width: 100%;
}
+/* GUI BUILDER */
+
.GuiBuilder {
position: relative;
- border-bottom: 1px solid #F0F0F0;
- max-height: 100%;
+ display: flex;
+ flex-direction: column;
+ font-size: 0.9em;
+ z-index: 2;
+ background-color: #fff;
+
+ border: 1px solid #e0e0e0;
}
-.GuiBuilder.GuiBuilder--collapsed {
- max-height: 2rem;
- min-height: 2rem;
+.GuiBuilder-row {
+ border-bottom: 1px solid #e0e0e0;
}
-.GuiBuilder.GuiBuilder--collapsed .Query-section {
- display: none;
+.GuiBuilder-row:last-child {
+ border-bottom: none;
}
-.QueryToggleWrapper {
- bottom: -1rem;
- z-index: 1;
+
+.GuiBuilder-section {
+ position: relative;
+ min-height: 48px;
+ min-width: 120px;
+ border-right: 1px solid #e0e0e0;
}
-.QueryToggle {
- color: #999;
- border-radius: 99px;
- z-index: 1000;
- border: 1px solid #ddd;
+.GuiBuilder-section:last-child {
+ border-right: none;
}
-.QueryToggle:hover {
- color: var(--brand-color);
- border-color: var(--brand-color);
- transition: color .3s linear, border .3s linear;
+.GuiBuilder-section-label {
+ background-color: white;
+ position: absolute;
+ top: -7px;
+ left: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
+}
+
+/* for medium breakpoint only expand if data reference is not shown */
+@media screen and (--breakpoint-min-md) {
+ .GuiBuilder {
+ font-size: 1.0em;
+ }
+ .QueryBuilder:not(.QueryBuilder--showDataReference) .GuiBuilder {
+ flex-direction: row;
+ }
+ .QueryBuilder:not(.QueryBuilder--showDataReference) .GuiBuilder-row:last-child {
+ border-right: none;
+ border-bottom: 1px solid #e0e0e0;
+ }
+ .QueryBuilder:not(.QueryBuilder--showDataReference) .GuiBuilder-section:last-child {
+ border-right: 1px solid #e0e0e0;
+ }
+}
+
+/* for large breakpoint always expand */
+@media screen and (--breakpoint-min-lg) {
+ .GuiBuilder {
+ font-size: 1.1em;
+ flex-direction: row;
+ }
+ .GuiBuilder-row:last-child {
+ border-right: none;
+ border-bottom: 1px solid #e0e0e0;
+ }
+ .GuiBuilder-section:last-child {
+ border-right: 1px solid #e0e0e0;
+ }
+}
+
+.QueryOption {
+ color: color(var(--base-grey) shade(20%));
+ font-weight: 700;
+}
+
+.QueryOption:hover {
+ cursor: pointer;
}
/* @transitions */
-.Transition-qb-section-enter {
- opacity: 0.01;
- transition: opacity .3s linear !important;
+.AddToDashSuccess {
+ max-width: 260px;
+ text-align: center;
}
-.Transition-qb-section-enter-active {
- opacity: 1;
- transition: opacity .3s linear !important;
+/* DATA SECTION */
+
+.GuiBuilder-data {
+ z-index: 1; /* moved the arrow thingy above the filter outline */
+}
+
+/* FILTER BY SECTION */
+
+.Filter-section-field,
+.Filter-section-operator,
+.Filter-section-value {
+ color: var(--purple-color);
}
-.Transition-qb-section-leave {
+.Filter-section-field.selected .QueryOption {
+ color: var(--purple-color);
+}
+.Filter-section-operator.selected .QueryOption {
+ color: var(--purple-color);
+ text-transform: lowercase;
+}
+.Filter-section-value.selected .QueryOption {
+ color: var(--purple-color);
+}
+
+/* put quotes around numeric or text values */
+.Filter-section-value .QueryOption.QueryOption--text:before,
+.Filter-section-value .QueryOption.QueryOption--text:after,
+.Filter-section-value .QueryOption.QueryOption--number:before,
+.Filter-section-value .QueryOption.QueryOption--number:after,
+.Filter-section-value .QueryOption.QueryOption--select:before,
+.Filter-section-value .QueryOption.QueryOption--select:after {
+ content: '"';
+}
+
+.Filter-section-sort-field.selected .QueryOption,
+.Filter-section-sort-direction.selected .QueryOption {
+ color: inherit;
+}
+
+.Filter-section-value {
+ padding-right: 0.5em;
+}
+
+.FilterPopover .ColumnarSelector-row--selected,
+.FilterPopover .PopoverHeader-item.selected {
+ color: var(--purple-color) !important;
+}
+.FilterPopover .ColumnarSelector-row:hover {
+ background-color: var(--purple-color) !important;
+}
+
+.Filter-section-value .Button,
+.Filter-section-value .input {
+ padding: 0.5rem;
+}
+
+.Filter-section-value .input {
+ font-size: inherit;
+ border: 1px solid var(--border-color);
+ border-radius: 4px;
+}
+
+.Filter-section-value .input:focus {
+ outline: none;
+ border-color: var(--purple-color);
+ box-shadow: 0 0 2px var(--purple-color);
+}
+
+/* VIEW SECTION */
+
+.View-section-aggregation,
+.View-section-aggregation-target,
+.View-section-breakout {
+ color: var(--green-color);
+}
+
+.View-section-aggregation.selected .QueryOption,
+.View-section-aggregation-target.selected .QueryOption,
+.View-section-breakout.selected .QueryOption {
+ color: var(--green-color);
+}
+
+/* SORT/LIMIT SECTION */
+
+.GuiBuilder-sort-limit {
+ min-width: 0px;
+}
+
+.EllipsisButton {
+ font-size: 3em;
+ position: relative;
+ top: -0.8rem;
+}
+
+/* NATIVE */
+
+.NativeQueryEditor .GuiBuilder-data {
+ border-right: none;
+}
+
+/* VISUALIZATION SETTINGS */
+
+.VisualizationSettings .GuiBuilder-section {
+ border-right: none !important;
+}
+
+.ChartType-button {
+ width: 38px;
+ height: 38px;
+ border-radius: 38px;
+ background-color: white;
+ border: 1px solid #ccdff6;
+}
+
+.ChartType-popover {
+ min-width: 15em !important;
+}
+
+.ChartType--selected {
+ color: white;
+ background-color: rgb(74, 144, 226);
+}
+
+.ChartType--notSensible {
+ opacity: 0.5;
+}
+
+.ColorWell {
+ width: 18px;
+ height: 18px;
+ margin: 3px;
+ margin-right: 0.3rem;
+}
+
+.RunButton {
+ z-index: 1;
+ margin-top: 0;
opacity: 1;
- transition: opacity .3s linear !important;
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .22);
+ transition: margin-top 0.5s, opacity 0.5s;
}
-.Transition-qb-section-leave-active {
- opacity: 0.01;
- transition: opacity .3s linear !important;
+.RunButton.RunButton--hidden {
+ margin-top: -110px;
+ opacity: 0;
}
-.AddToDashSuccess {
- max-width: 260px;
- text-align: center;
+/* DATA REFERENCE */
+
+.DataReference {
+ z-index: -1;
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 300px;
+ height: 100%;
+ background-color: #F9FBFC;
+ overflow: hidden;
}
-.QueryOption {
- border: 1px solid var(--selection-color);
+.DataReference-container {
+ width: 300px;
+}
+
+.DataReference h1 {
+ font-size: 20pt;
+}
+
+.DataRefererenceQueryButton-circle {
+ border: 1px solid currentColor;
+ border-radius: 99px;
+ width: 1.25rem;
+ height: 1.25rem;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.DataRefererenceQueryButton-text {
+ max-width: 160px;
+}
+
+.DataReference-paneCount {
+ padding-right: 0.6em;
+}
+
+/* object detail */
+.ObjectDetail {
+ border: 1px solid #DEDEDE;
+ min-width: 906px;
+ margin: 0 auto;
+ margin-bottom: 2rem;
+}
+
+@media screen and (--breakpoint-min-lg) {
+ .ObjectDetail {
+ min-width: 1140px;
+ }
+}
+
+.ObjectDetail-headingGroup {
+ border-bottom: 1px solid #DEDEDE;
+}
+
+.ObjectDetail-infoMain {
+ border-right: 1px solid #DEDEDE;
+ margin-left: 2.4rem;
+ font-size: 1rem;
+}
+
+.ObjectJSON {
+ max-height: 200px;
+ overflow: scroll;
+ padding: 1em;
+ background-color: #F8F8F8;
+ border: 1px solid #dedede;
border-radius: 2px;
- color: var(--brand-color);
- line-height: 1;
}
-.QueryOption--offset {
- margin-left: 7rem;
+.ace_gutter-cell {
+ padding-top: 2px;
+ font-size: 10px;
+ font-weight: 700;
+ color: color(var(--base-grey) shade(30%));
+ padding-left: 0;
+ padding-right: 0;
+ display: block;
+ text-align: center;
}
-.QueryOption:hover {
- border-color: color(var(--selection-color) shade(5%));
- cursor: pointer;
+.ace_gutter-layer {
+ background-color: #F9FBFC;
+ border-right: 1px solid var(--border-color);
}
-.SelectionModule.selected .QueryOption {
- background-color: var(--selection-color);
+.QueryBuilder .Entity-title,
+.QueryBuilder .Entity-attribution {
+ margin-left: 0.5rem;
}
-.SelectionModule.selected .QueryOption:hover {
- background-color: var(--brand-color);
- border-color: var(--brand-color);
- color: #fff;
+.PopoverBody.AddToDashboard {
+ min-width: 25em;
}
diff --git a/resources/frontend_client/app/css/setup.css b/resources/frontend_client/app/css/setup.css
index 9a4f08e25b4c59e755900a05f37adff382087c33..8b4ee8654f0a971943e68003f136f7eb46943ec2 100644
--- a/resources/frontend_client/app/css/setup.css
+++ b/resources/frontend_client/app/css/setup.css
@@ -98,43 +98,3 @@
.SetupHelp {
color: var(--body-text-color);
}
-
-.DatabaseEngine {
- position: relative;
- font-size: 1.137em;
- padding-top: 0.875em;
- padding-bottom: 0.875em;
- padding-left: 3em;
- line-height: 2em;
-}
-
-.DatabaseEngine:hover {
- color: var(--brand-color);
- cursor: pointer;
-}
-
-.DatabaseEngine:before {
- position: absolute;
- left: 0;
- content: '';
- display: inline-block;
- width: 2em;
- height: 2em;
- border-radius: 99px;
- border: 1px solid currentColor;
-}
-
-.DatabaseEngine-check {
- display: none;
- position: absolute;
- left: 0.6em;
- top: 1em;
-}
-
-.DatabaseEngine:hover .DatabaseEngine-check {
- display: block;
-}
-
-.DatabaseEngine.DatabaseEngine--selected .DatabaseEngine-check {
- display: block;
-}
diff --git a/resources/frontend_client/app/dashboard/dashboard.controllers.js b/resources/frontend_client/app/dashboard/dashboard.controllers.js
index cfc6c7473c5b321b761fafbed4ab1564ed5b269b..0d3bfc03bc5eaa8bd1f9ef598c6f3e1f5cdb64b3 100644
--- a/resources/frontend_client/app/dashboard/dashboard.controllers.js
+++ b/resources/frontend_client/app/dashboard/dashboard.controllers.js
@@ -1,6 +1,9 @@
'use strict';
/*global _*/
+import MetabaseAnalytics from '../lib/analytics';
+
+
// Dashboard Controllers
var DashboardControllers = angular.module('corvus.dashboard.controllers', []);
@@ -25,6 +28,10 @@ DashboardControllers.controller('DashList', ['$scope', '$location', 'Dashboard',
refreshListing();
});
+ $scope.$on("dashboard:update", function(event, dashboardId) {
+ refreshListing();
+ });
+
// always initialize with a fresh listing
refreshListing();
@@ -56,6 +63,7 @@ DashboardControllers.controller('DashDetail', ['$scope', '$routeParams', '$locat
* window is set to < 600px, even without mobileBreakPoint set.
*/
//mobileBreakPoint: 640,
+ saveGridItemCalculatedHeightInMobile: true,
floating: false,
pushing: false,
swapping: true,
@@ -70,17 +78,17 @@ DashboardControllers.controller('DashDetail', ['$scope', '$routeParams', '$locat
}
};
- var processResize = function(event, $element, item){
+ function processResize(event, $element, item){
$element.scope().$broadcast('cv-gridster-item-resized', $element);
savePosition();
- };
+ }
- var savePosition = function() {
+ function savePosition() {
Dashboard.reposition_cards({
'dashId': $scope.dashboard.id,
'cards': $scope.dashcards
});
- };
+ }
$scope.toggleDashEditMode = function() {
@@ -97,6 +105,13 @@ DashboardControllers.controller('DashDetail', ['$scope', '$routeParams', '$locat
}
$scope.gridsterOptions.draggable.enabled = !$scope.gridsterOptions.draggable.enabled;
$scope.gridsterOptions.resizable.enabled = !$scope.gridsterOptions.resizable.enabled;
+
+ // Tracking
+ if ($scope.gridsterOptions.resizable.enabled) {
+ MetabaseAnalytics.trackEvent('Dashboard', 'Rearrange Finished');
+ } else {
+ MetabaseAnalytics.trackEvent('Dashboard', 'Rearrange Started');
+ }
};
$scope.notifyDashboardSaved = function(dashboard) {
diff --git a/resources/frontend_client/app/dashboard/dashboard.directives.js b/resources/frontend_client/app/dashboard/dashboard.directives.js
index 324329ff91b1dcab13970c8392a85774b1472e14..d7f426854719b8ec2d123db87945813931f55c21 100644
--- a/resources/frontend_client/app/dashboard/dashboard.directives.js
+++ b/resources/frontend_client/app/dashboard/dashboard.directives.js
@@ -18,7 +18,16 @@ DashboardDirectives.directive('mbDashboardSaver', ['CorvusCore', 'Dashboard', '$
controller: ['$scope', '$modalInstance',
function($scope, $modalInstance) {
$scope.dashboard = angular.copy(scope.dashboard);
- $scope.permOptions = CorvusCore.perms;
+
+ // TODO: hard coding this is wack, but right now there is little choice.
+ // we need to cleanup these definitions and ideally get them from the api.
+ $scope.permOptions = this.perms = [{
+ 'id': 0,
+ 'name': 'Private'
+ }, {
+ 'id': 2,
+ 'name': 'Public'
+ }];
$scope.save = function(dash) {
$scope.$broadcast("form:reset");
@@ -29,6 +38,8 @@ DashboardDirectives.directive('mbDashboardSaver', ['CorvusCore', 'Dashboard', '$
scope.callback(result);
}
+ $rootScope.$broadcast("dashboard:update", scope.dashboard.id);
+
// just close out the modal now that we're done
$modalInstance.close();
diff --git a/resources/frontend_client/app/dashboard/partials/_card.html b/resources/frontend_client/app/dashboard/partials/_card.html
index c891c82106c17b80c57be28c58ed05bdbe7f7309..e88e0eecbe0e349d3665d0c5eda90f9ace86d985 100644
--- a/resources/frontend_client/app/dashboard/partials/_card.html
+++ b/resources/frontend_client/app/dashboard/partials/_card.html
@@ -1,4 +1,4 @@
-<div class="Card" ng-class="{ 'Card--errored': cardDataEmpty || cardData.error || sqlError }">
+<div class="Card bordered rounded" ng-class="{ 'Card--errored': cardDataEmpty || cardData.error || sqlError }">
<div id="{{chartId}}_heading" ng-include="'/app/dashboard/partials/_card_heading.html'" onload="headerLoaded = true"></div>
<div ng-if="cardDataEmpty && !sqlError">
diff --git a/resources/frontend_client/app/dashboard/partials/dash_view.html b/resources/frontend_client/app/dashboard/partials/dash_view.html
index e07321fc1c044e491fc2f96ab8c9ebf612c0ac93..bd0fcee5d80d9164e9af0cf0bbe16c124219f455 100644
--- a/resources/frontend_client/app/dashboard/partials/dash_view.html
+++ b/resources/frontend_client/app/dashboard/partials/dash_view.html
@@ -1,13 +1,12 @@
-<div class="Dashboard full-height">
-
- <div class="wrapper full-height" ng-if="dashboardLoaded && dashboardLoadError">
+<div class="Dashboard full-height flex flex-row flex-full">
+ <div class="Dash-wrapper wrapper" ng-if="dashboardLoaded && dashboardLoadError">
<div class="full-height text-centered flex layout-centered">
<h2 class="text-error text-grey-1">{{dashboardLoadError}}</h2>
</div>
</div>
<div class="text-centered my4 py4" ng-if="!dashboardLoaded">
- <div class="wrapper">
+ <div class="Dash-wrapper wrapper">
<div class="my4 py4 text-brand">
<mb-loading-icon></mb-loading-icon>
<h1 class="text-normal text-grey-2">Loading...</h1>
@@ -15,29 +14,31 @@
</div>
</div>
- <div ng-if="dashboardLoaded && !dashboardLoadError">
- <header class="py2 mt2 border-bottom">
- <div class="wrapper flex align-center">
- <div class="Entity">
- <div class="flex align-center">
- <h4 class="Entity-title">{{dashboard.name}}</h4>
- <mb-icon class="ml1 text-grey-4" name="lock" width="12px" height="12px" ng-if="dashboard.public_perms === 0"></mb-icon>
- <a class="cursor-pointer link ml1" href="#" mb-dashboard-saver ng-attr-dashboard="dashboard" ng-attr-callback="notifyDashboardSaved">Edit</a>
- </div>
- <span class="Entity-attribution">
- Created by <span class="Entity-creator">{{dashboard.creator.common_name}}</span>
- </span>
- </div>
+ <div class="full" ng-if="dashboardLoaded && !dashboardLoadError">
+ <header class="py2 xl-py4 bg-white border-bottom">
+ <div class="Dash-wrapper wrapper">
+ <div class="mx2 flex align-center">
+ <div class="Entity">
+ <div class="flex align-center">
+ <h4 class="Entity-title">{{dashboard.name}}</h4>
+ <mb-icon title="This Dashboar dis Private" class="ml1 text-grey-4" name="lock" width="12px" height="12px" ng-if="dashboard.public_perms === 0"></mb-icon>
+ <a class="cursor-pointer link ml1" href="#" mb-dashboard-saver ng-attr-dashboard="dashboard" ng-attr-callback="notifyDashboardSaved">Edit</a>
+ </div>
+ <span class="Entity-attribution">
+ Created by <span class="Entity-creator">{{dashboard.creator.common_name}}</span>
+ </span>
- <div class="flex-align-right hide md-show">
- <a class="cursor-pointer" ng-click="toggleDashEditMode()" ng-if="dashboard.can_write && dashcards.length > 0">
- <mb-icon name="grid" width="16px" height="16px"></mb-icon>
- </a>
+ </div>
+ <div class="flex-align-right hide md-show">
+ <a title="Edit Layout" class="cursor-pointer" ng-click="toggleDashEditMode()" ng-if="dashboard.can_write && dashcards.length > 0">
+ <mb-icon name="grid" width="16px" height="16px"></mb-icon>
+ </a>
+ </div>
</div>
</div>
</header>
- <div class="wrapper full-height">
+ <div class="Dash-wrapper wrapper full-height">
<div ng-if="!dashboardLoaded">
<div class="flex layout-centered text-centered full-height">
@@ -49,7 +50,7 @@
<div ng-if="dashboardLoaded && !dashcards.length > 0">
<h1 class="text-normal text-grey-2">This dashboard doesn't have any data yet.</h1>
- <a class="Button Button--primary" href="/card/create">Ask a question</a>
+ <a class="Button Button--primary" href="/q">Ask a question</a>
</div>
</div>
diff --git a/resources/frontend_client/app/directives.js b/resources/frontend_client/app/directives.js
index b2d5fd8c5a62ec8ae63a6c219e7baa6948856ea8..bd8b5e3a87624bf94a3d08016a60d228160f95af 100644
--- a/resources/frontend_client/app/directives.js
+++ b/resources/frontend_client/app/directives.js
@@ -133,6 +133,53 @@ CorvusDirectives.directive('mbActionButton', ['$timeout', '$compile', function (
};
}]);
+CorvusDirectives.directive('mbReactComponent', ['$timeout', function ($timeout) {
+ return {
+ restrict: 'A',
+ link: function (scope, element, attr) {
+ var Component = scope[attr.mbReactComponent];
+ delete scope[attr.mbReactComponent];
+
+ function render() {
+ var props = {};
+ function copyProp(key, value) {
+ if (typeof value === "function") {
+ props[key] = function() {
+ try {
+ return value.apply(this, arguments);
+ } finally {
+ $timeout(() => scope.$digest());
+ }
+ }
+ } else {
+ props[key] = value;
+ }
+ }
+ for (var key in scope) {
+ copyProp(key, scope[key]);
+ }
+ React.render(<Component {...props}/>, element[0]);
+ }
+
+ scope.$on("$destroy", function() {
+ React.unmountComponentAtNode(element[0]);
+ });
+
+ // limit renders to once per animation frame
+ var timeout;
+ scope.$watch(function() {
+ if (!timeout) {
+ timeout = requestAnimationFrame(function() {
+ timeout = null;
+ render();
+ });
+ }
+ });
+
+ render();
+ }
+ };
+}]);
var NavbarDirectives = angular.module('corvus.navbar.directives', []);
@@ -165,20 +212,7 @@ NavbarDirectives.directive('mbProfileLink', [function () {
return {
restrict: 'E',
replace: true,
- template: '<ul>' +
- '<li class="Dropdown inline-block" dropdown on-toggle="toggled(open)">' +
- '<a class="flex align-center" selectable-nav-item="settings" dropdown-toggle>' +
- '<span class="UserNick">' +
- '<span class="UserInitials NavItem-text">{{initials}}</span> ' +
- '</span>' +
- '<mb-icon name="chevrondown" class="Dropdown-chevron ml1" width="8px" height="8px"></mb-icon>' +
- '</a>' +
- '<ul class="Dropdown-content right">' +
- '<li><a class="Dropdown-item link block" href="/user/edit_current">Account Settings</a></li>' +
- '<li><a class="Dropdown-item link block" href="/auth/logout">Logout</a></li>' +
- '</ul>' +
- '</li>' +
- '</ul>',
+ templateUrl: '/app/partials/mb_profile_link.html',
scope: {
context: '=',
user: '='
diff --git a/resources/frontend_client/app/explore/explore.controllers.js b/resources/frontend_client/app/explore/explore.controllers.js
deleted file mode 100644
index eac1cdd99d7bc198a180bdb6d02b90953ca30bf6..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/explore/explore.controllers.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-/*jslint browser:true */
-/*global _*/
-/* global addValidOperatorsToFields*/
-
-var ExploreControllers = angular.module('corvus.explore.controllers', ['corvus.metabase.services']);
-
-ExploreControllers.controller('ExploreDatabaseList', ['$scope', 'Metabase', function($scope, Metabase) {
-
- $scope.databases = [];
- $scope.currentDB = {};
- $scope.tables = [];
-
- Metabase.db_list(function (databases) {
- $scope.databases = databases;
- $scope.selectCurrentDB(0)
- }, function (error) {
- console.log(error);
- });
-
-
- $scope.selectCurrentDB = function(index) {
- $scope.currentDB = $scope.databases[index];
- Metabase.db_tables({
- 'dbId': $scope.currentDB.id
- }, function (tables) {
- $scope.tables = tables;
- }, function (error) {
- console.log(error);
- })
- }
-}]);
diff --git a/resources/frontend_client/app/explore/explore.directives.js b/resources/frontend_client/app/explore/explore.directives.js
deleted file mode 100644
index f0f649920decdcfe7b51b9060f356e6e680b2273..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/explore/explore.directives.js
+++ /dev/null
@@ -1,433 +0,0 @@
-'use strict';
-/* global addValidOperatorsToFields*/
-
-var ExploreDirectives = angular.module('corvus.explore.directives', ['corvus.directives']);
-
-ExploreDirectives.directive('cvDataGrid', ['Metabase', 'TableSegment', 'CorvusCore', 'CorvusFormGenerator', function(Metabase, TableSegment, CorvusCore, CorvusFormGenerator) {
-
- function link($scope, element, attr) {
-
- // $scope.table_metadata
- // $scope.query
- // $scope.page
- // $scope.row_count
- // $scope.data
-
- $scope.page = 1;
- $scope.row_count = 0;
-
- $scope.new_filters = null;
- $scope.create_segment = false;
- $scope.change_columns = false;
-
- $scope.handleDropdownInput = function(event) {
- event.stopPropagation();
- };
- // this basically needs to be here so our ui-sortable directive can have a reference to it on page load
- $scope.table_metadata = {
- 'fields': []
- };
-
- $scope.setPage = function(page) {
- $scope.query.query.page.page = page;
-
- Metabase.dataset($scope.query, function(result) {
- // map our visible columns to the actual column list returned with the data so we can get rows easily
- if (result.data && result.data.cols) {
- for (var i = result.data.cols.length - 1; i >= 0; i--) {
- for (var k = $scope.table_metadata.fields.length - 1; k >= 0; k--) {
- if (result.data.cols[i].id == $scope.table_metadata.fields[k].id) {
- $scope.table_metadata.fields[k].colindex = i;
- }
- }
- }
- }
-
- $scope.data = result.data;
- });
- };
-
- $scope.updateDataGrid = function() {
- // new filters means resetting our data grid
- $scope.setPage(1);
-
- // update our row count
- var row_count_query = angular.copy($scope.query);
- row_count_query.query.aggregation = ['count'];
- Metabase.dataset(row_count_query, function(result) {
- if (result && result.data) {
- $scope.row_count = result.data.rows[0][0];
- }
- }, function(error) {
- console.log('error getting row count', error);
- });
- };
-
- // this stuff controls the filtering stuff
-
- $scope.isFiltering = function() {
- if ($scope.query && $scope.query.query && $scope.query.query.filter) {
- return $scope.query.query.filter.length > 0;
- }
- return false;
- };
-
- $scope.queryFilters = function() {
- if ($scope.query && $scope.query.query && $scope.query.query.filter) {
- // always strip off the first entry in the filter list because it just says "AND"
- var filters = $scope.query.query.filter.slice(1);
-
- if ($scope.filters) {
- filters = filters.slice($scope.filters.length);
- }
-
- return filters;
- }
-
- return null;
- };
-
- $scope.getFilterColumnName = function(filter) {
- if (!filter) return null;
-
- // this is less than ideal, but the way our query filter definitions only contain ids requires this lookup
- var colname;
- $scope.table_metadata.fields.forEach(function(coldef) {
- if (coldef.id === filter[1]) {
- colname = coldef.name;
- }
- });
-
- return colname;
- };
-
- $scope.removeFilter = function(index) {
- if ($scope.filters) {
- $scope.query.query.filter.splice(index + 1 + $scope.filters.length, 1);
- } else {
- $scope.query.query.filter.splice(index + 1, 1);
- }
-
- // if we clear them all then just reset the query filter to null
- if ($scope.query.query.filter.length === 1) {
- $scope.query.query.filter = null;
- }
-
- // automatically trigger data refreshes on filter removals
- $scope.updateDataGrid();
- };
-
- // set initial state of the filters dropdown
- $scope.filtersOpen = false;
- // set initial state of segments dropdown
- $scope.segmentsOpen = false;
-
- $scope.toggleNewFilters = function() {
- if ($scope.new_filters === null) {
- $scope.new_filters = [
- [null, null]
- ];
- } else {
- $scope.new_filters = null;
- }
- };
-
- $scope.clearNewFilters = function() {
- $scope.new_filters = null;
- };
-
- $scope.applyNewFilters = function(new_filters) {
- if (!$scope.filtersAreValid(new_filters)) return;
- new_filters.forEach(function(new_filter) {
- if (!$scope.query.query.filter) {
- $scope.query.query.filter = ["AND", new_filter];
- } else {
- $scope.query.query.filter.push(new_filter);
- }
- });
-
- $scope.updateDataGrid();
-
- // make sure and clear out the new additions now that they are part of the query
- $scope.clearNewFilters();
- $scope.filtersOpen = false;
- };
-
- /// Filter clause is just an array of filters; call filterIsValid() on each
- $scope.filtersAreValid = function(filterClause) {
- var len = filterClause.length;
- for (var i = 0; i < len; i++) {
- if (!$scope.filterIsValid(filterClause[i])) return false;
- }
- return true;
- };
-
- /// Check whether an individual FILTER is valid (a subclause of a filter clause)
- /// a filter clause is valid iff it and its children don't contain any nulls
- $scope.filterIsValid = function(filter) {
- var containsNulls = function(obj) {
- if (obj === null) return true;
-
- // if we're looking at an Array recurse over each child
- if (obj.constructor === Array) {
- var len = obj.length;
- for (var i = 0; i < len; i++) {
- if (containsNulls(obj[i])) return true; // return immediately if we see a null
- }
- }
- return false;
- };
-
- return !containsNulls(filter);
- };
-
- $scope.canAddFilter = function() {
- if (!$scope.new_filters) return false;
-
- // if we have no filters then adding is fine
- if ($scope.new_filters.length === 0) return true;
-
- // if we have filters, and the last one added is valid, then adding a new one makes sense
- if ($scope.new_filters[$scope.new_filters.length - 1][0] !== null) return true;
-
- // in all other cases there is no need to add another filter
- return false;
- };
-
- $scope.addNewFilter = function() {
- $scope.new_filters.push([null, null]);
- };
-
- $scope.removeNewFilter = function(table_filter_index) {
- if ($scope.new_filters.length > 1) {
- $scope.new_filters.splice(table_filter_index, 1);
- } else {
- // if there is only one in there then we are completely clearing the new filters
- $scope.clearNewFilters();
- }
- };
-
- $scope.field_for = function(table_filter, field_index) {
- var selected_field = $scope.table_metadata.fields_lookup[table_filter[1]];
- //console.log("selected_field", selected_field);
- var return_val = selected_field.operators_lookup[table_filter[0]].fields[field_index];
- //console.log("selected_input_field", return_val.values);
- return return_val;
- };
-
- $scope.field_type_for = function(table_filter, field_index) {
- return $scope.field_for(table_filter, field_index).type;
- };
-
- $scope.operator_selected = function(table_filter) {
- var selected_field = $scope.table_metadata.fields_lookup[table_filter[1]];
- table_filter.length = selected_field.operators_lookup[table_filter[0]].fields.length + 2;
- for (var i = 2; i < table_filter.length; i++) {
- table_filter[i] = null;
- }
- };
-
- $scope.isSortColumn = function(coldef) {
- // check if the specified column is currently our query sort column
- if (!$scope.query.query.order_by) return false;
-
- if ($scope.query.query.order_by[0] && $scope.query.query.order_by[0][0] === coldef.id) return true;
-
- return false;
- };
-
- $scope.sortBy = function(coldef) {
- $scope.query.query.order_by = [
- [coldef.id, 'ascending']
- ];
-
- $scope.updateDataGrid();
- };
-
- $scope.isLinkable = function(coldef) {
- if (!coldef || !coldef.special_type) return false;
-
- if (coldef.special_type === 'id' || (coldef.special_type === 'fk' && coldef.target)) {
- return true;
- } else {
- return false;
- }
- };
-
- $scope.buildEntityLink = function(coldef, value) {
- if (!coldef || !coldef.special_type) return null;
-
- if (coldef.special_type === 'id') {
- return '/explore/table/' + $scope.table.id + '/' + encodeURIComponent(value);
- }
-
- if (coldef.special_type === 'fk' && coldef.target) {
- return '/explore/table/' + coldef.target.table_id + '/' + encodeURIComponent(value);
- }
-
- return null;
- };
-
- $scope.isNumber = function(coldef) {
- return false;
-
- // leaving this here even though it's not going to be functional at the moment
- // the main problem is that blindly relying on base_type to decide if a column should be displayed as a
- // number is hugely problematic because many cases have number columns that shouldn't be formated as numbers
- // like Year, while other times columns that should be numbers are strings in the underlying data
- // the end result is that this ends up making things look worse rather than better :(
-
- // if (!coldef || !coldef.base_type) return false;
-
- // if (_.contains(["IntegerField", "DecimalField", "FloatField"], coldef.base_type)) {
- // return true;
- // } else {
- // return false;
- // }
- };
-
- $scope.toggleChangeVisibleColumns = function() {
- $scope.change_columns = !$scope.change_columns;
- };
-
- $scope.dragControlListeners = {
- accept: function(sourceItemHandleScope, destSortableScope) {
- return true;
- },
- itemMoved: function(event) {},
- orderChanged: function(event) {}
- };
-
- $scope.getEncodedQuery = function() {
- // make a copy and remove our page element
- var tmp = angular.copy($scope.query);
- delete tmp.query.page;
- return encodeURIComponent(JSON.stringify(tmp));
- };
-
- $scope.toggleSegment = function() {
- $scope.create_segment = !$scope.create_segment;
- };
-
- $scope.applySegment = function(segment) {
- if (!segment) return;
-
- // NOTE: we need to do a copy here, otherwise future changes to the filter of our query will
- // mess with our segment filter_clause
- var filter = angular.copy(segment.filter_clause);
- $scope.query.query.filter = filter;
- $scope.updateDataGrid();
-
- // cleanup
- $scope.selected_segment = undefined;
- $scope.toggleSegment();
- $scope.segmentsOpen = false;
- };
-
- $scope.createSegment = function(name) {
- var segment = {
- 'tableId': $scope.table.id,
- 'name': name,
- 'filter_clause': $scope.query.query.filter
- };
-
- Metabase.table_createsegment(segment, function(result) {
- $scope.segments.push(segment);
-
- // cleanup
- $scope.segment_name = undefined;
- $scope.toggleSegment();
- }, function(error) {
- console.log('error creating segment', error);
- });
- };
-
- $scope.deleteSegment = function(segment) {
- if (!segment) return;
-
- TableSegment.delete({
- 'segmentID': segment.id
- }, function(result) {
- var index = $scope.segments.indexOf(segment);
- $scope.segments.splice(index, 1);
- $scope.selected_segment = undefined;
- }, function(error) {
- console.log(error);
- });
- };
-
-
- $scope.$watch('table', function(table) {
- if (!table) return;
-
- // when we know the table we are working from then setup a couple things to work from
-
- // this will be the underlying query that controls the data we are showing the user
- $scope.query = {
- 'database': table.db.id,
- 'type': "query",
- 'query': {
- 'source_table': table.id,
- 'filter': null,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'limit': null,
- 'page': {
- 'page': 1,
- 'items': 20
- }
- }
- };
-
- // if we have required filters then apply them now
- if ($scope.filters && $scope.filters.length > 0) {
-
- $scope.query.query.filter = ["AND"];
- $scope.filters.forEach(function(filter) {
- $scope.query.query.filter.push(filter);
- });
- }
-
- // we need to have a full set of metadata about the table to make the UI
- Metabase.table_query_metadata({
- 'tableId': table.id
- }, function(metadata) {
-
- // Decorate with valid operators
- $scope.table_metadata = CorvusFormGenerator.addValidOperatorsToFields(metadata);
-
- CorvusCore.createLookupTables(metadata);
-
- // this will start us off by causing a data refresh
- // NOTE: we only want to do this after we have our metadata
- $scope.updateDataGrid();
-
- }, function(error) {
- console.log('error getting table query metadata', error);
- });
-
- // we need to know the set of saved segments that are related to this table
- Metabase.table_segments({
- 'tableId': table.id
- }, function(segments) {
- $scope.segments = segments;
- }, function(error) {
- console.log('Error fetching segments', error);
- });
- });
-
- }
-
- return {
- restrict: 'E',
- replace: true,
- templateUrl: '/app/explore/partials/data_grid.html',
- scope: {
- table: '=',
- query: '=',
- filters: '=',
- allowSegments: '='
- },
- link: link
- };
-}]);
diff --git a/resources/frontend_client/app/explore/explore.module.js b/resources/frontend_client/app/explore/explore.module.js
index f14c25c1d6d9a9f7b4e2884db82426eb5dc6e7bb..be6510bc7d54d5555dcda84f2b18a6014b2e1731 100644
--- a/resources/frontend_client/app/explore/explore.module.js
+++ b/resources/frontend_client/app/explore/explore.module.js
@@ -2,13 +2,5 @@
// Explore (Metabase)
var Explore = angular.module('corvus.explore', [
- 'corvus.explore.controllers',
- 'corvus.explore.services',
- 'corvus.explore.directives'
+ 'corvus.explore.services'
]);
-
-Explore.config(['$routeProvider', function ($routeProvider) {
- $routeProvider.when('/explore/', {templateUrl: '/app/explore/partials/database_list.html', controller: 'ExploreDatabaseList'});
- $routeProvider.when('/explore/table/:tableId', {templateUrl: '/app/explore/partials/table_detail.html', controller: 'ExploreTableDetail'});
- $routeProvider.when('/explore/table/:tableId/:entityKey*', {templateUrl: '/app/explore/partials/entity_detail.html', controller: 'ExploreEntityDetail'});
-}]);
diff --git a/resources/frontend_client/app/explore/explore.services.js b/resources/frontend_client/app/explore/explore.services.js
index 39f39921db488de74c1b228644cb353932acc180..df81e9e4c4530ee36b164220ae99019710a7ab0d 100644
--- a/resources/frontend_client/app/explore/explore.services.js
+++ b/resources/frontend_client/app/explore/explore.services.js
@@ -85,7 +85,7 @@ ExploreServices.service('CorvusFormGenerator', [function() {
if (!table.field_values) {
table.field_values = {};
for (var fld in table.fields) {
- table.field_values[fld.id] = fld.name; // ???
+ table.field_values[fld.id] = fld.display_name; // ???
}
}
@@ -115,7 +115,7 @@ ExploreServices.service('CorvusFormGenerator', [function() {
var validValues = _.map(longitudeFields, function(field) {
return {
'key': field.id,
- 'name': field.name
+ 'name': field.display_name
};
});
@@ -166,11 +166,6 @@ ExploreServices.service('CorvusFormGenerator', [function() {
'verbose_name': "Greater Than or Equal To",
'validArgumentsFilters': [comparableArgument]
},
- 'IN': {
- 'name': "IN",
- 'verbose_name': "In - [list of values]",
- 'validArgumentsFilters': [freeformArgument]
- },
'INSIDE': {
'name': "INSIDE",
'verbose_name': "Inside - (Lat,Long) for upper left, (Lat,Long) for lower right",
@@ -181,39 +176,36 @@ ExploreServices.service('CorvusFormGenerator', [function() {
'verbose_name': "Between - Min, Max",
'validArgumentsFilters': [comparableArgument, comparableArgument]
},
- 'NEAR': {
- 'name': "NEAR",
- 'verbose_name': "Near - (Lat, Long), Max Distance",
- 'validArgumentsFilters': [longitudeFieldSelectArgument, numberArgument, numberArgument, numberArgument]
+ 'STARTS_WITH': {
+ 'name': "STARTS_WITH",
+ 'verbose_name': "Starts With",
+ 'validArgumentsFilters': [freeformArgument]
+ },
+ 'ENDS_WITH': {
+ 'name': "ENDS_WITH",
+ 'verbose_name': "Ends With",
+ 'validArgumentsFilters': [freeformArgument]
+ },
+ 'CONTAINS': {
+ 'name': "CONTAINS",
+ 'verbose_name': "Contains",
+ 'validArgumentsFilters': [freeformArgument]
}
- // TODO - These are not yet implemented on the backend
- // Once we do that we should re-enable these
- // 'STARTS_WITH': {
- // 'name': "STARTS_WITH",
- // 'verbose_name': "Starts with - ",
- // 'validArgumentsFilters': [freeformArgument]
- // },
- // 'CONTAINS': {
- // 'name': "CONTAINS",
- // 'verbose_name': "Contains the substring - ",
- // 'validArgumentsFilters': [freeformArgument]
- // }
};
-
var BaseOperators = ['IS', 'IS_NOT', 'IS_NULL', 'IS_NOT_NULL'];
var AdditionalOperators = {
- // 'CharField': ['STARTS_WITH', 'CONTAINS'],
- // 'TextField': ['STARTS_WITH', 'CONTAINS'],
+ 'CharField': ['STARTS_WITH', 'ENDS_WITH', 'CONTAINS'],
+ 'TextField': ['STARTS_WITH', 'ENDS_WITH', 'CONTAINS'],
'IntegerField': ['LESS_THAN', 'LESS_THAN_OR_EQUAL', 'GREATER_THAN', 'GREATER_THAN_OR_EQUAL', 'BETWEEN'],
'BigIntegerField': ['LESS_THAN', 'LESS_THAN_OR_EQUAL', 'GREATER_THAN', 'GREATER_THAN_OR_EQUAL', 'BETWEEN'],
'DecimalField': ['LESS_THAN', 'LESS_THAN_OR_EQUAL', 'GREATER_THAN', 'GREATER_THAN_OR_EQUAL', 'BETWEEN'],
'FloatField': ['LESS_THAN', 'LESS_THAN_OR_EQUAL', 'GREATER_THAN', 'GREATER_THAN_OR_EQUAL', 'BETWEEN'],
'DateTimeField': ['LESS_THAN', 'LESS_THAN_OR_EQUAL', 'GREATER_THAN', 'GREATER_THAN_OR_EQUAL', 'BETWEEN'],
'DateField': ['LESS_THAN', 'LESS_THAN_OR_EQUAL', 'GREATER_THAN', 'GREATER_THAN_OR_EQUAL', 'BETWEEN'],
- 'LatLongField': ['INSIDE', 'NEAR'],
- 'latitude': ['INSIDE', 'NEAR']
+ 'LatLongField': ['INSIDE'],
+ 'latitude': ['INSIDE']
};
function formatOperator(cls, field, table) {
@@ -246,59 +238,64 @@ ExploreServices.service('CorvusFormGenerator', [function() {
}
// Breakouts and Aggregation options
- function shortenFields(fields) {
- return _.map(fields, function(field) {
- return [field.id, field.name];
- });
-
- }
-
function allFields(fields) {
- return shortenFields(fields);
+ return fields;
}
function summableFields(fields) {
- return shortenFields(_.filter(fields, isSummable));
+ return _.filter(fields, isSummable);
}
function dimensionFields(fields) {
- return shortenFields(_.filter(fields, isDimension));
+ return _.filter(fields, isDimension);
}
-
-
var Aggregators = [{
- 'name': "Bare Rows",
+ "name": "Raw data",
"short": "rows",
+ "description": "Just a table with the rows in the answer, no additional operations.",
+ "advanced": false,
"validFieldsFilters": []
}, {
- 'name': "Total count",
+ "name": "Count",
"short": "count",
+ "description": "Total number of rows in the answer.",
+ "advanced": false,
"validFieldsFilters": []
}, {
- 'name': "Sum of ",
+ "name": "Sum",
"short": "sum",
+ "description": "Sum of all the values of a column.",
+ "advanced": false,
"validFieldsFilters": [summableFields]
}, {
- 'name': "Cumulative Sum of ",
- "short": "cum_sum",
+ "name": "Average",
+ "short": "avg",
+ "description": "Average of all the values of a column",
+ "advanced": false,
"validFieldsFilters": [summableFields]
}, {
- 'name': "# distinct values of",
+ "name": "Number of distinct values",
"short": "distinct",
+ "description": "Number of unique values of a column among all the rows in the answer.",
+ "advanced": true,
"validFieldsFilters": [allFields]
}, {
- 'name': "Standard Deviation of ",
- "short": "stddev",
+ "name": "Cumulative sum",
+ "short": "cum_sum",
+ "description": "Additive sum of all the values of a column.\ne.x. total revenue over time.",
+ "advanced": true,
"validFieldsFilters": [summableFields]
}, {
- 'name': "Average of ",
- "short": "avg",
+ "name": "Standard deviation",
+ "short": "stddev",
+ "description": "Number which expresses how much the values of a colum vary among all rows in the answer.",
+ "advanced": true,
"validFieldsFilters": [summableFields]
}];
var BreakoutAggregator = {
- 'name': "Break out by dimension",
+ "name": "Break out by dimension",
"short": "breakout",
"validFieldsFilters": [dimensionFields]
};
@@ -307,9 +304,12 @@ ExploreServices.service('CorvusFormGenerator', [function() {
return {
'name': aggregator.name,
'short': aggregator.short,
+ 'description': aggregator.description || '',
+ 'advanced': aggregator.advanced || false,
'fields': _.map(aggregator.validFieldsFilters, function(validFieldsFilterFn) {
return validFieldsFilterFn(fields);
- })
+ }),
+ 'validFieldsFilters': aggregator.validFieldsFilters
};
}
@@ -322,6 +322,7 @@ ExploreServices.service('CorvusFormGenerator', [function() {
function getBreakouts(fields) {
var result = populateFields(BreakoutAggregator, fields);
result.fields = result.fields[0];
+ result.validFieldsFilter = result.validFieldsFilters[0];
return result;
}
diff --git a/resources/frontend_client/app/explore/partials/data_grid.html b/resources/frontend_client/app/explore/partials/data_grid.html
deleted file mode 100644
index d11a5ac3340968821f07023ec556e0c147d91c59..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/explore/partials/data_grid.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<div class="row p2">
- <!-- grid controls -->
- <div class="clearfix">
- <div class="float-left mr2">
- <!-- visible columns dropdown -->
- <div class="Dropdown inline-block" dropdown on-toggle="toggled(open)">
- <a class="Pill link mr1" href="#" dropdown-toggle>
- Columns
- </a>
- <div class="Dropdown-content DragBoundary" ng-click="handleDropdownInput($event)">
- <form novalidate>
- <ul as-sortable="dragControlListeners" ng-model="table_metadata.fields">
- <li class="relative clearfix" ng-repeat="field in table_metadata.fields" as-sortable-item>
- <div class="inline-block" title="Reorder" as-sortable-item-handle>
- <svg width="6" height="9">
- <rect class="Dragger" fill="url(#dragger)" width="6" height="42">
- </svg>
- </div>
- <div class="inline-block">
- <input type="checkbox" ng-model="field.preview_display" />
- {{field.name}}
- </div>
- </li>
- </ul>
- </form>
- </div>
- </div>
- <!-- end visible columns dropdown -->
-
- <h4 class="inline-block"><span class="text-brand">{{row_count}}</span> rows</h4>
- <ul class="TableFilterList inline-block">
- <li class="Pill Pill--filled mr1 inline-block clearfix" ng-repeat="filter in queryFilters() track by $index">
- <span>{{getFilterColumnName(filter)}}: {{filter[2]}}</span>
- <a class="Pill-action" href="#" ng-click="removeFilter($index)">
- <mb-icon name="close" width="12px" height="12px"></mb-icon>
- </a>
- </li>
- </ul>
-
- <!-- add filter button/dropdown -->
- <div class="Dropdown inline-block" dropdown is-open="filtersOpen">
- <a class="Pill link mr1" href="#" dropdown-toggle ng-click="toggleNewFilters()">
- <mb-icon name="add" width="12px" height="12px"></mb-icon>
- Filter
- </a>
- <div class="Dropdown-content" ng-click="handleDropdownInput($event)">
- <form novalidate>
- <div ng-if="new_filters.length > 0">
- <ul class="FilterClauseList">
- <li class="FilterClause py1 clearfix inline" ng-init="table_filter = new_filters[0]">
- <div ng-if="table_filter != 'AND'">
- <label class="Select" for="id_filtered_field">
- <select id="id_filtered_field" ng-model="table_filter[1]" ng-options="field.id as field.name for field in table_metadata.fields" ng-disabled="readonly">
- <option value="">Pick a Field</option>
- </select>
- </label>
-
- <label class="Select py1">
- <select id="id_filtered_field" ng-model="table_filter[0]" ng-options="operator.name as operator.verbose_name for operator in table_metadata.fields_lookup[table_filter[1]].valid_operators" ng-change="operator_selected(table_filter)" ng-disabled="readonly">
- <option value="">---------</option>
- </select>
- </label>
-
- <span ng-repeat="filter_value in table_filter|slice:2:1000 track by $index">
- <span ng-if="field_type_for(table_filter, $index)=='select'">
- <label class="Select">
- <select ng-model="table_filter[$index+2]" ng-options="f.key as f.name for f in field_for(table_filter, $index).values" ng-disabled="readonly">
- </select>
- </label>
- </span>
- <span ng-if="field_type_for(table_filter, $index)!='select'">
- <input class="input" size="30" type="{{field_type_for(table_filter, $index)}}" ng-model="table_filter[$index+2]" ng-readonly="readonly"/ >
- </span>
- </span>
- </div>
- </li>
- </ul>
- <button class="Button" ng-class="{'Button--primary': filtersAreValid(new_filters)}" ng-click="applyNewFilters(new_filters)">Apply</button>
- <button class="Button" ng-click="toggleNewFilters()">Cancel</button>
- </div>
- </form>
- </div>
- </div>
- <!-- end add filter button/dropdown -->
-
- <!-- add segment button/dropdown -->
- <!--
- <div class="Dropdown inline-block" ng-if="allowSegments" dropdown is-open="segmentsOpen">
- <a class="Pill link mr1" href="#" ng-click="toggleSegment()" dropdown-toggle>
- Segments
- </a>
- <div class="Dropdown-content" ng-click="handleDropdownInput($event)">
- <form novalidate>
- <div>
- Existing Segments
- <label class="Select py1 full">
- <select ng-model="selected_segment" ng-options="segment as segment.name for segment in segments">
- <option value="">---------</option>
- </select>
- </label>
-
- <button class="Button Button--primary" ng-click="applySegment(selected_segment)">Apply</button>
- <button class="Button" ng-click="deleteSegment(selected_segment)">Delete</button>
- </div>
-
- <div class="mt1 pt1 border-top" ng-if="isFiltering()">
- Create New Segment
- <input class="input my1 full" type="text" placeholder="name your segment" ng-model="segment_name" />
- <button class="Button" ng-click="createSegment(segment_name)" >Create</button>
- </div>
- </form>
- </div>
- </div>
- -->
- <!-- end add segment button/dropdown -->
- </div>
-
- <div class="float-right">
- <a href="#" class="Button Button--primary" ng-if="query.query.page.page > 1" ng-click="setPage(query.query.page.page-1)">Prev</a>
- <a href="#" class="Button Button--primary" ng-click="setPage(query.query.page.page+1)">Next</a>
- </div>
- </div>
- <!-- end grid controls -->
-
- <!-- grid data -->
- <div class="TableWrapper my2">
- <table class="Table">
- <thead>
- <tr>
- <th ng-repeat="coldef in table_metadata.fields track by $index" ng-if="coldef.preview_display">
- <a href="#" ng-click="sortBy(coldef)" ng-if="!isSortColumn(coldef)">{{coldef.name}}</a>
- <span ng-if="isSortColumn(coldef)">{{coldef.name}}</span>
- </th>
- </tr>
- </thead>
- <tfoot></tfoot>
-
- <tbody>
- <tr ng-repeat="row in data.rows track by $index">
- <td ng-repeat="coldef in table_metadata.fields track by $index" ng-if="coldef.preview_display">
- <a ng-if="isLinkable(coldef)" href="{{buildEntityLink(coldef, row[coldef.colindex])}}">{{row[coldef.colindex]}}</a>
- <span ng-if="!isLinkable(coldef)">
- <span ng-if="isNumber(coldef)">{{row[coldef.colindex] | number : 2}}</span>
- <span ng-if="!isNumber(coldef)">{{row[coldef.colindex] | limitTo : 24}}</span>
- </span>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <!-- end grid data -->
-
- <div>
- <a class="Button" href="/api/meta/dataset/csv?query={{getEncodedQuery()}}" target="_self">Download Rows</a>
- </div>
-</div>
diff --git a/resources/frontend_client/app/explore/partials/database_list.html b/resources/frontend_client/app/explore/partials/database_list.html
deleted file mode 100644
index 8c038ec397386f26a5986d35aed7a5384c0a8517..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/explore/partials/database_list.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="wrapper">
- <div class="col col-sm-12">
- <div class="row">
- <div ng-repeat="(dbId, database) in databases">
- <div class="mt2 py2 col col-sm-12 clearfix">
- <a class="mt2 link float-right" ng-click="show_non_entities[dbId] = !show_non_entities[dbId]" ng-if="database.entities.length > 0">
- <span ng-if="!show_non_entities[dbId]">Show</span>
- <span ng-if="show_non_entities[dbId]">Hide</span>
- other tables</a>
- <h2>Explore {{database.name}}</h2>
- </div>
- <ul class="clearfix">
- <li class="border-bottom py2" ng-repeat="table in database.entities">
- <span class="float-right text-grey-3 mt2">{{table.rows}} rows</span>
- <h3 class="text-normal text-brand mt2 mb0">
- <a class="link" href="/explore/table/{{table.id}}">{{table.entity_name}}</a>
- </h3>
- <p class="text-grey-3 mt1">{{table.description}}</p>
- </li>
- </ul>
- <div class="col col-sm-12 mt4" ng-if="show_non_entities[dbId]">
- <h5 class="text-bold mb2" ng-if="database.entities.length > 0">Other tables</h5>
- <ul>
- <li class="border-bottom py1" ng-repeat="table in database.non_entities">
- <div class="clearfix">
- <span class="float-right text-grey-3 mt1">{{table.rows}} rows</span>
- <h4 class="text-normal inline-block">
- <a ng-if="table.rows > 0" class="link" href="/explore/table/{{table.id}}">
- {{table.name}}
- </a>
- <span ng-if="table.rows === 0">
- {{table.name}}
- </span>
- </h4>
- </div>
- <p class="text-grey-3 m0 pb1" ng-if="table.description">{{table.description}}</p>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </div>
-</div>
diff --git a/resources/frontend_client/app/explore/partials/entity_detail.html b/resources/frontend_client/app/explore/partials/entity_detail.html
deleted file mode 100644
index 176a9d27055f0191bfc1249774be0a3c4206f81e..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/explore/partials/entity_detail.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div>
- <div class="col col-md-12">
- <div class="row p2 border-bottom clearfix">
- <h2>
- <a href="/explore/table/{{table.id}}">
- <span class="text-brand inline-block" ng-if="table.entity_name">{{table.entity_name}}</span>
- <span class="text-brand inline-block" ng-if="!table.entity_name">{{table.name}}</span>
- </a>
- >
- {{entityKey}}
- </h2>
- <p class="text-grey-3" ng-if="table.description">{{table.description}}</p>
- </div>
-
- <!-- entity details -->
- <div class="TableWrapper my2">
- <table class="Table">
- <thead>
- <tr>
- <th>Field</th>
- <th>Value</th>
- </tr>
- </thead>
- <tfoot></tfoot>
-
- <tbody>
- <tr ng-repeat="col in entity.data.cols track by $index" ng-switch="col.special_type">
- <td>{{col.name}}</td>
- <td ng-switch-when="url">
- <a href="{{entity.data.rows[0][$index]}}">
- {{entity.data.rows[0][$index]}}
- </a>
- </td>
- <td ng-switch-when="image">
- <img src="{{entity.data.rows[0][$index]}}"/>
- <a href="{{entity.data.rows[0][$index]}}" class="block">
- {{entity.data.rows[0][$index]}}
- </a>
- </td>
- <!-- Unfortunately i don't think we can combine image/avatar with a single ng-switch -->
- <td ng-switch-when="avatar">
- <img src="{{entity.data.rows[0][$index]}}"/>
- <a href="{{entity.data.rows[0][$index]}}" class="block">
- {{entity.data.rows[0][$index]}}
- </a>
- </td>
- <td ng-switch-when="fk">
- <a href="{{'/explore/table/'+col.extra_info.target_table_id+'/'+entity.data.rows[0][$index]}}">
- {{entity.data.rows[0][$index]}}
- </a>
- </td>
- <td ng-switch-when="json">
- <pre>
- {{ghettoFormatJson(entity.data.rows[0][$index])}}
- </pre>
- </td>
- <td ng-switch-default>
- {{entity.data.rows[0][$index]}}
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <!-- end entity details -->
-
- <div class="pt2 clearfix">
- <h4 class="inline-block float-left">Linked:</h4>
- <div class="Button-group mx2 inline-block">
- <a class="Button" ng-class="{ 'Button--selected' : fk_origin.id == fk.origin.id }" href="#" ng-repeat="fk in fks" ng-click="selectRelated(fk)">
- <span class="inline-block" ng-if="fk.origin.table.entity_name">{{fk.origin.table.entity_name}}</span>
- <span class="inline-block" ng-if="!fk.origin.table.entity_name">{{fk.origin.table.name}}</span>
- </a>
- </div>
- </div>
- <div class="row px2" ng-if="fk_origin">
- <cv-data-grid table="fk_origin.table" query="query" filters="filters" allowSegments="false"></cv-data-grid>
- </div>
- </div><!-- end canvas -->
-</div><!-- end page content -->
diff --git a/resources/frontend_client/app/explore/partials/table_detail.html b/resources/frontend_client/app/explore/partials/table_detail.html
deleted file mode 100644
index 0a19c343c93695d967f0ad684bd34e212cc5e0dd..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/explore/partials/table_detail.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<div>
- <div class="col col-md-12">
- <div class="row p2 border-bottom clearfix">
- <div class="float-right mt1">
- <a class="link" ng-class="{psdisabled: canvas === 'data'}" href="#" ng-click="canvas = 'data'">Data Grid</a>
- <a class="link px4" ng-class="{psdisabled: canvas === 'metadata'}" href="#" ng-click="canvas = 'metadata'">Metadata</a>
- </div>
- <h2>
- <span class="text-brand inline-block" ng-if="table.entity_name">{{table.entity_name}}</span>
- <span class="text-brand inline-block" ng-if="!table.entity_name">{{table.name}}</span>
- </h2>
- <p class="text-grey-3" ng-if="table.description">{{table.description}}</p>
- </div>
-
- <div ng-show="canvas == 'data'">
- <cv-data-grid table="table" query="query" allow-segments="true"></cv-data-grid>
- </div>
- <div ng-show="canvas == 'metadata'" class="TableMetadata">
- <div class="mt2 border-bottom">
- <ul>
- <li class="border-top py2" ng-repeat="field in fields">
- <div class="mx1 clearfix" ng-click="toggleExpandedField(field.id)">
- <div class="float-right">
- <h3 class="text-grey-2 float-left">{{field.base_type}}</h3>
- </div>
- <div class="float-left">
- <h3 class="text-brand text-bold inline-block">{{field.name}}</h3>
- <h3 class="text-grey-3 text-bold inline-block px3">{{field.field_type}}</h3>
- <h3 class="text-grey-3 text-bold inline-block">{{field.special_type}}</h3>
- </div>
- </div>
- <div class="mx1 pt1" ng-if="expanded_field === field.id">
- <div ng-if="field.description">{{field.description}}</div>
- </div>
- </li>
- </ul>
- </div>
- </div>
-
- </div><!-- end canvas -->
-<svg width="0" height="0">
- <defs>
- <pattern id="dragger" width=".50" height=".08">
- <rect width="2px" height="2px" fill="#cacaca">
- </pattern>
- </defs>
-</svg>
-</div><!-- end page content -->
diff --git a/resources/frontend_client/app/home/home.controllers.js b/resources/frontend_client/app/home/home.controllers.js
index e697996f8afdf0fc11344287a5dbd105f0687ff1..e99695bdee8aad96e64c177de2d47aa9a9bcac6c 100644
--- a/resources/frontend_client/app/home/home.controllers.js
+++ b/resources/frontend_client/app/home/home.controllers.js
@@ -1,9 +1,19 @@
'use strict';
-var HomeControllers = angular.module('corvus.home.controllers', []);
+import Table from "metabase/lib/table";
+
+var HomeControllers = angular.module('corvus.home.controllers', [
+ 'corvus.home.directives',
+ 'corvus.metabase.services'
+]);
HomeControllers.controller('Home', ['$scope', '$location', function($scope, $location) {
$scope.currentView = 'data';
+ $scope.showOnboarding = false;
+
+ if('new' in $location.search()) {
+ $scope.showOnboarding = true;
+ }
}]);
HomeControllers.controller('HomeGreeting', ['$scope', '$location', function($scope, $location) {
@@ -33,5 +43,31 @@ HomeControllers.controller('HomeGreeting', ['$scope', '$location', function($sc
}
$scope.greeting = buildGreeting(greetingPrefixes, $scope.user.first_name);
- $scope.subheading = "What do you want to know?"
+ $scope.subheading = "What do you want to know?";
+}]);
+
+HomeControllers.controller('HomeDatabaseList', ['$scope', 'Metabase', function($scope, Metabase) {
+
+ $scope.databases = [];
+ $scope.currentDB = {};
+ $scope.tables = [];
+
+ Metabase.db_list(function (databases) {
+ $scope.databases = databases;
+ $scope.selectCurrentDB(0)
+ }, function (error) {
+ console.log(error);
+ });
+
+
+ $scope.selectCurrentDB = function(index) {
+ $scope.currentDB = $scope.databases[index];
+ Metabase.db_tables({
+ 'dbId': $scope.currentDB.id
+ }, function (tables) {
+ $scope.tables = tables.filter(Table.isQueryable);
+ }, function (error) {
+ console.log(error);
+ })
+ }
}]);
diff --git a/resources/frontend_client/app/home/home.directives.js b/resources/frontend_client/app/home/home.directives.js
new file mode 100644
index 0000000000000000000000000000000000000000..b064c67eca0a9f95737b487c74125224adbd0d29
--- /dev/null
+++ b/resources/frontend_client/app/home/home.directives.js
@@ -0,0 +1,39 @@
+'use strict';
+
+var HomeDirectives = angular.module('corvus.home.directives', []);
+
+HomeDirectives.directive('mbNewUserOnboarding', ['$modal',
+ function($modal) {
+ function link(scope, element, attrs) {
+
+ function openModal() {
+ var modalInstance = $modal.open({
+ templateUrl: '/app/home/partials/modal_user_onboarding.html',
+ controller: ['$scope', '$modalInstance',
+ function($scope, $modalInstance) {
+
+ $scope.firstStep = true;
+ $scope.user = scope.user;
+
+ $scope.next = function() {
+ $scope.firstStep = false;
+ };
+
+ $scope.close = function() {
+ $modalInstance.dismiss('cancel');
+ };
+ }
+ ]
+ });
+ }
+
+ // always start with the modal open
+ openModal();
+ }
+
+ return {
+ restrict: 'E',
+ link: link
+ };
+ }
+]);
diff --git a/resources/frontend_client/app/home/home.html b/resources/frontend_client/app/home/home.html
index 0e3ad76d7f82c3b06c009524afe07c448efbb100..e3c26619ee713364778e576c7552fc281f5ffb64 100644
--- a/resources/frontend_client/app/home/home.html
+++ b/resources/frontend_client/app/home/home.html
@@ -1,23 +1,24 @@
-<div class="Home full-height" ng-controller="Home">
- <div class="bg-brand text-white pb4 sm-pb2 lg-pb4">
+<div class="Home" ng-controller="Home">
+ <div class="bg-brand text-white">
<div class="wrapper">
<div class="Grid Grid--full large-Grid--1of2 align-center">
<div class="Grid-cell" ng-controller="HomeGreeting">
<div class="Greeting">
<h1 class="text-light">{{greeting}}</h1>
- <h2 class="Greeting-subtitle text-light">{{subheading}}</h2>
- </div>
- </div>
- <div class="Grid-cell flex">
- <div class="HomeTabs p1 md-p2 inline-block md-flex-align-right">
- <a class="HomeTab rounded p1 md-p2 inline-block mr1 lg-mr2" ng-class="{'HomeTab--active' : currentView === 'data' }" ng-click="currentView = 'data'">A new question</a>
- <a class="HomeTab rounded p1 md-p2 inline-block" ng-class="{'HomeTab--active' : currentView === 'questions'}" ng-click="currentView = 'questions'">An existing question</a>
+ <h2 class="text-light text-brand-light">{{subheading}}</h2>
</div>
</div>
</div>
</div>
+ <div class="wrapper">
+ <a class="HomeTab inline-block" ng-class="{'HomeTab--active text-dark' : currentView === 'data' }" ng-click="currentView = 'data'">A new question</a>
+ <a class="HomeTab inline-block" ng-class="{'HomeTab--active text-dark' : currentView === 'questions'}" ng-click="currentView = 'questions'">Start from a saved question</a>
+ </div>
</div>
+ <div ng-if="showOnboarding"><mb-new-user-onboarding></mb-new-user-onboarding></div>
+
+
<div ng-controller="CardList" ng-if="currentView != 'data'">
<div class="flex align-center py2 lg-py3 bg-white border-bottom">
@@ -66,7 +67,7 @@
</div>
</div>
- <div ng-if="currentView === 'data'" ng-controller="ExploreDatabaseList">
+ <div ng-if="currentView === 'data'" ng-controller="HomeDatabaseList">
<div class="flex py2 lg-py3 align-center border-bottom">
<div class="wrapper">
<span class="h2 text-grey-2">Data source:</span>
@@ -93,10 +94,10 @@
</div>
<ul class="wrapper" ng-if="tables">
<li ng-repeat="table in tables" ng-if="table.rows > 0">
- <a class="no-decoration py2 border-bottom flex align-center" href="/card/create?db={{currentDB.id}}&table={{table.id}}">
+ <a class="no-decoration py2 border-bottom flex align-center" href="/q?db={{currentDB.id}}&table={{table.id}}">
<div class="flex flex-column pr3 lg-pr0">
- <h2 class="text-dark text-brand-hover break-word">{{table.name}}</h2>
- {{table.description}}
+ <h2 class="text-dark text-brand-hover break-word">{{table.display_name}}</h2>
+ <h4 class="TableDescription text-grey-4 text-normal mt1">{{table.description}}</h4>
</div>
<div class="flex flex-align-right align-center">
<div class="text-right text-brand text-brand-darken-hover mr2">
@@ -109,7 +110,7 @@
</li>
</ul>
</div>
- <div class="full-height" ng-if="tables.length === 0">
+ <div ng-if="tables.length === 0">
<div class="wrapper flex layout-centered">
<h2>No data is avaliable for this database</h2>
</div>
diff --git a/resources/frontend_client/app/home/partials/modal_user_onboarding.html b/resources/frontend_client/app/home/partials/modal_user_onboarding.html
new file mode 100644
index 0000000000000000000000000000000000000000..958557707f0e22e2c152ad87929b769663eebba0
--- /dev/null
+++ b/resources/frontend_client/app/home/partials/modal_user_onboarding.html
@@ -0,0 +1,32 @@
+<div class="ModalContent">
+ <div class="bordered rounded shadowed" ng-show="firstStep">
+ <div class="pl4 pr4 pt4 pb1 border-bottom">
+ <h2>{{user.first_name}}, welcome to Metabase!</h2>
+ <h2>Analytics you can use by yourself.</h2>
+
+ <p>Metabase lets you find answers to your questions from data your company already has.</p>
+
+ <p>It’s easy to use, because it’s designed so you don’t need any analytics knowledge to get started.</p>
+ </div>
+ <div class="px4 py2 text-grey-2 flex align-center">
+ STEP 1 of 2
+ <button class="Button Button--primary flex-align-right" ng-click="next()">Continue</button>
+ </div>
+ </div>
+
+ <div class="bordered rounded shadowed" ng-show="!firstStep">
+ <div class="pl4 pr4 pt4 pb1 border-bottom">
+ <h2>Just 3 things worth knowing</h2>
+
+ <p class="clearfix pt1"><img class="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_tables.png">All of your data is organized in Tables. Think of them in terms of Excel spreadsheets with columns and rows.</p>
+
+ <p class="clearfix"><img class="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_questions.png">To get answers, you Ask Questions by picking a table and a few other parameters. You can visualize the answer in many ways, including cool charts.</p>
+
+ <p class="clearfix"><img class="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_dashboards.png">You (and anyone on your team) can save answers in Dashboards, so you can check them often. It's a great way to quickly see a snapshot of your business.</p>
+ </div>
+ <div class="px4 py2 text-grey-2 flex align-center">
+ STEP 2 of 2
+ <button class="Button Button--primary flex-align-right" ng-click="close()">Continue</button>
+ </div>
+ </div>
+</div>
diff --git a/resources/frontend_client/app/home/partials/onboarding_illustration_dashboards.png b/resources/frontend_client/app/home/partials/onboarding_illustration_dashboards.png
new file mode 100644
index 0000000000000000000000000000000000000000..78c854dd547227291f3e8422eb5c5acbcd043ed4
Binary files /dev/null and b/resources/frontend_client/app/home/partials/onboarding_illustration_dashboards.png differ
diff --git a/resources/frontend_client/app/home/partials/onboarding_illustration_questions.png b/resources/frontend_client/app/home/partials/onboarding_illustration_questions.png
new file mode 100644
index 0000000000000000000000000000000000000000..e20bf9f7f0dffab8391bfc746f5bf3229b035122
Binary files /dev/null and b/resources/frontend_client/app/home/partials/onboarding_illustration_questions.png differ
diff --git a/resources/frontend_client/app/home/partials/onboarding_illustration_tables.png b/resources/frontend_client/app/home/partials/onboarding_illustration_tables.png
new file mode 100644
index 0000000000000000000000000000000000000000..7777e6d05a365ba6fc8095e804fc64ef660fb0f2
Binary files /dev/null and b/resources/frontend_client/app/home/partials/onboarding_illustration_tables.png differ
diff --git a/resources/frontend_client/app/icon_paths.js b/resources/frontend_client/app/icon_paths.js
index bca36c0e657e890eef28b15e5b79556f191a6c73..6135bf8e94f0c53d9689523aa7dd61e97dd301c8 100644
--- a/resources/frontend_client/app/icon_paths.js
+++ b/resources/frontend_client/app/icon_paths.js
@@ -11,28 +11,100 @@
*/
-export default {
+export var ICON_PATHS = {
add: 'M19,13 L19,2 L14,2 L14,13 L2,13 L2,18 L14,18 L14,30 L19,30 L19,18 L30,18 L30,13 L19,13 Z',
- addtodash: 'M17,15.5 L17,10 L15,10 L15,15.5 L9.5,15.5 L9.5,17.5 L15,17.5 L15,23 L17,23 L17,17.5 L22.5,17.5 L22.5,15.5 L17,15.5 Z',
+ addtodash: {
+ path: 'M15,14 L15,12 L14,12 L14,14 L12,14 L12,15 L14,15 L14,17 L15,17 L15,15 L17,15 L17,14 L15,14 Z M0,0 L5,0 L5,5 L0,5 L0,0 Z M17,6 L6,6 L6,11 L17,11 L17,6 Z M0,12 L11,12 L11,17 L0,17 L0,12 Z M6,0 L11,0 L11,5 L6,5 L6,0 Z M12,0 L17,0 L17,5 L12,5 L12,0 Z M5,6 L0,6 L0,11 L5,11 L5,6 Z',
+ attrs: { viewBox: '0 0 17 17' }
+ },
+ area: 'M25.4980562,23.9977382 L26.0040287,23.9999997 L26.0040283,22.4903505 L26.0040283,14 L26.0040287,12 L25.3213548,13.2692765 C25.3213548,13.2692765 22.6224921,15.7906709 21.2730607,17.0513681 C21.1953121,17.1240042 15.841225,18.0149981 15.841225,18.0149981 L15.5173319,18.0717346 L15.2903187,18.3096229 L10.5815987,23.2439142 L9.978413,23.9239006 L11.3005782,23.9342813 L25.4980562,23.9977382 L11.3050484,23.9342913 L16.0137684,19 L21.7224883,18 L26.0040283,14 L26.0040283,23.4903505 C26.0040283,23.7718221 25.7731425,23.9989679 25.4980562,23.9977382 Z M7,23.9342913 L14,16 L21,14 L25.6441509,9.35958767 C25.8429057,9.16099288 26.0040283,9.22974944 26.0040283,9.49379817 L26.0040283,13 L26.0040283,24 L7,23.9342913 Z',
+ bar: 'M9,20 L12,20 L12,24 L9,24 L9,20 Z M14,14 L17,14 L17,24 L14,24 L14,14 Z M19,9 L22,9 L22,24 L19,24 L19,9 Z',
cards: 'M16.5,11 C16.1340991,11 15.7865579,10.9213927 15.4733425,10.7801443 L7.35245972,21.8211652 C7.7548404,22.264891 8,22.8538155 8,23.5 C8,24.8807119 6.88071187,26 5.5,26 C4.11928813,26 3,24.8807119 3,23.5 C3,22.1192881 4.11928813,21 5.5,21 C5.87370843,21 6.22826528,21.0819977 6.5466604,21.2289829 L14.6623495,10.1950233 C14.2511829,9.74948188 14,9.15407439 14,8.5 C14,7.11928813 15.1192881,6 16.5,6 C17.8807119,6 19,7.11928813 19,8.5 C19,8.96980737 18.8704088,9.4093471 18.6450228,9.78482291 L25.0405495,15.4699905 C25.4512188,15.1742245 25.9552632,15 26.5,15 C27.8807119,15 29,16.1192881 29,17.5 C29,18.8807119 27.8807119,20 26.5,20 C25.1192881,20 24,18.8807119 24,17.5 C24,17.0256697 24.1320984,16.5821926 24.3615134,16.2043506 L17.9697647,10.5225413 C17.5572341,10.8228405 17.0493059,11 16.5,11 Z M5.5,25 C6.32842712,25 7,24.3284271 7,23.5 C7,22.6715729 6.32842712,22 5.5,22 C4.67157288,22 4,22.6715729 4,23.5 C4,24.3284271 4.67157288,25 5.5,25 Z M26.5,19 C27.3284271,19 28,18.3284271 28,17.5 C28,16.6715729 27.3284271,16 26.5,16 C25.6715729,16 25,16.6715729 25,17.5 C25,18.3284271 25.6715729,19 26.5,19 Z M16.5,10 C17.3284271,10 18,9.32842712 18,8.5 C18,7.67157288 17.3284271,7 16.5,7 C15.6715729,7 15,7.67157288 15,8.5 C15,9.32842712 15.6715729,10 16.5,10 Z',
check: 'M1 14 L5 10 L13 18 L27 4 L31 8 L13 26 z ',
chevrondown: 'M1 12 L16 26 L31 12 L27 8 L16 18 L5 8 z ',
chevronleft: 'M20 1 L24 5 L14 16 L24 27 L20 31 L6 16 z',
chevronright: 'M12 1 L26 16 L12 31 L8 27 L18 16 L8 5 z ',
chevronup: 'M1 20 L16 6 L31 20 L27 24 L16 14 L5 24 z',
+ clone: {
+ path: 'M12,11 L16,11 L16,0 L5,0 L5,3 L12,3 L12,11 L12,11 Z M0,4 L11,4 L11,15 L0,15 L0,4 Z',
+ attrs: { viewBox: '0 0 16 15' }
+ },
close: 'M4 8 L8 4 L16 12 L24 4 L28 8 L20 16 L28 24 L24 28 L16 20 L8 28 L4 24 L12 16 z ',
+ countrymap: 'M19.4375,6.97396734 L27,8.34417492 L27,25.5316749 L18.7837192,23.3765689 L11.875,25.3366259 L11.875,25.3366259 L11.875,11.0941749 L11.1875,11.0941749 L11.1875,25.5316749 L5,24.1566749 L5,7.65667492 L11.1875,9.03167492 L18.75,6.90135976 L18.75,22.0941749 L19.4375,22.0941749 L19.4375,6.97396734 Z',
+ connections: {
+ path: 'M5.37815706,11.5570815 C5.55061975,11.1918363 5.64705882,10.783651 5.64705882,10.3529412 C5.64705882,9.93118218 5.55458641,9.53102128 5.38881053,9.1716274 L11.1846365,4.82475792 C11.6952189,5.33295842 12.3991637,5.64705882 13.1764706,5.64705882 C14.7358628,5.64705882 16,4.38292165 16,2.82352941 C16,1.26413718 14.7358628,0 13.1764706,0 C11.6170784,0 10.3529412,1.26413718 10.3529412,2.82352941 C10.3529412,3.2452884 10.4454136,3.64544931 10.6111895,4.00484319 L10.6111895,4.00484319 L4.81536351,8.35171266 C4.3047811,7.84351217 3.60083629,7.52941176 2.82352941,7.52941176 C1.26413718,7.52941176 0,8.79354894 0,10.3529412 C0,11.9123334 1.26413718,13.1764706 2.82352941,13.1764706 C3.59147157,13.1764706 4.28780867,12.8698929 4.79682555,12.3724528 L10.510616,16.0085013 C10.408473,16.3004758 10.3529412,16.6143411 10.3529412,16.9411765 C10.3529412,18.5005687 11.6170784,19.7647059 13.1764706,19.7647059 C14.7358628,19.7647059 16,18.5005687 16,16.9411765 C16,15.3817842 14.7358628,14.1176471 13.1764706,14.1176471 C12.3029783,14.1176471 11.5221273,14.5142917 11.0042049,15.1372938 L5.37815706,11.5570815 Z',
+ attrs: { viewBox: '0 0 16 19.7647' }
+ },
+ contract: 'M18.0015892,0.327942852 L18.0015892,14 L31.6736463,14 L26.6544389,8.98079262 L32,3.63523156 L28.3647684,0 L23.0192074,5.34556106 L18.0015892,0.327942852 Z M14,31.6720571 L14,18 L0.327942852,18 L5.34715023,23.0192074 L0.00158917013,28.3647684 L3.63682073,32 L8.98238179,26.6544389 L14,31.6720571 Z',
dashboards: 'M17,5.49100518 L17,10.5089948 C17,10.7801695 17.2276528,11 17.5096495,11 L26.4903505,11 C26.7718221,11 27,10.7721195 27,10.5089948 L27,5.49100518 C27,5.21983051 26.7723472,5 26.4903505,5 L17.5096495,5 C17.2281779,5 17,5.22788048 17,5.49100518 Z M18.5017326,14 C18.225722,14 18,13.77328 18,13.4982674 L18,26.5017326 C18,26.225722 18.22672,26 18.5017326,26 L5.49826741,26 C5.77427798,26 6,26.22672 6,26.5017326 L6,13.4982674 C6,13.774278 5.77327997,14 5.49826741,14 L18.5017326,14 Z M14.4903505,6 C14.2278953,6 14,5.78028538 14,5.49100518 L14,10.5089948 C14,10.2167107 14.2224208,10 14.4903505,10 L5.50964952,10 C5.77210473,10 6,10.2197146 6,10.5089948 L6,5.49100518 C6,5.78328929 5.77757924,6 5.50964952,6 L14.4903505,6 Z M26.5089948,22 C26.2251201,22 26,21.7774008 26,21.4910052 L26,26.5089948 C26,26.2251201 26.2225992,26 26.5089948,26 L21.4910052,26 C21.7748799,26 22,26.2225992 22,26.5089948 L22,21.4910052 C22,21.7748799 21.7774008,22 21.4910052,22 L26.5089948,22 Z M26.5089948,14 C26.2251201,14 26,13.7774008 26,13.4910052 L26,18.5089948 C26,18.2251201 26.2225992,18 26.5089948,18 L21.4910052,18 C21.7748799,18 22,18.2225992 22,18.5089948 L22,13.4910052 C22,13.7748799 21.7774008,14 21.4910052,14 L26.5089948,14 Z M26.4903505,6 C26.2278953,6 26,5.78028538 26,5.49100518 L26,10.5089948 C26,10.2167107 26.2224208,10 26.4903505,10 L17.5096495,10 C17.7721047,10 18,10.2197146 18,10.5089948 L18,5.49100518 C18,5.78328929 17.7775792,6 17.5096495,6 L26.4903505,6 Z M5,13.4982674 L5,26.5017326 C5,26.7769181 5.21990657,27 5.49826741,27 L18.5017326,27 C18.7769181,27 19,26.7800934 19,26.5017326 L19,13.4982674 C19,13.2230819 18.7800934,13 18.5017326,13 L5.49826741,13 C5.22308192,13 5,13.2199066 5,13.4982674 Z M5,5.49100518 L5,10.5089948 C5,10.7801695 5.22765279,11 5.50964952,11 L14.4903505,11 C14.7718221,11 15,10.7721195 15,10.5089948 L15,5.49100518 C15,5.21983051 14.7723472,5 14.4903505,5 L5.50964952,5 C5.22817786,5 5,5.22788048 5,5.49100518 Z M21,21.4910052 L21,26.5089948 C21,26.7801695 21.2278805,27 21.4910052,27 L26.5089948,27 C26.7801695,27 27,26.7721195 27,26.5089948 L27,21.4910052 C27,21.2198305 26.7721195,21 26.5089948,21 L21.4910052,21 C21.2198305,21 21,21.2278805 21,21.4910052 Z M21,13.4910052 L21,18.5089948 C21,18.7801695 21.2278805,19 21.4910052,19 L26.5089948,19 C26.7801695,19 27,18.7721195 27,18.5089948 L27,13.4910052 C27,13.2198305 26.7721195,13 26.5089948,13 L21.4910052,13 C21.2198305,13 21,13.2278805 21,13.4910052 Z',
- download: 'M17,16.5 L17,8 L15,8 L15,16.5 L11,16.5 L9.93247919,16.5 L10.6158894,17.3200922 L15.6158894,23.3200922 L16,23.781025 L16.3841106,23.3200922 L21.3841106,17.3200922 L22.0675208,16.5 L21,16.5 L17,16.5 L17,16.5 Z',
- expand: 'M16 4 L28 4 L28 16 L24 12 L20 16 L16 12 L20 8z M4 16 L8 20 L12 16 L16 20 L12 24 L16 28 L4 28z ',
+ download: {
+ path: 'M4,8 L4,0 L7,0 L7,8 L10,8 L5.5,13.25 L1,8 L4,8 Z M11,14 L0,14 L0,17 L11,17 L11,14 Z',
+ attrs: { viewBox: '0 0 11 17' }
+ },
+ expand: 'M29,13.6720571 L29,8.26132482e-16 L15.3279429,8.64083276e-16 L20.3471502,5.01920738 L15.0015892,10.3647684 L18.6368207,14 L23.9823818,8.65443894 L29,13.6720571 Z M0.00158917013,15.3279429 L0.00158917013,29 L13.6736463,29 L8.65443894,23.9807926 L14,18.6352316 L10.3647684,15 L5.01920738,20.3455611 L0.00158917013,15.3279429 Z',
explore: 'M16.4796545,16.298957 L16.4802727,23.0580389 L16.4802727,23.0580389 C17.3528782,23.2731238 18,24.0609902 18,25 C18,26.1045695 17.1045695,27 16,27 C14.8954305,27 14,26.1045695 14,25 C14,24.0751922 14.6276951,23.2969904 15.4802906,23.0681896 L15.4796772,16.3617812 L15.4796772,16.3617812 L9.42693239,19.2936488 C9.54250354,19.9090101 9.36818637,20.5691625 8.90013616,21.0538426 C8.13283771,21.8484034 6.86670062,21.8705039 6.07213982,21.1032055 C5.27757902,20.335907 5.25547851,19.06977 6.02277696,18.2752092 C6.79007541,17.4806484 8.0562125,17.4585478 8.8507733,18.2258463 C8.90464955,18.277874 8.95497425,18.3321952 9.00174214,18.3885073 L14.8957415,15.5335339 L8.95698016,12.663638 C8.54316409,13.1288103 7.91883307,13.3945629 7.25239963,13.3245179 C6.15388108,13.2090589 5.35695382,12.2249357 5.47241277,11.1264172 C5.58787172,10.0278986 6.57199493,9.23097136 7.67051349,9.34643031 C8.76903204,9.46188927 9.5659593,10.4460125 9.45050035,11.544531 C9.44231425,11.6224166 9.42976147,11.6987861 9.41311084,11.7734218 L15.4795257,14.705006 L15.4789062,7.93143834 C14.6270158,7.70216703 14,6.9243072 14,6 C14,4.8954305 14.8954305,4 16,4 C17.1045695,4 18,4.8954305 18,6 C18,6.93950562 17.3521946,7.72770818 16.4788902,7.94230133 L16.4795143,14.7663758 L22.5940736,11.8045661 C22.4397082,11.1620316 22.6068068,10.4567329 23.0998638,9.94615736 C23.8671623,9.15159656 25.1332994,9.12949606 25.9278602,9.8967945 C26.722421,10.664093 26.7445215,11.93023 25.977223,12.7247908 C25.2099246,13.5193516 23.9437875,13.5414522 23.1492267,12.7741537 C23.120046,12.7459743 23.0919072,12.717122 23.0648111,12.687645 L17.1917924,15.5324558 L23.0283963,18.3529842 C23.4420438,17.8775358 24.073269,17.604607 24.7476004,17.6754821 C25.8461189,17.7909411 26.6430462,18.7750643 26.5275872,19.8735828 C26.4121283,20.9721014 25.4280051,21.7690286 24.3294865,21.6535697 C23.230968,21.5381107 22.4340407,20.5539875 22.5494996,19.455469 C22.5569037,19.3850239 22.56788,19.315819 22.5822296,19.2480155 L16.4796545,16.298957 Z M16.0651172,6.99791382 C16.5870517,6.96436642 17,6.53040783 17,6 C17,5.44771525 16.5522847,5 16,5 C15.4477153,5 15,5.44771525 15,6 C15,6.53446591 15.4192913,6.9710011 15.9468816,6.99861337 L16.0651172,6.99791382 L16.0651172,6.99791382 Z M16,26 C16.5522847,26 17,25.5522847 17,25 C17,24.4477153 16.5522847,24 16,24 C15.4477153,24 15,24.4477153 15,25 C15,25.5522847 15.4477153,26 16,26 Z M6.56266251,20.102897 C6.80476821,20.5992873 7.40343746,20.8054256 7.89982771,20.5633199 C8.39621795,20.3212142 8.60235631,19.722545 8.36025061,19.2261547 C8.11814491,18.7297645 7.51947566,18.5236261 7.02308541,18.7657318 C6.52669517,19.0078375 6.32055681,19.6065068 6.56266251,20.102897 Z M23.6397494,11.7738453 C23.8818551,12.2702355 24.4805243,12.4763739 24.9769146,12.2342682 C25.4733048,11.9921625 25.6794432,11.3934932 25.4373375,10.897103 C25.1952318,10.4007127 24.5965625,10.1945744 24.1001723,10.4366801 C23.603782,10.6787858 23.3976437,11.277455 23.6397494,11.7738453 Z M25.4373375,20.102897 C25.6794432,19.6065068 25.4733048,19.0078375 24.9769146,18.7657318 C24.4805243,18.5236261 23.8818551,18.7297645 23.6397494,19.2261547 C23.3976437,19.722545 23.603782,20.3212142 24.1001723,20.5633199 C24.5965625,20.8054256 25.1952318,20.5992873 25.4373375,20.102897 Z M8.36025061,11.7738453 C8.60235631,11.277455 8.39621795,10.6787858 7.89982771,10.4366801 C7.40343746,10.1945744 6.80476821,10.4007127 6.56266251,10.897103 C6.32055681,11.3934932 6.52669517,11.9921625 7.02308541,12.2342682 C7.51947566,12.4763739 8.11814491,12.2702355 8.36025061,11.7738453 Z',
filter: 'M6.57883011,7.57952565 L1.18660637e-12,-4.86721774e-13 L16,-4.92050845e-13 L9.42116989,7.57952565 L9.42116989,13.5542169 L6.57883011,15 L6.57883011,7.57952565 Z',
gear: 'M14 0 H18 L19 6 L20.707 6.707 L26 3.293 L28.707 6 L25.293 11.293 L26 13 L32 14 V18 L26 19 L25.293 20.707 L28.707 26 L26 28.707 L20.707 25.293 L19 26 L18 32 L14 32 L13 26 L11.293 25.293 L6 28.707 L3.293 26 L6.707 20.707 L6 19 L0 18 L0 14 L6 13 L6.707 11.293 L3.293 6 L6 3.293 L11.293 6.707 L13 6 L14 0 z M16 10 A6 6 0 0 0 16 22 A6 6 0 0 0 16 10',
grid: 'M2 2 L10 2 L10 10 L2 10z M12 2 L20 2 L20 10 L12 10z M22 2 L30 2 L30 10 L22 10z M2 12 L10 12 L10 20 L2 20z M12 12 L20 12 L20 20 L12 20z M22 12 L30 12 L30 20 L22 20z M2 22 L10 22 L10 30 L2 30z M12 22 L20 22 L20 30 L12 30z M22 22 L30 22 L30 30 L22 30z',
popular: 'M22.7319639,13.7319639 L16.5643756,19.8995521 L15.4656976,18.8008741 L15.4640332,18.8024814 L15.3719504,18.707127 L15.1500476,18.4852242 L15.1539209,18.4813508 L15.1522861,18.4796579 L15.1522861,18.4796579 L15.1103863,18.52012 L13.4809348,16.8327737 L13.4809348,16.8327737 L7.98163972,22.3320688 L6.56742615,20.9178552 L13.4852814,14 L14.5837075,15.0984261 L14.5851122,15.0970697 L14.6628229,15.1775415 L14.8994949,15.4142136 L14.8953638,15.4183447 L14.8968592,15.4198933 L14.9388754,15.3793187 L16.5684644,17.0668074 L16.5684644,17.0668074 L21.3176359,12.3176359 L19,10 L26,9 L25,16 L22.7319639,13.7319639 Z',
+ line: 'M17.5684644,16.0668074 L15.9388754,14.3793187 L15.8968592,14.4198933 L15.8953638,14.4183447 L15.8994949,14.4142136 L15.6628229,14.1775415 L15.5851122,14.0970697 L15.5837075,14.0984261 L14.4852814,13 L7.56742615,19.9178552 L8.98163972,21.3320688 L14.4809348,15.8327737 L14.4809348,15.8327737 L16.1103863,17.52012 L16.1522861,17.4796579 L16.1522861,17.4796579 L16.1539209,17.4813508 L16.1500476,17.4852242 L16.3719504,17.707127 L16.4640332,17.8024814 L16.4656976,17.8008741 L17.5643756,18.8995521 L24.4820322,11.9818955 L23.0677042,10.5675676 L17.5684644,16.0668074 Z',
list: 'M3 8 A3 3 0 0 0 9 8 A3 3 0 0 0 3 8 M12 6 L28 6 L28 10 L12 10z M3 16 A3 3 0 0 0 9 16 A3 3 0 0 0 3 16 M12 14 L28 14 L28 18 L12 18z M3 24 A3 3 0 0 0 9 24 A3 3 0 0 0 3 24 M12 22 L28 22 L28 26 L12 26z',
lock: 'M8.8125,13.2659641 L5.50307055,13.2659641 C4.93891776,13.2659641 4.5,13.7132101 4.5,14.2649158 L4.5,30.8472021 C4.5,31.4051918 4.94908998,31.8461538 5.50307055,31.8461538 L26.4969294,31.8461538 C27.0610822,31.8461538 27.5,31.3989079 27.5,30.8472021 L27.5,14.2649158 C27.5,13.7069262 27.05091,13.2659641 26.4969294,13.2659641 L23.1875,13.2659641 L23.1875,7.18200446 C23.1875,3.22368836 19.9695466,0 16,0 C12.0385306,0 8.8125,3.21549292 8.8125,7.18200446 L8.8125,13.2659641 Z M12.3509615,7.187641 C12.3509615,5.17225484 13.9813894,3.53846154 15.9955768,3.53846154 C18.0084423,3.53846154 19.6401921,5.17309313 19.6401921,7.187641 L19.6401921,13.0473232 L12.3509615,13.0473232 L12.3509615,7.187641 Z',
mine: 'M28.4907419,50 C25.5584999,53.6578499 21.0527692,56 16,56 C10.9472308,56 6.44150015,53.6578499 3.50925809,50 L28.4907419,50 Z M29.8594823,31.9999955 C27.0930063,27.217587 21.922257,24 16,24 C10.077743,24 4.9069937,27.217587 2.1405177,31.9999955 L29.8594849,32 Z M16,21 C19.8659932,21 23,17.1944204 23,12.5 C23,7.80557963 22,3 16,3 C10,3 9,7.80557963 9,12.5 C9,17.1944204 12.1340068,21 16,21 Z',
+ number: 'M8,8.4963932 C8,8.22224281 8.22618103,8 8.4963932,8 L23.5036068,8 C23.7777572,8 24,8.22618103 24,8.4963932 L24,23.5036068 C24,23.7777572 23.773819,24 23.5036068,24 L8.4963932,24 C8.22224281,24 8,23.773819 8,23.5036068 L8,8.4963932 Z M12.136,19 L12.136,13.4 L11.232,13.4 C11.1999998,13.6133344 11.1333338,13.7919993 11.032,13.936 C10.9306662,14.0800007 10.8066674,14.1959996 10.66,14.284 C10.5133326,14.3720004 10.3480009,14.4333332 10.164,14.468 C9.97999908,14.5026668 9.78933432,14.5173334 9.592,14.512 L9.592,15.368 L11,15.368 L11,19 L12.136,19 Z M13.616,16.176 C13.616,16.7360028 13.6706661,17.2039981 13.78,17.58 C13.8893339,17.9560019 14.0373324,18.2559989 14.224,18.48 C14.4106676,18.7040011 14.6279988,18.8639995 14.876,18.96 C15.1240012,19.0560005 15.3866653,19.104 15.664,19.104 C15.9466681,19.104 16.2119988,19.0560005 16.46,18.96 C16.7080012,18.8639995 16.9266657,18.7040011 17.116,18.48 C17.3053343,18.2559989 17.4546661,17.9560019 17.564,17.58 C17.6733339,17.2039981 17.728,16.7360028 17.728,16.176 C17.728,15.6319973 17.6733339,15.1746685 17.564,14.804 C17.4546661,14.4333315 17.3053343,14.1360011 17.116,13.912 C16.9266657,13.6879989 16.7080012,13.5280005 16.46,13.432 C16.2119988,13.3359995 15.9466681,13.288 15.664,13.288 C15.3866653,13.288 15.1240012,13.3359995 14.876,13.432 C14.6279988,13.5280005 14.4106676,13.6879989 14.224,13.912 C14.0373324,14.1360011 13.8893339,14.4333315 13.78,14.804 C13.6706661,15.1746685 13.616,15.6319973 13.616,16.176 Z M14.752,16.176 C14.752,16.0799995 14.7533333,15.9640007 14.756,15.828 C14.7586667,15.6919993 14.7679999,15.5520007 14.784,15.408 C14.8000001,15.2639993 14.8266665,15.121334 14.864,14.98 C14.9013335,14.838666 14.953333,14.7120006 15.02,14.6 C15.086667,14.4879994 15.1719995,14.3973337 15.276,14.328 C15.3800005,14.2586663 15.5093326,14.224 15.664,14.224 C15.8186674,14.224 15.9493328,14.2586663 16.056,14.328 C16.1626672,14.3973337 16.2506663,14.4879994 16.32,14.6 C16.3893337,14.7120006 16.4413332,14.838666 16.476,14.98 C16.5106668,15.121334 16.5373332,15.2639993 16.556,15.408 C16.5746668,15.5520007 16.5853333,15.6919993 16.588,15.828 C16.5906667,15.9640007 16.592,16.0799995 16.592,16.176 C16.592,16.3360008 16.5866667,16.5293322 16.576,16.756 C16.5653333,16.9826678 16.5320003,17.2013323 16.476,17.412 C16.4199997,17.6226677 16.329334,17.8026659 16.204,17.952 C16.078666,18.1013341 15.8986678,18.176 15.664,18.176 C15.4346655,18.176 15.2586673,18.1013341 15.136,17.952 C15.0133327,17.8026659 14.9240003,17.6226677 14.868,17.412 C14.8119997,17.2013323 14.7786667,16.9826678 14.768,16.756 C14.7573333,16.5293322 14.752,16.3360008 14.752,16.176 Z M18.064,16.176 C18.064,16.7360028 18.1186661,17.2039981 18.228,17.58 C18.3373339,17.9560019 18.4853324,18.2559989 18.672,18.48 C18.8586676,18.7040011 19.0759988,18.8639995 19.324,18.96 C19.5720012,19.0560005 19.8346653,19.104 20.112,19.104 C20.3946681,19.104 20.6599988,19.0560005 20.908,18.96 C21.1560012,18.8639995 21.3746657,18.7040011 21.564,18.48 C21.7533343,18.2559989 21.9026661,17.9560019 22.012,17.58 C22.1213339,17.2039981 22.176,16.7360028 22.176,16.176 C22.176,15.6319973 22.1213339,15.1746685 22.012,14.804 C21.9026661,14.4333315 21.7533343,14.1360011 21.564,13.912 C21.3746657,13.6879989 21.1560012,13.5280005 20.908,13.432 C20.6599988,13.3359995 20.3946681,13.288 20.112,13.288 C19.8346653,13.288 19.5720012,13.3359995 19.324,13.432 C19.0759988,13.5280005 18.8586676,13.6879989 18.672,13.912 C18.4853324,14.1360011 18.3373339,14.4333315 18.228,14.804 C18.1186661,15.1746685 18.064,15.6319973 18.064,16.176 Z M19.2,16.176 C19.2,16.0799995 19.2013333,15.9640007 19.204,15.828 C19.2066667,15.6919993 19.2159999,15.5520007 19.232,15.408 C19.2480001,15.2639993 19.2746665,15.121334 19.312,14.98 C19.3493335,14.838666 19.401333,14.7120006 19.468,14.6 C19.534667,14.4879994 19.6199995,14.3973337 19.724,14.328 C19.8280005,14.2586663 19.9573326,14.224 20.112,14.224 C20.2666674,14.224 20.3973328,14.2586663 20.504,14.328 C20.6106672,14.3973337 20.6986663,14.4879994 20.768,14.6 C20.8373337,14.7120006 20.8893332,14.838666 20.924,14.98 C20.9586668,15.121334 20.9853332,15.2639993 21.004,15.408 C21.0226668,15.5520007 21.0333333,15.6919993 21.036,15.828 C21.0386667,15.9640007 21.04,16.0799995 21.04,16.176 C21.04,16.3360008 21.0346667,16.5293322 21.024,16.756 C21.0133333,16.9826678 20.9800003,17.2013323 20.924,17.412 C20.8679997,17.6226677 20.777334,17.8026659 20.652,17.952 C20.526666,18.1013341 20.3466678,18.176 20.112,18.176 C19.8826655,18.176 19.7066673,18.1013341 19.584,17.952 C19.4613327,17.8026659 19.3720003,17.6226677 19.316,17.412 C19.2599997,17.2013323 19.2266667,16.9826678 19.216,16.756 C19.2053333,16.5293322 19.2,16.3360008 19.2,16.176 Z',
+ pie: 'M16.0113299,15.368011 L16.0113299,7.6605591 L16.0113246,7.66055936 C16.1469053,7.65372627 16.283376,7.65026855 16.4206543,7.65026855 C18.4538187,7.65026855 20.309836,8.40872524 21.7212043,9.65813664 L16.0113299,15.368011 Z M16.5768268,16.0595929 L24.4103638,16.0595929 C24.4171966,15.9240175 24.4206543,15.7875468 24.4206543,15.6502686 C24.4206543,13.5849976 23.6380543,11.7025127 22.35323,10.2831897 L16.5768268,16.0595929 Z M24.2956851,17.0665012 L15.0044217,17.0665012 L15.0044217,7.77523777 C11.2616718,8.44383611 8.4206543,11.7152747 8.4206543,15.6502686 C8.4206543,20.0685466 12.0023763,23.6502686 16.4206543,23.6502686 C20.3556481,23.6502686 23.6270867,20.8092511 24.2956851,17.0665012 L24.2956851,17.0665012 Z',
+ pinmap: 'M15,16.8999819 L15,21 L16,23 L17,21.0076904 L17,16.8999819 C16.6768901,16.9655697 16.3424658,17 16,17 C15.6575342,17 15.3231099,16.9655697 15,16.8999819 L15,16.8999819 Z M16,16 C18.209139,16 20,14.209139 20,12 C20,9.790861 18.209139,8 16,8 C13.790861,8 12,9.790861 12,12 C12,14.209139 13.790861,16 16,16 Z',
return:'M15.3040432,11.8500793 C22.1434689,13.0450349 27.291257,18.2496116 27.291257,24.4890512 C27.291257,25.7084278 27.0946472,26.8882798 26.7272246,28.0064033 L26.7272246,28.0064033 C25.214579,22.4825472 20.8068367,18.2141694 15.3040432,17.0604596 L15.3040432,25.1841972 L4.70874296,14.5888969 L15.3040432,3.99359668 L15.3040432,3.99359668 L15.3040432,11.8500793 Z',
+ reference: {
+ path: 'M15.9670388,2.91102126 L14.5202438,1.46422626 L14.5202438,13.9807372 C14.5202438,15.0873683 13.6272253,15.9844701 12.5215507,15.9844701 L2.89359,15.9844701 C2.16147687,15.9844701 1.446795,15.6184135 1.446795,14.5376751 L11.0747557,14.5376751 C12.1786034,14.5376751 13.0734488,13.6501624 13.0734488,12.5467556 L13.0734488,0 L2.17890813,0 C0,0 0,0 0,2.17890813 L0,14.5202438 C0,16.6991519 1.81285157,17.4312651 3.62570313,17.4312651 L13.9704736,17.4312651 C15.0731461,17.4312651 15.9670388,16.5448165 15.9670388,15.4275322 L15.9670388,2.91102126 Z',
+ attrs: { viewBox: '0 0 15.967 17.4313' }
+ },
search: 'M12 0 A12 12 0 0 0 0 12 A12 12 0 0 0 12 24 A12 12 0 0 0 18.5 22.25 L28 32 L32 28 L22.25 18.5 A12 12 0 0 0 24 12 A12 12 0 0 0 12 0 M12 4 A8 8 0 0 1 12 20 A8 8 0 0 1 12 4 ',
star: 'M16 0 L21 11 L32 12 L23 19 L26 31 L16 25 L6 31 L9 19 L0 12 L11 11',
+ statemap: 'M19.4375,6.97396734 L27,8.34417492 L27,25.5316749 L18.7837192,23.3765689 L11.875,25.3366259 L11.875,25.3366259 L11.875,11.0941749 L11.1875,11.0941749 L11.1875,25.5316749 L5,24.1566749 L5,7.65667492 L11.1875,9.03167492 L18.75,6.90135976 L18.75,22.0941749 L19.4375,22.0941749 L19.4375,6.97396734 Z',
+ table: 'M13.6373197,13.6373197 L18.3626803,13.6373197 L18.3626803,18.3626803 L13.6373197,18.3626803 L13.6373197,13.6373197 Z M18.9533504,18.9533504 L23.6787109,18.9533504 L23.6787109,23.6787109 L18.9533504,23.6787109 L18.9533504,18.9533504 Z M13.6373197,18.9533504 L18.3626803,18.9533504 L18.3626803,23.6787109 L13.6373197,23.6787109 L13.6373197,18.9533504 Z M8.32128906,18.9533504 L13.0466496,18.9533504 L13.0466496,23.6787109 L8.32128906,23.6787109 L8.32128906,18.9533504 Z M8.32128906,8.32128906 L13.0466496,8.32128906 L13.0466496,13.0466496 L8.32128906,13.0466496 L8.32128906,8.32128906 Z M8.32128906,13.6373197 L13.0466496,13.6373197 L13.0466496,18.3626803 L8.32128906,18.3626803 L8.32128906,13.6373197 Z M18.9533504,8.32128906 L23.6787109,8.32128906 L23.6787109,13.0466496 L18.9533504,13.0466496 L18.9533504,8.32128906 Z M18.9533504,13.6373197 L23.6787109,13.6373197 L23.6787109,18.3626803 L18.9533504,18.3626803 L18.9533504,13.6373197 Z M13.6373197,8.32128906 L18.3626803,8.32128906 L18.3626803,13.0466496 L13.6373197,13.0466496 L13.6373197,8.32128906 Z',
+ "illustration-icon-pie": {
+ svg: "<path d='M29.8065455,22.2351515 L15.7837576,15.9495758 L15.7837576,31.2174545 C22.0004848,31.2029091 27.3444848,27.5258182 29.8065455,22.2351515' fill='#78B5EC'></path><g id='Fill-1-+-Fill-3'><path d='M29.8065455,22.2351515 C30.7316364,20.2482424 31.2630303,18.0402424 31.2630303,15.7032727 C31.2630303,11.8138182 29.8220606,8.26763636 27.4569697,5.54472727 L15.7837576,15.9495758 L29.8065455,22.2351515' fill='#3875AC'></path><path d='M27.4569697,5.54472727 C24.6118788,2.26909091 20.4266667,0.188121212 15.7478788,0.188121212 C7.17963636,0.188121212 0.232727273,7.1350303 0.232727273,15.7032727 C0.232727273,24.2724848 7.17963636,31.2184242 15.7478788,31.2184242 C15.7604848,31.2184242 15.7721212,31.2174545 15.7837576,31.2174545 L15.7837576,15.9495758 L27.4569697,5.54472727' fill='#4C9DE6'></path></g>"
+ },
+ "illustration-icon-scalar": {
+ svg: "<g id='Fill-1-+-Fill-2-+-Fill-3' transform='translate(0.000000, 8.000000)' fill='#4C9DE6'><path d='M1.56121212,13.28 L4.54787879,13.28 L4.54787879,3.8070303 C4.54787879,3.52290909 4.55757576,3.23490909 4.5769697,2.944 L2.09454545,5.06763636 C2.02957576,5.1190303 1.96460606,5.15587879 1.90060606,5.17915152 C1.83563636,5.20145455 1.77454545,5.21309091 1.71636364,5.21309091 C1.61939394,5.21309091 1.53212121,5.19272727 1.45454545,5.14909091 C1.3769697,5.10836364 1.31878788,5.05793939 1.28,4.99878788 L0.736969697,4.25309091 L4.86787879,0.673939394 L6.27393939,0.673939394 L6.27393939,13.28 L9.00848485,13.28 L9.00848485,14.5997576 L1.56121212,14.5997576 L1.56121212,13.28'></path><path d='M15.8535758,0.547878788 C16.4421818,0.547878788 16.992,0.635151515 17.5030303,0.810666667 C18.0130909,0.985212121 18.454303,1.23830303 18.8266667,1.57187879 C19.1980606,1.90448485 19.4899394,2.31078788 19.7042424,2.78884848 C19.9175758,3.26690909 20.0242424,3.80993939 20.0242424,4.41793939 C20.0242424,4.93478788 19.945697,5.41284848 19.7905455,5.85309091 C19.6363636,6.29236364 19.4259394,6.71418182 19.1602424,7.11854545 C18.8955152,7.52290909 18.5900606,7.91369697 18.2448485,8.29187879 C17.8986667,8.66909091 17.5321212,9.056 17.1432727,9.45066667 L13.4875152,13.1927273 C13.7464242,13.1219394 14.0082424,13.065697 14.2729697,13.024 C14.5386667,12.982303 14.793697,12.96 15.0390303,12.96 L19.6945455,12.96 C19.881697,12.96 20.0300606,13.0162424 20.1406061,13.1258182 C20.2501818,13.2353939 20.3054545,13.3779394 20.3054545,13.5524848 L20.3054545,14.5997576 L11.0341818,14.5997576 L11.0341818,14.0072727 C11.0341818,13.8850909 11.0584242,13.7590303 11.1078788,13.6300606 C11.1553939,13.5010909 11.2349091,13.3808485 11.3444848,13.2712727 L15.7963636,8.8 C16.1648485,8.42569697 16.5003636,8.0649697 16.8048485,7.71975758 C17.1083636,7.37454545 17.3682424,7.02642424 17.5844848,6.67733333 C17.801697,6.32727273 17.9675152,5.97430303 18.0848485,5.61551515 C18.2012121,5.25672727 18.2593939,4.87272727 18.2593939,4.46545455 C18.2593939,4.05915152 18.1944242,3.70133333 18.0654545,3.39490909 C17.9355152,3.08848485 17.7580606,2.83442424 17.5321212,2.63369697 C17.3052121,2.4329697 17.0404848,2.28363636 16.736,2.18278788 C16.4324848,2.08290909 16.1066667,2.03248485 15.7575758,2.03248485 C15.4075152,2.03248485 15.0846061,2.08387879 14.7878788,2.18763636 C14.4901818,2.29042424 14.2264242,2.43490909 13.9975758,2.61818182 C13.7677576,2.80339394 13.5738182,3.02060606 13.4157576,3.27369697 C13.2567273,3.52581818 13.1452121,3.80412121 13.0802424,4.10666667 C13.0288485,4.29478788 12.9512727,4.43054545 12.8484848,4.51393939 C12.7447273,4.59830303 12.6089697,4.6409697 12.4412121,4.6409697 C12.4082424,4.6409697 12.374303,4.6390303 12.3384242,4.63515152 C12.3035152,4.63224242 12.2627879,4.62836364 12.2172121,4.62157576 L11.3163636,4.46545455 C11.4065455,3.83224242 11.5810909,3.27175758 11.84,2.784 C12.0979394,2.29527273 12.4266667,1.88606061 12.8232727,1.55636364 C13.2208485,1.22763636 13.6775758,0.977454545 14.1905455,0.805818182 C14.7054545,0.634181818 15.2591515,0.547878788 15.8535758,0.547878788'></path><path d='M27.286303,0.547878788 C27.8749091,0.547878788 28.4179394,0.632242424 28.9153939,0.8 C29.4128485,0.968727273 29.8414545,1.20824242 30.2002424,1.51757576 C30.5590303,1.82884848 30.838303,2.20412121 31.0390303,2.64339394 C31.2397576,3.08266667 31.3396364,3.57139394 31.3396364,4.10666667 C31.3396364,4.54787879 31.2833939,4.93963636 31.1699394,5.28484848 C31.0574545,5.632 30.8945455,5.93551515 30.6850909,6.19733333 C30.4746667,6.45915152 30.2215758,6.68024242 29.9238788,6.86060606 C29.6261818,7.04290909 29.2935758,7.18739394 28.9250909,7.2969697 C29.8298182,7.53745455 30.5105455,7.9369697 30.966303,8.50036364 C31.4220606,9.06278788 31.6499394,9.76678788 31.6499394,10.6133333 C31.6499394,11.2533333 31.5287273,11.8293333 31.286303,12.3403636 C31.0438788,12.8504242 30.7122424,13.2848485 30.2923636,13.6436364 C29.8724848,14.0024242 29.3818182,14.2778182 28.8232727,14.4688485 C28.2647273,14.6589091 27.6644848,14.7549091 27.0244848,14.7549091 C26.2875152,14.7549091 25.6572121,14.6627879 25.1335758,14.4785455 C24.6099394,14.2933333 24.1667879,14.0412121 23.8050909,13.7163636 C23.4424242,13.3944242 23.145697,13.0104242 22.9129697,12.5682424 C22.6802424,12.1250909 22.4833939,11.6450909 22.3214545,11.1282424 L23.0584242,10.8169697 C23.1941818,10.7597576 23.3299394,10.729697 23.465697,10.729697 C23.5946667,10.729697 23.7100606,10.7578182 23.8099394,10.8121212 C23.9098182,10.8673939 23.9854545,10.953697 24.0378182,11.0700606 C24.0504242,11.0952727 24.064,11.1233939 24.0766061,11.1524848 C24.0892121,11.1806061 24.1027879,11.2126061 24.1153939,11.2446061 C24.2065455,11.4317576 24.3161212,11.6441212 24.4450909,11.8797576 C24.5740606,12.1153939 24.7495758,12.3374545 24.9687273,12.544 C25.1888485,12.7505455 25.4613333,12.9250909 25.7881212,13.0676364 C26.1149091,13.2092121 26.5202424,13.28 27.0050909,13.28 C27.4899394,13.28 27.9146667,13.2014545 28.2802424,13.0424242 C28.6458182,12.8843636 28.9493333,12.6787879 29.1917576,12.4266667 C29.4341818,12.1755152 29.6174545,11.894303 29.7396364,11.5830303 C29.8627879,11.273697 29.9238788,10.9672727 29.9238788,10.6627879 C29.9238788,10.2875152 29.8734545,9.94521212 29.7735758,9.63490909 C29.673697,9.32363636 29.4923636,9.056 29.2305455,8.82909091 C28.9687273,8.60315152 28.6070303,8.42569697 28.1444848,8.29672727 C27.6819394,8.16775758 27.0894545,8.10181818 26.3650909,8.10181818 L26.3650909,6.84218182 C26.953697,6.84218182 27.456,6.78012121 27.8729697,6.6569697 C28.2899394,6.53478788 28.6312727,6.36606061 28.896,6.15369697 C29.1607273,5.94036364 29.353697,5.68436364 29.4729697,5.38763636 C29.5922424,5.08993939 29.6523636,4.76024242 29.6523636,4.39854545 C29.6523636,3.99709091 29.5893333,3.6489697 29.4632727,3.35127273 C29.3372121,3.05357576 29.1646061,2.80727273 28.9444848,2.61333333 C28.7243636,2.42036364 28.4644848,2.27490909 28.1638788,2.17793939 C27.8632727,2.08 27.5384242,2.03248485 27.1893333,2.03248485 C26.8402424,2.03248485 26.5173333,2.08387879 26.2196364,2.18763636 C25.9229091,2.29042424 25.6591515,2.43490909 25.4293333,2.61818182 C25.1995152,2.80242424 25.0075152,3.02157576 24.8523636,3.27757576 C24.6972121,3.53260606 24.5808485,3.808 24.5032727,4.10472727 C24.4518788,4.29284848 24.374303,4.42763636 24.2705455,4.512 C24.1667879,4.59539394 24.0349091,4.63806061 23.8729697,4.63806061 C23.8409697,4.63806061 23.8060606,4.63612121 23.7711515,4.63321212 C23.7352727,4.62933333 23.6955152,4.62448485 23.6499394,4.61866667 L22.7481212,4.46545455 C22.838303,3.83224242 23.0138182,3.27175758 23.2717576,2.784 C23.5306667,2.29527273 23.8584242,1.88606061 24.256,1.55636364 C24.6535758,1.22763636 25.1093333,0.977454545 25.6232727,0.805818182 C26.1372121,0.634181818 26.6918788,0.547878788 27.286303,0.547878788'></path></g>"
+ },
+ "illustration-icon-table": {
+ svg: "<g transform='translate(0.000000, 2.000000)'><path d='M0,0 L32,0 L32,29 L0,29 L0,0 Z' fill='#4C9DE6'></path><g id='Fill-2-+-Fill-3-+-Fill-4' transform='translate(1.000000, 25.000000)' fill='#78B5EC'><path d='M0,0 L8,0 L8,3 L0,3 L0,0 Z'></path><path d='M9,0 L21,0 L21,3 L9,3 L9,0 Z'></path><path d='M22,0 L30,0 L30,3 L22,3 L22,0 Z'></path></g><g id='Fill-2-+-Fill-3-+-Fill-4-Copy' transform='translate(1.000000, 21.000000)' fill='#78B5EC'><path d='M0,0 L8,0 L8,3 L0,3 L0,0 Z'></path><path d='M9,0 L21,0 L21,3 L9,3 L9,0 Z'></path><path d='M22,0 L30,0 L30,3 L22,3 L22,0 Z'></path></g><g id='Fill-2-+-Fill-3-+-Fill-4-Copy-2' transform='translate(1.000000, 17.000000)' fill='#78B5EC'><path d='M0,0 L8,0 L8,3 L0,3 L0,0 Z'></path><path d='M9,0 L21,0 L21,3 L9,3 L9,0 Z'></path><path d='M22,0 L30,0 L30,3 L22,3 L22,0 Z'></path></g><g id='Fill-2-+-Fill-3-+-Fill-4-Copy-3' transform='translate(1.000000, 13.000000)' fill='#78B5EC'><path d='M0,0 L8,0 L8,3 L0,3 L0,0 Z'></path><path d='M9,0 L21,0 L21,3 L9,3 L9,0 Z'></path><path d='M22,0 L30,0 L30,3 L22,3 L22,0 Z'></path></g><g id='Fill-2-+-Fill-3-+-Fill-4-Copy-4' transform='translate(1.000000, 9.000000)' fill='#78B5EC'><path d='M0,0 L8,0 L8,3 L0,3 L0,0 Z'></path><path d='M9,0 L21,0 L21,3 L9,3 L9,0 Z'></path><path d='M22,0 L30,0 L30,3 L22,3 L22,0 Z'></path></g><path d='M1,1 L31,1 L31,8 L1,8 L1,1 Z' fill='#3875AC'></path></g>"
+ },
+ "illustration-icon-bars": {
+ svg: "<g><path d='M5,15 L11,15 L11,31 L5,31 L5,15 Z' fill='#78B5EC'></path><path d='M13,0 L19,0 L19,31 L13,31 L13,0 Z' fill='#4C9DE6'></path><path d='M21,7 L27,7 L27,31 L21,31 L21,7 Z' fill='#3875AC'></path><path d='M0,31 L32,31 L32,32 L0,32 L0,31 Z' fill='#4C9DE6'></path></g>"
+ },
};
+
+export function loadIcon(name) {
+ var def = ICON_PATHS[name];
+ if (name && def == undefined) {
+ console.warn('Icon "' + name + '" does not exist.');
+ }
+
+ var icon = {
+ attrs: {
+ className: 'Icon Icon-' + name,
+ width: '32px',
+ height: '32px',
+ viewBox: '0 0 32 32',
+ fill: 'currentcolor'
+ },
+ svg: undefined,
+ path: undefined
+ };
+
+ if (typeof def === 'string') {
+ icon.path = def;
+ } else if (def != null) {
+ var { svg, path, attrs } = def;
+ for (var attr in attrs) {
+ icon.attrs[attr] = attrs[attr];
+ }
+ icon.path = path;
+ icon.svg = svg;
+ }
+
+ return icon;
+}
diff --git a/resources/frontend_client/app/lib/analytics.js b/resources/frontend_client/app/lib/analytics.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb5abcc193a48c35f05eafedce93c6a021e9ecba
--- /dev/null
+++ b/resources/frontend_client/app/lib/analytics.js
@@ -0,0 +1,26 @@
+'use strict';
+/*global ga*/
+
+// Simple module for in-app analytics. Currently sends data to GA but could be extended to anything else.
+var MetabaseAnalytics = {
+ // track a pageview (a.k.a. route change)
+ trackPageView: function(url) {
+ if (url) {
+ // scrub query builder urls to remove serialized json queries from path
+ url = (url.lastIndexOf('/q/', 0) === 0) ? '/q/' : url;
+
+ ga('set', 'page', url);
+ ga('send', 'pageview', url);
+ }
+ },
+
+ // track an event
+ trackEvent: function(category, action, label, value) {
+ // category & action are required, rest are optional
+ if (category && action) {
+ ga('send', 'event', category, action, label, value);
+ }
+ }
+}
+
+export default MetabaseAnalytics;
diff --git a/resources/frontend_client/app/lib/core.js b/resources/frontend_client/app/lib/core.js
new file mode 100644
index 0000000000000000000000000000000000000000..790e9714fee74abcdc534e7b2180ff871908ecf2
--- /dev/null
+++ b/resources/frontend_client/app/lib/core.js
@@ -0,0 +1,414 @@
+'use strict';
+/*global _, exports*/
+
+(function() {
+
+ this.perms = [{
+ 'id': 0,
+ 'name': 'Private'
+ }, {
+ 'id': 1,
+ 'name': 'Public (others can read)'
+ }];
+
+ this.permName = function(permId) {
+ if (permId >= 0 && permId <= (this.perms.length - 1)) {
+ return this.perms[permId].name;
+ }
+ return null;
+ };
+
+ this.charts = [{
+ 'id': 'scalar',
+ 'name': 'Scalar'
+ }, {
+ 'id': 'table',
+ 'name': 'Table'
+ }, {
+ 'id': 'pie',
+ 'name': 'Pie Chart'
+ }, {
+ 'id': 'bar',
+ 'name': 'Bar Chart'
+ }, {
+ 'id': 'line',
+ 'name': 'Line Chart'
+ }, {
+ 'id': 'area',
+ 'name': 'Area Chart'
+ }, {
+ 'id': 'timeseries',
+ 'name': 'Time Series'
+ }, {
+ 'id': 'pin_map',
+ 'name': 'Pin Map'
+ }, {
+ 'id': 'country',
+ 'name': 'World Heatmap'
+ }, {
+ 'id': 'state',
+ 'name': 'State Heatmap'
+ }];
+
+ this.chartName = function(chartId) {
+ for (var i = 0; i < this.charts.length; i++) {
+ if (this.charts[i].id == chartId) {
+ return this.charts[i].name;
+ }
+ }
+ return null;
+ };
+
+ this.table_entity_types = [{
+ 'id': null,
+ 'name': 'None'
+ }, {
+ 'id': 'person',
+ 'name': 'Person'
+ }, {
+ 'id': 'event',
+ 'name': 'Event'
+ }, {
+ 'id': 'photo',
+ 'name': 'Photo'
+ }, {
+ 'id': 'place',
+ 'name': 'Place'
+ }, {
+ 'id': 'evt-cohort',
+ 'name': 'Cohorts-compatible Event'
+ }];
+
+ this.tableEntityType = function(typeId) {
+ for (var i = 0; i < this.table_entity_types.length; i++) {
+ if (this.table_entity_types[i].id == typeId) {
+ return this.table_entity_types[i].name;
+ }
+ }
+ return null;
+ };
+
+ this.field_special_types = [{
+ 'id': 'id',
+ 'name': 'Entity Key',
+ 'section': 'Overall Row',
+ 'description': 'The primary key for this table.'
+ }, {
+ 'id': 'name',
+ 'name': 'Entity Name',
+ 'section': 'Overall Row',
+ 'description': 'The "name" of each record. Usually a column called "name", "title", etc.'
+ }, {
+ 'id': 'fk',
+ 'name': 'Foreign Key',
+ 'section': 'Overall Row',
+ 'description': 'Points to another table to make a connection.'
+ }, {
+ 'id': 'avatar',
+ 'name': 'Avatar Image URL',
+ 'section': 'Common'
+ }, {
+ 'id': 'category',
+ 'name': 'Category',
+ 'section': 'Common'
+ }, {
+ 'id': 'city',
+ 'name': 'City',
+ 'section': 'Common'
+ }, {
+ 'id': 'country',
+ 'name': 'Country',
+ 'section': 'Common'
+ }, {
+ 'id': 'desc',
+ 'name': 'Description',
+ 'section': 'Common'
+ }, {
+ 'id': 'image',
+ 'name': 'Image URL',
+ 'section': 'Common'
+ }, {
+ 'id': 'json',
+ 'name': 'Field containing JSON',
+ 'section': 'Common'
+ }, {
+ 'id': 'latitude',
+ 'name': 'Latitude',
+ 'section': 'Common'
+ }, {
+ 'id': 'longitude',
+ 'name': 'Longitude',
+ 'section': 'Common'
+ }, {
+ 'id': 'number',
+ 'name': 'Number',
+ 'section': 'Common'
+ }, {
+ 'id': 'state',
+ 'name': 'State',
+ 'section': 'Common'
+ }, {
+ id: 'timestamp_seconds',
+ name: 'UNIX Timestamp (Seconds)',
+ 'section': 'Common'
+ }, {
+ id: 'timestamp_milliseconds',
+ name: 'UNIX Timestamp (Milliseconds)',
+ 'section': 'Common'
+ }, {
+ 'id': 'url',
+ 'name': 'URL',
+ 'section': 'Common'
+ }, {
+ 'id': 'zip_code',
+ 'name': 'Zip Code',
+ 'section': 'Common'
+ }];
+
+ this.field_field_types = [{
+ 'id': 'info',
+ 'name': 'Information',
+ 'description': 'Non-numerical value that is not meant to be used.'
+ }, {
+ 'id': 'metric',
+ 'name': 'Metric',
+ 'description': 'A number that can be added, graphed, etc.'
+ }, {
+ 'id': 'dimension',
+ 'name': 'Dimension',
+ 'description': 'A high or low-cardinality numerical string value that is meant to be used as a grouping.'
+ }, {
+ 'id': 'sensitive',
+ 'name': 'Sensitive Information',
+ 'description': 'A field that should never be shown anywhere.'
+ }];
+
+ this.boolean_types = [{
+ 'id': true,
+ 'name': 'Yes'
+ }, {
+ 'id': false,
+ 'name': 'No'
+ }, ];
+
+ this.fieldSpecialType = function(typeId) {
+ for (var i = 0; i < this.field_special_types.length; i++) {
+ if (this.field_special_types[i].id == typeId) {
+ return this.field_special_types[i].name;
+ }
+ }
+ return null;
+ };
+
+ this.builtinToChart = {
+ 'latlong_heatmap': 'll_heatmap'
+ };
+
+ this.getTitleForBuiltin = function(viewtype, field1Name, field2Name) {
+ var builtinToTitleMap = {
+ 'state': 'State Heatmap',
+ 'country': 'Country Heatmap',
+ 'pin_map': 'Pin Map',
+ 'heatmap': 'Heatmap',
+ 'cohorts': 'Cohorts',
+ 'latlong_heatmap': 'Lat/Lon Heatmap'
+ };
+
+ var title = builtinToTitleMap[viewtype];
+ if (field1Name) {
+ title = title.replace("{0}", field1Name);
+ }
+ if (field2Name) {
+ title = title.replace("{1}", field2Name);
+ }
+
+ return title;
+ };
+
+ this.createLookupTables = function(table) {
+ // Create lookup tables (ported from ExploreTableDetailData)
+
+ table.fields_lookup = {};
+ _.each(table.fields, function(field) {
+ table.fields_lookup[field.id] = field;
+ field.operators_lookup = {};
+ _.each(field.valid_operators, function(operator) {
+ field.operators_lookup[operator.name] = operator;
+ });
+ });
+ };
+
+ // The various DB engines we support <3
+ // TODO - this should probably come back from the API, no?
+ //
+ // NOTE:
+ // A database's connection details is stored in a JSON map in the field database.details.
+ //
+ // ENGINE DICT FORMAT:
+ // * name - human-facing name to use for this DB engine
+ // * fields - array of available fields to display when a user adds/edits a DB of this type. Each field should be a dict of the format below:
+ //
+ // FIELD DICT FORMAT:
+ // * displayName - user-facing name for the Field
+ // * fieldName - name used for the field in a database details dict
+ // * transform - function to apply to this value before passing to the API, such as 'parseInt'. (default: none)
+ // * placeholder - placeholder value that should be used in text input for this field (default: none)
+ // * placeholderIsDefault - if true, use the value of 'placeholder' as the default value of this field if none is specified (default: false)
+ // (if you set this, don't set 'required', or user will still have to add a value for the field)
+ // * required - require the user to enter a value for this field? (default: false)
+ // * choices - array of possible values for this field. If provided, display a button toggle instead of a text input.
+ // Each choice should be a dict of the format below: (optional)
+ //
+ // CHOICE DICT FORMAT:
+ // * name - User-facing name for the choice.
+ // * value - Value to use for the choice in the database connection details dict.
+ // * selectionAccent - What accent type should be applied to the field when its value is chosen? Either 'active' (currently green), or 'danger' (currently red).
+ this.ENGINES = {
+ postgres: {
+ name: 'PostgreSQL',
+ fields: [{
+ displayName: "Host",
+ fieldName: "host",
+ type: "text",
+ placeholder: "localhost",
+ placeholderIsDefault: true
+ }, {
+ displayName: "Port",
+ fieldName: "port",
+ type: "text",
+ transform: parseInt,
+ placeholder: "5432",
+ placeholderIsDefault: true
+ }, {
+ displayName: "Database name",
+ fieldName: "dbname",
+ type: "text",
+ placeholder: "birds_of_the_world",
+ required: true
+ }, {
+ displayName: "Database username",
+ fieldName: "user",
+ type: "text",
+ placeholder: "What username do you use to login to the database?",
+ required: true
+ }, {
+ displayName: "Database password",
+ fieldName: "password",
+ type: "password",
+ placeholder: "*******"
+ }, {
+ displayName: "Use a secure connection (SSL)?",
+ fieldName: "ssl",
+ type: "select",
+ choices: [{
+ name: 'Yes',
+ value: true,
+ selectionAccent: 'active'
+ }, {
+ name: 'No',
+ value: false,
+ selectionAccent: 'danger'
+ }]
+ }]
+ },
+ mysql: {
+ name: 'MySQL',
+ fields: [{
+ displayName: "Host",
+ fieldName: "host",
+ type: "text",
+ placeholder: "localhost",
+ placeholderIsDefault: true
+ }, {
+ displayName: "Port",
+ fieldName: "port",
+ type: "text",
+ transform: parseInt,
+ placeholder: "3306",
+ placeholderIsDefault: true
+ }, {
+ displayName: "Database name",
+ fieldName: "dbname",
+ type: "text",
+ placeholder: "birds_of_the_world",
+ required: true
+ }, {
+ displayName: "Database username",
+ fieldName: "user",
+ type: "text",
+ placeholder: "What username do you use to login to the database?",
+ required: true
+ }, {
+ displayName: "Database password",
+ fieldName: "password",
+ type: "password",
+ placeholder: "*******"
+ }]
+ },
+ h2: {
+ name: 'H2',
+ fields: [{
+ displayName: "Connection String",
+ fieldName: "db",
+ type: "text",
+ placeholder: "file:/Users/camsaul/bird_sightings/toucans;AUTO_SERVER=TRUE"
+ }]
+ },
+ mongo: {
+ name: 'MongoDB',
+ fields: [{
+ displayName: "Host",
+ fieldName: "host",
+ type: "text",
+ placeholder: "localhost",
+ placeholderIsDefault: true
+ }, {
+ displayName: "Port",
+ fieldName: "port",
+ type: "text",
+ transform: parseInt,
+ placeholder: "27017"
+ }, {
+ displayName: "Database name",
+ fieldName: "dbname",
+ type: "text",
+ placeholder: "carrierPigeonDeliveries",
+ required: true
+ }, {
+ displayName: "Database username",
+ fieldName: "user",
+ type: "text",
+ placeholder: "What username do you use to login to the database?"
+ }, {
+ displayName: "Database password",
+ fieldName: "pass",
+ type: "password",
+ placeholder: "******"
+ }]
+ }
+ };
+
+ // Prepare database details before being sent to the API.
+ // This includes applying 'transform' functions and adding default values where applicable.
+ this.prepareDatabaseDetails = function(details) {
+ if (!details.engine) throw "Missing key 'engine' in database request details; please add this as API expects it in the request body.";
+
+ // iterate over each field definition
+ this.ENGINES[details.engine].fields.forEach(function(field) {
+ var fieldName = field.fieldName;
+
+ // set default value if applicable
+ if (!details[fieldName] && field.placeholderIsDefault) {
+ details[fieldName] = field.placeholder;
+ }
+
+ // apply transformation function if applicable
+ if (details[fieldName] && field.transform) {
+ details[fieldName] = field.transform(details[fieldName]);
+ }
+ });
+
+ return details;
+ };
+
+}).apply(exports);
diff --git a/resources/frontend_client/app/lib/query.js b/resources/frontend_client/app/lib/query.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bad68608393a83ca1627ee4b3f79c4d51b06e30
--- /dev/null
+++ b/resources/frontend_client/app/lib/query.js
@@ -0,0 +1,311 @@
+'use strict';
+
+var Query = {
+
+ canRun: function(query) {
+ return query && query.source_table != undefined && Query.hasValidAggregation(query);
+ },
+
+ cleanQuery: function(query) {
+ if (!query) {
+ return query;
+ }
+
+ // it's possible the user left some half-done parts of the query on screen when they hit the run button, so find those
+ // things now and clear them out so that we have a nice clean set of valid clauses in our query
+
+ // TODO: breakouts
+
+ // filters
+ var queryFilters = Query.getFilters(query);
+ if (queryFilters.length > 1) {
+ var hasNullValues = function(arr) {
+ for (var j=0; j < arr.length; j++) {
+ if (arr[j] === null) {
+ return true;
+ }
+ }
+
+ return false;
+ };
+
+ var cleanFilters = [queryFilters[0]];
+ for (var i=1; i < queryFilters.length; i++) {
+ if (!hasNullValues(queryFilters[i])) {
+ cleanFilters.push(queryFilters[i]);
+ }
+ }
+
+ if (cleanFilters.length > 1) {
+ query.filter = cleanFilters;
+ } else {
+ query.filter = [];
+ }
+ }
+
+ if (query.order_by) {
+ query.order_by = query.order_by.filter((s) => Query.isValidField(s[0]) && s[1] != null)
+ if (query.order_by.length === 0) {
+ delete query.order_by;
+ }
+ }
+
+ // TODO: limit
+
+ return query;
+ },
+
+ canAddDimensions: function(query) {
+ var MAX_DIMENSIONS = 2;
+ return (query.breakout.length < MAX_DIMENSIONS);
+ },
+
+ hasValidBreakout: function(query) {
+ return (query && query.breakout &&
+ query.breakout.length > 0 &&
+ query.breakout[0] !== null);
+ },
+
+ canSortByAggregateField: function(query) {
+ var SORTABLE_AGGREGATION_TYPES = new Set(["avg", "count", "distinct", "stddev", "sum"]);
+
+ return Query.hasValidBreakout(query) && SORTABLE_AGGREGATION_TYPES.has(query.aggregation[0]);
+ },
+
+ addDimension: function(query) {
+ query.breakout.push(null);
+ },
+
+ updateDimension: function(query, dimension, index) {
+ query.breakout[index] = dimension;
+ },
+
+ removeDimension: function(query, index) {
+ // TODO: when we remove breakouts we also need to remove any limits/sorts that don't make sense
+ query.breakout.splice(index, 1);
+ },
+
+ hasEmptyAggregation: function(query) {
+ var aggregation = query.aggregation;
+ if (aggregation !== undefined &&
+ aggregation.length > 0 &&
+ aggregation[0] !== null) {
+ return false;
+ }
+ return true;
+ },
+
+ hasValidAggregation: function(query) {
+ var aggregation = query && query.aggregation;
+ if (aggregation &&
+ ((aggregation.length === 1 && aggregation[0] !== null) ||
+ (aggregation.length === 2 && aggregation[0] !== null && aggregation[1] !== null))) {
+ return true;
+ }
+ return false;
+ },
+
+ isBareRowsAggregation: function(query) {
+ return (query.aggregation &&
+ query.aggregation.length > 0 &&
+ query.aggregation[0] === "rows");
+ },
+
+ updateAggregation: function(query, aggregationClause) {
+ query.aggregation = aggregationClause;
+
+ // for "rows" type aggregation we always clear out any dimensions because they don't make sense
+ if (aggregationClause.length > 0 && aggregationClause[0] === "rows") {
+ query.breakout = [];
+ }
+ },
+
+ getFilters: function(query) {
+ // Special handling for accessing query filters because it's been fairly complex to deal with their structure.
+ // This method provide a unified and consistent view of the filter definition for the rest of the tool to use.
+
+ var queryFilters = query.filter;
+
+ // quick check for older style filter definitions and tweak them to a format we want to work with
+ if (queryFilters && queryFilters.length > 0 && queryFilters[0] !== "AND") {
+ var reformattedFilters = [];
+
+ for (var i=0; i < queryFilters.length; i++) {
+ if (queryFilters[i] !== null) {
+ reformattedFilters = ["AND", queryFilters];
+ break;
+ }
+ }
+
+ queryFilters = reformattedFilters;
+ }
+
+ return queryFilters;
+ },
+
+ canAddFilter: function(query) {
+ var queryFilters = Query.getFilters(query);
+ if (!queryFilters) {
+ return false;
+ }
+ if (queryFilters.length > 0) {
+ var lastFilter = queryFilters[queryFilters.length - 1];
+ // simply make sure that there are no null values in the last filter
+ for (var i=0; i < lastFilter.length; i++) {
+ if (lastFilter[i] === null) {
+ return false
+ }
+ }
+ }
+ return true;
+ },
+
+ addFilter: function(query) {
+ var queryFilters = Query.getFilters(query);
+
+ if (queryFilters.length === 0) {
+ queryFilters = ["AND", [null, null, null]];
+ } else {
+ queryFilters.push([null, null, null]);
+ }
+
+ query.filter = queryFilters;
+ },
+
+ updateFilter: function(query, index, filter) {
+ var queryFilters = Query.getFilters(query);
+
+ queryFilters[index] = filter;
+
+ query.filter = queryFilters;
+ },
+
+ removeFilter: function(query, index) {
+ var queryFilters = Query.getFilters(query);
+
+ if (queryFilters.length === 2) {
+ // this equates to having a single filter because the arry looks like ... ["AND" [a filter def array]]
+ queryFilters = [];
+ } else {
+ queryFilters.splice(index, 1);
+ }
+
+ query.filter = queryFilters;
+ },
+
+ canAddLimitAndSort: function(query) {
+ if (Query.isBareRowsAggregation(query)) {
+ return true;
+ } else if (Query.hasValidBreakout(query)) {
+ return true;
+ } else {
+ return false;
+ }
+ },
+
+ getSortableFields: function(query, fields) {
+ // in bare rows all fields are sortable, otherwise we only sort by our breakout columns
+
+ if (Query.isBareRowsAggregation(query)) {
+ return fields;
+ } else if (Query.hasValidBreakout(query)) {
+ // further filter field list down to only fields in our breakout clause
+ var breakoutFieldList = [];
+ query.breakout.map(function (breakoutFieldId) {
+ for (var idx in fields) {
+ if (fields[idx].id === breakoutFieldId) {
+ breakoutFieldList.push(fields[idx]);
+ }
+ }
+ });
+
+ if (Query.canSortByAggregateField(query)) {
+ breakoutFieldList.push({
+ id: ["aggregation", 0],
+ name: query.aggregation[0], // e.g. "sum"
+ display_name: query.aggregation[0]
+ });
+ }
+
+ return breakoutFieldList;
+ } else {
+ return [];
+ }
+ },
+
+ addLimit: function(query) {
+ query.limit = null;
+ },
+
+ updateLimit: function(query, limit) {
+ query.limit = limit;
+ },
+
+ removeLimit: function(query) {
+ delete query.limit;
+ },
+
+ canAddSort: function(query) {
+ // TODO: allow for multiple sorting choices
+ return false;
+ },
+
+ addSort: function(query) {
+ // TODO: make sure people don't try to sort by the same field multiple times
+ var order_by = query.order_by;
+ if (!order_by) {
+ order_by = [];
+ }
+
+ order_by.push([null, "ascending"]);
+ query.order_by = order_by;
+ },
+
+ updateSort: function(query, index, sort) {
+ query.order_by[index] = sort;
+ },
+
+ removeSort: function(query, index) {
+ var queryOrderBy = query.order_by;
+
+ if (queryOrderBy.length === 1) {
+ delete query.order_by;
+ } else {
+ queryOrderBy.splice(index, 1);
+ }
+ },
+
+ isValidField: function(field) {
+ return (
+ typeof field === "number" ||
+ (Array.isArray(field) && (
+ (field[0] === 'fk->' && typeof field[1] === "number" && typeof field[2] === "number") ||
+ (field[0] === 'aggregation' && typeof field[1] === "number")
+ ))
+ );
+ },
+
+ getFieldOptions: function(fields, includeJoins = false, filterFn = (fields) => fields, usedFields = {}) {
+ var results = {
+ count: 0,
+ fields: null,
+ fks: []
+ };
+ // filter based on filterFn, then remove fks if they'll be duplicated in the joins fields
+ results.fields = filterFn(fields).filter((f) => !usedFields[f.id] && (f.special_type !== "fk" || !includeJoins));
+ results.count += results.fields.length;
+ if (includeJoins) {
+ results.fks = fields.filter((f) => f.special_type === "fk" && f.target).map((joinField) => {
+ var targetFields = filterFn(joinField.target.table.fields).filter((f) => (!Array.isArray(f.id) || f.id[0] !== "aggregation") && !usedFields[f.id]);
+ results.count += targetFields.length;
+ return {
+ field: joinField,
+ fields: targetFields
+ }
+ }).filter((r) => r.fields.length > 0);
+ }
+ return results;
+ }
+}
+
+export default Query;
diff --git a/resources/frontend_client/app/lib/table.js b/resources/frontend_client/app/lib/table.js
new file mode 100644
index 0000000000000000000000000000000000000000..3149642293ec567913c2e81add394858eb8479a2
--- /dev/null
+++ b/resources/frontend_client/app/lib/table.js
@@ -0,0 +1,10 @@
+'use strict';
+
+var Table = {
+ isQueryable: function(table) {
+ return table.visibility_type == null;
+ }
+};
+
+
+export default Table;
diff --git a/resources/frontend_client/app/not_found.html b/resources/frontend_client/app/not_found.html
new file mode 100644
index 0000000000000000000000000000000000000000..89cbb9ab940ebb2f42a0e7f5412dfe84f321c6ad
--- /dev/null
+++ b/resources/frontend_client/app/not_found.html
@@ -0,0 +1,21 @@
+<div class="layout-centered flex full-height">
+ <div class="p4 text-bold">
+ <h1 class="text-brand text-light mb3">We're a little lost...</h1>
+ <p class="h4 mb1">The page you asked for couldn't be found.</p>
+ <p class="h4">You might've been tricked by a ninja, but in all likelihood, you were just given a bad link.</p>
+ <p class="h4 my4">You can always:</p>
+ <div class="flex align-center">
+ <a class="Button Button--primary" href="/q">
+ <div class="p1">Ask a new question.</div>
+ </a>
+ <span class="mx2">or</span>
+ <a class="Button Button--withIcon" target="_blank" href="http://tv.giphy.com/kitten">
+ <div class="p1 flex align-center relative">
+ <span class="h2">😸</span>
+ <span class="ml1">Take a kitten break.</span>
+ </div>
+ </a>
+ </div>
+ </div>
+</div>
+<div class="NotFoundScene" ng-include="'/app/auth/partials/auth_scene.html'"></div>
diff --git a/resources/frontend_client/app/operator/operator.controllers.js b/resources/frontend_client/app/operator/operator.controllers.js
deleted file mode 100644
index c6626c1a546543c12a34f48e56d748f1b559ed5c..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/operator/operator.controllers.js
+++ /dev/null
@@ -1,187 +0,0 @@
-'use strict';
-
-var OperatorControllers = angular.module('corvus.operator.controllers', []);
-
-OperatorControllers.controller('SpecialistList', ['$scope', 'Metabase', 'Operator',
- function($scope, Metabase, Operator) {
- // set initial defaults for sorting
- $scope.orderByField = "nick";
- $scope.reverseSort = false;
-
- Operator.queryInfo().then(function(queryInfo){
-
- // TODO: we need offset support in dataset_query if we want to do paging
-
- // TODO: ideally we can search by (name, id, store)
- $scope.search = function () {
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.specialist_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter':[null, null],
- 'limit': null
- }
- }, function (queryResponse) {
- // TODO: we should check that the query succeeded
- $scope.specialists = Operator.convertToObjects(queryResponse.data);
-
- }, function (error) {
- console.log(error);
- });
- };
-
- $scope.search();
-
- //run saved SQL queries for overview metrics in right pane
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'result',
- 'result':{
- query_id: queryInfo.specialist_overview_avg_rating_query
- }
- }, function(queryResponse){
- $scope.overviewAvgRating = queryResponse.data.rows[0][0];
- }, function(error){
- console.log("error:");
- console.log(error);
- });
-
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'result',
- 'result': {
- query_id: queryInfo.specialist_overview_avg_response_time_query
- }
- }, function(queryResponse){
- $scope.overviewAvgResponseTimeSecs = queryResponse.data.rows[0][0];
- }, function(error){
- console.log("error:");
- console.log(error);
- });
-
- }, function(reason){
- console.log("failed to get queryInfo:");
- console.log(reason);
- });
-
- }
-]);
-
-
-OperatorControllers.controller('SpecialistDetail', ['$scope', '$routeParams', 'Metabase', 'Operator',
- function($scope, $routeParams, Metabase, Operator) {
- // set the default ordering to the last message sent, as the field team is generally concerned with
- // recent messages
- $scope.orderByField = "time_newmessage_server";
- // set reverse to true so we see the most recent messages first
- $scope.reverseSort = true;
-
- Operator.queryInfo().then(function(queryInfo){
- if ($routeParams.specialistId) {
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.specialist_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter':['=', queryInfo.specialist_id_field, parseInt($routeParams.specialistId, 10)],
- 'limit': null
- }
- }, function (queryResponse) {
- $scope.specialist = Operator.convertToObjects(queryResponse.data)[0];
-
- // grab conversations
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.conversations_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter':['=', queryInfo.conversations_specialist_fk, parseInt($routeParams.specialistId, 10)],
- 'limit': null
- }
- }, function (response) {
- $scope.conversations = Operator.convertToObjects(response.data);
-
- }, function (error) {
- console.log(error);
- });
-
- }, function (error) {
- console.log(error);
- });
- }
- }, function(reason){
- console.log("failed to get queryInfo:");
- console.log(reason);
- });
- }
-]);
-
-
-OperatorControllers.controller('ConversationDetail', ['$scope', '$routeParams', 'Metabase', 'Operator',
- function($scope, $routeParams, Metabase, Operator) {
-
- $scope.toObject = function(str) {
- //var unescaped = str.replace(/\\"/g, '"');
- return angular.fromJson(str);
- };
-
- Operator.queryInfo().then(function(queryInfo){
- if ($routeParams.conversationId) {
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.conversations_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter':['=', queryInfo.conversations_id_field, $routeParams.conversationId],
- 'limit': null
- }
- }, function (queryResponse) {
- $scope.conversation = Operator.convertToObjects(queryResponse.data)[0];
-
- // grab messages
- // TODO: ensure ordering by message timestamp
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.messages_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter':['=', queryInfo.messages_table_conversation_fk, $routeParams.conversationId],
- 'limit': null
- }
- }, function (response) {
- $scope.messages = Operator.convertToObjects(response.data);
-
- // sort them by timestamp
- $scope.messages.sort(function compare (a, b) {
- if (a.time_updated_server < b.time_updated_server)
- return -1;
- if (a.time_updated_server > b.time_updated_server)
- return 1;
- return 0;
- });
-
- }, function (error) {
- console.log(error);
- });
-
- }, function (error) {
- console.log(error);
- });
- }
- }, function(reason){
- console.log("failed to get queryInfo:");
- console.log(reason);
- });
- }
-]);
diff --git a/resources/frontend_client/app/operator/operator.module.js b/resources/frontend_client/app/operator/operator.module.js
deleted file mode 100644
index 6dadd90e2010fd34eb695fa06bee8409c4c80723..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/operator/operator.module.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-var Operator = angular.module('corvus.operator', [
- 'ngRoute',
- 'ngCookies',
- 'corvus.filters',
- 'corvus.directives',
- 'corvus.services',
- 'corvus.metabase.services',
- 'corvus.operator.controllers',
- 'corvus.operator.services'
-]);
-
-Operator.config(['$routeProvider', function ($routeProvider) {
- $routeProvider.when('/operator/specialist/:specialistId', {templateUrl: '/app/operator/partials/specialist_detail.html', controller: 'SpecialistDetail'});
- $routeProvider.when('/operator/specialist/', {templateUrl: '/app/operator/partials/specialist_list.html', controller: 'SpecialistList'});
- $routeProvider.when('/operator/conversation/:conversationId', {templateUrl: '/app/operator/partials/conversation_detail.html', controller: 'ConversationDetail'});
-}]);
diff --git a/resources/frontend_client/app/operator/operator.services.js b/resources/frontend_client/app/operator/operator.services.js
deleted file mode 100644
index 83d7a9a779d59a7d6bee45568f2a2ffabc31006f..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/operator/operator.services.js
+++ /dev/null
@@ -1,113 +0,0 @@
-'use strict';
-/*jslint browser:true */
-/*global _*/
-/* Services */
-
-var OperatorServices = angular.module('corvus.operator.services', []);
-
-OperatorServices.service('Operator', ['$resource', '$q', 'Metabase', 'Query',
- function($resource, $q, Metabase, Query) {
-
- var OPERATOR_DB_NAME = "operator";
-
- var SPECIALIST_TABLE_NAME = "ps_specialist_details_with_calc_metrics";
- var SPECIALIST_ID_FIELD_NAME = "specialist_id";
-
- var CONVERSATIONS_TABLE_NAME = "ag_conversations";
- var CONVERSATIONS_ID_FIELD_NAME = "channel_id";
- var CONVERSATIONS_SPECIALIST_FK_NAME = "specialist_id";
-
- var MESSAGES_TABLE_NAME = "chat_message";
- var MESSAGES_CONVERSATIONS_FK_NAME = "channel_id";
-
- var SPECIALIST_OVERVIEW_AVG_RATING_QUERY_NAME = "Specialist Entity Avg Rating";
- var SPECIALIST_OVERVIEW_AVG_RESPONSE_TIME_QUERY = "Specialist Entity Avg Response Time Secs";
-
-
- this.queryInfo = function() {
- var deferred = $q.defer();
- var queryInfo = {};
- Metabase.db_list(function (dbs){
- dbs.forEach(function(db){
- if(db.name == OPERATOR_DB_NAME){
- queryInfo.database = db.id;
- Metabase.db_tables({dbId:db.id}, function(tables){
- tables.forEach(function(table){
- if(table.name == SPECIALIST_TABLE_NAME){
- queryInfo.specialist_table = table.id;
- }else if(table.name == CONVERSATIONS_TABLE_NAME){
- queryInfo.conversations_table = table.id;
- }else if(table.name == MESSAGES_TABLE_NAME){
- queryInfo.messages_table = table.id;
- }
- });
-
- Metabase.table_fields({tableId:queryInfo.specialist_table}, function(specialistTableFields){
- specialistTableFields.forEach(function(field){
- if(field.name == SPECIALIST_ID_FIELD_NAME){
- queryInfo.specialist_id_field = field.id;
-
- Metabase.table_fields({tableId:queryInfo.conversations_table}, function(conversationsTableFields){
- conversationsTableFields.forEach(function(field){
- if(field.name == CONVERSATIONS_ID_FIELD_NAME){
- queryInfo.conversations_id_field = field.id;
- }else if(field.name == CONVERSATIONS_SPECIALIST_FK_NAME){
- queryInfo.conversations_specialist_fk = field.id;
- }
- });
-
- Metabase.table_fields({tableId:queryInfo.messages_table}, function(messagesTableFields){
- messagesTableFields.forEach(function(field){
- if(field.name == MESSAGES_CONVERSATIONS_FK_NAME){
- queryInfo.messages_table_conversation_fk = field.id;
- Query.list({
- filterMode: 'all'
- }, function(queries){
- queries.forEach(function(query){
- if(query.name == SPECIALIST_OVERVIEW_AVG_RATING_QUERY_NAME){
- queryInfo.specialist_overview_avg_rating_query = query.id;
- }else if(query.name == SPECIALIST_OVERVIEW_AVG_RESPONSE_TIME_QUERY){
- queryInfo.specialist_overview_avg_response_time_query = query.id;
- }
- });
- deferred.resolve(queryInfo);
- }, function(error){
- console.log("error getting queries:");
- console.log(error);
- });
- }
- });
- });
-
- });
-
- }
- });
- });
- });
- }
- });
- });
-
- return deferred.promise;
-
- };
-
- this.convertToObjects = function (data) {
- var rows = [];
- for (var i = 0; i < data.rows.length; i++) {
- var row = {};
-
- for (var j = 0; j < data.cols.length; j++) {
- var coldef = data.cols[j];
-
- row[coldef.name] = data.rows[i][j];
- }
-
- rows.push(row);
- }
-
- return rows;
- };
- }
-]);
diff --git a/resources/frontend_client/app/operator/partials/conversation_detail.html b/resources/frontend_client/app/operator/partials/conversation_detail.html
deleted file mode 100644
index 1f422c07fe630b165a9416dc99cb45c75549b15a..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/operator/partials/conversation_detail.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="col col-md-12">
- <div class="row">
- <div class="p4 border-bottom">
- <h3>Conversation with
- <a class="link" href="/operator/specialist/{{conversation.specialist_id}}">{{conversation.specialist_nick}}</a>
- and {{conversation.sender_nick}}
- </h3>
- </div>
- </div>
-
- <div class="row">
- <ul>
- <li class="Message clearfix" ng-repeat="message in messages" ng-class="{'Message--alt' : message.sender_id == conversation.specialist_id}">
- <div class="Message-sender inline-block text-bold">
- <div ng-if="message.sender_id == conversation.specialist_id">{{conversation.specialist_nick}}</div>
- <div ng-if="message.sender_id == conversation.sender_id">{{conversation.sender_nick}}</div>
- </div>
- <div class="Timestamp ml1 inline-block">{{message.time_updated_server | date : 'MMM d, y - hh:mm a'}}</div>
-
- <p class="Message-text" ng-if="message.content_type == 'mixed'">{{toObject(message.content).text}}</p>
- <p class="Message-text" ng-if="message.content_type != 'mixed'">{{message.content_type}}: {{message.content}}</p>
- </li>
- </ul>
- </div>
-</div>
diff --git a/resources/frontend_client/app/operator/partials/specialist_detail.html b/resources/frontend_client/app/operator/partials/specialist_detail.html
deleted file mode 100644
index 5d6bc553514e07f1cbd153c2dcd7e16be45c085b..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/operator/partials/specialist_detail.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<div class="col col-md-9">
- <div class="row">
- <div class="clearfix full-width">
- <div class="p4 float-left">
- <img class="EntityImage EntityImage--large" ng-src="{{specialist.avatar}}" ng-if="specialist.avatar">
- <img src="" ng-if="!specialist.avatar" />
- </div>
- <div class="mt3 float-left">
- <h2>
- <a class="link" href="/operator/specialist/{{specialist.specialist_id}}">{{specialist.nick}}</a> <span ng-if="specialist.is_test_account">[test account]</span>
- </h2>
- <div class="inline-block">{{specialist.business_name}}</div>
- <div class="inline-block ml2">Specialist since: {{specialist.ts_created | date : 'MMMM d, y'}}</div>
-
- </div>
- <div class="float-right m4">
- <a class="Button mt1" href="mailto:team@operator.com?subject=Specialist%20{{specialist.nick}}">Share</a>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="mt3 px3">
- <h4>Conversations</h4>
- </div>
- <div class="EntityTableWrapper">
- <table class="EntityTable Table">
- <thead>
- <tr>
- <th ng-click="orderByField='sender_nick'; reverseSort = !reverseSort" ng-class="'ColumnSelected' : orderByField == 'sender_nick'">With:
- <span ng-if="orderByField == 'sender_nick'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='ts_start'; reverseSort = !reverseSort" ng-class="'ColumnSelected' : orderByField == 'ts_start'">Started:
- <span ng-if="orderByField == 'ts_start'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='ts_newmsg'; reverseSort = !reverseSort" ng-class="'ColumnSelected' : orderByField == 'ts_newmsg'">Last message:
- <span ng-if="orderByField == 'ts_newmsg'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='total_channel_msgs'; reverseSort = !reverseSort" ng-class="'ColumnSelected' : orderByField == 'total_channel_msgs'">Total messages:
- <span ng-if="orderByField == 'total_channel_msgs'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='avg_response_time_secs'; reverseSort = !reverseSort" ng-class="'ColumnSelected' : orderByField == 'average_response_time_secs'">Avg Response Time (s)
- <span ng-if="orderByField == 'average_response_time_secs'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th></th>
- </tr>
- </thead>
- <tfoot>
- </tfoot>
- <tbody>
- <tr ng-repeat="convo in conversations | orderBy:orderByField:reverseSort">
- <td>
- <span class="EntityName">{{convo.sender_nick}}</span>
- </td>
- <td>{{convo.ts_start | date : 'MMM d, y, hh:mm a'}}</td>
- <td>{{convo.ts_newmsg | date : 'MMM d, y, hh:mm a'}}</td>
- <td>{{convo.total_channel_msgs}}</td>
- <td>{{convo.avg_response_time_secs}}</td>
- <td><a class="link" href="/operator/conversation/{{convo.channel_id}}">View conversation</a></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-</div>
-
-<div class="col col-md-3">
- <div class="row">
- <div class="p3">
- <h3 class="mt2">{{specialist.nick}}'s Metrics</h3>
- </div>
-
- <ol class="px2 py2">
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{specialist.avg_response_time_secs | readableTime}}</div>
- <div class="Metric-title mb2">Average response time</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{specialist.avg_rating}}</div>
- <div class="Metric-title mb2">Average rating</div>
- </div>
- </li>
- </ol>
- </div>
-</div>
-
diff --git a/resources/frontend_client/app/operator/partials/specialist_list.html b/resources/frontend_client/app/operator/partials/specialist_list.html
deleted file mode 100644
index 4087bdee9c798417d3a8ee2e38510000366535cc..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/operator/partials/specialist_list.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<div class="col col-md-9">
- <div class="row">
- <div class="p3 border-bottom">
- <div class="float-right">
- <input class="input" type="text" ng-model="searchFilter" placeholder="Search specialists ...">
- </div>
- <h3 class="text-brand">Specialists</h2>
- </div>
-
- <div ng-if="!specialists">
- <h3>Loading ...</h3>
- </div>
-
-
- <div class="EntityTableWrapper">
- <table class="EntityTable Table">
- <thead>
- <tr>
- <th ng-click="orderByField='nick'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'nick'}">Name
- <span ng-if="orderByField == 'nick'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='business_name'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'business_name'}">Business
- <span ng-if="orderByField == 'business_name'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='avg_response_time_secs'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'avg_response_time_secs'}">Avg response time (s)
- <span ng-if="orderByField == 'avg_response_time_secs'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='avg_rating'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'avg_rating'}">Avg rating
- <span ng-if="orderByField == 'avg_rating'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='ts_created'; reverseSort = !reverseSort" >Specialist since:
- <span ng-if="orderByField == 'ts_created'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='most_recent_activity'; reverseSort = !reverseSort">Most recent activitity:
- <span ng-if="orderByField == 'most_recent_activity'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- </tr>
- </thead>
- <tfoot></tfoot>
- <tbody>
- <tr ng-repeat="specialist in specialists | orderBy:orderByField:reverseSort | filter:searchFilter">
- <td class="clearfix">
- <img class="EntityImage EntityImage--small float-left hide lg-show" src="{{specialist.avatar}}">
- <a class="EntityName float-left ml1 link" href="/operator/specialist/{{specialist.specialist_id}}">{{specialist.nick}}</a>
- </td>
- <td>{{specialist.business_name}}</td>
- <td>{{specialist.avg_response_time_secs}}</td>
- <td>{{specialist.avg_rating}}</td>
- <td>{{specialist.ts_created | date : 'MMMM d, y '}}</td>
- <td>{{specialist.most_recent_activity}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-</div>
-
-<div class="col col-md-3">
- <div class="row">
- <div class="p3 border-bottom">
- <h3>Specialist metrics</h3>
- </div>
-
- <ol class="px2 py2">
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{overviewAvgResponseTimeSecs | readableTime}}</div>
- <div class="Metric-title mb2">Average response time</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{overviewAvgRating}}</div>
- <div class="Metric-title mb2">Average rating</div>
- </div>
- </li>
- </ol>
- </div>
-</div>
diff --git a/resources/frontend_client/app/partials/mb_profile_link.html b/resources/frontend_client/app/partials/mb_profile_link.html
new file mode 100644
index 0000000000000000000000000000000000000000..6d2c51b0e3976b7fac13568d03fc6cf745f8ca26
--- /dev/null
+++ b/resources/frontend_client/app/partials/mb_profile_link.html
@@ -0,0 +1,20 @@
+<div class="NavDropdown inline-block" dropdown on-toggle="toggled(open)">
+ <a class="NavDropdown-button NavItem flex align-center p2" selectable-nav-item="settings" dropdown-toggle>
+ <div class="NavDropdown-button-layer">
+ <div class="flex align-center">
+ <span class="UserNick">
+ <span class="UserInitials NavItem-text">{{initials}}</span>
+ </span>
+ <mb-icon name="chevrondown" class="Dropdown-chevron ml1" width="8px" height="8px"></mb-icon>
+ </div>
+ </div>
+ </a>
+ <div class="NavDropdown-content right">
+ <ul class="NavDropdown-content-layer">
+ <li><a class="Dropdown-item block text-white no-decoration" href="/user/edit_current">Account Settings</a></li>
+ <li ng-if="user.is_superuser && context !== 'admin'"><a class="Dropdown-item block text-white no-decoration" href="/admin/">Admin Panel</a></li>
+ <li ng-if="user.is_superuser && context === 'admin'"><a class="Dropdown-item block text-white no-decoration" href="/">Exit Admin</a></li>
+ <li class="border-top border-light"><a class="Dropdown-item block text-white no-decoration" href="/auth/logout">Logout</a></li>
+ </ul>
+ </div>
+</div>
diff --git a/resources/frontend_client/app/query_builder/action_button.react.js b/resources/frontend_client/app/query_builder/action_button.react.js
index db1c7627cae952809df5a1c8d839d85aced09aee..011d612bf2463cd14655779f1c7454325b0676e8 100644
--- a/resources/frontend_client/app/query_builder/action_button.react.js
+++ b/resources/frontend_client/app/query_builder/action_button.react.js
@@ -14,9 +14,9 @@ export default React.createClass({
getDefaultProps: function() {
return {
normalText: "Save",
- activeText: "Saving ...",
+ activeText: "Saving...",
failedText: "Save failed",
- successText: "Save succeeded",
+ successText: "Saved",
className: 'Button'
};
},
diff --git a/resources/frontend_client/app/query_builder/add_to_dashboard.react.js b/resources/frontend_client/app/query_builder/add_to_dashboard.react.js
index 9b61b6508f8276addb27115699219532f7ea9ae4..575babd793e6bfc135d45cf50ae100753fe077a8 100644
--- a/resources/frontend_client/app/query_builder/add_to_dashboard.react.js
+++ b/resources/frontend_client/app/query_builder/add_to_dashboard.react.js
@@ -34,7 +34,7 @@ export default React.createClass({
return (
<Popover
tetherOptions={tetherOptions}
- className="PopoverBody PopoverBody--withArrow"
+ className="PopoverBody PopoverBody--withArrow AddToDashboard"
>
<AddToDashboardPopover
card={this.props.card}
@@ -47,18 +47,12 @@ export default React.createClass({
}
},
render: function () {
- // if we don't have a saved card then don't render anything
- // TODO: we should probably do this in the header
- if (this.props.card.id === undefined) {
- return false;
- }
-
// TODO: if our card is dirty should we disable this button?
// ex: someone modifies a query but hasn't run/save the change?
return (
<span>
- <a className="mx1 text-grey-4 text-brand-hover" href="#" title="Add this data to a dashboard" onClick={this.toggleModal}>
- <Icon name='addtodash' />
+ <a className="mx1 text-grey-4 text-brand-hover" href="#" title="Add this to a dashboard" onClick={this.toggleModal}>
+ <Icon name='addtodash' width="16px" height="16px"/>
</a>
{this.addToDash()}
</span>
diff --git a/resources/frontend_client/app/query_builder/add_to_dashboard_popover.react.js b/resources/frontend_client/app/query_builder/add_to_dashboard_popover.react.js
index 9e1cdc95eed00f557d667ed94d375a6b53148fb2..47df9a7ce8bd3a8b05e650929ede1132e8cc66b0 100644
--- a/resources/frontend_client/app/query_builder/add_to_dashboard_popover.react.js
+++ b/resources/frontend_client/app/query_builder/add_to_dashboard_popover.react.js
@@ -1,4 +1,5 @@
'use strict';
+/*global _*/
import OnClickOutside from 'react-onclickoutside';
@@ -32,10 +33,15 @@ export default React.createClass({
loadDashboardList: function() {
var component = this;
this.props.dashboardApi.list({
- 'filterMode': 'mine'
+ 'filterMode': 'all'
}, function(result) {
+ // filter down to dashboards we can modify
+ var editableDashes = _.filter(result, function(dash) {
+ return dash.can_write;
+ });
+
component.setState({
- dashboards: result
+ dashboards: editableDashes
});
}, function(error) {
// TODO: do something relevant here
@@ -88,13 +94,13 @@ export default React.createClass({
var name = this.refs.name.getDOMNode().value.trim();
var description = this.refs.description.getDOMNode().value.trim();
- var perms = this.refs.public_perms.getDOMNode().value;
+ var perms = parseInt(this.refs.public_perms.state.value);
// populate a new Dash object
var newDash = {
'name': (name && name.length > 0) ? name : null,
'description': (description && description.length > 0) ? name : null,
- 'public_perms': 0
+ 'public_perms': perms
};
// create a new dashboard, then add the card to that
@@ -144,8 +150,7 @@ export default React.createClass({
// TODO: hard coding values :(
var privacyOptions = [
(<option key="0" value={0}>Private</option>),
- (<option key="1" value={1}>Others can read</option>),
- (<option key="2" value={2}>Others can modify</option>)
+ (<option key="2" value={2}>Public</option>)
];
var formError;
@@ -191,7 +196,7 @@ export default React.createClass({
return (
<form className="Form-new" onSubmit={this.createNewDash}>
- <div className="Form-offset flex align-center mr4">
+ <div className="Form-offset flex align-center mr4 mb2">
<h3 className="flex-full">Create a new dashboard</h3>
<a className="text-grey-3" onClick={this.toggleCreate}>
<Icon name='close' width="12px" height="12px"/>
@@ -220,7 +225,7 @@ export default React.createClass({
showCharm={false}
errors={this.state.errors}>
<label className="Select Form-offset">
- <select ref="public_perms">
+ <select className="mt1" ref="public_perms" defaultValue="2">
{privacyOptions}
</select>
</label>
@@ -268,9 +273,7 @@ export default React.createClass({
return (
<div>
- <ReactCSSTransitionGroup transitionName="Transition-popover-state">
- {content}
- </ReactCSSTransitionGroup>
+ {content}
</div>
);
}
diff --git a/resources/frontend_client/app/query_builder/aggregation_widget.react.js b/resources/frontend_client/app/query_builder/aggregation_widget.react.js
index a9e529d274da37185639e24bbfddf5293346169a..ffae4117bc3763c63f9933b6c98e7f6b0fc4f3b8 100644
--- a/resources/frontend_client/app/query_builder/aggregation_widget.react.js
+++ b/resources/frontend_client/app/query_builder/aggregation_widget.react.js
@@ -2,49 +2,45 @@
/*global _ */
import SelectionModule from './selection_module.react';
+import FieldWidget from './field_widget.react';
+import Icon from './icon.react';
+
+import Query from "metabase/lib/query";
export default React.createClass({
displayName: 'AggregationWidget',
propTypes: {
aggregation: React.PropTypes.array.isRequired,
- aggregationOptions: React.PropTypes.array.isRequired,
+ tableMetadata: React.PropTypes.object.isRequired,
updateAggregation: React.PropTypes.func.isRequired
},
- getDefaultProps: function() {
- return {
- querySectionClasses: 'Query-section mt1 md-mt2 flex align-center'
- };
- },
-
componentWillMount: function() {
this.componentWillReceiveProps(this.props);
},
componentWillReceiveProps: function(newProps) {
-
// build a list of aggregations that are valid, taking into account specifically if we have valid fields available
+ var aggregationFieldOptions = [];
var availableAggregations = [];
- var aggregationFields;
- for (var i=0; i < newProps.aggregationOptions.length; i++) {
- var option = newProps.aggregationOptions[i];
-
+ newProps.tableMetadata.aggregation_options.forEach((option) => {
if (option.fields &&
(option.fields.length === 0 ||
- (option.fields.length > 0 && option.fields[0].length && option.fields[0].length > 0))) {
+ (option.fields.length > 0 && option.fields[0]))) {
availableAggregations.push(option);
}
if (newProps.aggregation.length > 0 &&
newProps.aggregation[0] !== null &&
option.short === newProps.aggregation[0]) {
- aggregationFields = option.fields[0];
+ // TODO: support multiple targets?
+ aggregationFieldOptions = Query.getFieldOptions(newProps.tableMetadata.fields, true, option.validFieldsFilters[0]);
}
- }
+ });
this.setState({
availableAggregations: availableAggregations,
- aggregationFields: aggregationFields
+ aggregationFieldOptions: aggregationFieldOptions
});
},
@@ -52,7 +48,7 @@ export default React.createClass({
var queryAggregation = [aggregation];
// check to see if this aggregation type requires another choice
- _.map(this.props.aggregationOptions, function (option) {
+ _.map(this.props.tableMetadata.aggregation_options, function (option) {
if (option.short === aggregation &&
option.fields.length > 0) {
@@ -78,42 +74,38 @@ export default React.createClass({
}
// aggregation clause. must have table details available
- var aggregationListOpen = true;
- if(this.props.aggregation[0]) {
- aggregationListOpen = false;
- }
+ var aggregationListOpen = this.props.aggregation[0] == null;
// if there's a value in the second aggregation slot render another selector
var aggregationTarget;
if(this.props.aggregation.length > 1) {
- var aggregationTargetListOpen = true;
- if(this.props.aggregation[1] !== null) {
- aggregationTargetListOpen = false;
- }
+ var aggregationTargetListOpen = this.props.aggregation[1] == null;
aggregationTarget = (
<div className="flex align-center">
- <span className="mx2">of</span>
- <SelectionModule
- placeholder="What attribute?"
- items={this.state.aggregationFields}
- display="1"
- selectedValue={this.props.aggregation[1]}
- selectedKey="0"
+ <span className="text-bold">of</span>
+ <FieldWidget
+ className="View-section-aggregation-target SelectionModule p1"
+ tableName={this.props.tableMetadata.display_name}
+ field={this.props.aggregation[1]}
+ fieldOptions={this.state.aggregationFieldOptions}
+ setField={this.setAggregationTarget}
isInitiallyOpen={aggregationTargetListOpen}
- action={this.setAggregationTarget}
/>
+ <Icon name="chevrondown" width="8px" height="8px" />
</div>
);
}
return (
- <div className={this.props.querySectionClasses}>
- <span className="Query-label">I want to see:</span>
+ <div className='Query-section'>
<SelectionModule
- placeholder="What data?"
+ className="View-section-aggregation"
+ placeholder="..."
items={this.state.availableAggregations}
display="name"
+ descriptionKey="description"
+ expandFilter={(item) => !item.advanced}
selectedValue={this.props.aggregation[0]}
selectedKey="short"
isInitiallyOpen={aggregationListOpen}
diff --git a/resources/frontend_client/app/query_builder/calendar.react.js b/resources/frontend_client/app/query_builder/calendar.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..ddc3153057ce27819dffa43743104b35e848aa9f
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/calendar.react.js
@@ -0,0 +1,122 @@
+"use strict";
+
+import Icon from "./icon.react";
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: "Calendar",
+ propTypes: {
+ selected: React.PropTypes.object.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ month: this.props.selected.clone()
+ };
+ },
+
+ previous: function() {
+ var month = this.state.month;
+ month.add(-1, "M");
+ this.setState({ month: month });
+ },
+
+ next: function() {
+ var month = this.state.month;
+ month.add(1, "M");
+ this.setState({ month: month });
+ },
+
+ render: function() {
+ return (
+ <div className="Calendar">
+ {this.renderMonthHeader()}
+ {this.renderDayNames()}
+ {this.renderWeeks()}
+ </div>
+ );
+ },
+
+ renderMonthHeader: function() {
+ return (
+ <div className="Calendar-header flex align-center px2 mb1">
+ <Icon name="chevronleft" width="10" height="12" onClick={this.previous} />
+ <span className="flex-full" />
+ <span className="h3 text-bold">{this.state.month.format("MMMM YYYY")}</span>
+ <span className="flex-full" />
+ <Icon name="chevronright" width="10" height="12" onClick={this.next} />
+ </div>
+ )
+ },
+
+ renderDayNames: function() {
+ var names = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
+ return (
+ <div className="Calendar-day-names Calendar-week border-bottom mb1">
+ {names.map((name) => <span key={name} className="Calendar-day Calendar-day-name">{name}</span>)}
+ </div>
+ );
+ },
+
+ renderWeeks: function() {
+ var weeks = [],
+ done = false,
+ date = this.state.month.clone().startOf("month").add("w" -1).day("Sunday"),
+ monthIndex = date.month(),
+ count = 0;
+
+ while (!done) {
+ weeks.push(<Week
+ key={date.toString()}
+ date={date.clone()}
+ month={this.state.month}
+ onChange={this.props.onChange}
+ selected={this.props.selected}
+ />);
+ date.add(1, "w");
+ done = count++ > 2 && monthIndex !== date.month();
+ monthIndex = date.month();
+ }
+
+ return (
+ <div className="Calendar-weeks mt1">{weeks}</div>
+ );
+ }
+});
+
+var Week = React.createClass({
+ getDefaultProps: function() {
+ return {
+ onChange: () => {}
+ };
+ },
+
+ render: function() {
+ var days = [],
+ date = this.props.date,
+ month = this.props.month;
+
+ for (var i = 0; i < 7; i++) {
+ var classes = cx({
+ "Calendar-day": true,
+ "Calendar-day--today": date.isSame(new Date(), "day"),
+ "Calendar-day--this-month": date.month() === month.month(),
+ "Calendar-day--selected": date.isSame(this.props.selected)
+ });
+ days.push(
+ <span key={date.toString()} className={classes} onClick={this.props.onChange.bind(null, date)}>
+ {date.date()}
+ </span>
+ );
+ date = date.clone();
+ date.add(1, "d");
+ }
+
+ return (
+ <div className="Calendar-week" key={days[0].toString()}>
+ {days}
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/card_favorite_button.react.js b/resources/frontend_client/app/query_builder/card_favorite_button.react.js
index b3ab98002a95b2c40538cf2e83cbbc86e22d6cf3..e345c57b5e8c02a0feffb9afbacf30b8f630a0fd 100644
--- a/resources/frontend_client/app/query_builder/card_favorite_button.react.js
+++ b/resources/frontend_client/app/query_builder/card_favorite_button.react.js
@@ -74,11 +74,17 @@ export default React.createClass({
},
render: function() {
- var fillColor = (this.state.favorite) ? 'text-gold' : 'text-grey-1';
+ var iconClasses = cx({
+ 'mx1': true,
+ 'transition-color': true,
+ 'text-grey-4': !this.state.favorite,
+ 'text-brand-hover': !this.state.favorite,
+ 'text-gold': this.state.favorite
+ });
return (
- <a className="mx1 text-grey-4 text-gold-hover transition-color" href="#" onClick={this.toggleFavorite}>
- <Icon name="star" width="18px" height="18px"></Icon>
+ <a className={iconClasses} href="#" onClick={this.toggleFavorite} title="Favorite this question">
+ <Icon name="star" width="16px" height="16px"></Icon>
</a>
);
}
diff --git a/resources/frontend_client/app/query_builder/columnar_selector.react.js b/resources/frontend_client/app/query_builder/columnar_selector.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b4651f308e21d7e9a8dbe17f0bec6496a0759ba
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/columnar_selector.react.js
@@ -0,0 +1,70 @@
+"use strict";
+
+import Icon from "./icon.react";
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: "ColumnarSelector",
+ propTypes: {
+ columns: React.PropTypes.array.isRequired
+ },
+
+ render: function() {
+ var columns = this.props.columns.map((column, columnIndex) => {
+ var sectionElements;
+ if (column) {
+ var lastColumn = columnIndex === this.props.columns.length - 1;
+ var sections = column.sections || [column];
+ sectionElements = sections.map((section, sectionIndex) => {
+ var title = section.title;
+ var items = section.items.map((item, rowIndex) => {
+ var itemClasses = cx({
+ 'ColumnarSelector-row': true,
+ 'ColumnarSelector-row--selected': item === column.selectedItem,
+ 'flex': true,
+ 'no-decoration': true
+ });
+ var checkIcon = lastColumn ? <Icon name="check" width="14" height="14"/> : null;
+ var descriptionElement;
+ var description = column.itemDescriptionFn && column.itemDescriptionFn(item);
+ if (description) {
+ descriptionElement = <div className="ColumnarSelector-description">{description}</div>
+ }
+ return (
+ <li key={rowIndex}>
+ <a className={itemClasses} href="#" onClick={column.itemSelectFn.bind(null, item)}>
+ {checkIcon}
+ <div className="flex flex-column">
+ {column.itemTitleFn(item)}
+ {descriptionElement}
+ </div>
+ </a>
+ </li>
+ );
+ });
+ var titleElement;
+ if (title) {
+ titleElement = <div className="ColumnarSelector-title">{title}</div>
+ }
+ return (
+ <section key={sectionIndex} className="ColumnarSelector-section">
+ {titleElement}
+ <ul className="ColumnarSelector-rows">{items}</ul>
+ </section>
+ );
+ });
+ }
+
+ return (
+ <div key={columnIndex} className="ColumnarSelector-column">
+ {sectionElements}
+ </div>
+ );
+ });
+
+ return (
+ <div className="ColumnarSelector">{columns}</div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/data_reference.react.js b/resources/frontend_client/app/query_builder/data_reference.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9bb9f33e147e5f25d5e2d4ee4fd35bc25d340c2
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/data_reference.react.js
@@ -0,0 +1,95 @@
+'use strict';
+
+import DataReferenceMain from './data_reference_main.react';
+import DataReferenceTable from './data_reference_table.react';
+import DataReferenceField from './data_reference_field.react';
+import Icon from './icon.react';
+import inflection from 'inflection';
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: 'DataReference',
+ propTypes: {
+ Metabase: React.PropTypes.func.isRequired,
+ query: React.PropTypes.object.isRequired,
+ closeFn: React.PropTypes.func.isRequired,
+ runQueryFn: React.PropTypes.func.isRequired,
+ setQueryFn: React.PropTypes.func.isRequired,
+ setDatabaseFn: React.PropTypes.func.isRequired,
+ setSourceTableFn: React.PropTypes.func.isRequired,
+ setDisplayFn: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ stack: [],
+ tables: {},
+ fields: {}
+ };
+ },
+
+ close: function() {
+ this.props.closeFn();
+ },
+
+ back: function() {
+ this.setState({
+ stack: this.state.stack.slice(0, -1)
+ });
+ },
+
+ showField: function(field) {
+ this.setState({
+ stack: this.state.stack.concat({ type: "field", field: field })
+ });
+ },
+
+ showTable: function(table) {
+ this.setState({
+ stack: this.state.stack.concat({ type: "table", table: table })
+ });
+ },
+
+ render: function() {
+ var content;
+ if (this.state.stack.length === 0) {
+ content = <DataReferenceMain {...this.props} showTable={this.showTable} />
+ } else {
+ var page = this.state.stack[this.state.stack.length - 1];
+ if (page.type === "table") {
+ content = <DataReferenceTable {...this.props} table={page.table} showField={this.showField} />
+ } else if (page.type === "field") {
+ content = <DataReferenceField {...this.props} field={page.field}/>
+ }
+ }
+
+ var backButton;
+ if (this.state.stack.length > 0) {
+ backButton = (
+ <a href="#" className="flex align-center mb2 text-default text-brand-hover no-decoration" onClick={this.back}>
+ <Icon name="chevronleft" width="18px" height="18px" />
+ <span className="text-uppercase">Back</span>
+ </a>
+ )
+ }
+
+ var closeButton = (
+ <a href="#" className="flex-align-right text-default text-brand-hover no-decoration" onClick={this.close}>
+ <Icon name="close" width="18px" height="18px" />
+ </a>
+ );
+
+ return (
+ <div className="DataReference-container p3 scroll-y full-height">
+ <div className="DataReference-header flex mb1">
+ {backButton}
+ {closeButton}
+ </div>
+ <div className="DataReference-content">
+ {content}
+ </div>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/data_reference_field.react.js b/resources/frontend_client/app/query_builder/data_reference_field.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..16f949b250888ea92f43537ad14ad4e57aa4e2df
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/data_reference_field.react.js
@@ -0,0 +1,155 @@
+'use strict';
+
+import DataReferenceQueryButton from './data_reference_query_button.react';
+import Icon from './icon.react';
+import Query from "metabase/lib/query";
+import inflection from 'inflection';
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: 'DataReferenceField',
+ propTypes: {
+ loadTableFn: React.PropTypes.func.isRequired,
+ runQueryFn: React.PropTypes.func.isRequired,
+ setQueryFn: React.PropTypes.func.isRequired,
+ setDatabaseFn: React.PropTypes.func.isRequired,
+ setSourceTableFn: React.PropTypes.func.isRequired,
+ setDisplayFn: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ table: undefined,
+ tableForeignKeys: undefined
+ };
+ },
+
+ componentWillMount: function() {
+ this.props.loadTableFn(this.props.field.table_id).then((result) => {
+ this.setState({
+ table: result.metadata,
+ tableForeignKeys: result.foreignKeys
+ });
+ });
+ },
+
+ filterBy: function() {
+ var query = this.setDatabaseAndTable();
+ // Add an aggregation so both aggregation and filter popovers aren't visible
+ if (!Query.hasValidAggregation(query.query)) {
+ Query.updateAggregation(query.query, ["rows"]);
+ }
+ Query.addFilter(query.query);
+ Query.updateFilter(query.query, Query.getFilters(query.query).length - 1, [null, this.props.field.id, null]);
+ this.setQuery(query, false);
+ },
+
+ groupBy: function() {
+ var query = this.setDatabaseAndTable();
+ if (!Query.hasValidAggregation(query.query)) {
+ Query.updateAggregation(query.query, ["rows"]);
+ }
+ Query.addDimension(query.query);
+ Query.updateDimension(query.query, this.props.field.id, query.query.breakout.length - 1);
+ this.setQuery(query);
+ },
+
+ setQuerySum: function() {
+ var query = this.setDatabaseAndTable();
+ query.query.aggregation = ["sum", this.props.field.id];
+ query.query.breakout = [];
+ query.query.filter = [];
+ this.setQuery(query);
+ },
+
+ setQueryDistinct: function() {
+ var query = this.setDatabaseAndTable();
+ query.query.aggregation = ["rows"];
+ query.query.breakout = [this.props.field.id];
+ query.query.filter = [];
+ this.setQuery(query);
+ },
+
+ setQueryCountGroupedBy: function(chartType) {
+ var query = this.setDatabaseAndTable();
+ query.query.aggregation = ["count"];
+ query.query.breakout = [this.props.field.id];
+ query.query.filter = [];
+ this.setQuery(query);
+ this.props.setDisplayFn(chartType);
+ },
+
+ setDatabaseAndTable: function() {
+ var query;
+ query = this.props.setDatabaseFn(this.state.table.db_id);
+ query = this.props.setSourceTableFn(this.state.table.id);
+ return query;
+ },
+
+ setQuery: function(query, run) {
+ query = this.props.setQueryFn(query);
+ if (run || run === undefined) {
+ this.props.runQueryFn(query);
+ }
+ },
+
+ render: function() {
+ var fieldName = this.props.field.display_name;
+ var tableName = this.state.table ? this.state.table.display_name : "";
+
+ var validForCurrentQuestion = !this.props.query.query || this.props.query.query.source_table == undefined || this.props.query.query.source_table === this.props.field.table_id;
+
+ var useForCurrentQuestion;
+ if (validForCurrentQuestion) {
+ var validBreakout = this.state.table && this.state.table.breakout_options.validFieldsFilter(this.state.table.fields).filter((f) => {
+ return f.id === this.props.field.id;
+ }).length > 0;
+ var useForCurrentQuestionArray = [];
+ useForCurrentQuestionArray.push(
+ <li key="filter-by" className="mt1">
+ <a className="Button Button--white text-default text-brand-hover border-brand-hover no-decoration" href="#" onClick={this.filterBy}>
+ <Icon className="mr1" name="add" width="12px" height="12px"/> Filter by {name}
+ </a>
+ </li>
+ );
+ if (validBreakout) {
+ useForCurrentQuestionArray.push(
+ <li key="group-by" className="mt1">
+ <a className="Button Button--white text-default text-brand-hover border-brand-hover no-decoration" href="#" onClick={this.groupBy}>
+ <Icon className="mr2" name="add" width="12px" height="12px" /> Group by {name}
+ </a>
+ </li>
+ );
+ }
+ useForCurrentQuestion = (
+ <div>
+ <p className="text-bold">Use for current question</p>
+ <ul className="my2">{useForCurrentQuestionArray}</ul>
+ </div>
+ );
+ }
+
+ var usefulQuestions = [];
+ if (this.props.field.special_type === "number") {
+ usefulQuestions.push(<li className="border-row-divider" key="sum"><DataReferenceQueryButton icon="illustration-icon-scalar" text={"Sum of all values of " + fieldName} onClick={this.setQuerySum} /></li>);
+ }
+ usefulQuestions.push(<li className="border-row-divider" key="distinct-values"><DataReferenceQueryButton icon="illustration-icon-table" text={"All distinct values of " + fieldName} onClick={this.setQueryDistinct} /></li>);
+ var queryCountGroupedByText = "Number of " + inflection.pluralize(tableName) + " grouped by " + fieldName;
+ usefulQuestions.push(<li className="border-row-divider" key="count-bar"><DataReferenceQueryButton icon="illustration-icon-bars" text={queryCountGroupedByText} onClick={this.setQueryCountGroupedBy.bind(null, "bar")} /></li>);
+ usefulQuestions.push(<li className="border-row-divider" key="count-pie"><DataReferenceQueryButton icon="illustration-icon-pie" text={queryCountGroupedByText} onClick={this.setQueryCountGroupedBy.bind(null, "pie")} /></li>);
+
+ var descriptionClasses = cx({ "text-grey-3": !this.props.field.description });
+ var description = (<p className={descriptionClasses}>{this.props.field.description || "No description set."}</p>);
+
+ return (
+ <div>
+ <h1>{fieldName}</h1>
+ {description}
+ {useForCurrentQuestion}
+ <p className="text-bold">Potentially useful questions</p>
+ <ul>{usefulQuestions}</ul>
+ </div>
+ );
+ },
+})
diff --git a/resources/frontend_client/app/query_builder/data_reference_main.react.js b/resources/frontend_client/app/query_builder/data_reference_main.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..285fa23540e42092e71c2191f7ef6b5bce89418a
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/data_reference_main.react.js
@@ -0,0 +1,74 @@
+'use strict';
+
+import Icon from './icon.react';
+import inflection from 'inflection';
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: 'DataReferenceMain',
+ propTypes: {
+ Metabase: React.PropTypes.func.isRequired,
+ closeFn: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ databases: {},
+ tables: {}
+ };
+ },
+
+ render: function() {
+ var databases;
+ if (this.props.databases) {
+ databases = this.props.databases.map((database) => {
+ var dbTables = this.state.databases[database.id];
+ if (dbTables === undefined) {
+ this.state.databases[database.id] = null; // null indicates loading
+ this.props.Metabase.db_tables({
+ 'dbId': database.id
+ }).$promise.then((db) => {
+ this.state.databases[database.id] = db;
+ this.setState({ databases: this.state.databases });
+ });
+ }
+ var tables;
+ var tableCount;
+ if (dbTables && dbTables.length > 0) {
+ tableCount = dbTables.length + " " + inflection.inflect("table", dbTables.length);
+ tables = dbTables.map((table, index) => {
+ var classes = cx({
+ 'p1' : true,
+ 'border-bottom': index !== dbTables.length - 1
+ })
+ return (
+ <li key={table.id} className={classes}>
+ <a className="text-brand text-brand-darken-hover no-decoration" href="#" onClick={this.props.showTable.bind(null, table)}>{table.display_name}</a>
+ </li>
+ );
+ });
+ return (
+ <li key={database.id}>
+ <div className="my2">
+ <h2 className="inline-block">{database.name}</h2>
+ <span className="ml1">{tableCount}</span>
+ </div>
+ <ul>{tables}</ul>
+ </li>
+ );
+ }
+ });
+ }
+
+ return (
+ <div>
+ <h1>Data Reference</h1>
+ <p>Learn more about your data structure to
 ask more useful questions.</p>
+ <ul>
+ {databases}
+ </ul>
+ </div>
+ );
+ },
+})
diff --git a/resources/frontend_client/app/query_builder/data_reference_query_button.react.js b/resources/frontend_client/app/query_builder/data_reference_query_button.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a3b61fa5e8999feb06ad4205eb19c165249df46
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/data_reference_query_button.react.js
@@ -0,0 +1,26 @@
+'use strict';
+
+import Icon from './icon.react';
+
+export default React.createClass({
+ displayName: 'DataReferenceQueryButton',
+ propTypes: {
+ icon: React.PropTypes.string.isRequired,
+ text: React.PropTypes.string.isRequired,
+ onClick: React.PropTypes.func
+ },
+
+ render: function(page) {
+ return (
+ <div className={this.props.className}>
+ <a className="DataRefererenceQueryButton flex align-center no-decoration py1" href="#" onClick={this.props.onClick} >
+ <Icon name={this.props.icon} />
+ <span className="DataRefererenceQueryButton-text mx2 text-default text-brand-hover">{this.props.text}</span>
+ <span className="DataRefererenceQueryButton-circle flex-align-right text-brand">
+ <Icon width="8" height="8" name="chevronright" />
+ </span>
+ </a>
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/data_reference_table.react.js b/resources/frontend_client/app/query_builder/data_reference_table.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..09f77dc8f39b629a1c74ff92aaefa56547d4ca36
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/data_reference_table.react.js
@@ -0,0 +1,121 @@
+'use strict';
+
+import Icon from './icon.react';
+import DataReferenceQueryButton from './data_reference_query_button.react';
+import inflection from 'inflection';
+
+import Query from "metabase/lib/query";
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: 'DataReferenceTable',
+ propTypes: {
+ query: React.PropTypes.object.isRequired,
+ loadTableFn: React.PropTypes.func.isRequired,
+ closeFn: React.PropTypes.func.isRequired,
+ runQueryFn: React.PropTypes.func.isRequired,
+ setQueryFn: React.PropTypes.func.isRequired,
+ setDatabaseFn: React.PropTypes.func.isRequired,
+ setSourceTableFn: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ table: undefined,
+ tableForeignKeys: undefined,
+ pane: "fields"
+ };
+ },
+
+ componentWillMount: function() {
+ this.props.loadTableFn(this.props.table.id).then((result) => {
+ this.setState({
+ table: result.metadata,
+ tableForeignKeys: result.foreignKeys
+ });
+ });
+ },
+
+ showPane: function(name) {
+ this.setState({ pane: name });
+ },
+
+ setQueryAllRows: function() {
+ var query;
+ query = this.props.setDatabaseFn(this.state.table.db_id);
+ query = this.props.setSourceTableFn(this.state.table.id);
+ query.query.aggregation = ["rows"];
+ query.query.breakout = [];
+ query.query.filter = [];
+ query = this.props.setQueryFn(query);
+ this.props.runQueryFn(query);
+ },
+
+ render: function(page) {
+ var table = this.state.table;
+ if (table) {
+ var queryButton;
+ if (table.rows != null) {
+ var text = "Show all " + table.rows.toLocaleString() + " rows in " + table.display_name
+ queryButton = (<DataReferenceQueryButton className="border-bottom border-top mb3" icon="illustration-icon-table" text={text} onClick={this.setQueryAllRows} />);
+ }
+ var panes = {
+ "fields": table.fields.length,
+ // "metrics": 0,
+ "connections": this.state.tableForeignKeys.length
+ };
+ var tabs = Object.keys(panes).map((name) => {
+ var count = panes[name];
+ var classes = cx({
+ 'Button': true,
+ 'Button--small': true,
+ 'Button--active': name === this.state.pane
+ });
+ return (
+ <a key={name} className={classes} href="#" onClick={this.showPane.bind(null, name)}>
+ <span className="DataReference-paneCount">{count}</span><span>{inflection.inflect(name, count)}</span>
+ </a>
+ );
+ });
+
+ var pane;
+ if (this.state.pane === "fields") {
+ var fields = table.fields.map((field, index) => {
+ return (
+ <li key={field.id} className="p1 border-row-divider">
+ <a className="text-brand text-brand-darken-hover no-decoration" href="#" onClick={this.props.showField.bind(null, field)}>{field.display_name}</a>
+ </li>
+ );
+ });
+ pane = <ul>{fields}</ul>;
+ } else if (this.state.pane === "connections") {
+ var connections = this.state.tableForeignKeys.map((fk, index) => {
+ return (
+ <li key={fk.id} className="p1 border-row-divider">
+ <a className="text-brand text-brand-darken-hover no-decoration" href="#" onClick={this.props.showField.bind(null, fk.origin)}>{fk.origin.table.display_name}</a>
+ </li>
+ );
+ });
+ pane = <ul>{connections}</ul>;
+ }
+
+ var descriptionClasses = cx({ "text-grey-3": !table.description });
+ var description = (<p className={descriptionClasses}>{table.description || "No description set."}</p>);
+
+ return (
+ <div>
+ <h1>{table.display_name}</h1>
+ {description}
+ {queryButton}
+ <div className="Button-group Button-group--brand text-uppercase">
+ {tabs}
+ </div>
+ {pane}
+ </div>
+ );
+ } else {
+ return null;
+ }
+ }
+})
diff --git a/resources/frontend_client/app/query_builder/data_selector.react.js b/resources/frontend_client/app/query_builder/data_selector.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..7dfa4e25d5d8308c67300ceebd30c866f8de7d27
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/data_selector.react.js
@@ -0,0 +1,110 @@
+"use strict";
+
+import Icon from './icon.react';
+import PopoverWithTrigger from './popover_with_trigger.react';
+import ColumnarSelector from './columnar_selector.react';
+
+import Table from 'metabase/lib/table';
+
+export default React.createClass({
+ displayName: "DataSelector",
+ propTypes: {
+ query: React.PropTypes.object.isRequired,
+ databases: React.PropTypes.array.isRequired,
+ tables: React.PropTypes.array,
+ setDatabaseFn: React.PropTypes.func.isRequired,
+ setSourceTableFn: React.PropTypes.func,
+ isInitiallyOpen: React.PropTypes.bool,
+ name: React.PropTypes.string
+ },
+
+ getDefaultProps: function() {
+ return {
+ name: "Data",
+ isInitiallyOpen: false,
+ includeTables: false
+ };
+ },
+
+ toggleModal: function() {
+ this.refs.popover.toggleModal();
+ },
+
+ render: function() {
+ var database = this.props.databases && this.props.databases.filter((t) => t.id === this.props.query.database)[0]
+ var table = this.props.tables && this.props.tables.filter((t) => t.id === this.props.query.query.source_table)[0]
+
+ var content;
+ if (this.props.includeTables) {
+ if (table) {
+ content = <span className="text-grey no-decoration">{table.display_name}</span>;
+ } else {
+ content = <span className="text-grey-4 no-decoration">Select a table</span>;
+ }
+ } else {
+ if (database) {
+ content = <span className="text-grey no-decoration">{database.name}</span>;
+ } else {
+ content = <span className="text-grey-4 no-decoration">Select a database</span>;
+ }
+ }
+
+ var triggerElement = (
+ <span className="px2 py2 text-bold cursor-pointer text-default">
+ {content}
+ <Icon className="ml1" name="chevrondown" width="8px" height="8px"/>
+ </span>
+ )
+
+ var columns = [
+ {
+ title: "Databases",
+ selectedItem: database,
+ items: this.props.databases,
+ itemTitleFn: (db) => db.name,
+ itemSelectFn: (db) => {
+ this.props.setDatabaseFn(db.id)
+ if (!this.props.includeTables) {
+ this.toggleModal();
+ }
+ }
+ }
+ ];
+
+ if (this.props.includeTables) {
+ if (database && this.props.tables) {
+ columns.push({
+ title: database.name + " Tables",
+ selectedItem: table,
+ items: this.props.tables.filter(Table.isQueryable),
+ itemTitleFn: (table) => table.display_name,
+ itemSelectFn: (table) => { this.props.setSourceTableFn(table.id); this.toggleModal() }
+ });
+ } else {
+ columns.push(null);
+ }
+ }
+
+ var tetherOptions = {
+ attachment: 'top left',
+ targetAttachment: 'bottom left',
+ targetOffset: '5px 0'
+ };
+
+ var name = this.props.name;
+ var classes = "GuiBuilder-section GuiBuilder-data flex align-center " + (this.props.className || "");
+ return (
+ <div className={classes}>
+ <span className="GuiBuilder-section-label Query-label">{name}</span>
+ <PopoverWithTrigger ref="popover"
+ className="PopoverBody PopoverBody--withArrow"
+ isInitiallyOpen={this.props.isInitiallyOpen}
+ tetherOptions={tetherOptions}
+ triggerElement={triggerElement}
+ triggerClasses="flex align-center">
+ <ColumnarSelector columns={columns}/>
+ </PopoverWithTrigger>
+ </div>
+ );
+ },
+})
diff --git a/resources/frontend_client/app/query_builder/database_selector.react.js b/resources/frontend_client/app/query_builder/database_selector.react.js
deleted file mode 100644
index 656dceed37b1b631b78558770bd23c42c28a74d1..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/query_builder/database_selector.react.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-
-import SelectionModule from './selection_module.react';
-
-export default React.createClass({
- displayName: 'DatabaseSelector',
- propTypes: {
- currentDatabaseId: React.PropTypes.number.isRequired,
- databases: React.PropTypes.array.isRequired,
- setDatabase: React.PropTypes.func.isRequired,
- },
- render: function () {
- return (
- <SelectionModule
- placeholder="What database would you like to work with?"
- items={this.props.databases}
- action={this.props.setDatabase}
- isInitiallyOpen={false}
- selectedValue={this.props.currentDatabaseId}
- selectedKey='id'
- display='name'
- />
- );
- }
-});
diff --git a/resources/frontend_client/app/query_builder/date_filter.react.js b/resources/frontend_client/app/query_builder/date_filter.react.js
deleted file mode 100644
index da331ad2f6389cfe7442556a7b2273b8a99f9101..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/query_builder/date_filter.react.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-
-/*global window*/
-
-// import compiled version, webpack doesn't seem to be running JSX transforms on node_modules
-// css imported in init.css
-import DatePicker from 'react-datepicker';
-import Tether from 'tether';
-import moment from 'moment';
-
-// DatePicker depedencies :(
-window.Tether = Tether;
-window.moment = moment;
-
-export default React.createClass({
- displayName: 'DateFilter',
- propTypes: {
- date: React.PropTypes.string,
- index: React.PropTypes.number,
- onChange: React.PropTypes.func.isRequired
- },
-
- onChange: function(date) {
- if (this.props.index) {
- this.props.onChange(this.props.index, date);
- } else {
- this.props.onChange(date);
- }
- },
-
- render: function () {
- var date;
- if(this.props.date) {
- date = moment(this.props.date);
- } else {
- date = moment();
- }
-
- return (
- <DatePicker
- dateFormat="YYYY-MM-DD"
- selected={date}
- onChange={this.onChange}
- />
- );
- }
-});
diff --git a/resources/frontend_client/app/query_builder/expandable_string.react.js b/resources/frontend_client/app/query_builder/expandable_string.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..b2dccf4b3e31a78f49284b135a812af9f3fa7b6a
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/expandable_string.react.js
@@ -0,0 +1,47 @@
+'use strict';
+
+import Humanize from 'humanize';
+
+
+export default React.createClass({
+ displayName: 'ExpandableString',
+
+ getDefaultProps: function () {
+ return {
+ length: 140,
+ expanded: false
+ };
+ },
+
+ getInitialState: function() {
+ return {
+ expanded: false
+ };
+ },
+
+ componentWillReceiveProps: function(newProps) {
+ this.setState({
+ expanded: newProps.expanded
+ });
+ },
+
+ toggleExpansion: function() {
+ this.setState({
+ expanded: !this.state.expanded
+ });
+ },
+
+ render: function () {
+ if (!this.props.str) return false;
+
+ var truncated = Humanize.truncate(this.props.str || "", 140);
+
+ if (this.state.expanded) {
+ return (<span>{this.props.str} <span className="block mt1 link" onClick={this.toggleExpansion}>View less</span></span>);
+ } else if (truncated !== this.props.str) {
+ return (<span>{truncated} <span className="block mt1 link" onClick={this.toggleExpansion}>View more</span></span>);
+ } else {
+ return (<span>{this.props.str}</span>);
+ }
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/field_name.react.js b/resources/frontend_client/app/query_builder/field_name.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..577f9cfe30b2480808dfc5fffa4b2358258c85de
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/field_name.react.js
@@ -0,0 +1,75 @@
+"use strict";
+/*global _*/
+
+import Icon from "./icon.react";
+
+import Query from "metabase/lib/query";
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: "FieldName",
+ propTypes: {
+ field: React.PropTypes.oneOfType([React.PropTypes.number, React.PropTypes.array]),
+ fieldOptions: React.PropTypes.object.isRequired,
+ onClick: React.PropTypes.func,
+ removeField: React.PropTypes.func
+ },
+
+ getDefaultProps: function() {
+ return {
+ className: ""
+ };
+ },
+
+ render: function() {
+ var targetTitle, fkTitle, fkIcon;
+ var field = this.props.field;
+
+ if (Array.isArray(field) && field[0] === 'fk->') {
+ var fkDef = _.find(this.props.fieldOptions.fks, (fk) => _.isEqual(fk.field.id, field[1]));
+ if (fkDef) {
+ fkTitle = (<span>{fkDef.field.display_name}</span>);
+ var targetDef = _.find(fkDef.fields, (f) => _.isEqual(f.id, field[2]));
+ if (targetDef) {
+ targetTitle = (<span>{targetDef.display_name}</span>);
+ fkIcon = (<span className="px1"><Icon name="connections" width="10" height="10" /></span>);
+ }
+ }
+ } else {
+ var fieldDef = _.find(this.props.fieldOptions.fields, (f) => _.isEqual(f.id, field));
+ if (fieldDef) {
+ targetTitle = (<span>{fieldDef.display_name}</span>);
+ }
+ }
+
+ var titleElement;
+ if (fkTitle || targetTitle) {
+ titleElement = <span className="QueryOption">{fkTitle}{fkIcon}{targetTitle}</span>;
+ } else {
+ titleElement = <span className="QueryOption">field</span>;
+ }
+
+ var classes = cx({
+ 'selected': Query.isValidField(field)
+ });
+
+ var removeButton;
+ if (this.props.removeField) {
+ removeButton = (
+ <a className="text-grey-2 no-decoration pr1 flex align-center" href="#" onClick={this.props.removeField}>
+ <Icon name='close' width="14px" height="14px" />
+ </a>
+ )
+ }
+
+ return (
+ <div className="flex align-center">
+ <div className={this.props.className + " " + classes} onClick={this.props.onClick}>
+ {titleElement}
+ </div>
+ {removeButton}
+ </div>
+ );
+ },
+});
diff --git a/resources/frontend_client/app/query_builder/field_selector.react.js b/resources/frontend_client/app/query_builder/field_selector.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..4baaad780cc2a468deb1fd1b9cb349ec3583483c
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/field_selector.react.js
@@ -0,0 +1,117 @@
+"use strict";
+/*global _*/
+
+import ColumnarSelector from "./columnar_selector.react";
+
+import Query from "metabase/lib/query";
+
+export default React.createClass({
+ displayName: "FieldSelector",
+ propTypes: {
+ field: React.PropTypes.oneOfType([React.PropTypes.number, React.PropTypes.array]),
+ fieldOptions: React.PropTypes.object.isRequired,
+ tableName: React.PropTypes.string,
+ setField: React.PropTypes.func.isRequired
+ },
+
+ getInitialState: function() {
+ return {
+ // must use "undefined" not "null" since null signifies the table itself is "selected" in the first column
+ partialField: undefined
+ };
+ },
+
+ setField: function(field) {
+ if (Query.isValidField(field)) {
+ this.setState({ partialField: undefined });
+ this.props.setField(field);
+ } else {
+ this.setState({ partialField: field });
+ }
+ },
+
+ render: function() {
+ var field = this.state.partialField !== undefined ? this.state.partialField : this.props.field;
+
+ var sourceTable = {
+ title: this.props.tableName || null,
+ field: null
+ };
+
+ if (!this.props.fieldOptions) {
+ return <div>blah</div>;
+ }
+
+ var connectionTables = this.props.fieldOptions.fks
+ .map((fk) => {
+ return {
+ title: fk.field.display_name,
+ subtitle: this.props.tableName || null,
+ field: ["fk->", fk.field.id, null],
+ fieldId: fk.field.id
+ };
+ });
+
+ var tableSections = [
+ {
+ title: "Source",
+ items: [sourceTable]
+ }
+ ];
+ if (connectionTables.length > 0) {
+ tableSections.push({
+ title: "Connections",
+ items: connectionTables
+ });
+ }
+
+ var tableColumn = {
+ sections: tableSections,
+ selectedItem: null,
+ itemTitleFn: (table) => {
+ var subtitleElement = table.subtitle ? <div className="text-grey-3 mb1">{table.subtitle}</div> : null;
+ return (
+ <div>
+ {subtitleElement}
+ <div>{table.title}</div>
+ </div>
+ );
+ },
+ itemSelectFn: (table) => {
+ this.setField(table.field);
+ }
+ }
+
+ var fieldColumn = {
+ items: null,
+ selectedItem: null,
+ itemTitleFn: (field) => field.display_name,
+ itemSelectFn: null
+ };
+
+ if (field == undefined || typeof field === "number" || field[0] === "aggregation") {
+ tableColumn.selectedItem = sourceTable;
+ fieldColumn.items = this.props.fieldOptions.fields;
+ fieldColumn.selectedItem = _.find(this.props.fieldOptions.fields, (f) => _.isEqual(f.id, field));
+ fieldColumn.itemSelectFn = (f) => {
+ this.setField(f.id);
+ }
+ } else {
+ tableColumn.selectedItem = _.find(connectionTables, (t) => _.isEqual(t.fieldId, field[1]));
+ fieldColumn.items = _.find(this.props.fieldOptions.fks, (fk) => _.isEqual(fk.field.id, tableColumn.selectedItem.fieldId)).fields;
+ fieldColumn.selectedItem = _.find(fieldColumn.items, (f) => _.isEqual(f.id, field[2]));
+ fieldColumn.itemSelectFn = (f) => {
+ this.setField(["fk->", field[1], f.id]);
+ }
+ }
+
+ var columns = [
+ tableColumn,
+ fieldColumn
+ ];
+
+ return (
+ <ColumnarSelector columns={columns}/>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/field_widget.react.js b/resources/frontend_client/app/query_builder/field_widget.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..b639f402046fcab0d34b0ce19dd926b62bacd50a
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/field_widget.react.js
@@ -0,0 +1,76 @@
+"use strict";
+
+import FieldSelector from "./field_selector.react";
+import FieldName from "./field_name.react";
+import Icon from "./icon.react";
+import Popover from "./popover.react";
+
+import Query from "metabase/lib/query";
+
+export default React.createClass({
+ displayName: "FieldWidget",
+ propTypes: {
+ field: React.PropTypes.oneOfType([React.PropTypes.number, React.PropTypes.array]),
+ fieldOptions: React.PropTypes.object.isRequired,
+ setField: React.PropTypes.func.isRequired,
+ removeField: React.PropTypes.func,
+ isInitiallyOpen: React.PropTypes.bool
+ },
+
+ getInitialState: function() {
+ return {
+ modalOpen: this.props.isInitiallyOpen || false
+ };
+ },
+
+ setField:function(value) {
+ this.props.setField(value);
+ if (Query.isValidField(value)) {
+ this.toggleModal();
+ }
+ },
+
+ toggleModal: function() {
+ this.setState({ modalOpen: !this.state.modalOpen });
+ },
+
+ renderPopover: function() {
+ if (this.state.modalOpen) {
+ var tetherOptions = {
+ attachment: 'top center',
+ targetAttachment: 'bottom center',
+ targetOffset: '15px 25px'
+ };
+ return (
+ <Popover
+ ref="popover"
+ className="PopoverBody PopoverBody--withArrow FieldPopover"
+ tetherOptions={tetherOptions}
+ handleClickOutside={this.toggleModal}
+ >
+ <FieldSelector
+ tableName={this.props.tableName}
+ field={this.props.field}
+ fieldOptions={this.props.fieldOptions}
+ setField={this.setField}
+ />
+ </Popover>
+ );
+ }
+ },
+
+ render: function() {
+ return (
+ <div className="flex align-center">
+ <FieldName
+ className={this.props.className}
+ field={this.props.field}
+ fieldOptions={this.props.fieldOptions}
+ removeField={this.props.removeField}
+ onClick={this.toggleModal}
+ />
+ {this.renderPopover()}
+ </div>
+ );
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/filter_widget.react.js b/resources/frontend_client/app/query_builder/filter_widget.react.js
index f41bdff3cef8e2ab30141d2f5df29668e4f6771c..1fbd8cb9db7747a6ccda42669e4eaa5c1c36342a 100644
--- a/resources/frontend_client/app/query_builder/filter_widget.react.js
+++ b/resources/frontend_client/app/query_builder/filter_widget.react.js
@@ -1,22 +1,32 @@
'use strict';
+/*global _*/
-import DateFilter from './date_filter.react';
+import Calendar from './calendar.react';
import Icon from './icon.react';
+import FieldName from './field_name.react';
+import FieldSelector from './field_selector.react';
import SelectionModule from './selection_module.react';
+import Popover from './popover.react';
+import ColumnarSelector from './columnar_selector.react';
+
+import Query from "metabase/lib/query";
+import moment from 'moment';
+
+var cx = React.addons.classSet;
export default React.createClass({
displayName: 'FilterWidget',
propTypes: {
filter: React.PropTypes.array.isRequired,
- filterFieldList: React.PropTypes.array.isRequired,
+ tableMetadata: React.PropTypes.object.isRequired,
index: React.PropTypes.number.isRequired,
updateFilter: React.PropTypes.func.isRequired,
removeFilter: React.PropTypes.func.isRequired
},
- getDefaultProps: function() {
+ getInitialState: function() {
return {
- sectionClassName: 'Filter-section'
+ currentPane: this.props.filter[0] == undefined ? 0 : -1
};
},
@@ -44,11 +54,14 @@ export default React.createClass({
}
// if we know what field we are filtering by we can extract the fieldDef to help us with filtering choices
- var fieldDef;
- for(var j in newProps.filterFieldList) {
- if(newProps.filterFieldList[j].id === field) {
- fieldDef = newProps.filterFieldList[j];
+ var fieldDef
+ if (Array.isArray(field)) {
+ var fkDef = newProps.tableMetadata.fields_lookup[field[1]];
+ if (fkDef) {
+ fieldDef = fkDef.target.table.fields_lookup[field[2]];
}
+ } else {
+ fieldDef = newProps.tableMetadata.fields_lookup[field];
}
// once we know our field we can pull out the list of possible operators to filter on
@@ -91,26 +104,48 @@ export default React.createClass({
fieldValues.values = safeValues;
}
+ var fieldOptions = Query.getFieldOptions(newProps.tableMetadata.fields, true);
+
this.setState({
field: field,
operator: operator,
operatorList: operatorList,
values: values,
fieldValues: fieldValues,
- fieldDef: fieldDef
+ fieldDef: fieldDef,
+ fieldOptions: fieldOptions
});
},
- setField: function(value, index, filterListIndex) {
+ isVisible: function() {
+ return this.state.currentPane >= 0 && this.state.currentPane < this.props.filter.length
+ },
+
+ selectPane: function(index) {
+ this.setState({ currentPane: index });
+ },
+
+ hasField: function() {
+ return Query.isValidField(this.state.field);
+ },
+
+ hasOperator: function() {
+ return (typeof this.state.operator === "string");
+ },
+
+ setField: function(value) {
// whenever the field is set we completely clear the filter and reset it, this is because some operators and values don't
// make sense once you've changed the field, so starting fresh is the most sensible thing to do
- if (this.state.field !== value) {
+ if (!_.isEqual(this.state.field, value)) {
var filter = [null, value, null];
this.props.updateFilter(this.props.index, filter);
}
+ if (Query.isValidField(value)) {
+ this.selectPane(1);
+ }
},
- setOperator: function(value, index, filterListIndex) {
+ setOperator: function(value) {
// different operators will lead to different filter scenarios, so handle that here
var operatorInfo = this.state.fieldDef.operators_lookup[value];
var filter = this.props.filter;
@@ -137,14 +172,20 @@ export default React.createClass({
}
this.props.updateFilter(this.props.index, filter);
+
+ this.selectPane(2);
},
- setValue: function(value, index, filterListIndex) {
+ setValue: function(index, value) {
var filter = this.props.filter;
if (value && value.length > 0) {
// value casting. we need the value in the filter to be of the proper type
- if (this.state.fieldDef.base_type === "IntegerField") {
+ if (this.state.fieldDef.special_type === "timestamp_milliseconds" ||
+ this.state.fieldDef.special_type === "timestamp_seconds") {
+ } else if (this.state.fieldDef.base_type === "IntegerField" ||
+ this.state.fieldDef.base_type === "SmallIntegerField" ||
+ this.state.fieldDef.base_type === "BigIntegerField") {
value = parseInt(value);
} else if (this.state.fieldDef.base_type === "BooleanField") {
value = (value.toLowerCase() === "true") ? true : false;
@@ -159,140 +200,245 @@ export default React.createClass({
}
if (value !== undefined) {
- filter[index] = value;
+ filter[index + 2] = value;
this.props.updateFilter(this.props.index, filter);
}
+
+ var nextPane = index + 2 + 1;
+ if (nextPane < filter.length) {
+ this.selectPane(nextPane);
+ } else {
+ this.selectPane(-1);
+ }
},
setDateValue: function (index, date) {
- this.setValue(date.format('YYYY-MM-DD'), index, this.props.index);
+ this.setValue(index, date.format('YYYY-MM-DD'));
},
setTextValue: function(index) {
var value = this.refs.textFilterValue.getDOMNode().value;
// we always know the index will be 2 for the value of a filter
- this.setValue(value, index, this.props.index);
+ this.setValue(index, value);
},
removeFilterFn: function() {
this.props.removeFilter(this.props.index);
},
- renderFieldList: function() {
+ renderField: function() {
+ var classes = cx({
+ 'Filter-section': true,
+ 'Filter-section-field': true,
+ 'px1': true,
+ 'pt1': true
+ });
+
return (
- <div className={this.props.sectionClassName}>
- <SelectionModule
- action={this.setField}
- display='name'
- index={1}
- items={this.props.filterFieldList}
- placeholder="Filter by..."
- selectedValue={this.state.field}
- selectedKey='id'
- isInitiallyOpen={this.state.field === null}
- parentIndex={this.props.index}
- />
- </div>
+ <FieldName
+ className={classes}
+ field={this.state.field}
+ fieldOptions={this.state.fieldOptions}
+ onClick={this.selectPane.bind(null, 0)}
+ />
);
},
- renderOperatorList: function() {
+ renderOperator: function() {
+ var operator;
// if we don't know our field yet then don't render anything
- if (this.state.field === null) {
- return false;
+ if (this.hasField()) {
+ operator = _.find(this.state.operatorList, (o) => o.name === this.state.operator);
}
-
+ var operatorName = operator ? operator.verbose_name : "operator";
+
+ var classes = cx({
+ "SelectionModule": true,
+ "Filter-section": true,
+ "Filter-section-operator": true,
+ "selected": !!operator
+ })
return (
- <div className={this.props.sectionClassName}>
- <SelectionModule
- placeholder="..."
- items={this.state.operatorList}
- display='verbose_name'
- selectedValue={this.state.operator}
- selectedKey='name'
- index={0}
- isInitiallyOpen={this.state.operator === null}
- parentIndex={this.props.index}
- action={this.setOperator}
- />
+ <div className={classes} onClick={this.selectPane.bind(null, 1)}>
+ <a className="QueryOption p1 flex align-center">{operatorName}</a>
</div>
);
},
- renderFilterValue: function() {
+ renderValues: function() {
// if we don't know our field AND operator yet then don't render anything
- if (this.state.field === null || this.state.operator === null) {
+ if (!this.hasField() || this.state.operator === null) {
return false;
}
// the first 2 positions of the filter are always for fieldId + fieldOperator
- var numValues = this.props.filter.length - 2;
-
- var filterValueInputs = [];
- for (var i=0; i < numValues; i++) {
- var filterIndex = i + 2;
- var filterValue = this.state.values[i];
-
- var valueHtml;
- if(this.state.fieldValues) {
- if(this.state.fieldValues.values) {
- valueHtml = (
- <SelectionModule
- action={this.setValue}
- display='name'
- index={filterIndex}
- items={this.state.fieldValues.values}
- isInitiallyOpen={filterValue === null && i === 0}
- placeholder="..."
- selectedValue={filterValue}
- selectedKey='key'
- parentIndex={filterValue}
- />
- );
+ return this.props.filter.slice(2).map((filterValue, valueIndex) => {
+ var filterIndex = valueIndex + 2;
+ var value = this.state.values[valueIndex];
+ if (this.state.fieldValues) {
+ var filterSectionClasses = cx({
+ "Filter-section": true,
+ "Filter-section-value": true,
+ "selected": filterValue != null
+ });
+ var queryOptionClasses = {};
+ queryOptionClasses["QueryOption"] = true
+ queryOptionClasses["QueryOption--" + this.state.fieldValues.type] = true;
+ var valueString;
+ if (this.state.fieldValues.type === "date") {
+ valueString = value ? moment(value).format("MMMM D, YYYY") : "date";
} else {
- switch(this.state.fieldValues.type) {
- case 'date':
- valueHtml = (
- <DateFilter
- date={filterValue}
- index={filterIndex}
- onChange={this.setDateValue}
- />
- );
- break;
- default:
- valueHtml = (
- <input
- className="input p1 lg-p2"
- type="text"
- value={filterValue}
- onChange={this.setTextValue.bind(null, filterIndex)}
- ref="textFilterValue"
- placeholder="What value?"
- />
- );
- }
+ valueString = value != null ? value.toString() : "value";
}
+ return (
+ <div key={valueIndex} className={filterSectionClasses} onClick={this.selectPane.bind(null, filterIndex)}>
+ <span className={cx(queryOptionClasses)}>{valueString}</span>
+ </div>
+ );
}
+ });
+ },
- filterValueInputs[i] = (
- <div className="FilterSection">
- {valueHtml}
- </div>
- );
+ renderFieldPane: function() {
+ return (
+ <FieldSelector
+ field={this.state.field}
+ fieldOptions={this.state.fieldOptions}
+ tableName={this.props.tableMetadata.display_name}
+ setField={this.setField}
+ />
+ );
+ },
+
+ renderOperatorPane: function() {
+ var column = {
+ selectedItem: _.find(this.state.operatorList, (o) => o.name === this.state.operator),
+ items: this.state.operatorList,
+ itemTitleFn: (o) => o.verbose_name,
+ itemSelectFn: (o, index) => this.setOperator(o.name, index)
+ };
+ return (
+ <ColumnarSelector columns={[column]} />
+ );
+ },
+
+ renderValuePane: function(valueIndex) {
+ if (this.state.fieldValues && this.state.values && valueIndex <= this.state.values.length) {
+ var value = this.state.values[valueIndex];
+ if (this.state.fieldValues.values) {
+ var column = {
+ selectedItem: _.find(this.state.fieldValues.values, (v) => v.key === value),
+ items: this.state.fieldValues.values,
+ itemTitleFn: (v) => v.name,
+ itemSelectFn: (v, index) => this.setValue(valueIndex, v.key)
+ };
+ return (
+ <ColumnarSelector columns={[column]} />
+ );
+ } else if (this.state.fieldValues.type === "date") {
+ var date = value ? moment(value) : moment();
+ return (
+ <div className="flex full-height layout-centered m2">
+ <Calendar
+ selected={date}
+ onChange={this.setDateValue.bind(null, valueIndex)}
+ />
+ </div>
+ );
+ } else {
+ return (
+ <div className="Filter-section Filter-section-value flex p2">
+ <input
+ className="QueryOption input mx1 flex-full"
+ type="text"
+ defaultValue={value}
+ ref="textFilterValue"
+ placeholder="What value?"
+ autoFocus={true}
+ />
+ <button className="Button mx1 text-default text-normal" onClick={() => this.setTextValue(valueIndex, this.refs.textFilterValue.value)}>
+ Add
+ </button>
+ </div>
+ );
+ }
}
+ return <div><div>{value}</div><pre>{JSON.stringify(this.state.fieldValues)}</pre></div>;
+ },
+
+ renderPopover: function() {
+ if (this.isVisible()) {
+ var pane;
+ if (this.state.currentPane === 0) {
+ pane = this.renderFieldPane();
+ } else if (this.state.currentPane === 1) {
+ pane = this.renderOperatorPane();
+ } else {
+ pane = this.renderValuePane(this.state.currentPane - 2);
+ }
+
+ var tabs = [
+ { name: "Field", enabled: true },
+ { name: "Operator", enabled: this.hasField() }
+ ];
+
+ var numValues = this.props.filter.length - 2;
+ for (var i = 0; i < numValues; i++) {
+ tabs.push({ name: "Value", enabled: this.hasField() && this.state.operator != null });
+ }
- return filterValueInputs;
+ var tetherOptions = {
+ attachment: 'top left',
+ targetAttachment: 'bottom left',
+ targetOffset: '10px 0'
+ };
+
+ return (
+ <Popover
+ ref="popover"
+ className="PopoverBody PopoverBody--withArrow FilterPopover"
+ isInitiallyOpen={this.state.field === null}
+ tetherOptions={tetherOptions}
+ handleClickOutside={this.selectPane.bind(null, -1)}
+ >
+ <ul className="PopoverHeader">
+ {tabs.map((t, index) => {
+ var classes = cx({
+ "PopoverHeader-item": true,
+ "PopoverHeader-item--withArrow": index < tabs.length,
+ "cursor-pointer": t.enabled,
+ "selected": this.state.currentPane === index,
+ "disabled": !t.enabled
+ });
+ return <li key={index} className={classes} onClick={this.selectPane.bind(null, index)}>{t.name}</li>
+ })}
+ </ul>
+ <div>{pane}</div>
+ </Popover>
+ );
+ }
},
render: function() {
+ var classes = cx({
+ "Query-filter": true,
+ "px1": true,
+ "selected": this.isVisible()
+ });
return (
- <div className="Query-filter">
- {this.renderFieldList()}
- {this.renderOperatorList()}
- {this.renderFilterValue()}
- <a onClick={this.removeFilterFn}>
- <Icon name='close' width="12px" height="12px" />
+ <div className={classes}>
+ <div>
+ <div>
+ {this.renderField()}
+ </div>
+ <div className="flex align-center">
+ {this.renderOperator()}
+ {this.renderValues()}
+ </div>
+ {this.renderPopover()}
+ </div>
+ <a className="text-grey-2 no-decoration px1 flex align-center" href="#" onClick={this.removeFilterFn}>
+ <Icon name='close' width="14px" height="14px" />
</a>
</div>
);
diff --git a/resources/frontend_client/app/query_builder/gui_query_editor.react.js b/resources/frontend_client/app/query_builder/gui_query_editor.react.js
index 1e773b0e8d31168fa9e4c8a14484355e2650e97c..61d7937b4591728927b1cecb7430bc5bcde20281 100644
--- a/resources/frontend_client/app/query_builder/gui_query_editor.react.js
+++ b/resources/frontend_client/app/query_builder/gui_query_editor.react.js
@@ -1,14 +1,19 @@
'use strict';
/*global _*/
+import MetabaseAnalytics from '../lib/analytics';
+
import AggregationWidget from './aggregation_widget.react';
-import DatabaseSelector from './database_selector.react';
+import DataSelector from './data_selector.react';
+import FieldWidget from './field_widget.react';
import FilterWidget from './filter_widget.react';
import Icon from './icon.react';
+import IconBorder from './icon_border.react';
import LimitWidget from './limit_widget.react';
-import RunButton from './run_button.react';
-import SelectionModule from './selection_module.react';
import SortWidget from './sort_widget.react';
+import PopoverWithTrigger from './popover_with_trigger.react';
+
+import Query from "metabase/lib/query";
var cx = React.addons.classSet;
var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
@@ -18,378 +23,122 @@ export default React.createClass({
propTypes: {
databases: React.PropTypes.array.isRequired,
query: React.PropTypes.object.isRequired,
- defaultQuery: React.PropTypes.object.isRequired,
- isRunning: React.PropTypes.bool.isRequired,
- isExpanded: React.PropTypes.bool.isRequired,
- runFn: React.PropTypes.func.isRequired,
- notifyQueryModifiedFn: React.PropTypes.func.isRequired,
+ options: React.PropTypes.object, // can't be required, sometimes null
+ isShowingDataReference: React.PropTypes.bool.isRequired,
+ setQueryFn: React.PropTypes.func.isRequired,
+ setDatabaseFn: React.PropTypes.func.isRequired,
+ setSourceTableFn: React.PropTypes.func.isRequired,
toggleExpandCollapseFn: React.PropTypes.func.isRequired
},
- getDefaultProps: function() {
- return {
- querySectionClasses: 'Query-section mt1 md-mt2 flex align-center'
- };
- },
-
- setQuery: function(dataset_query, notify) {
- this.props.notifyQueryModifiedFn(dataset_query);
- },
-
- setDatabase: function(databaseId) {
- if (databaseId !== this.props.query.database) {
- // reset to a brand new query
- var query = this.props.defaultQuery;
-
- // set our new database on the query
- query.database = databaseId;
-
- // notify parent that we've started over
- // TODO: should this clear the visualization as well?
- this.props.notifyQueryModifiedFn(query);
-
- // load rest of the data we need
- this.props.loadDatabaseInfoFn(databaseId);
- }
- },
-
- setSourceTable: function(sourceTable) {
- // this will either be the id or an object with an id
- var tableId = sourceTable.id || sourceTable;
- this.props.loadTableInfoFn(tableId);
-
- // when the table changes we reset everything else in the query, except the database of course
- // TODO: should this clear the visualization as well?
- var query = this.props.defaultQuery;
- query.database = this.props.query.database;
- query.query.source_table = tableId;
-
- this.setQuery(query, true);
- },
-
- canRun: function() {
- if (this.hasValidAggregation()) {
- return true;
- }
- return false;
- },
-
- runQuery: function() {
- var cleanQuery = this.cleanQuery(this.props.query);
-
- this.props.runFn(cleanQuery);
- },
-
- cleanQuery: function(dataset_query) {
- // it's possible the user left some half-done parts of the query on screen when they hit the run button, so find those
- // things now and clear them out so that we have a nice clean set of valid clauses in our query
-
- // TODO: breakouts
-
- // filters
- var queryFilters = this.getFilters();
- if (queryFilters.length > 1) {
- var hasNullValues = function(arr) {
- for (var j=0; j < arr.length; j++) {
- if (arr[j] === null) {
- return true;
- }
- }
-
- return false;
- };
-
- var cleanFilters = [queryFilters[0]];
- for (var i=1; i < queryFilters.length; i++) {
- if (!hasNullValues(queryFilters[i])) {
- cleanFilters.push(queryFilters[i]);
- }
- }
-
- if (cleanFilters.length > 1) {
- dataset_query.query.filter = cleanFilters;
- } else {
- dataset_query.query.filter = [];
- }
- }
-
- // TODO: limit
-
- // TODO: sort
-
- return dataset_query;
- },
-
- canAddDimensions: function() {
- var MAX_DIMENSIONS = 2;
- return (this.props.query.query.breakout.length < MAX_DIMENSIONS);
- },
-
- hasValidBreakout: function() {
- return (this.props.query.query.breakout &&
- this.props.query.query.breakout.length > 0 &&
- this.props.query.query.breakout[0] !== null);
- },
-
- canSortByAggregateField: function() {
- var SORTABLE_AGGREGATION_TYPES = new Set(["avg", "count", "distinct", "stddev", "sum"]);
-
- return this.hasValidBreakout() && SORTABLE_AGGREGATION_TYPES.has(this.props.query.query.aggregation[0]);
+ setQuery: function(dataset_query) {
+ this.props.setQueryFn(dataset_query);
},
addDimension: function() {
- var query = this.props.query;
- query.query.breakout.push(null);
+ Query.addDimension(this.props.query.query);
+ this.setQuery(this.props.query);
- this.setQuery(query, true);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Add GroupBy');
},
- updateDimension: function(dimension, index) {
- var query = this.props.query;
- query.query.breakout[index] = dimension;
+ updateDimension: function(index, dimension) {
+ Query.updateDimension(this.props.query.query, dimension, index);
+ this.setQuery(this.props.query);
- this.setQuery(query, true);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Modify GroupBy');
},
removeDimension: function(index) {
- // TODO: when we remove breakouts we also need to remove any limits/sorts that don't make sense
- var query = this.props.query;
- query.query.breakout.splice(index, 1);
-
- this.setQuery(query, true);
- },
+ Query.removeDimension(this.props.query.query, index);
+ this.setQuery(this.props.query);
- hasEmptyAggregation: function() {
- var aggregation = this.props.query.query.aggregation;
- if (aggregation !== undefined &&
- aggregation.length > 0 &&
- aggregation[0] !== null) {
- return false;
- }
- return true;
- },
-
- hasValidAggregation: function() {
- var aggregation = this.props.query.query.aggregation;
- if (aggregation !== undefined &&
- ((aggregation.length === 1 && aggregation[0] !== null) ||
- (aggregation.length === 2 && aggregation[0] !== null && aggregation[1] !== null))) {
- return true;
- }
- return false;
- },
-
- isBareRowsAggregation: function() {
- return (this.props.query.query.aggregation &&
- this.props.query.query.aggregation.length > 0 &&
- this.props.query.query.aggregation[0] === "rows");
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Remove GroupBy');
},
updateAggregation: function(aggregationClause) {
- var query = this.props.query;
- query.query.aggregation = aggregationClause;
-
- // for "rows" type aggregation we always clear out any dimensions because they don't make sense
- if (aggregationClause.length > 0 && aggregationClause[0] === "rows") {
- query.query.breakout = [];
- }
+ Query.updateAggregation(this.props.query.query, aggregationClause);
+ this.setQuery(this.props.query);
- this.setQuery(query, true);
- },
-
- renderAddIcon: function () {
- return (
- <span className="mr1">
- <Icon name="add" width="12px" height="12px" />
- </span>
- )
- },
-
- getFilters: function() {
- // Special handling for accessing query filters because it's been fairly complex to deal with their structure.
- // This method provide a unified and consistent view of the filter definition for the rest of the tool to use.
-
- var queryFilters = this.props.query.query.filter;
-
- // quick check for older style filter definitions and tweak them to a format we want to work with
- if (queryFilters && queryFilters.length > 0 && queryFilters[0] !== "AND") {
- var reformattedFilters = [];
-
- for (var i=0; i < queryFilters.length; i++) {
- if (queryFilters[i] !== null) {
- reformattedFilters = ["AND", queryFilters];
- break;
- }
- }
-
- queryFilters = reformattedFilters;
- }
-
- return queryFilters;
- },
-
- canAddFilter: function(queryFilters) {
- var canAdd = true;
-
- if (queryFilters && queryFilters.length > 0) {
- var lastFilter = queryFilters[queryFilters.length - 1];
-
- // simply make sure that there are no null values in the last filter
- for (var i=0; i < lastFilter.length; i++) {
- if (lastFilter[i] === null) {
- canAdd = false;
- }
- }
- } else {
- canAdd = false;
- }
-
- return canAdd;
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Set Aggregation', aggregationClause[0]);
},
addFilter: function() {
- var query = this.props.query,
- queryFilters = this.getFilters();
+ Query.addFilter(this.props.query.query);
+ this.setQuery(this.props.query);
- if (queryFilters.length === 0) {
- queryFilters = ["AND", [null, null, null]];
- } else {
- queryFilters.push([null, null, null]);
- }
-
- query.query.filter = queryFilters;
- this.setQuery(query, true);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Add Filter');
},
updateFilter: function(index, filter) {
- var query = this.props.query,
- queryFilters = this.getFilters();
-
- queryFilters[index] = filter;
+ Query.updateFilter(this.props.query.query, index, filter);
+ this.setQuery(this.props.query);
- query.query.filter = queryFilters;
- this.setQuery(query, true);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Modify Filter');
},
removeFilter: function(index) {
- var query = this.props.query,
- queryFilters = this.getFilters();
+ Query.removeFilter(this.props.query.query, index);
+ this.setQuery(this.props.query);
- if (queryFilters.length === 2) {
- // this equates to having a single filter because the arry looks like ... ["AND" [a filter def array]]
- queryFilters = [];
- } else {
- queryFilters.splice(index, 1);
- }
-
- query.query.filter = queryFilters;
- this.setQuery(query, true);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Remove Filter');
},
- canAddLimitAndSort: function() {
- // limits and sorts only make sense if we know there will be multiple rows
- var query = this.props.query;
+ addLimit: function() {
+ Query.addLimit(this.props.query.query);
+ this.setQuery(this.props.query);
- if (this.isBareRowsAggregation()) {
- return true;
- } else if (this.hasValidBreakout()) {
- return true;
- } else {
- return false;
- }
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Set Limit');
},
- getSortableFields: function() {
- // in bare rows all fields are sortable, otherwise we only sort by our breakout columns
- var query = this.props.query;
-
- // start with all fields
- var fieldList = [];
- for(var key in this.props.options.fields_lookup) {
- fieldList.push(this.props.options.fields_lookup[key]);
- }
-
- if (this.isBareRowsAggregation()) {
- return fieldList;
- } else if (this.hasValidBreakout()) {
- // further filter field list down to only fields in our breakout clause
- var breakoutFieldList = [];
- this.props.query.query.breakout.map(function (breakoutFieldId) {
- for (var idx in fieldList) {
- if (fieldList[idx].id === breakoutFieldId) {
- breakoutFieldList.push(fieldList[idx]);
- }
- }
- }.bind(this));
-
- if (this.canSortByAggregateField()) {
- breakoutFieldList.push({
- id: ["aggregation", 0],
- name: this.props.query.query.aggregation[0] // e.g. "sum"
- });
- }
-
- return breakoutFieldList;
+ updateLimit: function(limit) {
+ if (limit) {
+ Query.updateLimit(this.props.query.query, limit);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Set Limit');
} else {
- return [];
+ Query.removeLimit(this.props.query.query);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Remove Limit');
}
+ this.setQuery(this.props.query);
},
- addLimit: function() {
- var query = this.props.query;
- query.query.limit = null;
- this.setQuery(query, true);
- },
+ addSort: function() {
+ Query.addSort(this.props.query.query);
+ this.setQuery(this.props.query);
- updateLimit: function(limit) {
- var query = this.props.query;
- query.query.limit = limit;
- this.setQuery(query, true);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Set Sort', 'manual');
},
- removeLimit: function() {
- var query = this.props.query;
- delete query.query.limit;
- this.setQuery(query, true);
- },
+ updateSort: function(index, sort) {
+ Query.updateSort(this.props.query.query, index, sort);
+ this.setQuery(this.props.query);
- canAddSort: function() {
- // TODO: allow for multiple sorting choices
- return false;
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Set Sort', 'manual');
},
- addSort: function() {
- // TODO: make sure people don't try to sort by the same field multiple times
- var query = this.props.query,
- order_by = query.query.order_by;
-
- if (!order_by) {
- order_by = [];
- }
-
- order_by.push([null, "ascending"]);
- query.query.order_by = order_by;
+ removeSort: function(index) {
+ Query.removeSort(this.props.query.query, index);
+ this.setQuery(this.props.query);
- this.setQuery(query, true);
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Remove Sort');
},
- updateSort: function(index, sort) {
- var query = this.props.query;
- query.query.order_by[index] = sort;
- this.setQuery(query, true);
+ renderAdd: function(text, onClick) {
+ let classes = "text-grey-2 text-grey-4-hover cursor-pointer text-bold no-decoration flex align-center mx2 transition-color";
+ return (
+ <a className={classes} onClick={onClick}>
+ {this.renderAddIcon()}
+ { text ? (<span className="ml1">{text}</span>) : (null) }
+ </a>
+ )
},
- removeSort: function(index) {
- var query = this.props.query,
- queryOrderBy = query.query.order_by;
-
- if (queryOrderBy.length === 1) {
- delete query.query.order_by;
- } else {
- queryOrderBy.splice(index, 1);
- }
-
- this.setQuery(query, true);
+ renderAddIcon: function () {
+ return (
+ <IconBorder borderRadius="3px">
+ <Icon name="add" width="14px" height="14px" />
+ </IconBorder>
+ )
},
renderDbSelector: function() {
@@ -407,350 +156,306 @@ export default React.createClass({
}
},
- renderTableSelector: function() {
- if (this.props.tables) {
- var sourceTableListOpen = true;
- if(this.props.query.query.source_table) {
- sourceTableListOpen = false;
- }
-
- // if we don't have any filters applied yet then provide an option to do that
-
-
- return (
- <div className={this.props.querySectionClasses}>
- <span className="Query-label">Table:</span>
- <SelectionModule
- placeholder="What part of your data?"
- items={this.props.tables}
- display="name"
- selectedValue={this.props.query.query.source_table}
- selectedKey="id"
- isInitiallyOpen={sourceTableListOpen}
- action={this.setSourceTable}
- />
- <ReactCSSTransitionGroup transitionName="Transition-qb-section">
- {this.renderFilterButton()}
- </ReactCSSTransitionGroup>
- </div>
- );
- }
- },
-
- renderFilterButton: function() {
- if (this.props.query.query.source_table &&
- this.getFilters().length === 0 &&
- this.props.options &&
- this.props.options.fields.length > 0) {
- return (
- <a className="QueryOption flex align-center p1 lg-p2 ml2" onClick={this.addFilter}>
- <Icon name='filter' width={16} height={ 16} viewBox='0 0 16 16' />
- <span className="mr1">Filter</span> <span>{(this.props.options) ? this.props.options.name : ''}</span>
- </a>
- );
- }
- },
-
- renderBreakouts: function() {
- // breakout clause. must have table details available & a valid aggregation defined
- if (this.props.options &&
- this.props.options.breakout_options.fields.length > 0 &&
- !this.hasEmptyAggregation()) {
-
- // only render a label for our breakout if we have a valid breakout clause already
- var breakoutLabel;
- if(this.props.query.query.breakout.length > 0) {
- breakoutLabel = (
- <div className="Query-label">
- Grouped by:
- </div>
- );
- }
-
- var breakoutList;
- if(this.props.options.breakout_options) {
- breakoutList = this.props.query.query.breakout.map(function (breakout, index) {
- var breakoutListOpen = false;
- if(breakout === null) {
- breakoutListOpen = true;
- }
-
- return (
- <div className="DimensionList">
- <SelectionModule
- placeholder='What part of your data?'
- display="1"
- items={this.props.options.breakout_options.fields}
- selectedValue={breakout}
- selectedKey="0"
+ renderFilters: function() {
+ var enabled;
+ var filterList;
+ var addFilterButton;
+
+ if (this.props.options) {
+ enabled = true;
+
+ var queryFilters = Query.getFilters(this.props.query.query);
+ if (queryFilters && queryFilters.length > 0) {
+ filterList = queryFilters.map((filter, index) => {
+ if(index > 0) {
+ return (
+ <FilterWidget
+ key={index}
+ placeholder="Item"
+ filter={filter}
+ tableMetadata={this.props.options}
index={index}
- isInitiallyOpen={breakoutListOpen}
- action={this.updateDimension}
- remove={this.removeDimension}
+ removeFilter={this.removeFilter}
+ updateFilter={this.updateFilter}
/>
- </div>
- );
- }.bind(this));
+ );
+ }
+ });
}
- // include a button to add a breakout, up to 2 total
- var addBreakoutButton;
- if (this.props.query.query.breakout.length === 0) {
- addBreakoutButton = (
- <a className="QueryOption QueryOption--offset p1 lg-p2" onClick={this.addDimension}>
- {this.renderAddIcon()}
- Add a grouping
- </a>
- );
- } else if (this.props.query.query.breakout.length === 1 &&
- this.props.query.query.breakout[0] !== null) {
- addBreakoutButton = (
- <a className="QueryOption p1 lg-p2 ml1 lg-ml2" onClick={this.addDimension}>
- {this.renderAddIcon()}
- Add another grouping
- </a>
- );
+ // TODO: proper check for isFilterComplete(filter)
+ if (Query.canAddFilter(this.props.query.query)) {
+ if (filterList) {
+ addFilterButton = this.renderAdd(null, this.addFilter);
+ } else {
+ addFilterButton = this.renderAdd("Add filters to narrow your answer", this.addFilter);
+ }
}
+ } else {
+ enabled = false;
+ addFilterButton = this.renderAdd("Add filters to narrow your answer", this.addFilter);
+ }
- return (
- <div className={this.props.querySectionClasses}>
- {breakoutLabel}
- {breakoutList}
- {addBreakoutButton}
+ var querySectionClasses = cx({
+ "Query-section": true,
+ disabled: !enabled
+ });
+ return (
+ <div className={querySectionClasses}>
+ <div className="Query-filters">
+ {filterList}
</div>
- );
- }
+ {addFilterButton}
+ </div>
+ );
},
renderAggregation: function() {
// aggregation clause. must have table details available
- if(this.props.options) {
+ if (this.props.options) {
return (
<AggregationWidget
aggregation={this.props.query.query.aggregation}
- aggregationOptions={this.props.options.aggregation_options}
- updateAggregation={this.updateAggregation}>
- </AggregationWidget>
+ tableMetadata={this.props.options}
+ updateAggregation={this.updateAggregation}
+ />
+ );
+ } else {
+ // TODO: move this into AggregationWidget?
+ return (
+ <div className="Query-section Query-section-aggregation disabled">
+ <a className="QueryOption p1 flex align-center">Raw data</a>
+ </div>
);
}
},
- renderFilterSelector: function() {
- var queryFilters = this.getFilters();
+ renderBreakouts: function() {
+ var enabled;
+ var breakoutList;
+ var addBreakoutButton;
- if (this.props.options && queryFilters && queryFilters.length > 0) {
- var component = this;
+ // breakout clause. must have table details available & a valid aggregation defined
+ if (this.props.options &&
+ this.props.options.breakout_options.fields.length > 0 &&
+ !Query.hasEmptyAggregation(this.props.query.query)) {
+ enabled = true;
- var filterFieldList = [];
- for(var key in this.props.options.fields_lookup) {
- filterFieldList.push(this.props.options.fields_lookup[key]);
- }
+ // include a button to add a breakout, up to 2 total
+ // don't include already used fields
+ var usedFields = {};
+ breakoutList = []
+ this.props.query.query.breakout.forEach((breakout, index) => {
+ var breakoutListOpen = breakout === null;
+ var fieldOptions = Query.getFieldOptions(this.props.options.fields, true, this.props.options.breakout_options.validFieldsFilter, usedFields);
+
+ if (breakout) {
+ usedFields[breakout] = true;
+ }
- var filterList = queryFilters.map(function (filter, index) {
- if(index > 0) {
- return (
- <FilterWidget
- placeholder="Item"
- filter={filter}
- filterFieldList={filterFieldList}
- index={index}
- removeFilter={component.removeFilter}
- updateFilter={component.updateFilter}
- />
- );
+ if (fieldOptions.count === 0) {
+ return null;
}
- }.bind(this));
- // TODO: proper check for isFilterComplete(filter)
- var addFilterButton;
- if (this.canAddFilter(queryFilters)) {
- addFilterButton = (
- <a className="QueryOption p1 lg-p2" onClick={this.addFilter}>
- {this.renderAddIcon()}
- Add another filter
- </a>
+ breakoutList.push(
+ <span key={"_"+index} className="text-bold">
+ {breakoutList.length > 0 ? "and" : "by"}
+ </span>
);
- }
- return (
- <div className={this.props.querySectionClasses}>
- <span className="Query-label">Filtered by:</span>
- <div className="Query-filters">
- {filterList}
- {addFilterButton}
- </div>
- </div>
- );
+ breakoutList.push(
+ <FieldWidget
+ key={index}
+ className="View-section-breakout SelectionModule p1"
+ placeholder='field'
+ field={breakout}
+ fieldOptions={fieldOptions}
+ tableName={this.props.options.display_name}
+ isInitiallyOpen={breakoutListOpen}
+ setField={this.updateDimension.bind(null, index)}
+ removeField={this.removeDimension.bind(null, index)}
+ />
+ );
+ });
+
+ var remainingFieldOptions = Query.getFieldOptions(this.props.options.fields, true, this.props.options.breakout_options.validFieldsFilter, usedFields);
+ if (remainingFieldOptions.count > 0) {
+ if (this.props.query.query.breakout.length === 0) {
+ addBreakoutButton = this.renderAdd("Add a grouping", this.addDimension);
+ } else if (this.props.query.query.breakout.length === 1 &&
+ this.props.query.query.breakout[0] !== null) {
+ addBreakoutButton = this.renderAdd(null, this.addDimension);
+ }
+ }
+ } else {
+ enabled = false;
+ addBreakoutButton = this.renderAdd("Add a grouping", this.addDimension);
}
+ var querySectionClasses = cx({
+ "Query-section": true,
+ ml1: true,
+ disabled: !enabled
+ });
+ return (
+ <div className={querySectionClasses}>
+ {breakoutList}
+ {addBreakoutButton}
+ </div>
+ );
},
- renderLimitAndSort: function() {
- if (this.props.options && !this.hasEmptyAggregation() &&
- (this.props.query.query.limit !== undefined || this.props.query.query.order_by !== undefined)) {
-
- var limitSection;
- if (this.props.query.query.limit !== undefined) {
- limitSection = (
- <LimitWidget
- limit={this.props.query.query.limit}
- updateLimit={this.updateLimit}
- removeLimit={this.removeLimit}
- />
- );
- } else {
- limitSection = (
- <div className="QueryOption p1 lg-p2 flex align-center">
- <a onClick={this.addLimit}>
- {this.renderAddIcon()}
- Add row limit
- </a>
- </div>
- );
- }
+ renderSort: function() {
+ var sortFieldOptions;
- var sortList = [];
- if (this.props.query.query.order_by) {
- var sortableFields = this.getSortableFields();
-
- var component = this;
- sortList = this.props.query.query.order_by.map(function (order_by, index) {
- return (
- <SortWidget
- placeholder="Attribute"
- sort={order_by}
- fieldList={sortableFields}
- index={index}
- removeSort={component.removeSort}
- updateSort={component.updateSort}
- />
- );
- }.bind(this));
- }
+ if (this.props.options) {
+ sortFieldOptions = Query.getFieldOptions(
+ this.props.options.fields,
+ true,
+ Query.getSortableFields.bind(null, this.props.query.query)
+ );
+ }
- var sortSection;
- if (sortList.length === 0) {
- sortSection = (
- <div className="QueryOption p1 lg-p2 flex align-center">
- <a onClick={this.addSort}>
- {this.renderAddIcon()}
- Add sort
- </a>
- </div>
+ var sortList = [];
+ if (this.props.query.query.order_by && this.props.options) {
+ sortList = this.props.query.query.order_by.map((order_by, index) => {
+ return (
+ <SortWidget
+ key={index}
+ tableName={this.props.options.display_name}
+ sort={order_by}
+ fieldOptions={sortFieldOptions}
+ removeSort={this.removeSort.bind(null, index)}
+ updateSort={this.updateSort.bind(null, index)}
+ />
);
- } else {
- var addSortButton;
- if (this.canAddSort()) {
- addSortButton = (
- <a onClick={this.addSort}>Add another sort</a>
- );
- }
+ });
+ }
- sortSection = (
- <div className="flex align-center">
- <span className="m2">sorted by</span>
- {sortList}
- {addSortButton}
- </div>
- );
- }
+ var content;
+ if (sortList.length > 0) {
+ content = sortList;
+ } else if (sortFieldOptions && sortFieldOptions.count > 0) {
+ content = this.renderAdd("Pick a field to sort by", this.addSort);
+ }
+ if (content) {
return (
- <div className={this.props.querySectionClasses}>
- <span className="Query-label">Limit and sort:</span>
- <div className="Query-filters">
- {limitSection}
- {sortSection}
- </div>
+ <div className="py1 border-bottom">
+ <div className="Query-label mb1">Sort by:</div>
+ {content}
</div>
);
+ }
+ },
- } else if (this.canAddLimitAndSort()) {
+ renderLimit: function() {
+ var limitOptions = [undefined, 1, 10, 25, 100, 1000].map((count) => {
+ var name = count || "None";
+ var classes = cx({
+ "Button": true,
+ "Button--active": count == this.props.query.query.limit
+ });
return (
- <div className={this.props.querySectionClasses}>
- <a className="QueryOption QueryOption--offset p1 lg-p2" onClick={this.addLimit}>
- {this.renderAddIcon()}
- Set row limits and sorting
- </a>
- </div>
+ <li key={name} className={classes} onClick={this.updateLimit.bind(null, count)}>{name}</li>
);
- }
+ });
+ return (
+ <ul className="Button-group Button-group--blue">
+ {limitOptions}
+ </ul>
+ )
+ },
+ renderDataSection: function() {
+ var isInitiallyOpen = !this.props.query.database || !this.props.query.query.source_table;
+ return (
+ <DataSelector
+ className="arrow-right"
+ includeTables={true}
+ query={this.props.query}
+ databases={this.props.databases}
+ tables={this.props.tables}
+ setDatabaseFn={this.props.setDatabaseFn}
+ setSourceTableFn={this.props.setSourceTableFn}
+ isInitiallyOpen={isInitiallyOpen}
+ />
+ );
},
- toggleOpen: function() {
- this.props.toggleExpandCollapseFn();
+ renderFilterSection: function() {
+ return (
+ <div className="GuiBuilder-section GuiBuilder-filtered-by flex align-center">
+ <span className="GuiBuilder-section-label Query-label">Filtered by</span>
+ {this.renderFilters()}
+ </div>
+ );
},
- toggleText: function() {
- return (this.props.isExpanded) ? 'Hide query' : 'Show query';
+ renderViewSection: function() {
+ return (
+ <div className="GuiBuilder-section GuiBuilder-view flex-full flex align-center px1">
+ <span className="GuiBuilder-section-label Query-label">View</span>
+ {this.renderAggregation()}
+ {this.renderBreakouts()}
+ </div>
+ );
},
- toggleIcon: function () {
- var iconSize = '12px'
- if(this.props.isExpanded) {
- return (
- <Icon name='chevronup' width={iconSize} height={iconSize} />
- );
- } else {
- return (
- <Icon name='chevrondown' width={iconSize} height={iconSize} />
- );
+ renderSortLimitSection: function() {
+ var tetherOptions = {
+ attachment: 'top right',
+ targetAttachment: 'bottom center',
+ targetOffset: '5px 20px'
+ };
+
+ var triggerElement = (<span className="EllipsisButton no-decoration text-grey-1 px1">…</span>);
+
+ // TODO: use this logic
+ if (this.props.options && !Query.hasEmptyAggregation(this.props.query.query) &&
+ (this.props.query.query.limit !== undefined || this.props.query.query.order_by !== undefined)) {
+
+ } else if (Query.canAddLimitAndSort(this.props.query.query)) {
+
}
- },
- openStatus: function() {
return (
- <a href="#" className="QueryToggle px2 py1 no-decoration bg-white flex align-center" onClick={this.toggleOpen}>
- <span className="mr1">
- {this.toggleIcon()}
- </span>
- {this.toggleText()}
- </a>
+ <div className="GuiBuilder-section GuiBuilder-sort-limit flex align-center">
+
+ <PopoverWithTrigger className="PopoverBody PopoverBody--withArrow"
+ tetherOptions={tetherOptions}
+ triggerElement={triggerElement}
+ triggerClasses="flex align-center">
+ <div className="px3 py1">
+ {this.renderSort()}
+ <div className="py1">
+ <div className="Query-label mb1">Limit:</div>
+ {this.renderLimit()}
+ </div>
+ </div>
+ </PopoverWithTrigger>
+ </div>
);
},
render: function() {
- var guiBuilderClasses = cx({
+ var classes = cx({
'GuiBuilder': true,
- 'wrapper': true,
- 'GuiBuilder--collapsed': !this.props.isExpanded,
- });
+ 'GuiBuilder--narrow': this.props.isShowingDataReference,
+ 'rounded': true,
+ 'shadowed': true
+ })
return (
- <div className={guiBuilderClasses}>
- <ReactCSSTransitionGroup transitionName="Transition-qb-section">
- {this.renderDbSelector()}
- </ReactCSSTransitionGroup>
-
- <ReactCSSTransitionGroup transitionName="Transition-qb-section">
- {this.renderTableSelector()}
- </ReactCSSTransitionGroup>
-
- <ReactCSSTransitionGroup transitionName="Transition-qb-section">
- {this.renderFilterSelector()}
- </ReactCSSTransitionGroup>
-
- <ReactCSSTransitionGroup transitionName="Transition-qb-section">
- {this.renderAggregation()}
- </ReactCSSTransitionGroup>
-
- <ReactCSSTransitionGroup transitionName="Transition-qb-section">
- {this.renderBreakouts()}
- </ReactCSSTransitionGroup>
-
- <ReactCSSTransitionGroup transitionName="Transition-qb-section">
- {this.renderLimitAndSort()}
- </ReactCSSTransitionGroup>
-
- <div className="Query-section Query-section--right mb2">
- <RunButton
- canRun={this.canRun()}
- isRunning={this.props.isRunning}
- runFn={this.runQuery}
- />
- </div>
- <div className="QueryToggleWrapper absolute left right flex layout-centered">
- {this.openStatus()}
+ <div className="wrapper">
+ <div className={classes}>
+ <div className="GuiBuilder-row flex">
+ {this.renderDataSection()}
+ {this.renderFilterSection()}
+ </div>
+ <div className="GuiBuilder-row flex flex-full">
+ {this.renderViewSection()}
+ {this.renderSortLimitSection()}
+ </div>
</div>
</div>
);
diff --git a/resources/frontend_client/app/query_builder/header.react.js b/resources/frontend_client/app/query_builder/header.react.js
index 25e1b7f01025a037f2d27e4915b777d295a28c3c..ccb86e8e48b056d575462d44dbefaa6a159e0498 100644
--- a/resources/frontend_client/app/query_builder/header.react.js
+++ b/resources/frontend_client/app/query_builder/header.react.js
@@ -5,10 +5,10 @@ import ActionButton from './action_button.react';
import AddToDashboard from './add_to_dashboard.react';
import CardFavoriteButton from './card_favorite_button.react';
import Icon from './icon.react';
-import Popover from './popover.react';
import QueryModeToggle from './query_mode_toggle.react';
import Saver from './saver.react';
+var cx = React.addons.classSet;
var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
export default React.createClass({
@@ -20,51 +20,28 @@ export default React.createClass({
notifyCardChangedFn: React.PropTypes.func.isRequired,
setQueryModeFn: React.PropTypes.func.isRequired,
downloadLink: React.PropTypes.string,
+ isShowingDataReference: React.PropTypes.bool.isRequired,
+ toggleDataReferenceFn: React.PropTypes.func.isRequired,
+ cardIsNewFn: React.PropTypes.func.isRequired,
+ cardIsDirtyFn: React.PropTypes.func.isRequired
},
getInitialState: function() {
return {
- origCard: JSON.stringify(this.props.card),
- recentlySaved: false,
- resetOrigCard: false
+ recentlySaved: null
};
},
- componentWillReceiveProps: function(nextProps) {
- // pre-empt a card update via props
- // we need this here for a specific case where we know the card will be changing
- // and thus we need to reset our :origCard state BEFORE our next render cycle
- if (this.state.resetOrigCard) {
- this.setState({
- origCard: JSON.stringify(nextProps.card),
- recentlySaved: false,
- resetOrigCard: false
- });
- }
- },
-
- cardIsNew: function() {
- // a card is considered new if it has not ID associated with it
- return (this.props.card.id === undefined);
- },
-
- cardIsDirty: function() {
- // a card is considered dirty if ANY part of it has been changed
- return (JSON.stringify(this.props.card) !== this.state.origCard);
- },
-
resetStateOnTimeout: function() {
// clear any previously set timeouts then start a new one
clearTimeout(this.timeout);
-
- var component = this;
- this.timeout = setTimeout(function() {
- if (component.isMounted()) {
- component.setState({
- recentlySaved: false
+ this.timeout = setTimeout(() => {
+ if (this.isMounted()) {
+ this.setState({
+ recentlySaved: null
});
}
- }.bind(component), 5000);
+ }, 5000);
},
save: function() {
@@ -72,59 +49,44 @@ export default React.createClass({
},
saveCard: function(card) {
- var component = this,
- apiCall;
if (card.id === undefined) {
// creating a new card
- apiCall = this.props.cardApi.create(card, function (newCard) {
- if (component.isMounted()) {
- component.props.notifyCardCreatedFn(newCard);
+ return this.props.cardApi.create(card).$promise.then((newCard) => {
+ if (this.isMounted()) {
+ this.props.notifyCardCreatedFn(newCard);
// update local state to reflect new card state
- component.setState({
- origCard: JSON.stringify(card),
- recentlySaved: true
- }, component.resetStateOnTimeout);
+ this.setState({ recentlySaved: "created" }, this.resetStateOnTimeout);
}
});
-
} else {
// updating an existing card
- apiCall = this.props.cardApi.update(card, function (updatedCard) {
- if (component.isMounted()) {
- component.props.notifyCardUpdatedFn(updatedCard);
+ return this.props.cardApi.update(card).$promise.then((updatedCard) => {
+ if (this.isMounted()) {
+ this.props.notifyCardUpdatedFn(updatedCard);
// update local state to reflect new card state
- component.setState({
- origCard: JSON.stringify(card),
- recentlySaved: true
- }, component.resetStateOnTimeout);
+ this.setState({ recentlySaved: "updated" }, this.resetStateOnTimeout);
}
});
}
-
- return apiCall.$promise;
},
deleteCard: function () {
- var card = this.props.card,
- component = this;
-
- var apiCall = this.props.cardApi.delete({'cardId': card.id}, function () {
- component.props.notifyCardDeletedFn();
+ var card = this.props.card;
+ return this.props.cardApi.delete({ 'cardId': card.id }).$promise.then(() => {
+ this.props.notifyCardDeletedFn();
});
-
},
setQueryMode: function(mode) {
- // we need to update our dirty state here
- var component = this;
- this.setState({
- resetOrigCard: true
- }, function() {
- component.props.setQueryModeFn(mode);
- });
+ this.props.setQueryModeFn(mode);
+ },
+
+ toggleDataReference: function() {
+ this.props.toggleDataReferenceFn();
},
+
permissions: function() {
var permission;
if(this.props.card.public_perms) {
@@ -132,7 +94,7 @@ export default React.createClass({
case 0:
permission = (
<span className="ml1 sm-ml1 text-grey-3">
- <Icon name="lock" width="12px" height="12px" />
+ <Icon title="This question is private" name="lock" width="12px" height="12px" />
</span>
)
break;
@@ -144,10 +106,10 @@ export default React.createClass({
},
render: function() {
- var title = this.props.card.name || "What would you like to know?";
+ var title = this.props.card.name || "New question";
var editButton;
- if (!this.cardIsNew()) {
+ if (!this.props.cardIsNewFn() && this.props.card.is_creator) {
editButton = (
<Saver
card={this.props.card}
@@ -161,7 +123,7 @@ export default React.createClass({
}
var saveButton;
- if (this.cardIsNew() && this.cardIsDirty()) {
+ if (this.props.cardIsNewFn() && this.props.cardIsDirtyFn()) {
// new cards get a custom treatment, like saving a new Excel document
saveButton = (
<Saver
@@ -172,7 +134,7 @@ export default React.createClass({
canDelete={false}
/>
);
- } else if (this.cardIsDirty() || this.state.recentlySaved) {
+ } else if (this.state.recentlySaved === "updated" || (this.props.cardIsDirtyFn() && this.props.card.is_creator)) {
// for existing cards we render a very simply ActionButton
saveButton = (
<ActionButton
@@ -187,17 +149,22 @@ export default React.createClass({
if (this.props.downloadLink) {
downloadButton = (
<a className="mx1" href={this.props.downloadLink} title="Download this data" target="_blank">
- <Icon name='download'>
- <Popover>
- <span>Download data</span>
- </Popover>
- </Icon>
+ <Icon name='download' width="16px" height="16px" />
+ </a>
+ );
+ }
+
+ var cloneButton;
+ if (this.props.card.id) {
+ cloneButton = (
+ <a href="#" className="mx1 text-grey-4 text-brand-hover" title="Ask another question based on this question">
+ <Icon name='clone' width="16px" height="16px" onClick={this.props.cloneCardFn}></Icon>
</a>
);
}
var queryModeToggle;
- if (this.cardIsNew() && !this.cardIsDirty()) {
+ if (this.props.cardIsNewFn() && !this.props.cardIsDirtyFn()) {
queryModeToggle = (
<QueryModeToggle
currentQueryMode={this.props.card.dataset_query.type}
@@ -207,11 +174,33 @@ export default React.createClass({
}
var cardFavorite;
- if (!this.cardIsNew()) {
+ if (this.props.card.id != undefined) {
cardFavorite = (<CardFavoriteButton cardApi={this.props.cardApi} cardId={this.props.card.id}></CardFavoriteButton>);
}
+ var addToDashButton;
+ if (this.props.card.id != undefined) {
+ addToDashButton = (
+ <AddToDashboard
+ card={this.props.card}
+ dashboardApi={this.props.dashboardApi}
+ broadcastEventFn={this.props.broadcastEventFn}
+ />
+ )
+ }
+ var dataReferenceButtonClasses = cx({
+ 'mx1': true,
+ 'transition-color': true,
+ 'text-grey-4': !this.props.isShowingDataReference,
+ 'text-brand': this.props.isShowingDataReference,
+ 'text-brand-hover': !this.state.isShowingDataReference
+ });
+ var dataReferenceButton = (
+ <a href="#" className={dataReferenceButtonClasses} title="Get help on what data means">
+ <Icon name='reference' width="16px" height="16px" onClick={this.toggleDataReference}></Icon>
+ </a>
+ );
var attribution;
@@ -220,11 +209,25 @@ export default React.createClass({
<div className="Entity-attribution">
Asked by {this.props.card.creator.common_name}
</div>
- )
+ );
+ }
+
+ var hasLeft = !!downloadButton;
+ var hasMiddle = !!(cardFavorite || cloneButton || addToDashButton);
+ var hasRight = !!dataReferenceButton;
+
+ var dividerLeft;
+ if (hasLeft && (hasMiddle || hasRight)) {
+ dividerLeft = <div className="border-right border-dark mx1"> </div>
+ }
+
+ var dividerRight;
+ if (hasRight && hasMiddle) {
+ dividerRight = <div className="border-right border-dark mx1"> </div>
}
return (
- <div className="border-bottom py1 lg-py2 xl-py3 QueryBuilder-section wrapper flex align-center">
+ <div className="py1 lg-py2 xl-py3 QueryBuilder-section wrapper flex align-center">
<div className="Entity">
<div className="flex align-center">
<h1 className="Entity-title">{title}</h1>
@@ -234,16 +237,24 @@ export default React.createClass({
{attribution}
</div>
- <div className="QueryHeader-actions flex-align-right">
+ <div className="flex align-center flex-align-right">
+
+ <span className="pr3">
+ {saveButton}
+ {queryModeToggle}
+ </span>
+
{downloadButton}
+
+ {dividerLeft}
+
{cardFavorite}
- <AddToDashboard
- card={this.props.card}
- dashboardApi={this.props.dashboardApi}
- broadcastEventFn={this.props.broadcastEventFn}
- />
- {saveButton}
- {queryModeToggle}
+ {cloneButton}
+ {addToDashButton}
+
+ {dividerRight}
+
+ {dataReferenceButton}
</div>
</div>
);
diff --git a/resources/frontend_client/app/query_builder/icon.react.js b/resources/frontend_client/app/query_builder/icon.react.js
index 346a80d9db242f5e9f164e169372b47a19f5920f..a36c21de329e28e0ff7154b0e54bd9b327e8c99b 100644
--- a/resources/frontend_client/app/query_builder/icon.react.js
+++ b/resources/frontend_client/app/query_builder/icon.react.js
@@ -1,34 +1,16 @@
'use strict';
-import ICON_PATHS from 'metabase/icon_paths';
+import { loadIcon } from 'metabase/icon_paths';
export default React.createClass({
displayName: 'Icon',
- getDefaultProps: function () {
- return {
- width: '32px',
- height: '32px',
- fill: 'currentcolor'
- };
- },
render: function () {
- var iconPath = ICON_PATHS[this.props.name],
- path;
+ var icon = loadIcon(this.props.name);
- // handle multi path icons which appear as non strings
- if(typeof(iconPath) != 'string') {
- // create a path for each path present
- path = iconPath.map(function (path) {
- return (<path d={path} /> );
- });
+ if (icon.svg) {
+ return (<svg {... icon.attrs} {... this.props} dangerouslySetInnerHTML={{__html: icon.svg}}></svg>);
} else {
- path = (<path d={iconPath} />);
+ return (<svg {... icon.attrs} {... this.props}><path d={icon.path} /></svg>);
}
-
- return (
- <svg viewBox="0 0 32 32" {... this.props} className={'Icon Icon-' + this.props.name}>
- {path}
- </svg>
- );
}
});
diff --git a/resources/frontend_client/app/query_builder/icon_border.react.js b/resources/frontend_client/app/query_builder/icon_border.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..083101ba74238d60f176e5e18f529825a1e6205e
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/icon_border.react.js
@@ -0,0 +1,47 @@
+'use strict';
+
+var cx = React.addons.classSet;
+
+var IconBorder = React.createClass({
+ displayName: 'IconBorder',
+ getDefaultProps: function () {
+ return {
+ borderWidth: '1px',
+ borderStyle: 'solid',
+ borderColor: 'currentcolor',
+ rounded: true
+ }
+ },
+ computeSize: function () {
+ var width = parseInt(this.props.children.props.width, 10);
+ return width * 2;
+ },
+ render: function () {
+ var classes = cx({
+ 'flex': true,
+ 'layout-centered': true
+ });
+
+ var styles = {
+ width: this.computeSize(),
+ height: this.computeSize(),
+ borderWidth: this.props.borderWidth,
+ borderStyle: this.props.borderStyle,
+ borderColor: this.props.borderColor
+ }
+
+ if (this.props.borderRadius) {
+ styles.borderRadius = this.props.borderRadius;
+ } else if (this.props.rounded) {
+ styles.borderRadius = "99px";
+ }
+
+ return (
+ <span className={classes + ' ' + this.props.className} style={styles}>
+ {this.props.children}
+ </span>
+ );
+ }
+});
+
+export default IconBorder;
diff --git a/resources/frontend_client/app/query_builder/limit_widget.react.js b/resources/frontend_client/app/query_builder/limit_widget.react.js
index d5988296fc47118205290d80003c1b892df90a83..6322001e9d96ba2faa671f23a14b4db31bddafbe 100644
--- a/resources/frontend_client/app/query_builder/limit_widget.react.js
+++ b/resources/frontend_client/app/query_builder/limit_widget.react.js
@@ -10,7 +10,6 @@ export default React.createClass({
updateLimit: React.PropTypes.func.isRequired,
removeLimit: React.PropTypes.func.isRequired
},
- sectionClassName: 'Filter-section',
getDefaultProps: function() {
return {
@@ -35,7 +34,7 @@ export default React.createClass({
render: function() {
return (
<div className="Query-filter">
- <div className={this.sectionClassName}>
+ <div className='Filter-section'>
<SelectionModule
placeholder="How many rows?"
items={this.props.options}
diff --git a/resources/frontend_client/app/query_builder/native_query_editor.react.js b/resources/frontend_client/app/query_builder/native_query_editor.react.js
index 80be2c424da680c587d60e462dea085f552a2310..db9668f193e8ba7f9e628e57d4fa358cb0f626bf 100644
--- a/resources/frontend_client/app/query_builder/native_query_editor.react.js
+++ b/resources/frontend_client/app/query_builder/native_query_editor.react.js
@@ -1,23 +1,32 @@
'use strict';
/*global ace*/
-import RunButton from './run_button.react';
-import DatabaseSelector from './database_selector.react';
+import DataSelector from './data_selector.react';
+import Icon from './icon.react';
export default React.createClass({
displayName: 'NativeQueryEditor',
propTypes: {
databases: React.PropTypes.array.isRequired,
- defaultQuery: React.PropTypes.object.isRequired,
query: React.PropTypes.object.isRequired,
- isRunning: React.PropTypes.bool.isRequired,
- runFn: React.PropTypes.func.isRequired,
- notifyQueryModifiedFn: React.PropTypes.func.isRequired,
+ setQueryFn: React.PropTypes.func.isRequired,
+ setDatabaseFn: React.PropTypes.func.isRequired,
autocompleteResultsFn: React.PropTypes.func.isRequired
},
getInitialState: function() {
- return {};
+ return {
+ showEditor: false
+ };
+ },
+
+ componentWillMount: function() {
+ // if the sql is empty then start with the editor showing, otherwise our default is to start out collapsed
+ if (!this.props.query.native.query) {
+ this.setState({
+ showEditor: true
+ });
+ }
},
componentDidMount: function() {
@@ -53,7 +62,11 @@ export default React.createClass({
editor.setOptions({
enableBasicAutocompletion: true,
enableSnippets: true,
- enableLiveAutocompletion: true
+ enableLiveAutocompletion: true,
+ showPrintMargin: false,
+ highlightActiveLine: false,
+ highlightGutterLine: false,
+ showLineNumbers: true
});
var autocompleteFn = this.props.autocompleteResultsFn;
@@ -83,68 +96,61 @@ export default React.createClass({
});
},
- setDatabase: function(databaseId) {
- // check if this is the same db or not
- if (databaseId !== this.props.query.database) {
- // reset to a brand new query
- var query = this.props.defaultQuery;
-
- // set our new database on the query
- query.database = databaseId;
-
- // carry over our previous query
- query.native.query = this.props.query.native.query;
-
- // notify parent that we've started over
- this.props.notifyQueryModifiedFn(query);
- }
- },
-
- canRunQuery: function() {
- return (this.props.query.database !== undefined && this.props.query.native.query !== "");
- },
-
- runQuery: function() {
- this.props.runFn(this.props.query);
+ setQuery: function(dataset_query) {
+ this.props.setQueryFn(dataset_query);
},
onChange: function(event) {
if (this.state.editor) {
var query = this.props.query;
query.native.query = this.state.editor.getValue();
- this.props.notifyQueryModifiedFn(query);
+ this.setQuery(query);
}
},
+ toggleEditor: function() {
+ this.setState({ showEditor: !this.state.showEditor })
+ },
+
render: function() {
- //console.log(this.props.query);
// we only render a db selector if there are actually multiple to choose from
var dbSelector;
- if(this.props.databases && this.props.databases.length > 1) {
+ if(this.state.showEditor && this.props.databases && this.props.databases.length > 1) {
dbSelector = (
- <DatabaseSelector
+ <DataSelector
+ name="Database"
databases={this.props.databases}
- setDatabase={this.setDatabase}
- currentDatabaseId={this.props.query.database}
+ query={this.props.query}
+ setDatabaseFn={this.props.setDatabaseFn}
/>
);
+ } else {
+ dbSelector = <span className="p2 text-grey-4">This question is written in SQL.</span>;
+ }
+
+ var editorClasses, toggleEditorText, toggleEditorIcon;
+ if (this.state.showEditor) {
+ editorClasses = "";
+ toggleEditorText = "Hide Editor";
+ toggleEditorIcon = "contract";
+ } else {
+ editorClasses = "hide";
+ toggleEditorText = "Open Editor";
+ toggleEditorIcon = "expand";
}
return (
- <div className="QueryBuilder-section border-bottom">
- <div className="wrapper">
- <div id="id_sql" className="Query-section bordered mt2"></div>
- <div className="py2 clearfix">
- <div className="float-right">
- <RunButton
- canRun={this.canRunQuery()}
- isRunning={this.props.isRunning}
- runFn={this.runQuery}
- />
- </div>
- <div className="float-left">
- {dbSelector}
- </div>
+ <div className="wrapper">
+ <div className="NativeQueryEditor bordered rounded shadowed">
+ <div className="flex">
+ {dbSelector}
+ <a href="#" className="Query-label no-decoration flex-align-right flex align-center px2" onClick={this.toggleEditor}>
+ <span className="mx2">{toggleEditorText}</span>
+ <Icon name={toggleEditorIcon} width="20" height="20"/>
+ </a>
+ </div>
+ <div className={"border-top " + editorClasses}>
+ <div id="id_sql"></div>
</div>
</div>
</div>
diff --git a/resources/frontend_client/app/query_builder/popover.react.js b/resources/frontend_client/app/query_builder/popover.react.js
index f299b87c1d2e80f53917e8d200cb37cbe9b92a64..078e4d2117e4f512ba800b4bff26707830d7a18f 100644
--- a/resources/frontend_client/app/query_builder/popover.react.js
+++ b/resources/frontend_client/app/query_builder/popover.react.js
@@ -1,5 +1,9 @@
'use strict';
-/*global document, Tether*/
+/*global document*/
+
+import PopoverContent from './popover_content.react';
+
+import Tether from 'tether';
export default React.createClass({
displayName: 'Popover',
@@ -33,11 +37,12 @@ export default React.createClass({
},
_popoverComponent: function() {
- var className = this.props.className;
return (
- <div className={className}>
- {this.props.children}
- </div>
+ <PopoverContent handleClickOutside={this.props.handleClickOutside}>
+ <div className={this.props.className}>
+ {this.props.children}
+ </div>
+ </PopoverContent>
);
},
diff --git a/resources/frontend_client/app/query_builder/popover_content.react.js b/resources/frontend_client/app/query_builder/popover_content.react.js
index e4967684e9c2ce6d774958356e1ab6e4a0450859..e436606cedafe481bd351e94b1a9cad416a447ab 100644
--- a/resources/frontend_client/app/query_builder/popover_content.react.js
+++ b/resources/frontend_client/app/query_builder/popover_content.react.js
@@ -5,12 +5,35 @@ import OnClickOutside from 'react-onclickoutside';
// this feels a little silly, but we have this component ONLY so that we can add the OnClickOutside functionality on an
// arbitrary set of html content. I wish we could do that more easily
+// keep track of the order popovers were opened so we only close the last one when clicked outside
+var popoverStack = [];
+
export default React.createClass({
displayName: 'PopoverContent',
mixins: [OnClickOutside],
- handleClickOutside: function() {
- this.props.handleClickOutside();
+ componentWillMount: function() {
+ popoverStack.push(this);
+ },
+
+ componentDidMount: function() {
+ // HACK: set the z-index of the parent element to ensure it's always on top
+ this.getDOMNode().parentNode.style.zIndex = popoverStack.length;
+ },
+
+ componentWillUnmount: function() {
+ // remove popover from the stack
+ var index = popoverStack.indexOf(this);
+ if (index >= 0) {
+ popoverStack.splice(index, 1);
+ }
+ },
+
+ handleClickOutside: function(e) {
+ // only propagate event for the popover on top of the stack
+ if (this === popoverStack[popoverStack.length - 1]) {
+ this.props.handleClickOutside.apply(this, arguments);
+ }
},
render: function() {
diff --git a/resources/frontend_client/app/query_builder/popover_with_trigger.react.js b/resources/frontend_client/app/query_builder/popover_with_trigger.react.js
index 659915d9fdbfa3593e4867356c7856bed5d4af42..236de4e042c6761650d97a016328bf851171a629 100644
--- a/resources/frontend_client/app/query_builder/popover_with_trigger.react.js
+++ b/resources/frontend_client/app/query_builder/popover_with_trigger.react.js
@@ -1,14 +1,19 @@
'use strict';
-/*global document, Tether*/
+/*global document*/
import PopoverContent from './popover_content.react'
+import Tether from 'tether';
+
export default React.createClass({
displayName: 'PopoverWithTrigger',
getInitialState: function() {
+ // a selection module can be told to be open on initialization but otherwise is closed
+ var isInitiallyOpen = this.props.isInitiallyOpen || false;
return {
- modalOpen: false
+ modalOpen: isInitiallyOpen,
+ recentlyToggled: false
};
},
@@ -42,16 +47,22 @@ export default React.createClass({
}
},
- toggleModal: function() {
- var modalOpen = !this.state.modalOpen;
- this.setState({
- modalOpen: modalOpen
- });
+ toggleModal: function(modalOpen) {
+ if (!this.state.recentlyToggled || modalOpen !== undefined) {
+ if (modalOpen === undefined) {
+ modalOpen = !this.state.modalOpen;
+ }
+ this.setState({
+ modalOpen: modalOpen,
+ recentlyToggled: true
+ });
+ setTimeout(() => this.setState({ recentlyToggled: false }), 500);
+ }
},
_popoverComponent: function() {
return (
- <PopoverContent handleClickOutside={this.toggleModal}>
+ <PopoverContent handleClickOutside={this.toggleModal.bind(null, false)}>
<div className={this.props.className}>
{this.props.children}
</div>
@@ -95,12 +106,14 @@ export default React.createClass({
},
render: function() {
+ var classes = "no-decoration";
+ if (this.props.triggerClasses) {
+ classes += " " + this.props.triggerClasses;
+ }
return (
- <span>
- <a className="mx1" href="#" onClick={this.toggleModal}>
- {this.props.triggerElement}
- </a>
- </span>
+ <a className={classes} href="#" onClick={this.toggleModal}>
+ {this.props.triggerElement}
+ </a>
);
}
});
diff --git a/resources/frontend_client/app/query_builder/run_button.react.js b/resources/frontend_client/app/query_builder/run_button.react.js
index 1fcfd7e49af7ea950e1e2390561bead3d8185436..89d5e6d9052a102785ad5e1ab8be94e235de845f 100644
--- a/resources/frontend_client/app/query_builder/run_button.react.js
+++ b/resources/frontend_client/app/query_builder/run_button.react.js
@@ -1,25 +1,26 @@
'use strict';
+var cx = React.addons.classSet;
+
export default React.createClass({
displayName: 'RunButton',
propTypes: {
canRun: React.PropTypes.bool.isRequired,
isRunning: React.PropTypes.bool.isRequired,
+ isDirty: React.PropTypes.bool.isRequired,
runFn: React.PropTypes.func.isRequired
- },
- run: function() {
-
},
render: function () {
- // default state is to not render anything if we can't actually run
- var runButton = false;
- if (this.props.canRun) {
- var runButtonText = (this.props.isRunning) ? "Loading..." : "Find out!";
- runButton = (
- <button className="Button Button--primary" onClick={this.props.runFn}>{runButtonText}</button>
- );
- }
-
- return runButton;
+ var runButtonText = (this.props.isRunning) ? "Loading..." : "Run query";
+ var classes = cx({
+ "Button": true,
+ "Button--primary": true,
+ "circular": true,
+ "RunButton": true,
+ "RunButton--hidden": (!this.props.canRun || !this.props.isDirty)
+ });
+ return (
+ <button className={classes} onClick={this.props.runFn}>{runButtonText}</button>
+ );
}
});
diff --git a/resources/frontend_client/app/query_builder/saver.react.js b/resources/frontend_client/app/query_builder/saver.react.js
index 69beb0a2d009e33d4b6e4ee08f1d290ba2dd6885..f5434499fb319acc2e0617137180176b05b59c08 100644
--- a/resources/frontend_client/app/query_builder/saver.react.js
+++ b/resources/frontend_client/app/query_builder/saver.react.js
@@ -73,24 +73,29 @@ export default React.createClass({
card.description = this.refs.description.getDOMNode().value.trim();
card.public_perms = parseInt(this.refs.public_perms.getDOMNode().value);
- var component = this;
- this.props.saveFn(card).then(function(success) {
- component.setState({
- modalOpen: false
- });
- }, function(error) {
- component.setState({
- errors: error
- });
+ this.props.saveFn(card).then((success) => {
+ if (this.isMounted()) {
+ this.setState({
+ modalOpen: false
+ });
+ }
+ }, (error) => {
+ if (this.isMounted()) {
+ this.setState({
+ errors: error
+ });
+ }
});
},
renderCardDelete: function () {
if(this.props.canDelete) {
return (
- <div className="Form-offset mb4">
- <label className="block">Danger zone:</label>
- <a className="Button Button--danger" onClick={this.props.deleteFn}>Delete card</a>
+ <div className="Form-field">
+ <label className="Form-label Form-offset mb1"><span>Danger zone</span>:</label>
+ <label className="Form-offset">
+ <a className="Button Button--danger" onClick={this.props.deleteFn}>Delete card</a>
+ </label>
</div>
)
}
@@ -156,7 +161,7 @@ export default React.createClass({
showCharm={false}
errors={this.state.errors}>
<label className="Select Form-offset">
- <select ref="public_perms" defaultValue={this.props.card.public_perms}>
+ <select className="mt1" ref="public_perms" defaultValue={this.props.card.public_perms}>
{privacyOptions}
</select>
</label>
diff --git a/resources/frontend_client/app/query_builder/selection_module.react.js b/resources/frontend_client/app/query_builder/selection_module.react.js
index 3fed0cc63d7b46348d6160012a09233a8823e7dc..82f6b2dee37d9818a3f3416052048ae9f3ab05ad 100644
--- a/resources/frontend_client/app/query_builder/selection_module.react.js
+++ b/resources/frontend_client/app/query_builder/selection_module.react.js
@@ -1,6 +1,7 @@
'use strict';
+/*global _ */
-import OnClickOutside from 'react-onclickoutside';
+import Popover from './popover.react';
import Icon from './icon.react';
import SearchBar from './search_bar.react';
@@ -12,6 +13,9 @@ export default React.createClass({
propTypes: {
action: React.PropTypes.func.isRequired,
display: React.PropTypes.string.isRequired,
+ descriptionKey: React.PropTypes.string,
+ expandFilter: React.PropTypes.func,
+ expandTitle: React.PropTypes.string,
isInitiallyOpen: React.PropTypes.bool,
items: React.PropTypes.array,
remove: React.PropTypes.func,
@@ -20,7 +24,12 @@ export default React.createClass({
parentIndex: React.PropTypes.number,
placeholder: React.PropTypes.string
},
- mixins: [OnClickOutside],
+
+ getDefaultProps: function() {
+ return {
+ className: ""
+ };
+ },
getInitialState: function () {
// a selection module can be told to be open on initialization but otherwise is closed
@@ -28,6 +37,7 @@ export default React.createClass({
return {
open: isInitiallyOpen,
+ expanded: false,
searchThreshold: 20,
searchEnabled: false,
filterTerm: null
@@ -36,7 +46,8 @@ export default React.createClass({
handleClickOutside: function() {
this.setState({
- open: false
+ open: false,
+ expanded: false
});
},
@@ -53,12 +64,32 @@ export default React.createClass({
},
_toggleOpen: function() {
- var open = !this.state.open;
this.setState({
- open: open
+ open: !this.state.open,
+ expanded: !this.state.open ? this.state.expanded : false
+ });
+ },
+
+ _expand: function() {
+ this.setState({
+ expanded: true
});
},
+ _isExpanded: function() {
+ if (this.state.expanded || !this.props.expandFilter) {
+ return true;
+ }
+ // if an item that is normally in the expansion is selected then show the expansion
+ for (var i = 0; i < this.props.items.length; i++) {
+ var item = this.props.items[i];
+ if (this._itemIsSelected(item) && !this.props.expandFilter(item, i)) {
+ return true;
+ }
+ }
+ return false;
+ },
+
_displayCustom: function(values) {
var custom = [];
this.props.children.forEach(function (element) {
@@ -70,26 +101,55 @@ export default React.createClass({
},
_listItems: function(selection) {
- var items,
- remove;
+ if (this.props.items) {
+ var sourceItems = this.props.items;
- if(this.props.items) {
- items = this.props.items.map(function (item, index) {
+ var isExpanded = this._isExpanded();
+ if (!isExpanded) {
+ sourceItems = sourceItems.filter(this.props.expandFilter);
+ }
+
+ var items = sourceItems.map(function (item, index) {
var display = (item) ? item[this.props.display] || item : item;
var itemClassName = cx({
'SelectionItem' : true,
'SelectionItem--selected': selection === display
});
+ var description = null;
+ if (this.props.descriptionKey && item && item[this.props.descriptionKey]) {
+ description = (
+ <div className="SelectionModule-description">
+ {item[this.props.descriptionKey]}
+ </div>
+ );
+ }
// if children are provided, use the custom layout display
return (
<li className={itemClassName} onClick={this._select.bind(null, item)} key={index}>
- <Icon name='check' width="12px" height="12px" />
- <span className="SelectionModule-display">
- {display}
- </span>
+ <Icon name="check" width="12px" height="12px" />
+ <div className="flex-full">
+ <div className="SelectionModule-display">
+ {display}
+ </div>
+ {description}
+ </div>
+ </li>
+ );
+ }, this);
+
+ if (!isExpanded && items.length !== this.props.items.length) {
+ items.push(
+ <li className="SelectionItem border-top" onClick={this._expand} key="expand">
+ <Icon name="chevrondown" width="12px" height="12px" />
+ <div>
+ <div className="SelectionModule-display">
+ {this.props.expandedTitle || "Advanced..."}
+ </div>
+ </div>
</li>
);
- }.bind(this));
+ }
+
return items;
} else {
return "Sorry. Something went wrong.";
@@ -113,63 +173,82 @@ export default React.createClass({
this._toggleOpen();
},
+ _itemIsSelected: function(item) {
+ return item && _.isEqual(item[this.props.selectedKey], this.props.selectedValue);
+ },
+
+ renderPopover: function(selection) {
+ if(this.state.open) {
+ var tetherOptions = {
+ attachment: 'top center',
+ targetAttachment: 'bottom center',
+ targetOffset: '14px 0'
+ };
+
+ var itemListClasses = cx({
+ 'SelectionItems': true,
+ 'SelectionItems--open': this.state.open,
+ 'SelectionItems--expanded': this.state.expanded
+ });
+
+ var searchBar;
+ if(this._enableSearch()) {
+ searchBar = <SearchBar onFilter={this._filterSelections} />;
+ }
+
+ return (
+ <Popover
+ tetherOptions={tetherOptions}
+ className={"SelectionModule PopoverBody PopoverBody--withArrow " + this.props.className}
+ handleClickOutside={this.handleClickOutside}
+ >
+ <div className={itemListClasses}>
+ {searchBar}
+ <ul className="SelectionList">
+ {this._listItems(selection)}
+ </ul>
+ </div>
+ </Popover>
+ );
+ }
+ },
+
render: function() {
var selection;
- this.props.items.map(function (item) {
- if(item && item[this.props.selectedKey] === this.props.selectedValue) {
+ this.props.items.forEach(function (item) {
+ if (this._itemIsSelected(item)) {
selection = item[this.props.display];
}
- }.bind(this));
+ }, this);
var placeholder = selection || this.props.placeholder,
- searchBar,
remove,
- removeable = false;
-
- if(this.props.remove) {
- removeable = true;
- }
+ removeable = !!this.props.remove;
var moduleClasses = cx({
'SelectionModule': true,
- 'relative': true,
'selected': selection,
'removeable': removeable
});
- var itemListClasses = cx({
- 'SelectionItems': true,
- 'open' : this.state.open
- });
-
- if(this._enableSearch()) {
- searchBar = <SearchBar onFilter={this._filterSelections} />;
- }
-
if(this.props.remove) {
remove = (
- <div onClick={this.props.remove.bind(null, this.props.index)}>
- <span className="ml1 md-ml12">
- <Icon name='close' width="12px" height="12px" />
- </span>
- </div>
+ <a className="text-grey-2 no-decoration pr1 flex align-center" href="#" onClick={this.props.remove.bind(null, this.props.index)}>
+ <Icon name='close' width="14px" height="14px" />
+ </a>
);
}
return (
- <div className={moduleClasses}>
- <div className="SelectionModule-trigger">
- <a className="QueryOption p1 lg-p2 flex align-center" onClick={this._toggleOpen}>
+ <div className={moduleClasses + " " + this.props.className}>
+ <div className="SelectionModule-trigger flex align-center">
+ <a className="QueryOption p1 flex align-center" onClick={this._toggleOpen}>
{placeholder}
- {remove}
+ { selection ? (<Icon className="ml1" name="chevrondown" width="8px" height="8px" />) : (null) }
</a>
+ {remove}
</div>
- <div className={itemListClasses}>
- {searchBar}
- <ul className="SelectionList">
- {this._listItems(selection)}
- </ul>
- </div>
+ {this.renderPopover(selection)}
</div>
);
}
diff --git a/resources/frontend_client/app/query_builder/sort_widget.react.js b/resources/frontend_client/app/query_builder/sort_widget.react.js
index acfc609f28ab58b6cff63bd06c29202ac9700eda..db4d7a9fa38542f1c85d6fb70ffe4f0483d0a89f 100644
--- a/resources/frontend_client/app/query_builder/sort_widget.react.js
+++ b/resources/frontend_client/app/query_builder/sort_widget.react.js
@@ -1,43 +1,41 @@
'use strict';
-import DateFilter from './date_filter.react';
import Icon from './icon.react';
+import FieldWidget from './field_widget.react';
import SelectionModule from './selection_module.react';
+import Query from "metabase/lib/query";
+
export default React.createClass({
displayName: 'SortWidget',
propTypes: {
sort: React.PropTypes.array.isRequired,
- fieldList: React.PropTypes.array.isRequired,
- index: React.PropTypes.number.isRequired,
+ fieldOptions: React.PropTypes.object.isRequired,
+ tableName: React.PropTypes.string,
updateSort: React.PropTypes.func.isRequired,
removeSort: React.PropTypes.func.isRequired
},
- sectionClassName: 'Filter-section',
componentWillMount: function() {
this.componentWillReceiveProps(this.props);
},
componentWillReceiveProps: function(newProps) {
- var field = newProps.sort[0], // id of the field
- direction = newProps.sort[1]; // sort direction
-
this.setState({
- field: field,
- direction: direction
+ field: newProps.sort[0], // id of the field
+ direction: newProps.sort[1] // sort direction
});
},
- setField: function(value, index, sortListIndex) {
+ setField: function(value) {
if (this.state.field !== value) {
- this.props.updateSort(this.props.index, [value, this.state.direction]);
+ this.props.updateSort([value, this.state.direction]);
}
},
- setDirection: function(value, index, sortListIndex) {
+ setDirection: function(value) {
if (this.state.direction !== value) {
- this.props.updateSort(this.props.index, [this.state.field, value]);
+ this.props.updateSort([this.state.field, value]);
}
},
@@ -48,36 +46,28 @@ export default React.createClass({
];
return (
- <div className="Query-filter">
- <div className={this.sectionClassName}>
- <SelectionModule
- action={this.setField}
- display='name'
- index={0}
- items={this.props.fieldList}
- placeholder="Sort by ..."
- selectedValue={this.state.field}
- selectedKey='id'
- isInitiallyOpen={this.state.field === null}
- parentIndex={this.props.index}
- />
- </div>
+ <div className="flex align-center">
+ <FieldWidget
+ className="Filter-section Filter-section-sort-field SelectionModule"
+ tableName={this.props.tableName}
+ field={this.state.field}
+ fieldOptions={this.props.fieldOptions}
+ setField={this.setField}
+ isInitiallyOpen={this.state.field === null}
+ />
- <div className={this.sectionClassName}>
- <SelectionModule
- placeholder="..."
- items={directionOptions}
- display="key"
- selectedValue={this.state.direction}
- selectedKey="val"
- index={1}
- isInitiallyOpen={false}
- parentIndex={this.props.index}
- action={this.setDirection}
- />
- </div>
+ <SelectionModule
+ className="Filter-section Filter-section-sort-direction"
+ placeholder="..."
+ items={directionOptions}
+ display="key"
+ selectedValue={this.state.direction}
+ selectedKey="val"
+ isInitiallyOpen={false}
+ action={this.setDirection}
+ />
- <a onClick={this.props.removeSort.bind(null, this.props.index)}>
+ <a onClick={this.props.removeSort}>
<Icon name='close' width="12px" height="12px" />
</a>
</div>
diff --git a/resources/frontend_client/app/query_builder/visualization.react.js b/resources/frontend_client/app/query_builder/visualization.react.js
index 5a7a6b67c2758de5e8d47799e2926b884cb21254..f7bc066ffd02b16f90cf1debeb2b2478656061d5 100644
--- a/resources/frontend_client/app/query_builder/visualization.react.js
+++ b/resources/frontend_client/app/query_builder/visualization.react.js
@@ -1,10 +1,14 @@
'use strict';
import { CardRenderer } from '../card/card.charting';
-import PopoverWithTrigger from './popover_with_trigger.react';
import QueryVisualizationTable from './visualization_table.react';
import QueryVisualizationChart from './visualization_chart.react';
import QueryVisualizationObjectDetailTable from './visualization_object_detail_table.react';
+import RunButton from './run_button.react';
+import VisualizationSettings from './visualization_settings.react';
+import LoadingSpinner from '../components/icons/loading.react';
+
+import Query from "metabase/lib/query";
var cx = React.addons.classSet;
var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
@@ -19,24 +23,15 @@ export default React.createClass({
setChartColorFn: React.PropTypes.func.isRequired,
setSortFn: React.PropTypes.func.isRequired,
cellIsClickableFn: React.PropTypes.func,
- cellClickedFn: React.PropTypes.func
+ cellClickedFn: React.PropTypes.func,
+ isRunning: React.PropTypes.bool.isRequired,
+ runQueryFn: React.PropTypes.func.isRequired
},
getDefaultProps: function() {
return {
// NOTE: this should be more dynamic from the backend, it's set based on the query lang
- maxTableRows: 2000,
- visualizationTypes: [
- 'scalar',
- 'table',
- 'line',
- 'bar',
- 'pie',
- 'area',
- 'state',
- 'country',
- 'pin_map'
- ]
+ maxTableRows: 2000
};
},
@@ -60,205 +55,80 @@ export default React.createClass({
return (JSON.stringify(this.props.card.dataset_query) !== this.state.origQuery);
},
- hasLatitudeAndLongitudeColumns: function(columnDefs) {
- var hasLatitude = false,
- hasLongitude = false;
- columnDefs.forEach(function(col, index) {
- if (col.special_type &&
- col.special_type === "latitude") {
- hasLatitude = true;
-
- } else if (col.special_type &&
- col.special_type === "longitude") {
- hasLongitude = true;
- }
- });
-
- return (hasLatitude && hasLongitude);
- },
-
- isSensibleChartDisplay: function(display) {
- var data = (this.props.result) ? this.props.result.data : null;
-
- if (display === "table") {
- // table is always appropriate
- return true;
-
- } else if (display === "scalar" && data &&
- data.rows && data.rows.length === 1 &&
- data.cols && data.cols.length === 1) {
- // a 1x1 data set is appropriate for a scalar
- return true;
-
- } else if (display === "pin_map" && data && this.hasLatitudeAndLongitudeColumns(data.cols)) {
- // when we have a latitude and longitude a pin map is cool
- return true;
-
- } else if ((display === "line" || display === "area") && data &&
- data.rows && data.rows.length > 1 &&
- data.cols && data.cols.length > 1) {
- // if we have 2x2 or more then that's enough to make a line/area chart
- return true;
-
- } else if (this.isChartDisplay(display) && data &&
- data.cols && data.cols.length > 1) {
- // general check for charts is that they require 2 columns
- return true;
- }
-
- return false;
- },
-
isChartDisplay: function(display) {
return (display !== "table" && display !== "scalar");
},
- setDisplay: function(event) {
- // notify our parent about our change
- this.props.setDisplayFn(event.target.value);
+ runQuery: function() {
+ this.props.runQueryFn(this.props.card.dataset_query);
},
- setChartColor: function(color) {
- // tell parent about our new color
- this.props.setChartColorFn(color);
+ canRun: function() {
+ var query = this.props.card.dataset_query;
+ if (query.query) {
+ return Query.canRun(query.query);
+ } else {
+ return (query.database != undefined && query.native.query !== "");
+ }
},
- renderChartColorPicker: function() {
- if (this.props.card.display === "line" || this.props.card.display === "area" || this.props.card.display === "bar") {
- var colors = this.props.visualizationSettingsApi.getDefaultColorHarmony();
- var colorItems = [];
- for (var i=0; i < colors.length; i++) {
- var color = colors[i];
- var localStyles = {
- "backgroundColor": color
- };
-
- colorItems.push((
- <li key={i} className="CardSettings-colorBlock" style={localStyles} onClick={this.setChartColor.bind(null, color)}></li>
- ));
- }
-
- var colorPickerButton = (
- <a className="Button">
- Change color
- </a>
- );
+ renderHeader: function() {
+ var visualizationSettings = false;
+ if (!this.props.isObjectDetail) {
+ visualizationSettings = (<VisualizationSettings {...this.props}/>);
+ }
- var tetherOptions = {
- attachment: 'middle left',
- targetAttachment: 'middle right',
- targetOffset: '0 12px'
- };
+ return (
+ <div className="relative flex full mt3">
+ {visualizationSettings}
+ <div className="absolute left right ml-auto mr-auto layout-centered flex">
+ <RunButton
+ canRun={this.canRun()}
+ isDirty={this.queryIsDirty()}
+ isRunning={this.props.isRunning}
+ runFn={this.runQuery}
+ />
+ </div>
+ {this.renderCount()}
+ </div>
+ );
+ },
- return (
- <PopoverWithTrigger className="PopoverBody"
- tetherOptions={tetherOptions}
- triggerElement={colorPickerButton}>
- <ol className="p1">
- {colorItems}
- </ol>
- </PopoverWithTrigger>
- );
+ hasTooManyRows: function () {
+ const dataset_query = this.props.card.dataset_query,
+ rows = this.props.result.data.rows;
+ if (this.props.result.data.rows_truncated ||
+ (dataset_query.type === "query" &&
+ dataset_query.query.aggregation[0] === "rows" &&
+ rows.length === 2000))
+ {
+ return true;
} else {
return false;
}
},
- clickedForeignKey: function(fk) {
- this.props.followForeignKeyFn(fk);
- },
-
- renderFooter: function(tableFootnote) {
- if (this.props.isObjectDetail) {
- if (!this.props.tableForeignKeys) return false;
-
- var component = this;
- var relationships = this.props.tableForeignKeys.map(function(fk) {
- var relationName = (fk.origin.table.entity_name) ? fk.origin.table.entity_name : fk.origin.table.name;
- return (
- <li className="block mb1 lg-mb2">
- <a className="QueryOption inline-block no-decoration p2 lg-p2" key={fk.id} href="#" onClick={component.clickedForeignKey.bind(null, fk)}>
- {relationName}
- </a>
- </li>
- )
- });
-
+ renderCount: function() {
+ if (this.props.result && !this.props.isObjectDetail && this.props.card.display === "table") {
return (
- <div className="VisualizationSettings wrapper QueryBuilder-section clearfix">
- <h3 className="mb1 lg-mb2">Relationships:</h3>
- <ul>
- {relationships}
- </ul>
- </div>
- );
-
- } else {
- var vizControls;
- if (this.props.result && this.props.result.error === undefined) {
- var displayOptions = [];
- for (var i = 0; i < this.props.visualizationTypes.length; i++) {
- var val = this.props.visualizationTypes[i];
-
- if (this.isSensibleChartDisplay(val)) {
- displayOptions.push(
- <option key={i} value={val}>{val}</option>
- );
- } else {
- // NOTE: the key below MUST be different otherwise we get React errors, so we just append a '_' to it (sigh)
- displayOptions.push(
- <option key={i+'_'} value={val}>{val} (not sensible)</option>
- );
- }
- }
-
- vizControls = (
- <div>
- Show as:
- <label className="Select ml2">
- <select onChange={this.setDisplay} value={this.props.card.display}>
- {displayOptions}
- </select>
- </label>
- {this.renderChartColorPicker()}
- </div>
- );
- }
-
- return (
- <div className="VisualizationSettings wrapper flex">
- {vizControls}
- <div className="flex-align-right">
- {tableFootnote}
- </div>
+ <div className="flex-align-right mt1">
+ { this.hasTooManyRows() ? ("Showing max of ") : ("Showing ")}
+ <b>{this.props.result.row_count}</b>
+ { (this.props.result.data.rows.length > 1) ? (" rows") : (" row")}.
</div>
);
}
},
- loader: function() {
- var animate = '<animateTransform attributeName="transform" type="rotate" from="0 16 16" to="360 16 16" dur="0.8s" repeatCount="indefinite" />';
- return (
- <div className="Loading-indicator">
- <svg viewBox="0 0 32 32" width="32px" height="32px" fill="currentcolor">
- <path opacity=".25" d="M16 0 A16 16 0 0 0 16 32 A16 16 0 0 0 16 0 M16 4 A12 12 0 0 1 16 28 A12 12 0 0 1 16 4"/>
- <path d="M16 0 A16 16 0 0 1 32 16 L28 16 A12 12 0 0 0 16 4z" dangerouslySetInnerHTML={{__html: animate}}></path>
- </svg>
- </div>
- );
- },
-
render: function() {
var loading,
- viz,
- queryModified,
- tableFootnote;
+ viz;
if(this.props.isRunning) {
loading = (
<div className="Loading absolute top left bottom right flex flex-column layout-centered text-brand">
- {this.loader()}
+ <LoadingSpinner />
<h2 className="Loading-message text-brand text-uppercase mt3">Doing science...</h2>
</div>
);
@@ -271,14 +141,6 @@ export default React.createClass({
</div>
);
} else {
- if (this.queryIsDirty()) {
- queryModified = (
- <div className="flex mt2 layout-centered text-headsup">
- <span className="Badge Badge--headsUp mr2">Heads up</span> The data below is out of date because your query has changed
- </div>
- );
- }
-
if (this.props.result.error) {
viz = (
<div className="QueryError flex full align-center text-error">
@@ -296,8 +158,12 @@ export default React.createClass({
viz = (
<QueryVisualizationObjectDetailTable
data={this.props.result.data}
+ tableMetadata={this.props.tableMetadata}
+ tableForeignKeys={this.props.tableForeignKeys}
+ tableForeignKeyReferences={this.props.tableForeignKeyReferences}
cellIsClickableFn={this.props.cellIsClickableFn}
- cellClickedFn={this.props.cellClickedFn} />
+ cellClickedFn={this.props.cellClickedFn}
+ followForeignKeyFn={this.props.followForeignKeyFn} />
);
} else if (this.props.result.data.rows.length === 0) {
@@ -328,24 +194,6 @@ export default React.createClass({
);
} else if (this.props.card.display === "table") {
- // when we are displaying a data grid, setup a footnote which provides some row information
- if (this.props.result.data.rows_truncated ||
- (this.props.card.dataset_query.type === "query" &&
- this.props.card.dataset_query.query.aggregation[0] === "rows" &&
- this.props.result.data.rows.length === 2000)) {
- tableFootnote = (
- <div className="mt1">
- <span className="Badge Badge--headsUp mr2">Too many rows!</span>
- Result data was capped at <b>{this.props.result.row_count}</b> rows.
- </div>
- );
- } else {
- tableFootnote = (
- <div className="mt1">
- Showing <b>{this.props.result.row_count}</b> rows.
- </div>
- );
- }
var sort = (this.props.card.dataset_query.query && this.props.card.dataset_query.query.order_by) ?
this.props.card.dataset_query.query.order_by : null;
@@ -369,46 +217,33 @@ export default React.createClass({
data={this.props.result.data} />
);
}
-
- // check if the query result was truncated and let the user know about it if so
- if (this.props.result.data.rows_truncated && !tableFootnote) {
- tableFootnote = (
- <div className="mt1">
- <span className="Badge Badge--headsUp mr2">Too many rows!</span>
- Result data was capped at <b>{this.props.result.data.rows_truncated}</b> rows.
- </div>
- );
- }
}
}
var wrapperClasses = cx({
- 'relative': true,
+ 'wrapper': true,
'full': true,
+ 'relative': true,
+ 'mb2': true,
'flex': !this.props.isObjectDetail,
'flex-column': !this.props.isObjectDetail
});
var visualizationClasses = cx({
+ 'flex': true,
+ 'flex-full': true,
'Visualization': true,
'Visualization--errors': (this.props.result && this.props.result.error),
'Visualization--loading': this.props.isRunning,
- 'wrapper': true,
- 'full': true,
- 'flex': true,
- 'flex-full': true,
- 'QueryBuilder-section': true,
- 'pt2 lg-pt4': true
});
return (
<div className={wrapperClasses}>
- {queryModified}
+ {this.renderHeader()}
{loading}
<div className={visualizationClasses}>
{viz}
</div>
- {this.renderFooter(tableFootnote)}
</div>
);
}
diff --git a/resources/frontend_client/app/query_builder/visualization_object_detail_table.react.js b/resources/frontend_client/app/query_builder/visualization_object_detail_table.react.js
index b40cb9ca5da385fe472ac220e1a9a123d5d6c30f..9fb59d2349463c206410d4ab45520bf9e29565f2 100644
--- a/resources/frontend_client/app/query_builder/visualization_object_detail_table.react.js
+++ b/resources/frontend_client/app/query_builder/visualization_object_detail_table.react.js
@@ -1,7 +1,11 @@
'use strict';
+import ExpandableString from './expandable_string.react';
import FixedDataTable from 'fixed-data-table';
+import Humanize from 'humanize';
import Icon from './icon.react';
+import IconBorder from './icon_border.react';
+import LoadingSpinner from './../components/icons/loading.react';
var cx = React.addons.classSet;
var Table = FixedDataTable.Table;
@@ -13,38 +17,14 @@ export default React.createClass({
data: React.PropTypes.object
},
- getInitialState: function() {
- return {
- width: 0,
- height: 0
- };
- },
-
- componentDidMount: function() {
- this.calculateSizing(this.getInitialState());
- },
-
- componentDidUpdate: function(prevProps, prevState) {
- this.calculateSizing(prevState);
- },
-
- calculateSizing: function(prevState) {
- var element = this.getDOMNode(); //React.findDOMNode(this);
-
- // account for padding above our parent
- var style = window.getComputedStyle(element.parentElement, null);
- var paddingTop = Math.ceil(parseFloat(style.getPropertyValue("padding-top")));
-
- var width = element.parentElement.offsetWidth;
- var height = element.parentElement.offsetHeight - paddingTop;
-
- if (width !== prevState.width || height !== prevState.height) {
- var updatedState = {
- width: width,
- height: height
- };
+ getIdValue: function() {
+ if (!this.props.data) return null;
- this.setState(updatedState);
+ for (var i=0; i < this.props.data.cols.length; i++) {
+ var coldef = this.props.data.cols[i];
+ if (coldef.special_type === "id") {
+ return this.props.data.rows[0][i];
+ }
}
},
@@ -65,60 +45,168 @@ export default React.createClass({
key = 'cl'+rowIndex+'_'+cellDataKey;
if (cellDataKey === 'field') {
- var colValue = (row[0] !== null) ? row[0].name.toString() : null;
+ var colValue = (row[0] !== null) ? (row[0].display_name.toString() || row[0].name.toString()) : null;
return (<div key={key}>{colValue}</div>);
} else {
- // TODO: should we be casting all values toString()?
- var cellValue = (row[1] !== null) ? row[1].toString() : null;
+
+ var cellValue;
+ if (row[1] === null || (typeof row[1] === "string" && row[1].length === 0)) {
+ cellValue = (<span className="text-grey-2">Empty</span>);
+
+ } else if(row[0].special_type === "json") {
+ var formattedJson = JSON.stringify(JSON.parse(row[1]), null, 2);
+ cellValue = (<pre className="ObjectJSON">{formattedJson}</pre>);
+
+ } else {
+ // TODO: should we be casting all values toString()?
+ cellValue = (<ExpandableString str={row[1].toString()} length={140}></ExpandableString>);
+ }
// NOTE: that the values to our function call look off, but that's because we are un-pivoting them
if (this.props.cellIsClickableFn(0, rowIndex)) {
- return (<a key={key} className="link" href="#" onClick={this.cellClicked.bind(null, 0, rowIndex)}>{cellValue}</a>);
+ return (<div key={key}><a className="link" href="#" onClick={this.cellClicked.bind(null, 0, rowIndex)}>{cellValue}</a></div>);
} else {
return (<div key={key}>{cellValue}</div>);
}
}
},
+ clickedForeignKey: function(fk) {
+ this.props.followForeignKeyFn(fk);
+ },
+
+ renderDetailsTable: function() {
+ var rows = [];
+ for (var i=0; i < this.props.data.cols.length; i++) {
+ var row = this.rowGetter(i),
+ keyCell = this.cellRenderer(row[0], 'field', row, i, 0),
+ valueCell = this.cellRenderer(row[1], 'value', row, i, 0);
+
+ rows[i] = (
+ <div className="Grid mb2" key={i}>
+ <div className="Grid-cell">{keyCell}</div>
+ <div className="Grid-cell text-bold text-dark">{valueCell}</div>
+ </div>
+ );
+ }
+
+ return rows;
+ },
+
+ renderRelationships: function() {
+ if (!this.props.tableForeignKeys) return false;
+
+ if (this.props.tableForeignKeys.length < 1) {
+ return (<p className="my4 text-centered">No relationships found.</p>);
+ }
+
+ var component = this;
+ var relationships = this.props.tableForeignKeys.map(function(fk) {
+
+ var fkCount = (
+ <LoadingSpinner width="25px" height="25px" />
+ ),
+ fkCountValue = 0,
+ fkClickable = false;
+ if (component.props.tableForeignKeyReferences) {
+ var fkCountInfo = component.props.tableForeignKeyReferences[fk.origin.id];
+ if (fkCountInfo && fkCountInfo["status"] === 1) {
+ fkCount = (<span>{fkCountInfo["value"]}</span>);
+
+ if (fkCountInfo["value"]) {
+ fkCountValue = fkCountInfo["value"];
+ fkClickable = true;
+ }
+ }
+ }
+ var chevron = (
+ <IconBorder className="flex-align-right">
+ <Icon name='chevronright' width="10px" height="10px" />
+ </IconBorder>
+ );
+
+ var relationName = Humanize.pluralize(fkCountValue, fk.origin.table.display_name);
+
+ var info = (
+ <div>
+ <h2>{fkCount}</h2>
+ <h5 className="block">{relationName}</h5>
+ </div>
+ );
+ var fkReference;
+ var referenceClasses = cx({
+ 'flex': true,
+ 'align-center': true,
+ 'my2': true,
+ 'pb2': true,
+ 'border-bottom': true,
+ 'text-brand-hover': fkClickable,
+ 'cursor-pointer': fkClickable,
+ 'text-dark': fkClickable,
+ 'text-grey-3': !fkClickable
+ });
+
+ if (fkClickable) {
+ fkReference = (
+ <div className={referenceClasses} key={fk.id} onClick={component.clickedForeignKey.bind(null, fk)}>
+ {info}
+ {chevron}
+ </div>
+ );
+ } else {
+ fkReference = (
+ <div className={referenceClasses} key={fk.id}>
+ {info}
+ </div>
+ );
+ }
+
+ return (
+ <li>
+ {fkReference}
+ </li>
+ );
+ });
+
+ return (
+ <ul className="px4">
+ {relationships}
+ </ul>
+ );
+ },
+
render: function() {
if(!this.props.data) {
return false;
}
- var fieldColumnWidth = 150,
- valueColumnWidth = (this.state.width - fieldColumnWidth),
- headerHeight = 50,
- rowHeight = 35,
- totalHeight = (this.props.data.cols.length * rowHeight) + headerHeight + 2; // 2 extra pixels for border
+ var tableName = (this.props.tableMetadata) ? this.props.tableMetadata.display_name : "Unknown",
+ // TODO: once we nail down the "title" column of each table this should be something other than the id
+ idValue = this.getIdValue();
return (
- <Table
- className="MB-DataTable"
- rowHeight={rowHeight}
- rowGetter={this.rowGetter}
- rowsCount={this.props.data.cols.length}
- width={this.state.width}
- height={totalHeight}
- headerHeight={headerHeight}>
-
- <Column
- className="MB-DataTable-column"
- width={fieldColumnWidth}
- isResizable={false}
- cellRenderer={this.cellRenderer}
- dataKey={'field'}
- label={'Field'}>
- </Column>
-
- <Column
- className="MB-DataTable-column"
- width={valueColumnWidth}
- isResizable={false}
- cellRenderer={this.cellRenderer}
- dataKey={'value'}
- label={'Value'}>
- </Column>
- </Table>
+ <div className="ObjectDetail rounded">
+ <div className="Grid ObjectDetail-headingGroup">
+ <div className="Grid-cell ObjectDetail-infoMain px4 py3 ml2 arrow-right">
+ <div className="text-brand text-bold">
+ <span>{tableName}</span>
+ <h1>{idValue}</h1>
+ </div>
+ </div>
+ <div className="Grid-cell flex align-center Cell--1of3 bg-alt">
+ <div className="p4 flex align-center text-bold text-grey-3">
+ <Icon name="connections" width="17px" height="20px" />
+ <div className="ml2">
+ This <span className="text-dark">{tableName}</span> is connected to.
+ </div>
+ </div>
+ </div>
+ </div>
+ <div className="Grid">
+ <div className="Grid-cell ObjectDetail-infoMain p4">{this.renderDetailsTable()}</div>
+ <div className="Grid-cell Cell--1of3 bg-alt">{this.renderRelationships()}</div>
+ </div>
+ </div>
);
}
});
diff --git a/resources/frontend_client/app/query_builder/visualization_settings.react.js b/resources/frontend_client/app/query_builder/visualization_settings.react.js
new file mode 100644
index 0000000000000000000000000000000000000000..8940b302e92d6ac1129f85cfb7f78b462ed3b64f
--- /dev/null
+++ b/resources/frontend_client/app/query_builder/visualization_settings.react.js
@@ -0,0 +1,217 @@
+"use strict";
+
+import Icon from './icon.react';
+import PopoverWithTrigger from './popover_with_trigger.react';
+
+var cx = React.addons.classSet;
+
+export default React.createClass({
+ displayName: 'VisualizationSettings',
+ propTypes: {
+ visualizationSettingsApi: React.PropTypes.object.isRequired,
+ card: React.PropTypes.object.isRequired,
+ result: React.PropTypes.object,
+ setDisplayFn: React.PropTypes.func.isRequired,
+ setChartColorFn: React.PropTypes.func.isRequired
+ },
+
+ visualizationTypeNames: {
+ 'scalar': { displayName: 'Number', iconName: 'number' },
+ 'table': { displayName: 'Table', iconName: 'table' },
+ 'line': { displayName: 'Line', iconName: 'line' },
+ 'bar': { displayName: 'Bar', iconName: 'bar' },
+ 'pie': { displayName: 'Pie', iconName: 'pie' },
+ 'area': { displayName: 'Area', iconName: 'area' },
+ 'state': { displayName: 'State map', iconName: 'statemap' },
+ 'country': { displayName: 'Country map', iconName: 'countrymap' },
+ 'pin_map': { displayName: 'Pin map', iconName: 'pinmap' }
+ },
+
+ getDefaultProps: function() {
+ return {
+ visualizationTypes: [
+ 'scalar',
+ 'table',
+ 'line',
+ 'bar',
+ 'pie',
+ 'area',
+ 'state',
+ 'country',
+ 'pin_map'
+ ]
+ };
+ },
+
+ setDisplay: function(type) {
+ // notify our parent about our change
+ this.props.setDisplayFn(type);
+ this.refs.displayPopover.toggleModal();
+ },
+
+ setChartColor: function(color) {
+ // tell parent about our new color
+ this.props.setChartColorFn(color);
+ this.refs.colorPopover.toggleModal();
+ },
+
+ hasLatitudeAndLongitudeColumns: function(columnDefs) {
+ var hasLatitude = false,
+ hasLongitude = false;
+ columnDefs.forEach(function(col, index) {
+ if (col.special_type &&
+ col.special_type === "latitude") {
+ hasLatitude = true;
+
+ } else if (col.special_type &&
+ col.special_type === "longitude") {
+ hasLongitude = true;
+ }
+ });
+
+ return (hasLatitude && hasLongitude);
+ },
+
+ isSensibleChartDisplay: function(display) {
+ var data = (this.props.result) ? this.props.result.data : null;
+ switch (display) {
+ case "table":
+ // table is always appropriate
+ return true;
+ case "scalar":
+ // a 1x1 data set is appropriate for a scalar
+ return (data && data.rows && data.rows.length === 1 && data.cols && data.cols.length === 1);
+ case "pin_map":
+ // when we have a latitude and longitude a pin map is cool
+ return (data && this.hasLatitudeAndLongitudeColumns(data.cols));
+ case "line":
+ case "area":
+ // if we have 2x2 or more then that's enough to make a line/area chart
+ return (data && data.rows && data.rows.length > 1 && data.cols && data.cols.length > 1);
+ case "country":
+ case "state":
+ return (data && data.cols && data.cols.length > 1 && data.cols[0].base_type === "TextField");
+ case "bar":
+ case "pie":
+ default:
+ // general check for charts is that they require 2 columns
+ return (data && data.cols && data.cols.length > 1);
+ }
+ },
+
+ renderChartTypePicker: function() {
+ var tetherOptions = {
+ attachment: 'top left',
+ targetAttachment: 'bottom left',
+ targetOffset: '5px 25px'
+ };
+
+ var iconName = this.visualizationTypeNames[this.props.card.display].iconName;
+ var triggerElement = (
+ <span className="px2 py1 text-bold cursor-pointer text-default flex align-center">
+ <Icon name={iconName} width="24px" height="24px"/>
+ {this.visualizationTypeNames[this.props.card.display].displayName}
+ <Icon className="ml1" name="chevrondown" width="8px" height="8px"/>
+ </span>
+ )
+
+ var displayOptions = this.props.visualizationTypes.map((type, index) => {
+ var classes = cx({
+ 'p2': true,
+ 'flex': true,
+ 'align-center': true,
+ 'cursor-pointer': true,
+ 'bg-brand-hover': true,
+ 'text-white-hover': true,
+ 'ChartType--selected': type === this.props.card.display,
+ 'ChartType--notSensible': !this.isSensibleChartDisplay(type),
+ });
+ var displayName = this.visualizationTypeNames[type].displayName;
+ var iconName = this.visualizationTypeNames[type].iconName;
+ return (
+ <li className={classes} key={index} onClick={this.setDisplay.bind(null, type)}>
+ <Icon name={iconName} width="24px" height="24px"/>
+ <span className="ml1">{displayName}</span>
+ </li>
+ );
+ });
+ return (
+ <div className="relative">
+ <span className="GuiBuilder-section-label Query-label">Visualization</span>
+ <PopoverWithTrigger ref="displayPopover"
+ className="PopoverBody PopoverBody--withArrow ChartType-popover"
+ tetherOptions={tetherOptions}
+ triggerElement={triggerElement}
+ triggerClasses="flex align-center">
+ <ul className="pt1 pb1">
+ {displayOptions}
+ </ul>
+ </PopoverWithTrigger>
+ </div>
+ );
+ },
+
+ renderChartColorPicker: function() {
+ if (this.props.card.display === "line" || this.props.card.display === "area" || this.props.card.display === "bar") {
+ var colors = this.props.visualizationSettingsApi.getDefaultColorHarmony();
+ var colorItems = [];
+ for (var i=0; i < colors.length; i++) {
+ var color = colors[i];
+ var localStyles = {
+ "backgroundColor": color
+ };
+
+ colorItems.push((
+ <li key={i} className="CardSettings-colorBlock" style={localStyles} onClick={this.setChartColor.bind(null, color)}></li>
+ ));
+ }
+
+ // TODO: currently we set all chart type colors to the same value so bar color always works
+ var currentColor = this.props.card.visualization_settings.bar && this.props.card.visualization_settings.bar.color || this.props.visualizationSettingsApi.getDefaultColor();
+ var triggerElement = (
+ <span className="px2 py1 text-bold cursor-pointer text-default flex align-center">
+ <div className="ColorWell rounded bordered" style={{backgroundColor:currentColor}}></div>
+ Color
+ <Icon className="ml1" name="chevrondown" width="8px" height="8px"/>
+ </span>
+ )
+
+ var tetherOptions = {
+ attachment: 'middle left',
+ targetAttachment: 'middle right',
+ targetOffset: '0 6px'
+ };
+
+ return (
+ <div className="relative">
+ <span className="GuiBuilder-section-label Query-label">Color</span>
+ <PopoverWithTrigger ref="colorPopover"
+ className="PopoverBody"
+ tetherOptions={tetherOptions}
+ triggerElement={triggerElement}
+ triggerClasses="flex align-center">
+ <ol className="p1">
+ {colorItems}
+ </ol>
+ </PopoverWithTrigger>
+ </div>
+ );
+
+ } else {
+ return false;
+ }
+ },
+
+ render: function() {
+ if (this.props.result && this.props.result.error === undefined) {
+ return (
+ <div className="VisualizationSettings flex align-center mb2">
+ {this.renderChartTypePicker()}
+ {this.renderChartColorPicker()}
+ </div>
+ );
+ } else {
+ return false;
+ }
+ }
+});
diff --git a/resources/frontend_client/app/query_builder/visualization_table.react.js b/resources/frontend_client/app/query_builder/visualization_table.react.js
index 0b056460f1d2a3f34a4e14ada8db3e19f4bb46e5..46daf586af9974fadde2eb31808186249e56de8f 100644
--- a/resources/frontend_client/app/query_builder/visualization_table.react.js
+++ b/resources/frontend_client/app/query_builder/visualization_table.react.js
@@ -1,7 +1,11 @@
'use strict';
+/*global _*/
+
+import MetabaseAnalytics from '../lib/analytics';
import FixedDataTable from 'fixed-data-table';
import Icon from './icon.react';
+import Popover from './popover.react';
var cx = React.addons.classSet;
var Table = FixedDataTable.Table;
@@ -33,7 +37,8 @@ export default React.createClass({
width: 0,
height: 0,
columnWidths: [],
- colDefs: null
+ colDefs: null,
+ popover: null
};
},
@@ -60,8 +65,15 @@ export default React.createClass({
this.calculateSizing(this.getInitialState());
},
- componentDidUpdate: function(prevProps, prevState) {
- this.calculateSizing(prevState);
+ shouldComponentUpdate: function(nextProps, nextState) {
+ // this is required because we don't pass in the containing element size as a property :-/
+ // if size changes don't update yet because state will change in a moment
+ this.calculateSizing(nextState)
+
+ // compare props and state to determine if we should re-render
+ // NOTE: this is essentially the same as React.addons.PureRenderMixin but
+ // we currently need to recalculate the container size here.
+ return !_.isEqual(this.props, nextProps) || !_.isEqual(this.state, nextState);
},
// availableWidth, minColumnWidth, # of columns
@@ -80,11 +92,13 @@ export default React.createClass({
calculateSizing: function(prevState) {
var element = this.getDOMNode(); //React.findDOMNode(this);
- // account for padding above our parent
+ // account for padding of our parent
var style = window.getComputedStyle(element.parentElement, null);
var paddingTop = Math.ceil(parseFloat(style.getPropertyValue("padding-top")));
+ var paddingLeft = Math.ceil(parseFloat(style.getPropertyValue("padding-left")));
+ var paddingRight = Math.ceil(parseFloat(style.getPropertyValue("padding-right")));
- var width = element.parentElement.offsetWidth;
+ var width = element.parentElement.offsetWidth - paddingLeft - paddingRight;
var height = element.parentElement.offsetHeight - paddingTop;
if (width !== prevState.width || height !== prevState.height) {
@@ -109,14 +123,40 @@ export default React.createClass({
setSort: function(fieldId) {
this.props.setSortFn(fieldId);
+
+ MetabaseAnalytics.trackEvent('QueryBuilder', 'Set Sort', 'table column');
},
cellClicked: function(rowIndex, columnIndex) {
this.props.cellClickedFn(rowIndex, columnIndex);
},
+ popoverFilterClicked: function(rowIndex, columnIndex, operator) {
+ this.props.cellClickedFn(rowIndex, columnIndex, operator);
+ this.setState({ popover: null });
+ },
+
rowGetter: function(rowIndex) {
- return this.props.data.rows[rowIndex];
+ var row = {
+ hasPopover: this.state.popover && this.state.popover.rowIndex === rowIndex || false
+ };
+ for (var i = 0; i < this.props.data.rows[rowIndex].length; i++) {
+ row[i] = this.props.data.rows[rowIndex][i];
+ }
+ return row;
+ },
+
+ showPopover: function(rowIndex, cellDataKey) {
+ this.setState({
+ popover: {
+ rowIndex: rowIndex,
+ cellDataKey: cellDataKey
+ }
+ });
+ },
+
+ handleClickOutside: function() {
+ this.setState({ popover: null });
},
cellRenderer: function(cellData, cellDataKey, rowData, rowIndex, columnData, width) {
@@ -127,12 +167,37 @@ export default React.createClass({
if (this.props.cellIsClickableFn(rowIndex, cellDataKey)) {
return (<a key={key} className="link" href="#" onClick={this.cellClicked.bind(null, rowIndex, cellDataKey)}>{cellData}</a>);
} else {
- return (<div key={key}>{cellData}</div>);
+ var popover = null;
+ if (this.state.popover && this.state.popover.rowIndex === rowIndex && this.state.popover.cellDataKey === cellDataKey) {
+ var tetherOptions = {
+ targetAttachment: "middle center",
+ attachment: "middle center"
+ };
+ var operators = ["<", "=", "≠", ">"].map(function(operator) {
+ return (<li key={operator} className="p2 text-brand-hover" onClick={this.popoverFilterClicked.bind(null, rowIndex, cellDataKey, operator)}>{operator}</li>);
+ }, this);
+ popover = (
+ <Popover
+ tetherOptions={tetherOptions}
+ handleClickOutside={this.handleClickOutside}
+ >
+ <div className="bg-white bordered shadowed p1">
+ <ul className="h1 flex align-center">{operators}</ul>
+ </div>
+ </Popover>
+ );
+ }
+ return (
+ <div key={key}>
+ <div onClick={this.showPopover.bind(null, rowIndex, cellDataKey)}>{cellData}</div>
+ {popover}
+ </div>
+ );
}
},
columnResized: function(width, idx) {
- var tableColumnWidths = this.state.columnWidths;
+ var tableColumnWidths = this.state.columnWidths.slice();
tableColumnWidths[idx] = width;
this.setState({
columnWidths: tableColumnWidths
@@ -142,7 +207,8 @@ export default React.createClass({
tableHeaderRenderer: function(columnIndex) {
var column = this.props.data.cols[columnIndex],
- colVal = (column !== null) ? column.name.toString() : null;
+ colVal = (column && column.display_name && column.display_name.toString()) ||
+ (column && column.name && column.name.toString());
var headerClasses = cx({
'MB-DataTable-header' : true,
@@ -210,7 +276,7 @@ export default React.createClass({
rowGetter={this.rowGetter}
rowsCount={this.props.data.rows.length}
width={this.state.width}
- height={this.state.height}
+ maxHeight={this.state.height}
headerHeight={50}
isColumnResizing={this.isColumnResizing}
onColumnResizeEndCallback={component.columnResized}>
diff --git a/resources/frontend_client/app/reserve/partials/user_detail.html b/resources/frontend_client/app/reserve/partials/user_detail.html
deleted file mode 100644
index 8a4e5432de4fe2c7f514f7bb92683878c40588b3..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/reserve/partials/user_detail.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<div class="col col-md-9">
- <div class="row">
- <div class="clearfix full-width">
- <div class="p4 float-left">
- <img class="EntityImage EntityImage--large" ng-src="{{user.profileImage.secureBaseUrl}}" ng-if="user.profileImage.secureBaseUrl">
- <img src="" ng-if="!user.profileImage.secureBaseUrl" />
- </div>
- <div class="mt3 float-left">
- <h2>
- <a class="link" href="/reserve/user/{{user.id}}">{{user.firstName}} {{user.lastName}}</a>
- </h2>
- <div class="inline-block">{{user.role}}</div>
- <div class="inline-block ml2">Member since: {{user.createdAt | date : 'MMMM d, y'}}</div>
-
- </div>
- <div class="float-right m4">
- <a class="Button mt1" href="mailto:data@expa.com?subject=User%20{{user.firstName}}%20{{user.lastName}}">Share</a>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="mt3 px3">
- <h4>Bookings</h4>
- </div>
- <div class="EntityTableWrapper">
- <table class="EntityTable Table">
- <thead>
- <tr>
- <th ng-click="orderByField='venue'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'venue'}">Venue:
- <span ng-if="orderByField == 'venue'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='guests'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'guests'}">Guests:
- <span ng-if="orderByField == 'guests'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='overage'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'overage'}">Overage:
- <span ng-if="orderByField == 'overage'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='rating'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'rating'}">Rating:
- <span ng-if="orderByField == 'rating'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='createdAt'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'createdAt'}">Created:
- <span ng-if="orderByField == 'createdAt'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='updatedAt'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'updatedAt'}">Updated:
- <span ng-if="orderByField == 'updatedAt'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th></th>
- </tr>
- </thead>
- <tfoot>
- </tfoot>
- <tbody>
- <tr ng-repeat="booking in bookings | orderBy:orderByField:reverseSort">
- <td><a href="/reserve/venue/{{booking.id}}">{{booking.name}}</a></td>
- <td>{{booking.guests}}</td>
- <td>{{booking.overage}}</td>
- <td>{{booking.rating}}</td>
- <td>{{booking.createdAt | date : 'MMM d, y, hh:mm a'}}</td>
- <td>{{booking.updatedAt | date : 'MMM d, y, hh:mm a'}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-</div>
-
-<div class="col col-md-3">
- <div class="row">
- <div class="p3">
- <h3 class="mt2">{{user.firstName}} {{user.lastName}}'s Metrics</h3>
- </div>
-
- <ol class="px2 py2">
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{user.rating}}</div>
- <div class="Metric-title mb2">Rating</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{user.avg_num_bookings_per_week}}</div>
- <div class="Metric-title mb2">Average bookings per week</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{user.total_bookings}}</div>
- <div class="Metric-title mb2">Total Bookings</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{user.percent_cancelled}}</div>
- <div class="Metric-title mb2">Percent Cancelled</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{user.avg_time_to_booking_min}}</div>
- <div class="Metric-title mb2">Avg. Time to Booking (min)</div>
- </div>
- </li>
- </ol>
- </div>
-</div>
-
diff --git a/resources/frontend_client/app/reserve/partials/user_list.html b/resources/frontend_client/app/reserve/partials/user_list.html
deleted file mode 100644
index fcf4247c50451b59ee2089686870e7f112948525..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/reserve/partials/user_list.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<div class="col col-md-9">
- <div class="row">
- <div class="p3 border-bottom">
- <div class="float-right">
- <input class="input" type="text" ng-model="searchFilter" placeholder="Search users ...">
- </div>
- <h3 class="text-brand">Users</h2>
- </div>
-
- <div ng-if="!users">
- <h3>Loading ...</h3>
- </div>
-
-
- <div class="EntityTableWrapper">
- <table class="EntityTable Table">
- <thead>
- <tr>
- <th ng-click="orderByField='firstName'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'firstName'}">Name
- <span ng-if="orderByField == 'firstName'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='avg_num_bookings_per_week'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'avg_num_bookings_per_week'}">Avg. Num Bookings / wk
- <span ng-if="orderByField == 'avg_num_bookings_per_week'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='total_bookings'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'total_bookings'}">Total Bookings
- <span ng-if="orderByField == 'total_bookings'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='percent_cancelled'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'percent_cancelled'}">Percent Cancelled
- <span ng-if="orderByField == 'percent_cancelled'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='avg_time_to_booking_min'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'avg_time_to_booking_min'}">Avg. Time to Booking (min)
- <span ng-if="orderByField == 'avg_time_to_booking_min'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='avg_num_days_advanced_booking'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'avg_num_days_advanced_booking'}">Avg. Days to Booking
- <span ng-if="orderByField == 'avg_num_days_advanced_booking'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='pct_containers_accepted'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'pct_containers_accepted'}">% Containers Accepted
- <span ng-if="orderByField == 'pct_containers_accepted'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='rating'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'rating'}">Rating
- <span ng-if="orderByField == 'rating'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='createdAt'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'createdAt'}">Created
- <span ng-if="orderByField == 'createdAt'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- </tr>
- </thead>
- <tfoot></tfoot>
- <tbody>
-
- <tr ng-repeat="user in users | orderBy:orderByField:reverseSort | filter:searchFilter">
- <td class="clearfix">
- <img class="EntityImage EntityImage--small float-left hide lg-show" src="{{user.profileImage.secureBaseUrl}}">
- <a class="EntityName float-left ml1 link" href="/reserve/user/{{user.user_id}}">{{user.firstName}} {{user.lastName}}</a>
- </td>
- <td>{{user.avg_num_bookings_per_week}}</td>
- <td>{{user.total_bookings}}</td>
- <td>{{user.percent_cancelled}}</td>
- <td>{{user.avg_time_to_booking_min}}</td>
- <td>{{user.avg_num_days_advanced_booking}}</td>
- <td>{{user.pct_containers_accepted}}</td>
- <td>{{user.rating}}</td>
- <td>{{user.createdAt | date : 'MMMM d, y '}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-</div>
-
-<div class="col col-md-3">
- <div class="row">
- <div class="p3 border-bottom">
- <h3>User metrics</h3>
- </div>
-
- <ol class="px2 py2">
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">25</div>
- <div class="Metric-title mb2">Average bookings per week</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">3.75</div>
- <div class="Metric-title mb2">Average rating</div>
- </div>
- </li>
- </ol>
- </div>
-</div>
diff --git a/resources/frontend_client/app/reserve/partials/venue_detail.html b/resources/frontend_client/app/reserve/partials/venue_detail.html
deleted file mode 100644
index 441e7cbf02e57d7e0edc0a1fb9107dcee05750b2..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/reserve/partials/venue_detail.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<div class="col col-md-9">
- <div class="row">
- <div class="clearfix full-width">
- <div class="p4 float-left">
- <img class="EntityImage EntityImage--large" ng-src="{{venue.avatar}}" ng-if="venue.avatar">
- <img src="" ng-if="!venue.avatar" />
- </div>
- <div class="mt3 float-left">
- <h2>
- <a class="link" href="/reserve/venue/{{venue.id}}">{{venue.name}}</a> <span ng-if="venue.is_test_account">[test account]</span>
- </h2>
- <div class="inline-block">{{venue.locality}}</div>
- <div class="inline-block ml2">Member since: {{venue.createdAt | date : 'MMMM d, y'}}</div>
-
- </div>
- <div class="float-right m4">
- <a class="Button mt1" href="mailto:data@expa.com?subject=Venue%20{{venue.name}}">Share</a>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="mt3 px3">
- <h4>Bookings</h4>
- </div>
- <div class="EntityTableWrapper">
- <table class="EntityTable Table">
- <thead>
- <tr>
- <th ng-click="orderByField='name'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'name'}">By:
- <span ng-if="orderByField == 'name'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='guests'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'guests'}">Guests:
- <span ng-if="orderByField == 'guests'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='overage'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'overage'}">Overage:
- <span ng-if="orderByField == 'overage'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='rating'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'rating'}">Rating:
- <span ng-if="orderByField == 'rating'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='createdAt'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'createdAt'}">Created:
- <span ng-if="orderByField == 'createdAt'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='updatedAt'; reverseSort = !reverseSort" ng-class="{'ColumnSelected' : orderByField == 'updatedAt'}">Updated:
- <span ng-if="orderByField == 'updatedAt'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th></th>
- </tr>
- </thead>
- <tfoot>
- </tfoot>
- <tbody>
- <tr ng-repeat="booking in bookings | orderBy:orderByField:reverseSort">
- <td>
- <span class="EntityName"><a href="/reserve/user/{{booking.user_id}}">{{booking.firstName}} {{booking.lastName}}</a></span>
- </td>
- <td>{{booking.guests}}</td>
- <td>{{booking.overage}}</td>
- <td>{{booking.rating}}</td>
- <td>{{booking.createdAt | date : 'MMM d, y, hh:mm a'}}</td>
- <td>{{booking.updatedAt | date : 'MMM d, y, hh:mm a'}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-</div>
-
-<div class="col col-md-3">
- <div class="row">
- <div class="p3">
- <h3 class="mt2">{{venue.name}}'s Metrics</h3>
- </div>
-
- <ol class="px2 py2">
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{venue.rating}}</div>
- <div class="Metric-title mb2">Rating</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{venue.avg_num_bookings_per_week}}</div>
- <div class="Metric-title mb2">Average bookings per week</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">{{venue.total_bookings}}</div>
- <div class="Metric-title mb2">Total Bookings</div>
- </div>
- </li>
- </ol>
- </div>
-</div>
-
diff --git a/resources/frontend_client/app/reserve/partials/venue_list.html b/resources/frontend_client/app/reserve/partials/venue_list.html
deleted file mode 100644
index ceb3060ee35b43db5ecc50f14ef855417899ce53..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/reserve/partials/venue_list.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div class="col col-md-9">
- <div class="row">
- <div class="p3 border-bottom">
- <div class="float-right">
- <input class="input" type="text" ng-model="searchFilter" placeholder="Search venues ...">
- </div>
- <h3 class="text-brand">Venues</h2>
- </div>
-
- <div ng-if="!venues">
- <h3>Loading ...</h3>
- </div>
-
-
- <div class="EntityTableWrapper">
- <table class="EntityTable Table">
- <thead>
- <tr>
- <th ng-click="orderByField='name'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'name'}">Name
- <span ng-if="orderByField == 'name'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='locality'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'locality'}">City
- <span ng-if="orderByField == 'locality'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='avg_num_bookings_per_week'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'avg_num_bookings_per_week'}">Avg. Bookings Per Week
- <span ng-if="orderByField == 'avg_num_bookings_per_week'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='total_bookings'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'total_bookings'}">Total Bookings
- <span ng-if="orderByField == 'total_bookings'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='percent_cancelled'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'percent_cancelled'}">Percent Cancelled
- <span ng-if="orderByField == 'percent_cancelled'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
-
- <th ng-click="orderByField='rating'; reverseSort = !reverseSort" ng-class="{'EntityTable--columnSelected': orderByField == 'rating'}">Rating
- <span ng-if="orderByField == 'rating'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- <th ng-click="orderByField='createdAt'; reverseSort = !reverseSort" >Created:
- <span ng-if="orderByField == 'createdAt'">
- <span ng-show="!reverseSort">^</span>
- <span ng-show="reverseSort">v</span>
- </span>
- </th>
- </tr>
- </thead>
- <tfoot></tfoot>
- <tbody>
- <tr ng-repeat="venue in venues | orderBy:orderByField:reverseSort | filter:searchFilter">
- <td class="clearfix">
- <img class="EntityImage EntityImage--small float-left hide lg-show" src="">
- <a class="EntityName float-left ml1 link" href="/reserve/venue/{{venue.id}}">{{venue.name}}</a>
- </td>
- <td>{{venue.locality}}</td>
- <td>{{venue.avg_num_bookings_per_week}}</td>
- <td>{{venue.total_bookings}}</td>
- <td>{{venue.percent_cancelled}}</td>
- <td>{{venue.rating}}</td>
- <td>{{venue.createdAt | date : 'MMMM d, y '}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-</div>
-
-<div class="col col-md-3">
- <div class="row">
- <div class="p3 border-bottom">
- <h3>Venue metrics</h3>
- </div>
-
- <ol class="px2 py2">
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">25</div>
- <div class="Metric-title mb2">Average bookings per week</div>
- </div>
- </li>
- <li class="Metric mb2 shadowed">
- <div class="px3 py1">
- <div class="Metric-value">3.75</div>
- <div class="Metric-title mb2">Average rating</div>
- </div>
- </li>
- </ol>
- </div>
-</div>
diff --git a/resources/frontend_client/app/reserve/reserve.controllers.js b/resources/frontend_client/app/reserve/reserve.controllers.js
deleted file mode 100644
index e967eff71b71276e7d431a2ed62ddd7c66be9088..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/reserve/reserve.controllers.js
+++ /dev/null
@@ -1,187 +0,0 @@
-'use strict';
-
-var ReserveControllers = angular.module('corvus.reserve.controllers', []);
-
-ReserveControllers.controller('VenueList', ['$scope', 'Metabase', 'Reserve',
- function($scope, Metabase, Reserve){
- $scope.orderByField = "name";
- $scope.reverseSort = false;
-
- Reserve.queryInfo().then(function(queryInfo){
- $scope.search = function(){
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.venue_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter': [null, null],
- 'limit': null
- }
- }, function(queryResponse){
- $scope.venues = Reserve.convertToObjects(queryResponse.data);
- }, function(error){
- console.log(error);
- });
- };
-
- $scope.search();
- });
- }
-]);
-
-ReserveControllers.controller('VenueDetail', ['$scope', '$routeParams', 'Metabase', 'Reserve',
- function($scope, $routeParams, Metabase, Reserve) {
- $scope.orderByField = "user";
- $scope.reverseSort = false;
-
- Reserve.queryInfo().then(function(queryInfo){
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.venue_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter': ['=', queryInfo.venue_id_field, $routeParams.venueId]
- }
- }, function(venueResponse){
- $scope.venue = Reserve.convertToObjects(venueResponse.data)[0];
- var dataset_query = {
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'fields':[
- queryInfo.user_firstName_field,
- queryInfo.user_lastName_field,
- queryInfo.user_id_field,
- queryInfo.booking_guests_field,
- queryInfo.booking_overage_field,
- queryInfo.booking_rating_field,
- queryInfo.booking_createdAt_field,
- queryInfo.booking_updatedAt_field
- ],
- 'from':[{
- 'table': queryInfo.user_table
- }, {
- 'table': queryInfo.booking_table,
- 'join_type': 'inner',
- 'conditions':[
- {
- 'src_field': queryInfo.user_id_field,
- 'dest_field': queryInfo.booking_user_fk
- }
- ]
- }],
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter': ['=', queryInfo.booking_venue_fk, $routeParams.venueId]
- }
- };
-
- Metabase.dataset(dataset_query,
- function(bookingsResponse){
- $scope.bookings = Reserve.convertToObjects(bookingsResponse.data);
- }, function(error){
- console.log(error);
- });
-
- }, function(error){
- console.log(error);
- });
- });
- }
-]);
-
-
-ReserveControllers.controller('UserList', ['$scope', 'Metabase', 'Reserve',
- function($scope, Metabase, Reserve){
- $scope.orderByField = "firstName";
- $scope.reverseSort = false;
-
- Reserve.queryInfo().then(function(queryInfo){
- $scope.search = function(){
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.user_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter': [null, null],
- 'limit': null
- }
- }, function(queryResponse){
- $scope.users = Reserve.convertToObjects(queryResponse.data);
- }, function(error){
- console.log(error);
- });
- };
-
- $scope.search();
- });
-
- }
-]);
-
-
-ReserveControllers.controller('UserDetail', ['$scope', '$routeParams', 'Metabase', 'Reserve',
- function($scope, $routeParams, Metabase, Reserve) {
- $scope.orderByField = "user";
- $scope.reverseSort = false;
-
- Reserve.queryInfo().then(function(queryInfo){
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'source_table': queryInfo.user_table,
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter': ['=', queryInfo.user_id_field, $routeParams.userId]
- }
- }, function(userResponse){
- $scope.user = Reserve.convertToObjects(userResponse.data)[0];
-
- Metabase.dataset({
- 'database': queryInfo.database,
- 'type': 'query',
- 'query': {
- 'fields':[
- queryInfo.venue_name_field,
- queryInfo.venue_id_field,
- queryInfo.booking_guests_field,
- queryInfo.booking_overage_field,
- queryInfo.booking_rating_field,
- queryInfo.booking_createdAt_field,
- queryInfo.booking_updatedAt_field
- ],
- 'from':[{
- 'table': queryInfo.venue_table
- }, {
- 'table': queryInfo.booking_table,
- 'join_type': 'inner',
- 'conditions':[
- {
- 'src_field': queryInfo.venue_id_field,
- 'dest_field': queryInfo.booking_venue_fk
- }
- ]
- }],
- 'aggregation': ['rows'],
- 'breakout': [null],
- 'filter': ['=', queryInfo.booking_user_fk, $routeParams.userId]
- }
- }, function(bookingsResponse){
- $scope.bookings = Reserve.convertToObjects(bookingsResponse.data);
- }, function(error){
- console.log(error);
- });
-
- }, function(error){
- console.log(error);
- });
- });
- }
-]);
diff --git a/resources/frontend_client/app/reserve/reserve.module.js b/resources/frontend_client/app/reserve/reserve.module.js
deleted file mode 100644
index 3a768dc5e18aada1d17fc378aa59eb3f888aa1c1..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/reserve/reserve.module.js
+++ /dev/null
@@ -1,20 +0,0 @@
-'use strict';
-
-var Reserve = angular.module('corvus.reserve', [
- 'ngRoute',
- 'ngCookies',
- 'corvus.filters',
- 'corvus.directives',
- 'corvus.services',
- 'corvus.metabase.services',
- 'corvus.reserve.controllers',
- 'corvus.reserve.services'
-]);
-
-Reserve.config(['$routeProvider', function ($routeProvider) {
- $routeProvider.when('/reserve/venue/', {templateUrl: '/app/reserve/partials/venue_list.html', controller: 'VenueList'});
- $routeProvider.when('/reserve/venue/:venueId', {templateUrl: '/app/reserve/partials/venue_detail.html', controller: 'VenueDetail'});
-
- $routeProvider.when('/reserve/user/', {templateUrl: '/app/reserve/partials/user_list.html', controller: 'UserList'});
- $routeProvider.when('/reserve/user/:userId', {templateUrl: '/app/reserve/partials/user_detail.html', controller: 'UserDetail'});
-}]);
diff --git a/resources/frontend_client/app/reserve/reserve.services.js b/resources/frontend_client/app/reserve/reserve.services.js
deleted file mode 100644
index 81c3cd253f9eac33a7150673a92478e5f32e974a..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/reserve/reserve.services.js
+++ /dev/null
@@ -1,130 +0,0 @@
-'use strict';
-/*jslint browser:true */
-/*global _*/
-/* Services */
-
-var ReserveServices = angular.module('corvus.reserve.services', []);
-
-ReserveServices.service('Reserve', ['$resource', '$q', 'Metabase',
- function($resource, $q, Metabase) {
-
-
- var RESERVE_DB_NAME = "reserve";
-
- var VENUE_TABLE_NAME = "rh_reserve_venue_entity";
- var VENUE_ID_FIELD_NAME = "id";
- var VENUE_NAME_FIELD_NAME = "name";
-
- var BOOKING_TABLE_NAME = "booking";
- var BOOKING_ID_FIELD_NAME = "id";
- var BOOKING_VENUE_FK_NAME = "venue";
- var BOOKING_USER_FK_NAME = "user";
- var BOOKING_GUESTS_FIELD_NAME = "guests";
- var BOOKING_OVERAGE_FIELD_NAME = "overage";
- var BOOKING_RATING_FIELD_NAME = "rating";
- var BOOKING_CREATED_AT_FIELD_NAME = "createdAt";
- var BOOKING_UPDATED_AT_FIELD_NAME = "updatedAt";
-
- var USER_TABLE_NAME = "rh_reserve_user_entity";
- var USER_ID_FIELD_NAME = "user_id";
- var USER_FIRST_NAME_FIELD_NAME = "firstName";
- var USER_LAST_NAME_FIELD_NAME = "lastName";
-
- this.queryInfo = function() {
- var deferred = $q.defer();
- var queryInfo = {};
- Metabase.db_list(function(dbs){
- dbs.forEach(function(db){
- if(db.name == RESERVE_DB_NAME){
- queryInfo.database = db.id;
- Metabase.db_tables({
- dbId:db.id
- }, function(tables){
- tables.forEach(function(table){
- if(table.name == VENUE_TABLE_NAME){
- queryInfo.venue_table = table.id;
- }else if(table.name == BOOKING_TABLE_NAME){
- queryInfo.booking_table = table.id;
- }else if(table.name == USER_TABLE_NAME){
- queryInfo.user_table = table.id;
- }
- });
-
- Metabase.table_fields({
- tableId: queryInfo.venue_table
- }, function(venueTableFields){
- venueTableFields.forEach(function(field){
- if(field.name == VENUE_ID_FIELD_NAME){
- queryInfo.venue_id_field = field.id;
- }else if(field.name == VENUE_NAME_FIELD_NAME){
- queryInfo.venue_name_field = field.id;
- }
- });
-
- Metabase.table_fields({
- tableId: queryInfo.booking_table
- }, function(bookingTableFields){
- bookingTableFields.forEach(function(field){
- if(field.name == BOOKING_ID_FIELD_NAME){
- queryInfo.booking_id_field = field.id;
- }else if(field.name == BOOKING_VENUE_FK_NAME){
- queryInfo.booking_venue_fk = field.id;
- }else if(field.name == BOOKING_USER_FK_NAME){
- queryInfo.booking_user_fk = field.id;
- }else if(field.name == BOOKING_GUESTS_FIELD_NAME){
- queryInfo.booking_guests_field = field.id;
- }else if(field.name == BOOKING_OVERAGE_FIELD_NAME){
- queryInfo.booking_overage_field = field.id;
- }else if(field.name == BOOKING_RATING_FIELD_NAME){
- queryInfo.booking_rating_field = field.id;
- }else if(field.name == BOOKING_CREATED_AT_FIELD_NAME){
- queryInfo.booking_createdAt_field = field.id;
- }else if(field.name == BOOKING_UPDATED_AT_FIELD_NAME){
- queryInfo.booking_updatedAt_field = field.id;
- }
- });
-
- Metabase.table_fields({
- tableId: queryInfo.user_table
- }, function(userTableFields){
- userTableFields.forEach(function(field){
- if(field.name == USER_ID_FIELD_NAME){
- queryInfo.user_id_field = field.id;
- deferred.resolve(queryInfo);
- }else if(field.name == USER_FIRST_NAME_FIELD_NAME){
- queryInfo.user_firstName_field = field.id;
- }else if(field.name == USER_LAST_NAME_FIELD_NAME){
- queryInfo.user_lastName_field = field.id;
- }
- });
- });
- });
-
- });
- });
- }
- });
- });
-
- return deferred.promise;
- };
-
- this.convertToObjects = function (data) {
- var rows = [];
- for (var i = 0; i < data.rows.length; i++) {
- var row = {};
-
- for (var j = 0; j < data.cols.length; j++) {
- var coldef = data.cols[j];
-
- row[coldef.name] = data.rows[i][j];
- }
-
- rows.push(row);
- }
-
- return rows;
- };
-
- }
-]);
diff --git a/resources/frontend_client/app/services.js b/resources/frontend_client/app/services.js
index f00d640ee7438cf1638b862806de6def65f8350a..45459d090e791f5197c609de7d91b5e467763269 100644
--- a/resources/frontend_client/app/services.js
+++ b/resources/frontend_client/app/services.js
@@ -3,10 +3,13 @@
/*global _*/
/* Services */
+import MetabaseAnalytics from 'metabase/lib/analytics';
+import MetabaseCore from 'metabase/lib/core';
+
var CorvusServices = angular.module('corvus.services', ['http-auth-interceptor', 'ipCookie', 'corvus.core.services']);
-CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout', 'ipCookie', 'Session', 'User', 'Settings',
- function($rootScope, $q, $location, $timeout, ipCookie, Session, User, Settings) {
+CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$interval', '$timeout', 'ipCookie', 'Session', 'User', 'Settings',
+ function($rootScope, $q, $location, $interval, $timeout, ipCookie, Session, User, Settings) {
// this is meant to be a global service used for keeping track of our overall app state
// we fire 2 events as things change in the app
// 1. appstate:user
@@ -20,7 +23,7 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
setupToken: null,
currentUser: null,
siteSettings: null,
- appContext: 'unknown'
+ appContext: 'none'
},
init: function() {
@@ -38,6 +41,16 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
}, function(error) {
deferred.resolve();
});
+
+ // start Intercom updater
+ // this tells Intercom to update every 60s if we have a currently logged in user
+ $interval(function() {
+ if (service.model.currentUser && isTracking()) {
+ /* eslint-disable */
+ window.Intercom('update');
+ /* eslint-enable */
+ }
+ }, 60000);
}
return initPromise;
@@ -46,7 +59,6 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
clearState: function() {
currentUserPromise = null;
service.model.currentUser = null;
- service.model.siteSettings = null;
// clear any existing session cookies if they exist
ipCookie.remove('metabase.SESSION_ID');
@@ -94,6 +106,11 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
$location.path('/unauthorized/');
},
+ setAppContext: function(appContext) {
+ service.model.appContext = appContext;
+ $rootScope.$broadcast('appstate:context-changed', service.model.appContext);
+ },
+
routeChanged: function(event) {
// establish our application context based on the route (URI)
// valid app contexts are: 'setup', 'auth', 'main', 'admin', or 'unknown'
@@ -110,8 +127,7 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
// if the context of the app has changed due to this route change then send out an event
if (service.model.appContext !== routeContext) {
- service.model.appContext = routeContext;
- $rootScope.$broadcast('appstate:context-changed', service.model.appContext);
+ service.setAppContext(routeContext);
}
// this code is here to ensure that we have resolved our currentUser BEFORE we execute any other
@@ -122,6 +138,8 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
}, function(error) {
service.routeChangedImpl(event);
});
+ } else {
+ service.routeChangedImpl(event);
}
},
@@ -153,6 +171,34 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
}
};
+ function isTracking() {
+ var settings = service.model.siteSettings;
+ if (!settings) return false;
+
+ var tracking = settings['anon-tracking-enabled']['value'];
+ return (tracking === "true" || tracking === null);
+ }
+
+ /* eslint-disable */
+ function startupIntercom(user) {
+ window.Intercom('boot', {
+ app_id: "gqfmsgf1",
+ name: user.common_name,
+ email: user.email
+ });
+ }
+
+ function teardownIntercom() {
+ window.Intercom('shutdown');
+ }
+ /* eslint-enable */
+
+ // listen for location changes and use that as a trigger for page view tracking
+ $rootScope.$on('$locationChangeSuccess', function() {
+ // NOTE: we are only taking the path right now to avoid accidentally grabbing sensitive data like table/field ids
+ MetabaseAnalytics.trackPageView($location.path());
+ });
+
// listen for all route changes so that we can update organization as appropriate
$rootScope.$on('$routeChangeSuccess', service.routeChanged);
@@ -171,6 +217,34 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
Session.delete({
'session_id': session_id
});
+
+ // close down intercom
+ teardownIntercom();
+ });
+
+ $rootScope.$on("appstate:user", function(event, user) {
+ if (isTracking()) {
+ startupIntercom(user);
+ }
+ });
+
+ // enable / disable GA based on opt-out of anonymous tracking
+ $rootScope.$on("appstate:site-settings", function(event, settings) {
+ if (isTracking()) {
+ // we are doing tracking
+ window['ga-disable-UA-60817802-1'] = null;
+
+ if (currentUserPromise) {
+ currentUserPromise.then(function(user) {
+ startupIntercom(user);
+ });
+ }
+ } else {
+ // tracking is disabled
+ window['ga-disable-UA-60817802-1'] = true;
+
+ teardownIntercom();
+ }
});
// NOTE: the below events are generated from the http-auth-interceptor which listens on our $http calls
@@ -198,354 +272,12 @@ CorvusServices.factory('AppState', ['$rootScope', '$q', '$location', '$timeout',
}
]);
-CorvusServices.service('CorvusCore', ['$resource', 'User', function($resource, User) {
- this.perms = [{
- 'id': 0,
- 'name': 'Private'
- }, {
- 'id': 1,
- 'name': 'Public (others can read)'
- }];
-
- this.permName = function(permId) {
- if (permId >= 0 && permId <= (this.perms.length - 1)) {
- return this.perms[permId].name;
- }
- return null;
- };
-
- this.charts = [{
- 'id': 'scalar',
- 'name': 'Scalar'
- }, {
- 'id': 'table',
- 'name': 'Table'
- }, {
- 'id': 'pie',
- 'name': 'Pie Chart'
- }, {
- 'id': 'bar',
- 'name': 'Bar Chart'
- }, {
- 'id': 'line',
- 'name': 'Line Chart'
- }, {
- 'id': 'area',
- 'name': 'Area Chart'
- }, {
- 'id': 'timeseries',
- 'name': 'Time Series'
- }, {
- 'id': 'pin_map',
- 'name': 'Pin Map'
- }, {
- 'id': 'country',
- 'name': 'World Heatmap'
- }, {
- 'id': 'state',
- 'name': 'State Heatmap'
- }];
-
- this.chartName = function(chartId) {
- for (var i = 0; i < this.charts.length; i++) {
- if (this.charts[i].id == chartId) {
- return this.charts[i].name;
- }
- }
- return null;
- };
-
- this.table_entity_types = [{
- 'id': null,
- 'name': 'None'
- }, {
- 'id': 'person',
- 'name': 'Person'
- }, {
- 'id': 'event',
- 'name': 'Event'
- }, {
- 'id': 'photo',
- 'name': 'Photo'
- }, {
- 'id': 'place',
- 'name': 'Place'
- }, {
- 'id': 'evt-cohort',
- 'name': 'Cohorts-compatible Event'
- }];
-
- this.tableEntityType = function(typeId) {
- for (var i = 0; i < this.table_entity_types.length; i++) {
- if (this.table_entity_types[i].id == typeId) {
- return this.table_entity_types[i].name;
- }
- }
- return null;
- };
-
- this.field_special_types = [{
- 'id': null,
- 'name': 'None'
- }, {
- 'id': 'avatar',
- 'name': 'Avatar Image URL'
- }, {
- 'id': 'category',
- 'name': 'Category'
- }, {
- 'id': 'city',
- 'name': 'City'
- }, {
- 'id': 'country',
- 'name': 'Country'
- }, {
- 'id': 'desc',
- 'name': 'Description'
- }, {
- 'id': 'fk',
- 'name': 'Foreign Key'
- }, {
- 'id': 'id',
- 'name': 'Entity Key'
- }, {
- 'id': 'image',
- 'name': 'Image URL'
- }, {
- 'id': 'json',
- 'name': 'Field containing JSON'
- }, {
- 'id': 'latitude',
- 'name': 'Latitude'
- }, {
- 'id': 'longitude',
- 'name': 'Longitude'
- }, {
- 'id': 'name',
- 'name': 'Entity Name'
- }, {
- 'id': 'number',
- 'name': 'Number'
- }, {
- 'id': 'state',
- 'name': 'State'
- }, {
- id: 'timestamp_seconds',
- name: 'UNIX Timestamp (Seconds)'
- }, {
- id: 'timestamp_milliseconds',
- name: 'UNIX Timestamp (Milliseconds)'
- }, {
- 'id': 'url',
- 'name': 'URL'
- }, {
- 'id': 'zip_code',
- 'name': 'Zip Code'
- }];
-
- this.field_field_types = [{
- 'id': 'info',
- 'name': 'Information'
- }, {
- 'id': 'metric',
- 'name': 'Metric'
- }, {
- 'id': 'dimension',
- 'name': 'Dimension'
- }, {
- 'id': 'sensitive',
- 'name': 'Sensitive Information'
- }];
-
- this.boolean_types = [{
- 'id': true,
- 'name': 'Yes'
- }, {
- 'id': false,
- 'name': 'No'
- }, ];
-
- this.fieldSpecialType = function(typeId) {
- for (var i = 0; i < this.field_special_types.length; i++) {
- if (this.field_special_types[i].id == typeId) {
- return this.field_special_types[i].name;
- }
- }
- return null;
- };
-
- this.builtinToChart = {
- 'latlong_heatmap': 'll_heatmap'
- };
-
- this.getTitleForBuiltin = function(viewtype, field1Name, field2Name) {
- var builtinToTitleMap = {
- 'state': 'State Heatmap',
- 'country': 'Country Heatmap',
- 'pin_map': 'Pin Map',
- 'heatmap': 'Heatmap',
- 'cohorts': 'Cohorts',
- 'latlong_heatmap': 'Lat/Lon Heatmap'
- };
-
- var title = builtinToTitleMap[viewtype];
- if (field1Name) {
- title = title.replace("{0}", field1Name);
- }
- if (field2Name) {
- title = title.replace("{1}", field2Name);
- }
-
- return title;
- };
-
- this.createLookupTables = function(table) {
- // Create lookup tables (ported from ExploreTableDetailData)
-
- table.fields_lookup = {};
- _.each(table.fields, function(field) {
- table.fields_lookup[field.id] = field;
- field.operators_lookup = {};
- _.each(field.valid_operators, function(operator) {
- field.operators_lookup[operator.name] = operator;
- });
- });
-
- table.aggregation_lookup = {};
- _.each(table.aggregation_options, function(agg) {
- table.aggregation_lookup[agg.short] = agg;
- });
- };
-
+CorvusServices.service('CorvusCore', ['User', function(User) {
// this just makes it easier to access the current user
this.currentUser = User.current;
- // The various DB engines we support <3
- // TODO - this should probably come back from the API, no?
- //
- // NOTE:
- // A database's connection details is stored in a JSON map in the field database.details.
- //
- // ENGINE DICT FORMAT:
- // * name - human-facing name to use for this DB engine
- // * fields - array of available fields to display when a user adds/edits a DB of this type. Each field should be a dict of the format below:
- //
- // FIELD DICT FORMAT:
- // * displayName - user-facing name for the Field
- // * fieldName - name used for the field in a database details dict
- // * transform - function to apply to this value before passing to the API, such as 'parseInt'. (default: none)
- // * placeholder - placeholder value that should be used in text input for this field (default: none)
- // * placeholderIsDefault - if true, use the value of 'placeholder' as the default value of this field if none is specified (default: false)
- // (if you set this, don't set 'required', or user will still have to add a value for the field)
- // * required - require the user to enter a value for this field? (default: false)
- // * choices - array of possible values for this field. If provided, display a button toggle instead of a text input.
- // Each choice should be a dict of the format below: (optional)
- //
- // CHOICE DICT FORMAT:
- // * name - User-facing name for the choice.
- // * value - Value to use for the choice in the database connection details dict.
- // * selectionAccent - What accent type should be applied to the field when its value is chosen? Either 'active' (currently green), or 'danger' (currently red).
- this.ENGINES = {
- postgres: {
- name: 'Postgres',
- fields: [{
- displayName: "Host",
- fieldName: "host",
- placeholder: "localhost",
- placeholderIsDefault: true
- }, {
- displayName: "Port",
- fieldName: "port",
- transform: parseInt,
- placeholder: "5432",
- placeholderIsDefault: true
- }, {
- displayName: "Database name",
- fieldName: "dbname",
- placeholder: "birds_of_the_world",
- required: true
- }, {
- displayName: "Database username",
- fieldName: "user",
- placeholder: "What username do you use to login to the database?",
- required: true
- }, {
- displayName: "Database password",
- fieldName: "password",
- placeholder: "*******"
- }, {
- displayName: "Use a secure connection (SSL)?",
- fieldName: "ssl",
- choices: [{
- name: 'Yes',
- value: true,
- selectionAccent: 'active'
- }, {
- name: 'No',
- value: false,
- selectionAccent: 'danger'
- }]
- }]
- },
- h2: {
- name: 'H2',
- fields: [{
- displayName: "Connection String",
- fieldName: "db",
- placeholder: "file:/Users/camsaul/bird_sightings/toucans;AUTO_SERVER=TRUE"
- }]
- },
- mongo: {
- name: 'MongoDB',
- fields: [{
- displayName: "Host",
- fieldName: "host",
- placeholder: "localhost",
- placeholderIsDefault: true
- }, {
- displayName: "Port",
- fieldName: "port",
- transform: parseInt,
- placeholder: "27017"
- }, {
- displayName: "Database name",
- fieldName: "dbname",
- placeholder: "carrierPigeonDeliveries",
- required: true
- }, {
- displayName: "Database username",
- fieldName: "user",
- placeholder: "What username do you use to login to the database?"
- }, {
- displayName: "Database password",
- fieldName: "pass",
- placeholder: "******"
- }]
- }
- };
-
- // Prepare database details before being sent to the API.
- // This includes applying 'transform' functions and adding default values where applicable.
- this.prepareDatabaseDetails = function(details) {
- if (!details.engine) throw "Missing key 'engine' in database request details; please add this as API expects it in the request body.";
-
- // iterate over each field definition
- this.ENGINES[details.engine].fields.forEach(function(field) {
- var fieldName = field.fieldName;
-
- // set default value if applicable
- if (!details[fieldName] && field.placeholderIsDefault) {
- details[fieldName] = field.placeholder;
- }
-
- // apply transformation function if applicable
- if (details[fieldName] && field.transform) {
- details[fieldName] = field.transform(details[fieldName]);
- }
- });
-
- return details;
- };
+ // copy over MetabaseCore properties and functions
+ angular.forEach(MetabaseCore, (value, key) => this[key] = value);
}]);
diff --git a/resources/frontend_client/app/unauthorized.html b/resources/frontend_client/app/unauthorized.html
index 54b62303b53b5cc937bc762c9bf77910058a88e3..541328000f28596e8be402e74201178b099c6cac 100644
--- a/resources/frontend_client/app/unauthorized.html
+++ b/resources/frontend_client/app/unauthorized.html
@@ -1 +1 @@
-sorry, you are not authorized to view the specified page.
+<h1 class="flex layout-centered flex-full text-grey-2">Sorry, you are not authorized to view the specified page.</h1>
diff --git a/resources/frontend_client/index.html b/resources/frontend_client/index.html
deleted file mode 100644
index 038c8b6e05d00d2996bbd9d581c01c68d26eab14..0000000000000000000000000000000000000000
--- a/resources/frontend_client/index.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" ng-app="corvus" class="no-js">
- <head>
- <meta charset="utf-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui" />
- <meta name="apple-mobile-web-app-capable" content="yes" />
- <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
- <title>Metabase</title>
-
- <link rel="stylesheet" href="/app/dist/styles.bundle.css"/>
- <script charset="utf-8" src="/app/dist/vendor.bundle.js"></script>
- <script charset="utf-8" src="/app/dist/app.bundle.js"></script>
- </head>
-
- <body ng-controller="Corvus">
- <div ng-controller="Nav" ng-if="user" ng-cloak>
- <!-- MAIN NAV -->
- <nav class="py2 sm-py1 xl-py3 relative bg-brand" ng-show="nav === 'main'">
- <div class="wrapper flex align-center">
- <a class="NavItem cursor-pointer text-white flex align-center" href="/">
- <mb-logo-icon class="text-white"></mb-logo-icon>
- </a>
- <div class="DashboardDropdown Dropdown ml1 md-ml3" dropdown on-toggle="toggled(open)">
- <a class="NavItem text-white cursor-pointer p2 flex align-center" dropdown-toggle>
- Dashboards
- <mb-icon class="ml1" name="chevrondown" width="8px" height="8px"></mb-icon>
- </a>
- <ul class="Dropdown-content" ng-controller="DashList">
- <li ng-repeat="dash in dashboards">
- <a class="Dropdown-item link flex align-center text-normal" href="/dash/{{dash.id}}">
- {{dash.name}}
- <mb-icon class="ml1 text-grey-4 flex flex-align-right align-center" name="lock" width="12px" height="12px" ng-if="dash.public_perms === 0"></mb-icon>
- </a>
- </li>
- </ul>
- </div>
- <div class="UserDropdown Dropdown flex-align-right" dropdown on-toggle="toggled(open)">
- <mb-profile-link class="NavItem text-white" user="user" context="nav"></mb-profile-link>
- <ul class="Dropdown-content right">
- <li><a class="Dropdown-item link block" href="/user/edit_current">Account Settings</a></li>
- <li><a class="Dropdown-item link block" href="/auth/logout">Logout</a></li>
- </ul>
- </div>
- <a class="AdminLink NavItem hide sm-show sm-ml1 md-ml2" ng-if="user.is_superuser" href="/admin/">
- <mb-icon class="text-white" name="gear" width="16px" height="16px"></mb-icon>
- </a>
- </div>
- </nav>
-
- <!-- ADMIN NAV -->
- <nav class="AdminNav" ng-show="nav === 'admin'">
- <div class="wrapper flex align-center">
- <div class="NavTitle flex align-center">
- <mb-icon name="gear" class="AdminGear" width="22px" height="22px"></mb-icon>
- <span class="NavItem-text ml1 hide sm-show">Site Administration</span>
- </div>
-
- <!-- admin sections -->
- <ul class="sm-ml4 flex flex-full">
- <li>
- <a class="NavItem py1 px2 no-decoration" ng-class="{ 'is--selected' : isActive('/admin/settings')}" href="/admin/settings/">
- Settings
- </a>
- </li>
- <li>
- <a class="NavItem py1 px2 no-decoration" ng-class="{ 'is--selected' : isActive('/admin/people')}" href="/admin/people/">
- People
- </a>
- </li>
- <li>
- <a class="NavItem py1 px2 no-decoration" ng-class="{ 'is--selected' : isActive('/admin/databases')}" href="/admin/databases/">
- Databases
- </a>
- </li>
- </ul>
-
- <!-- user profile dropdown -->
- <mb-profile-link user="user" context="nav"></mb-profile-link>
- <a class="text-white ml1 md-ml2" href="/">
- <mb-icon name="return" width="22px" height="22px"></mb-icon>
- </a>
- </div>
- </nav>
- </div>
-
- <main class="full-height flex flex-column" ng-view></main>
- </body>
-
-
- <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
- <script>
- WebFont.load({
- google: {
- families: ['Lato:n1,n2,n4,n7']
- }
- });
- </script>
-
- <script>
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
- ga('create', 'UA-60817802-1', 'auto');
- ga('send', 'pageview');
- </script>
-</html>
diff --git a/resources/frontend_client/index_template.html b/resources/frontend_client/index_template.html
new file mode 100644
index 0000000000000000000000000000000000000000..6e64633b9e757e2ae4367675aa85fec087cd84b5
--- /dev/null
+++ b/resources/frontend_client/index_template.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html lang="en" ng-app="corvus" class="no-js">
+ <head>
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui" />
+ <meta name="apple-mobile-web-app-capable" content="yes" />
+ <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+ <title>Metabase</title>
+
+ <script>(function(){var w=window;var ic=w.Intercom;if(typeof ic==="function"){ic('reattach_activator');ic('update',intercomSettings);}else{var d=document;var i=function(){i.c(arguments)};i.q=[];i.c=function(args){i.q.push(args)};w.Intercom=i;function l(){var s=d.createElement('script');s.type='text/javascript';s.async=true;s.src='https://widget.intercom.io/widget/gqfmsgf1';var x=d.getElementsByTagName('script')[0];x.parentNode.insertBefore(s,x);}if(w.attachEvent){w.attachEvent('onload',l);}else{w.addEventListener('load',l,false);}}})()</script>
+
+ </head>
+
+ <body ng-controller="Corvus">
+ <div class="Nav" ng-controller="Nav" ng-if="user" ng-cloak>
+ <!-- MAIN NAV -->
+ <nav class="py2 sm-py1 xl-py3 relative bg-brand" ng-show="nav === 'main'">
+ <ul class="wrapper flex align-center">
+ <li>
+ <a class="NavItem cursor-pointer text-white flex align-center" href="/">
+ <mb-logo-icon class="text-white my2"></mb-logo-icon>
+ </a>
+ </li>
+ <li>
+ <div class="NavDropdown ml1 md-ml3" dropdown on-toggle="toggled(open)">
+ <a class="NavDropdown-button NavItem text-white cursor-pointer p2 flex align-center" dropdown-toggle>
+ <span class="NavDropdown-button-layer">
+ Dashboards
+ <mb-icon class="ml1" name="chevrondown" width="8px" height="8px"></mb-icon>
+ </span>
+ </a>
+ <div class="NavDropdown-content DashboardList" ng-controller="DashList">
+ <div class="NavDropdown-content-layer text-white text-centered" ng-if="dashboards.length === 0">
+ <div class="p2"><span class="QuestionCircle">?</span></div>
+ <div class="px2 py1 text-bold">You don’t have any dashboards yet.</div>
+ <div class="px2 pb2 text-light">Dashboards group visualizations for frequent questions in a single handy place.</div>
+ <div class="p2 text-bold text-white border-top border-light">
+ To create your first dashboard, <a class="text-white" href="/q">
ask a question</a> and save it.
+ </div>
+ </div>
+ <ul class="NavDropdown-content-layer" ng-if="dashboards.length > 0">
+ <li class="block" ng-repeat="dash in dashboards">
+ <a class="Dropdown-item block text-white no-decoration" href="/dash/{{dash.id}}">
+ <div class="flex text-bold">
+ {{dash.name}}
+ <mb-icon class="ml1 flex flex-align-right align-center" name="lock" width="12px" height="12px" ng-if="dash.public_perms === 0"></mb-icon>
+ </div>
+ <div class="mt1 text-light text-brand-light" ng-if="dash.description">
+ {{dash.description}}
+ </div>
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </li>
+ <li class="bullet">
+ <a class="NavItem text-white cursor-pointer p2 flex align-center no-decoration" href="/q">Ask a Question</a>
+ </li>
+ <li class="flex-align-right">
+ <mb-profile-link class="text-white" user="user" context="nav"></mb-profile-link>
+ </li>
+ </ul>
+ </nav>
+
+ <!-- ADMIN NAV -->
+ <nav class="AdminNav" ng-show="nav === 'admin'">
+ <div class="wrapper flex align-center">
+ <div class="NavTitle flex align-center">
+ <mb-icon name="gear" class="AdminGear" width="22px" height="22px"></mb-icon>
+ <span class="NavItem-text ml1 hide sm-show">Site Administration</span>
+ </div>
+
+ <!-- admin sections -->
+ <ul class="sm-ml4 flex flex-full">
+ <li>
+ <a class="NavItem py1 px2 no-decoration" ng-class="{ 'is--selected' : isActive('/admin/settings')}" href="/admin/settings/">
+ Settings
+ </a>
+ </li>
+ <li>
+ <a class="NavItem py1 px2 no-decoration" ng-class="{ 'is--selected' : isActive('/admin/people')}" href="/admin/people/">
+ People
+ </a>
+ </li>
+ <li>
+ <a class="NavItem py1 px2 no-decoration" ng-class="{ 'is--selected' : isActive('/admin/metadata')}" href="/admin/metadata/">
+ Metadata
+ </a>
+ </li>
+ <li>
+ <a class="NavItem py1 px2 no-decoration" ng-class="{ 'is--selected' : isActive('/admin/databases')}" href="/admin/databases/">
+ Databases
+ </a>
+ </li>
+ </ul>
+
+ <!-- user profile dropdown -->
+ <mb-profile-link user="user" context="nav"></mb-profile-link>
+ </div>
+ </nav>
+
+ <!-- AUTH NAV -->
+ <nav class="py2 sm-py1 xl-py3 relative" ng-show="nav === 'auth'">
+ </nav>
+
+ <!-- NO NAV -->
+ <nav class="py2 sm-py1 xl-py3 relative" ng-show="nav === 'none'">
+ <ul class="wrapper flex align-center">
+ <li>
+ <a class="NavItem cursor-pointer flex align-center" href="/">
+ <mb-logo-icon class="text-brand my2"></mb-logo-icon>
+ </a>
+ </li>
+ </ul>
+ </nav>
+ </div>
+
+ <main class="Main flex flex-column flex-full" ng-view></main>
+ </body>
+
+
+ <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
+ <script>
+ WebFont.load({
+ google: {
+ families: ['Lato:n1,n2,n4,n7']
+ }
+ });
+ </script>
+
+ <script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ // start off with tracking disabled (the angular app will re-enable this once we know the app runtime settings)
+ window['ga-disable-UA-60817802-1'] = true;
+
+ ga('create', 'UA-60817802-1', 'auto');
+ </script>
+</html>
diff --git a/resources/frontend_client/test/unit/auth/auth.controllers.spec.js b/resources/frontend_client/test/unit/auth/auth.controllers.spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..278b462e5fd35acbb681c3e9c900053aaf31450c
--- /dev/null
+++ b/resources/frontend_client/test/unit/auth/auth.controllers.spec.js
@@ -0,0 +1,18 @@
+'use strict';
+
+import 'metabase/auth/auth.controllers';
+
+describe('corvus.auth.controllers', function() {
+ beforeEach(angular.mock.module('corvus.auth.controllers'));
+
+ describe('Login', function() {
+ beforeEach(angular.mock.inject(function($location) {
+ spyOn($location, 'path').and.returnValue('Fake location');
+ }))
+
+ it('should redirect logged-in user to /', inject(function($controller, $location) {
+ $controller('Login', { $scope: {}, AppState: { model: { currentUser: {} }} });
+ expect($location.path).toHaveBeenCalledWith('/');
+ }));
+ });
+});
diff --git a/resources/frontend_client/vendor.css b/resources/frontend_client/vendor.css
index 48c1bf20c7008ed549e216997e6aa0cf8afd5922..829ea3d71bb57d0b76836343514a07f2ed0fc21c 100644
--- a/resources/frontend_client/vendor.css
+++ b/resources/frontend_client/vendor.css
@@ -7,5 +7,4 @@
@import 'dc/dc.css';
/* react */
-@import 'react-datepicker/react-datepicker.css';
-@import 'fixed-data-table/dist/fixed-data-table.css';
\ No newline at end of file
+@import 'fixed-data-table/dist/fixed-data-table.css';
diff --git a/resources/frontend_client/vendor.js b/resources/frontend_client/vendor.js
index 67a47aac61a8913734299bf9bf6fb5034aff178e..2abeed3e87dbee00c32edfbb239420174b2c0b6c 100644
--- a/resources/frontend_client/vendor.js
+++ b/resources/frontend_client/vendor.js
@@ -2,6 +2,8 @@
"use strict";
+import 'babel/polyfill';
+
// angular:
import 'angular';
import 'angular-animate';
@@ -11,11 +13,11 @@ import 'angular-route';
import 'angular-sanitize';
// angular 3rd-party:
-import 'angular-bootstrap';
import 'angular-cookie';
import 'angular-gridster';
import 'angular-http-auth'; // currently pulled from unofficial fork: https://github.com/witoldsz/angular-http-auth/pull/100
import 'angular-readable-time';
+import 'angular-ui-bootstrap';
import 'angular-xeditable';
import 'ng-sortable';
import 'angularytics';
diff --git a/resources/log4j.properties b/resources/log4j.properties
index 9d4ab36d5642dd1ea6e8c4dde12e0fc571937fda..35f3fff6ee338862061fffd79965bed531d2cf35 100644
--- a/resources/log4j.properties
+++ b/resources/log4j.properties
@@ -18,3 +18,4 @@ log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p%c - %m%n
log4j.logger.com.mchange=WARN
log4j.logger.liquibase=WARN
log4j.logger.metabase=DEBUG
+log4j.logger.org.mongodb=WARN
diff --git a/resources/migrations/007_add_field_parent_id.json b/resources/migrations/007_add_field_parent_id.json
new file mode 100644
index 0000000000000000000000000000000000000000..d2fd5df82bb57753795ffcf4da312627c444771e
--- /dev/null
+++ b/resources/migrations/007_add_field_parent_id.json
@@ -0,0 +1,30 @@
+{
+ "databaseChangeLog": [
+ {
+ "changeSet": {
+ "id": "7",
+ "author": "cammsaul",
+ "changes": [
+ {
+ "addColumn": {
+ "tableName": "metabase_field",
+ "columns": [
+ {
+ "column": {
+ "name": "parent_id",
+ "type": "int",
+ "constraints": {
+ "nullable": true,
+ "references": "metabase_field(id)",
+ "foreignKeyName": "fk_field_parent_ref_field_id"
+ }
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/resources/migrations/008_add_display_name_columns.json b/resources/migrations/008_add_display_name_columns.json
new file mode 100644
index 0000000000000000000000000000000000000000..8eb9794ba7a40ad1519656a41681a17bb4125cba
--- /dev/null
+++ b/resources/migrations/008_add_display_name_columns.json
@@ -0,0 +1,38 @@
+{
+ "databaseChangeLog": [
+ {
+ "changeSet": {
+ "id": "8",
+ "author": "tlrobinson",
+ "changes": [
+ {
+ "addColumn": {
+ "tableName": "metabase_table",
+ "columns": [
+ {
+ "column": {
+ "name": "display_name",
+ "type": "varchar(254)"
+ }
+ }
+ ]
+ }
+ },
+ {
+ "addColumn": {
+ "tableName": "metabase_field",
+ "columns": [
+ {
+ "column": {
+ "name": "display_name",
+ "type": "varchar(254)"
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/resources/migrations/009_add_table_visibility_type_column.json b/resources/migrations/009_add_table_visibility_type_column.json
new file mode 100644
index 0000000000000000000000000000000000000000..74aa0a69cb50e629a11d658911711d4eb2aa9f8b
--- /dev/null
+++ b/resources/migrations/009_add_table_visibility_type_column.json
@@ -0,0 +1,25 @@
+{
+ "databaseChangeLog": [
+ {
+ "changeSet": {
+ "id": "9",
+ "author": "tlrobinson",
+ "changes": [
+ {
+ "addColumn": {
+ "tableName": "metabase_table",
+ "columns": [
+ {
+ "column": {
+ "name": "visibility_type",
+ "type": "varchar(254)"
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/resources/migrations/010_add_revision_table.yaml b/resources/migrations/010_add_revision_table.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ad05ed71181ac8cc62034113194e8dd838315dfc
--- /dev/null
+++ b/resources/migrations/010_add_revision_table.yaml
@@ -0,0 +1,63 @@
+databaseChangeLog:
+ - changeSet:
+ id: 9
+ author: cammsaul
+ changes:
+ - createTable:
+ tableName: revision
+ columns:
+ - column:
+ name: id
+ type: int
+ autoIncrement: true
+ constraints:
+ primaryKey: true
+ nullable: false
+ - column:
+ name: model
+ type: varchar(16)
+ constraints:
+ nullable: false
+ - column:
+ name: model_id
+ type: int
+ constraints:
+ nullable: false
+ - column:
+ name: user_id
+ type: int
+ constraints:
+ nullable: false
+ references: core_user(id)
+ foreignKeyName: fk_revision_ref_user_id
+ deferrable: false
+ initiallyDeferred: false
+ - column:
+ name: timestamp
+ type: DATETIME
+ constraints:
+ nullable: false
+ - column:
+ name: object
+ type: varchar
+ constraints:
+ nullable: false
+ - column:
+ name: is_reversion
+ type: boolean
+ defaultValueBoolean: false
+ constraints:
+ nullable: false
+ - createIndex:
+ tableName: revision
+ indexName: idx_revision_model_model_id
+ columns:
+ column:
+ name: model
+ column:
+ name: model_id
+ - modifySql:
+ dbms: postgresql
+ replace:
+ replace: WITHOUT
+ with: WITH
diff --git a/resources/migrations/011_cleanup_dashboard_perms.yaml b/resources/migrations/011_cleanup_dashboard_perms.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4ae87decd018e8c2c4aed9665362b3e3b23d9000
--- /dev/null
+++ b/resources/migrations/011_cleanup_dashboard_perms.yaml
@@ -0,0 +1,7 @@
+databaseChangeLog:
+ - changeSet:
+ id: 11
+ author: agilliland
+ changes:
+ - sql:
+ sql: update report_dashboard set public_perms = 2 where public_perms = 1
diff --git a/resources/migrations/liquibase.json b/resources/migrations/liquibase.json
index ba2d99753d644777803e605526db1a1f82a2e165..a2a585e46246ea0af5d1f63ed7f288714e878099 100644
--- a/resources/migrations/liquibase.json
+++ b/resources/migrations/liquibase.json
@@ -4,6 +4,11 @@
{"include": {"file": "migrations/002_add_session_table.json"}},
{"include": {"file": "migrations/004_add_setting_table.json"}},
{"include": {"file": "migrations/005_add_org_report_tz_column.json"}},
- {"include": {"file": "migrations/006_disconnect_orgs.json"}}
+ {"include": {"file": "migrations/006_disconnect_orgs.json"}},
+ {"include": {"file": "migrations/007_add_field_parent_id.json"}},
+ {"include": {"file": "migrations/008_add_display_name_columns.json"}},
+ {"include": {"file": "migrations/009_add_table_visibility_type_column.json"}},
+ {"include": {"file": "migrations/010_add_revision_table.yaml"}},
+ {"include": {"file": "migrations/011_cleanup_dashboard_perms.yaml"}}
]
}
diff --git a/resources/sample-dataset.db.mv.db b/resources/sample-dataset.db.mv.db
new file mode 100644
index 0000000000000000000000000000000000000000..3a022c843bb585c82a0389b8eba04d3938364233
Binary files /dev/null and b/resources/sample-dataset.db.mv.db differ
diff --git a/sample_dataset/metabase/sample_dataset/generate.clj b/sample_dataset/metabase/sample_dataset/generate.clj
new file mode 100644
index 0000000000000000000000000000000000000000..ca6d777d5ba9815b112ff8856ac69175ea4f3abe
--- /dev/null
+++ b/sample_dataset/metabase/sample_dataset/generate.clj
@@ -0,0 +1,372 @@
+(ns metabase.sample-dataset.generate
+ (:require [clojure.math.numeric-tower :as math]
+ [clojure.string :as s]
+ (faker [address :as address]
+ [company :as company]
+ [lorem :as lorem]
+ [internet :as internet]
+ [name :as name])
+ [incanter.distributions :as dist]
+ (korma [core :as k]
+ [db :as kdb]))
+ (:import java.util.Date))
+
+(def ^:private ^:const sample-dataset-filename
+ (str (System/getProperty "user.dir") "/resources/sample-dataset.db"))
+
+(defn- normal-distribution-rand [mean median]
+ (dist/draw (dist/normal-distribution mean median)))
+
+(defn- normal-distribution-rand-int [mean median]
+ (math/round (normal-distribution-rand mean median)))
+
+;;; ## PEOPLE
+
+(defn- random-latitude []
+ (-> (rand)
+ (* 180)
+ (- 90)))
+
+(defn- random-longitude []
+ (-> (rand)
+ (* 360)
+ (- 180)))
+
+(defn ^Date years-ago [n]
+ (let [d (Date.)]
+ (.setYear d (- (.getYear d) n))
+ d))
+
+(defn ^Date random-date-between [^Date min ^Date max]
+ (let [min-ms (.getTime min)
+ max-ms (.getTime max)
+ range (- max-ms min-ms)
+ d (Date.)]
+ (.setTime d (+ (long (rand range)) min-ms))
+ d))
+
+(defn- random-person []
+ (let [first (name/first-name)
+ last (name/last-name)]
+ {:name (format "%s %s" first last)
+ :email (internet/free-email (format "%s.%s" first last))
+ :password (str (java.util.UUID/randomUUID))
+ :birth_date (random-date-between (years-ago 60) (years-ago 18))
+ :address (address/street-address)
+ :city (address/city)
+ :zip (apply str (take 5 (address/zip-code)))
+ :state (address/us-state-abbr)
+ :latitude (random-latitude)
+ :longitude (random-longitude)
+ :source (rand-nth ["Google" "Twitter" "Facebook" "Organic" "Affiliate"])
+ :created_at (random-date-between (years-ago 1) (Date.))}))
+
+;;; ## PRODUCTS
+
+(defn- random-company-name []
+ (first (company/names)))
+
+(defn- random-price [min max]
+ (let [range (- max min)]
+ (-> (rand-int (* range 100))
+ (/ 100.0)
+ (+ min))))
+
+(def ^:private ^:const product-names
+ {:adjective '[Small, Ergonomic, Rustic, Intelligent, Gorgeous, Incredible, Fantastic, Practical, Sleek, Awesome, Enormous, Mediocre, Synergistic, Heavy Duty, Lightweight, Aerodynamic, Durable]
+ :material '[Steel, Wooden, Concrete, Plastic, Cotton, Granite, Rubber, Leather, Silk, Wool, Linen, Marble, Iron, Bronze, Copper, Aluminum, Paper]
+ :product '[Chair, Car, Computer, Gloves, Pants, Shirt, Table, Shoes, Hat, Plate, Knife, Bottle, Coat, Lamp, Keyboard, Bag, Bench, Clock, Watch, Wallet]})
+
+(defn- random-product-name []
+ (format "%s %s %s"
+ (rand-nth (product-names :adjective))
+ (rand-nth (product-names :material))
+ (rand-nth (product-names :product))))
+
+(def ^:private ean-checksum
+ (let [^:const weights (flatten (repeat 6 [1 3]))]
+ (fn [digits]
+ {:pre [(= 12 (count digits))
+ (= 12 (count (apply str digits)))]
+ :post [(= 1 (count (str %)))]}
+ (as-> (reduce + (map (fn [digit weight]
+ (* digit weight))
+ digits weights))
+ it
+ (mod it 10)
+ (- 10 it)
+ (mod it 10)))))
+
+(defn- random-ean []
+ {:post [(= (count %) 13)]}
+ (let [digits (vec (repeatedly 12 #(rand-int 10)))]
+ (->> (conj digits (ean-checksum digits))
+ (apply str))))
+
+(defn- random-product []
+ {:ean (random-ean)
+ :title (random-product-name)
+ :category (rand-nth ["Widget" "Gizmo" "Gadget" "Doohickey"])
+ :vendor (random-company-name)
+ :price (random-price 12 100)
+ :created_at (random-date-between (years-ago 1) (Date.))})
+
+
+;;; ## ORDERS
+
+(def ^:private ^:const state->tax-rate
+ {"AK" 0.0
+ "AL" 0.04
+ "AR" 0.065
+ "AZ" 0.056
+ "CA" 0.075
+ "CO" 0.029
+ "CT" 0.0635
+ "DC" 0.0575
+ "DE" 0.0
+ "FL" 0.06
+ "GA" 0.04
+ "HI" 0.04
+ "IA" 0.06
+ "ID" 0.06
+ "IL" 0.0625
+ "IN" 0.07
+ "KS" 0.065
+ "KY" 0.06
+ "LA" 0.04
+ "MA" 0.0625
+ "MD" 0.06
+ "ME" 0.055
+ "MI" 0.06
+ "MN" 0.06875
+ "MO" 0.04225
+ "MS" 0.07
+ "MT" 0.0
+ "NC" 0.0475
+ "ND" 0.05
+ "NE" 0.055
+ "NH" 0.0
+ "NJ" 0.07
+ "NM" 0.05125
+ "NV" 0.0685
+ "NY" 0.04
+ "OH" 0.0575
+ "OK" 0.045
+ "OR" 0.0
+ "PA" 0.06
+ "RI" 0.07
+ "SC" 0.06
+ "SD" 0.04
+ "TN" 0.07
+ "TX" 0.0625
+ "UT" 0.047
+ "VA" 0.043
+ "VT" 0.06
+ "WA" 0.065
+ "WI" 0.05
+ "WV" 0.06
+ "WY" 0.04
+ ;; Territories / Associated States / Armed Forces - just give these all zero
+ ;; These might come back from address/us-state-abbr
+ "AA" 0.0 ; Armed Forces - Americas
+ "AE" 0.0 ; Armed Forces - Europe
+ "AP" 0.0 ; Armed Forces - Pacific
+ "AS" 0.0 ; American Samoa
+ "FM" 0.0 ; Federated States of Micronesia
+ "GU" 0.0 ; Guam
+ "MH" 0.0 ; Marshall Islands
+ "MP" 0.0 ; Northern Mariana Islands
+ "PR" 0.0 ; Puerto Rico
+ "PW" 0.0 ; Palau
+ "VI" 0.0 ; Virgin Islands
+ })
+
+(defn- max-date [& dates]
+ {:pre [(every? (partial instance? Date) dates)]
+ :post [(instance? Date %)]}
+ (let [d (Date.)]
+ (.setTime d (apply max (map #(.getTime ^Date %) dates)))
+ d))
+
+(defn- min-date [& dates]
+ {:pre [(every? (partial instance? Date) dates)]
+ :post [(instance? Date %)]}
+ (let [d (Date.)]
+ (.setTime d (apply min (map #(.getTime ^Date %) dates)))
+ d))
+
+(defn random-order [{:keys [state], :as ^Person person} {:keys [price], :as product}]
+ {:pre [(string? state)
+ (number? price)]
+ :post [(map? %)]}
+ (let [tax-rate (state->tax-rate state)
+ _ (assert tax-rate
+ (format "No tax rate found for state '%s'." state))
+ tax (-> (* price 100.0)
+ int
+ (/ 100.0))]
+ {:user_id (:id person)
+ :product_id (:id product)
+ :subtotal price
+ :tax tax
+ :total (+ price tax)
+ :created_at (random-date-between (min-date (:created_at person) (:created_at product)) (Date.))}))
+
+
+;;; ## REVIEWS
+
+(defn random-review [product]
+ {:product_id (:id product)
+ :reviewer (internet/user-name)
+ :rating (rand-nth [1 1
+ 2 2 2
+ 3 3
+ 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
+ 5 5 5 5 5 5 5 5 5 5 5 5 5])
+ :body (first (lorem/paragraphs))
+ :created_at (random-date-between (:created_at product) (Date.))})
+
+(defn- create-randoms [n f]
+ (vec (map-indexed (fn [id obj]
+ (assoc obj :id (inc id)))
+ (repeatedly n f))))
+
+(defn- product-add-reviews [product]
+ (let [num-reviews (max 0 (normal-distribution-rand-int 5 4))
+ reviews (vec (for [review (repeatedly num-reviews #(random-review product))]
+ (assoc review :product_id (:id product))))
+ rating (if (seq reviews) (/ (reduce + (map :rating reviews))
+ (count reviews))
+ 0.0)]
+ (assoc product :reviews reviews, :rating (-> (* rating 10.0)
+ int
+ (/ 10.0)))))
+
+(defn- person-add-orders [products person]
+ {:pre [(sequential? products)
+ (map? person)]
+ :post [(map? %)]}
+ (let [num-orders (max 0 (normal-distribution-rand-int 5 10))]
+ (if (zero? num-orders)
+ person
+ (assoc person :orders (vec (repeatedly num-orders #(random-order person (rand-nth products))))))))
+
+(defn create-random-data [& {:keys [people products]
+ :or {people 2500 products 200}}]
+ {:post [(map? %)
+ (= (count (:people %)) people)
+ (= (count (:products %)) products)
+ (every? keyword? (keys %))
+ (every? sequential? (vals %))]}
+ (println (format "Generating random data: %d people, %d products..." people products))
+ (let [products (mapv product-add-reviews (create-randoms products random-product))
+ people (mapv (partial person-add-orders products) (create-randoms people random-person))]
+ {:people (mapv #(dissoc % :orders) people)
+ :products (mapv #(dissoc % :reviews) products)
+ :reviews (vec (mapcat :reviews products))
+ :orders (vec (mapcat :orders people))}))
+
+;;; # LOADING THE DATA
+
+(defn- create-table-sql [table-name field->type]
+ {:pre [(keyword? table-name)
+ (map? field->type)
+ (every? keyword? (keys field->type))
+ (every? string? (vals field->type))]
+ :post [(string? %)]}
+ (format "CREATE TABLE \"%s\" (\"ID\" BIGINT AUTO_INCREMENT, %s, PRIMARY KEY (\"ID\"));"
+ (s/upper-case (name table-name))
+ (apply str (->> (for [[field type] (seq field->type)]
+ (format "\"%s\" %s NOT NULL" (s/upper-case (name field)) type))
+ (interpose ", ")))))
+
+(def ^:private ^:const tables
+ {:people {:name "VARCHAR(255)"
+ :email "VARCHAR(255)"
+ :password "VARCHAR(255)"
+ :birth_date "DATE"
+ :address "VARCHAR(255)"
+ :zip "CHAR(5)"
+ :city "VARCHAR(255)"
+ :state "CHAR(2)"
+ :latitude "FLOAT"
+ :longitude "FLOAT"
+ :source "VARCHAR(255)"
+ :created_at "DATETIME"}
+ :products {:ean "CHAR(13)"
+ :title "VARCHAR(255)"
+ :category "VARCHAR(255)"
+ :vendor "VARCHAR(255)"
+ :price "FLOAT"
+ :rating "FLOAT"
+ :created_at "DATETIME"}
+ :orders {:user_id "INTEGER"
+ :product_id "INTEGER"
+ :subtotal "FLOAT"
+ :tax "FLOAT"
+ :total "FLOAT"
+ :created_at "DATETIME"}
+ :reviews {:product_id "INTEGER"
+ :reviewer "VARCHAR(255)"
+ :rating "SMALLINT"
+ :body "TEXT"
+ :created_at "DATETIME"}})
+
+(def ^:private ^:const fks
+ [{:source-table "ORDERS"
+ :field "USER_ID"
+ :dest-table "PEOPLE"}
+ {:source-table "ORDERS"
+ :field "PRODUCT_ID"
+ :dest-table "PRODUCTS"}
+ {:source-table "REVIEWS"
+ :field "PRODUCT_ID"
+ :dest-table "PRODUCTS"}])
+
+(defn create-h2-db
+ ([filename]
+ (create-h2-db filename (create-random-data)))
+ ([filename data]
+ (println "Deleting existing db...")
+ (clojure.java.io/delete-file (str filename ".mv.db") :silently)
+ (clojure.java.io/delete-file (str filename ".trace.db") :silently)
+ (println "Creating db...")
+ (let [db (kdb/h2 {:db (format "file:%s;UNDO_LOG=0;CACHE_SIZE=131072;QUERY_CACHE_SIZE=128;COMPRESS=TRUE;MULTI_THREADED=TRUE;MVCC=TRUE;DEFRAG_ALWAYS=TRUE;MAX_COMPACT_TIME=5000;ANALYZE_AUTO=100"
+ filename)
+ :make-pool? false})]
+ (doseq [[table-name field->type] (seq tables)]
+ (k/exec-raw db (create-table-sql table-name field->type)))
+
+ ;; Add FK constraints
+ (println "Adding FKs...")
+ (doseq [{:keys [source-table field dest-table]} fks]
+ (k/exec-raw db (format "ALTER TABLE \"%s\" ADD CONSTRAINT \"FK_%s_%s_%s\" FOREIGN KEY (\"%s\") REFERENCES \"%s\" (\"ID\");"
+ source-table
+ source-table field dest-table
+ field
+ dest-table)))
+
+ ;; Insert the data
+ (println "Inserting data...")
+ (doseq [[table rows] (seq data)]
+ (assert (keyword? table))
+ (assert (sequential? rows))
+ (let [entity (-> (k/create-entity (s/upper-case (name table)))
+ (k/database db))]
+ (k/insert entity (k/values (for [row rows]
+ (->> (for [[k v] (seq row)]
+ [(s/upper-case (name k)) v])
+ (into {})))))))
+
+ ;; Create the 'GUEST' user
+ (println "Preparing database for export...")
+ (k/exec-raw db "CREATE USER GUEST PASSWORD 'guest';")
+ (doseq [table (keys data)]
+ (k/exec-raw db (format "GRANT SELECT ON %s TO GUEST;" (s/upper-case (name table)))))
+
+ (println "Done."))))
+
+(defn -main [& [filename]]
+ (let [filename (or filename sample-dataset-filename)]
+ (println (format "Writing sample dataset to %s..." filename))
+ (create-h2-db filename)))
diff --git a/src/java/com/metabase/corvus/api/ApiException.java b/src/java/com/metabase/corvus/api/ApiException.java
deleted file mode 100644
index c9738547d2b8f13b29447414bf67f2ae1210402c..0000000000000000000000000000000000000000
--- a/src/java/com/metabase/corvus/api/ApiException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.metabase.corvus.api;
-
-public class ApiException extends Exception {
-
- private final Integer statusCode;
-
- public ApiException(Integer statusCode, String message) {
- super(message);
- this.statusCode = statusCode;
- }
-
- public Integer getStatusCode() {
- return this.statusCode;
- }
-}
diff --git a/src/java/com/metabase/corvus/api/ApiFieldValidationException.java b/src/java/com/metabase/corvus/api/ApiFieldValidationException.java
deleted file mode 100644
index 08c351afa72a40e98eefa74eb6fdbec273920445..0000000000000000000000000000000000000000
--- a/src/java/com/metabase/corvus/api/ApiFieldValidationException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.metabase.corvus.api;
-
-public class ApiFieldValidationException extends ApiException {
-
- private final String fieldName;
-
- public ApiFieldValidationException(String fieldName, String message) {
- super(400, message);
- this.fieldName = fieldName;
- }
-
- public String getFieldName() {
- return this.fieldName;
- }
-}
diff --git a/src/metabase/api/card.clj b/src/metabase/api/card.clj
index 54f28cc9d4138600ec9f2c75b0f1222881486a8b..7f47fdea9322778b08ad65fbf7979897d7adec5e 100644
--- a/src/metabase/api/card.clj
+++ b/src/metabase/api/card.clj
@@ -1,6 +1,6 @@
(ns metabase.api.card
(:require [compojure.core :refer [GET POST DELETE PUT]]
- [korma.core :refer :all]
+ [korma.core :as k]
[medley.core :refer [mapply]]
[metabase.api.common :refer :all]
[metabase.db :refer :all]
@@ -8,6 +8,7 @@
[card :refer [Card] :as card]
[card-favorite :refer [CardFavorite]]
[common :as common]
+ [revision :refer [push-revision]]
[user :refer [User]])))
(defannotation CardFilterOption
@@ -29,9 +30,9 @@
[f]
{f CardFilterOption}
(-> (case (or f :all) ; default value for `f` is `:all`
- :all (sel :many Card (order :name :ASC) (where (or {:creator_id *current-user-id*}
- {:public_perms [> common/perms-none]})))
- :mine (sel :many Card :creator_id *current-user-id* (order :name :ASC))
+ :all (sel :many Card (k/order :name :ASC) (k/where (or {:creator_id *current-user-id*}
+ {:public_perms [> common/perms-none]})))
+ :mine (sel :many Card :creator_id *current-user-id* (k/order :name :ASC))
:fav (->> (-> (sel :many [CardFavorite :card_id] :owner_id *current-user-id*)
(hydrate :card))
(map :card)
@@ -46,18 +47,18 @@
display [Required CardDisplayType]}
;; TODO - which other params are required?
(ins Card
- :creator_id *current-user-id*
- :dataset_query dataset_query
- :description description
- :display display
- :name name
- :public_perms public_perms
+ :creator_id *current-user-id*
+ :dataset_query dataset_query
+ :description description
+ :display display
+ :name name
+ :public_perms public_perms
:visualization_settings visualization_settings))
(defendpoint GET "/:id"
"Get `Card` with ID."
[id]
- (->404 (sel :one Card :id id)
+ (->404 (Card id)
read-check
(hydrate :creator :can_read :can_write)))
@@ -75,7 +76,7 @@
:name name
:public_perms public_perms
:visualization_settings visualization_settings))
- (sel :one Card :id id))
+ (push-revision :entity Card, :object (Card id)))
(defendpoint DELETE "/:id"
"Delete a `Card`."
diff --git a/src/metabase/api/common.clj b/src/metabase/api/common.clj
index 66f75aedb6c9f683f91f389d5ccbe781a49eb11c..f98ef1c4f62ebcf0b8bcd386ec5887712394c7b5 100644
--- a/src/metabase/api/common.clj
+++ b/src/metabase/api/common.clj
@@ -3,15 +3,14 @@
(:require [clojure.tools.logging :as log]
[cheshire.core :as json]
[compojure.core :refer [defroutes]]
- [korma.core :refer :all :exclude [update]]
- [medley.core :refer :all]
+ [korma.core :as k]
+ [medley.core :as m]
[metabase.api.common.internal :refer :all]
[metabase.db :refer :all]
[metabase.db.internal :refer [entity->korma]]
+ [metabase.models.interface :as models]
[metabase.util :as u]
- [metabase.util.password :as password])
- (:import com.metabase.corvus.api.ApiException
- com.metabase.corvus.api.ApiFieldValidationException))
+ [metabase.util.password :as password]))
(declare check-403
check-404)
@@ -29,22 +28,11 @@
(atom nil)) ; default binding is just something that will return nil when dereferenced
-;;; ## GENERAL HELPER FNS / MACROS
-
-;; TODO - move this to something like `metabase.util.debug`
-(defmacro with-current-user
- "Primarily for debugging purposes. Evaulates BODY as if `*current-user*` was the User with USER-ID."
- [user-id & body]
- `(binding [*current-user-id* ~user-id
- *current-user* (delay (sel :one 'metabase.models.user/User :id ~user-id))]
- ~@body))
-
-
;;; ## CONDITIONAL RESPONSE FUNCTIONS / MACROS
(defn check
"Assertion mechanism for use inside API functions.
- Checks that TEST is true, or throws an `ApiException` with STATUS-CODE and MESSAGE.
+ Checks that TEST is true, or throws an `ExceptionInfo` with STATUS-CODE and MESSAGE.
This exception is automatically caught in the body of `defendpoint` functions, and the appropriate HTTP response is generated.
@@ -65,7 +53,7 @@
[code-or-code-message-pair rest-args]
[[code-or-code-message-pair (first rest-args)] (rest rest-args)])]
(when-not tst
- (throw (ApiException. (int code) message)))
+ (throw (ex-info message {:status-code code})))
(if (empty? rest-args) tst
(recur (first rest-args) (second rest-args) (drop 2 rest-args))))))
@@ -80,11 +68,18 @@
(check-403 (:is_superuser @*current-user*)))
-;;; #### checkp- functions: as in "check param". These functions expect that you pass a symbol so they can throw ApiExceptions w/ relevant error messages.
+;;; #### checkp- functions: as in "check param". These functions expect that you pass a symbol so they can throw exceptions w/ relevant error messages.
+
+(defn- invalid-param-exception
+ "Create an `ExceptionInfo` that contains information about an invalid API params in the expected format."
+ [field-name message]
+ (ex-info (format "Invalid field: %s" field-name)
+ {:status-code 400
+ :errors {(keyword field-name) message}}))
(defn checkp
"Assertion mechanism for use inside API functions that validates individual input params.
- Checks that TEST is true, or throws an `ApiFieldValidationException` with FIELD-NAME and MESSAGE.
+ Checks that TEST is true, or throws an `ExceptionInfo` with FIELD-NAME and MESSAGE.
This exception is automatically caught in the body of `defendpoint` functions, and the appropriate HTTP response is generated.
@@ -93,7 +88,7 @@
(checkp test field-name message)"
([tst field-name message]
(when-not tst
- (throw (ApiFieldValidationException. (format "%s" field-name) message)))))
+ (throw (invalid-param-exception (str field-name) message)))))
(defmacro checkp-with
"Check (TEST-FN VALUE), or throw an exception with STATUS-CODE (default is 400).
@@ -104,9 +99,9 @@
(checkp-with (partial? contains? {:all :mine}) f :all)
-> :all
(checkp-with (partial? contains {:all :mine}) f :bad)
- -> ApiException: Invalid value ':bad' for 'f': test failed: (partial? contains? {:all :mine}
+ -> ExceptionInfo: Invalid value ':bad' for 'f': test failed: (partial? contains? {:all :mine}
- You may optionally pass a MESSAGE to append to the ApiException upon failure;
+ You may optionally pass a MESSAGE to append to the exception upon failure;
this will be used in place of the \"test failed: ...\" message.
MESSAGE may be either a string or a pair like `[status-code message]`."
@@ -148,13 +143,15 @@
(:id user))"
{:arglists '([[status-code message] [binding test] & body])}
[response-pair [binding test & more] & body]
- (when (seq more)
- (throw (IllegalArgumentException. (format "%s requires exactly 2 forms in binding vector" (name (first &form))))))
- `(let [test# ~test] ; bind ~test so doesn't get evaluated more than once (e.g. in case it's an expensive funcall)
- (check test# ~response-pair)
- (let [~binding test#
- ~@more]
- ~@body)))
+ (if (seq more)
+ `(api-let ~response-pair ~[binding test]
+ (api-let ~response-pair ~more
+ ~@body))
+ `(let [test# ~test] ; bind ~test so doesn't get evaluated more than once (e.g. in case it's an expensive funcall)
+ (check test# ~response-pair)
+ (let [~binding test#
+ ~@more]
+ ~@body))))
(defmacro api->
"If TEST is true, thread the result using `->` through BODY.
@@ -239,7 +236,7 @@
\"Param must be non-nil.\"
[symb value]
(when-not value
- (throw (ApiException. 400 (format \"'%s' is a required param.\" symb))))
+ (throw (ex-info (format \"'%s' is a required param.\" symb) {:status-code 400})))
value)
SYMBOL-BINDING is bound to the *symbol* of the annotated API arg (e.g., `'org`).
@@ -257,7 +254,7 @@
This can be used to test the annotation:
(annotation:Required org 100) -> 100
- (annotation:Required org nil) -> ApiException: 'org' is a required param.
+ (annotation:Required org nil) -> exception: 'org' is a required param.
You can also use it inside the body of another annotation:
@@ -294,17 +291,16 @@
(defannotation Required
"Param may not be `nil`."
[symb value]
- (when-not value
- (throw (ApiFieldValidationException. (name symb) "field is a required param.")))
- value)
+ (or value
+ (throw (invalid-param-exception (name symb) "field is a required param."))))
(defannotation Date
"Parse param string as an [ISO 8601 date](http://en.wikipedia.org/wiki/ISO_8601), e.g.
`2015-03-24T06:57:23+00:00`"
[symb value :nillable]
(try (u/parse-iso8601 value)
- (catch Throwable _
- (throw (ApiFieldValidationException. (name symb) (format "'%s' is not a valid date." value))))))
+ (catch Throwable _
+ (throw (invalid-param-exception (name symb) (format "'%s' is not a valid date." value))))))
(defannotation String->Integer
"Param is converted from a string to an integer."
@@ -327,7 +323,7 @@
(= value "true") true
(= value "false") false
(nil? value) nil
- :else (throw (ApiFieldValidationException. (name symb) (format "'%s' is not a valid boolean." value)))))
+ :else (throw (invalid-param-exception (name symb) (format "'%s' is not a valid boolean." value)))))
(defannotation Integer
"Param must be an integer (this does *not* cast the param)."
@@ -337,7 +333,7 @@
(defannotation Boolean
"Param must be a boolean (this does *not* cast the param)."
[symb value :nillable]
- (checkp-with boolean? symb value "value must be a boolean."))
+ (checkp-with m/boolean? symb value "value must be a boolean."))
(defannotation Dict
"Param must be a dictionary (this does *not* cast the param)."
@@ -386,7 +382,8 @@
- calls `auto-parse` to automatically parse certain args. e.g. `id` is converted from `String` to `Integer` via `Integer/parseInt`
- converts ROUTE from a simple form like `\"/:id\"` to a typed one like `[\"/:id\" :id #\"[0-9]+\"]`
- sequentially applies specified annotation functions on args to validate or cast them.
- - executes BODY inside a `try-catch` block that handles `ApiExceptions`
+ - executes BODY inside a `try-catch` block that handles exceptions; if exception is an instance of `ExceptionInfo` and includes a `:status-code`,
+ that code will be returned
- automatically calls `wrap-response-if-needed` on the result of BODY
- tags function's metadata in a way that subsequent calls to `define-routes` (see below)
will automatically include the function in the generated `defroutes` form.
@@ -416,39 +413,31 @@
`defendpoint` in the current namespace."
[& additional-routes]
(let [api-routes (->> (ns-publics *ns*)
- (filter-vals #(:is-endpoint? (meta %)))
+ (m/filter-vals #(:is-endpoint? (meta %)))
(map first))]
`(defroutes ~'routes ~@api-routes ~@additional-routes)))
-;; ## NEW PERMISSIONS CHECKING MACROS
-;; Since checking `@can_read`/`@can_write` is such a common pattern, these
-;; macros eliminate a bit of the redundancy around doing so.
-;; They support two forms:
-;;
-;; (read-check my-table) ; checks @(:can_read my-table)
-;; (read-check Table 1) ; checks @(:can_read (sel :one Table :id 1))
-;;
-;; * The first form is useful when you've already fetched an object (especially in threading forms such as `->404`).
-;; * The second form takes care of fetching the object for you and is useful in cases where you won't need the object afterward
-;; or want to combine the `sel` and permissions check statements into a single form.
-;;
-;; Both forms will throw a 404 if the object doesn't exist (saving you one more check!) and return the selected object.
-
-(defmacro read-check
- "Checks that `@can_read` is true for this object."
+(defn read-check
+ "Check whether we can read an existing OBJ, or ENTITY with ID."
([obj]
- `(let-404 [{:keys [~'can_read] :as obj#} ~obj]
- (check-403 @~'can_read)
- obj#))
+ (check-404 obj)
+ (check-403 (models/can-read? obj))
+ obj)
([entity id]
- `(read-check (sel :one ~entity :id ~id))))
+ {:pre [(models/metabase-entity? entity)
+ (integer? id)]}
+ (if (satisfies? models/ICanReadWrite entity)
+ (read-check (entity id)))))
-(defmacro write-check
- "Checks that `@can_write` is true for this object."
+(defn write-check
+ "Check whether we can write an existing OBJ, or ENTITY with ID."
([obj]
- `(let-404 [{:keys [~'can_write] :as obj#} ~obj]
- (check-403 @~'can_write)
- obj#))
+ (check-404 obj)
+ (check-403 (models/can-write? obj))
+ obj)
([entity id]
- `(write-check (sel :one ~entity :id ~id))))
+ {:pre [(models/metabase-entity? entity)
+ (integer? id)]}
+ (if (satisfies? models/ICanReadWrite entity) (models/can-write? entity id)
+ (write-check (entity id)))))
diff --git a/src/metabase/api/common/internal.clj b/src/metabase/api/common/internal.clj
index e99ad0c4cbe51a28d995061470544aa81baab3f4..f0ba141f32dea7d0ff37b7bc6508fd682c34a120 100644
--- a/src/metabase/api/common/internal.clj
+++ b/src/metabase/api/common/internal.clj
@@ -3,9 +3,7 @@
(:require [clojure.tools.logging :as log]
[medley.core :as m]
[swiss.arrows :refer :all]
- [metabase.util :as u])
- (:import com.metabase.corvus.api.ApiException
- com.metabase.corvus.api.ApiFieldValidationException))
+ [metabase.util :as u]))
;;; # DEFENDPOINT HELPER FUNCTIONS + MACROS
@@ -112,7 +110,7 @@
(defn parse-int [value]
(try (Integer/parseInt value)
(catch java.lang.NumberFormatException _
- (throw (ApiException. (int 400) (format "Not a valid integer: '%s'" value))))))
+ (throw (ex-info (format "Not a valid integer: '%s'" value) {:status-code 400})))))
(def ^:dynamic *auto-parse-types*
"Map of `param-type` -> map with the following keys:
@@ -212,24 +210,34 @@
;;; ## ROUTE BODY WRAPPERS
+(defn wrap-catch-api-exceptions
+ "Run F in a try-catch block, and format any caught exceptions as an API response."
+ [f]
+ (try (f)
+ (catch Throwable e
+ (let [{:keys [status-code], :as info} (ex-data e)
+ other-info (dissoc info :status-code)
+ message (.getMessage e)]
+ {:status (or status-code 500)
+ :body (cond
+ ;; Exceptions that include a status code *and* other info are things like Field validation exceptions.
+ ;; Return those as is
+ (and status-code
+ (seq other-info)) other-info
+ ;; If status code was specified but other data wasn't, it's something like a 404. Return message as the body.
+ status-code message
+ ;; Otherwise it's a 500. Return a body that includes exception & filtered stacktrace for debugging purposes
+ :else (let [stacktrace (u/filtered-stacktrace e)]
+ (log/debug message "\n" (u/pprint-to-str stacktrace))
+ (assoc other-info
+ :message message
+ :stacktrace stacktrace)))}))))
+
(defmacro catch-api-exceptions
"Execute BODY, and if an exception is thrown, return the appropriate HTTP response."
[& body]
- `(try ~@body
- (catch ApiFieldValidationException e#
- {:status (.getStatusCode e#)
- :body {:errors {(keyword (.getFieldName e#)) (.getMessage e#)}}})
- (catch ApiException e#
- {:status (.getStatusCode e#)
- :body (.getMessage e#)})
- (catch Throwable e#
- (let [message# (.getMessage e#)
- stacktrace# (->> (map str (.getStackTrace e#))
- (filter (partial re-find #"metabase")))]
- (log/debug message# "\n" (with-out-str (clojure.pprint/pprint stacktrace#)))
- {:status 500
- :body {:message message#
- :stacktrace stacktrace#}}))))
+ `(wrap-catch-api-exceptions
+ (fn [] ~@body)))
(defn wrap-response-if-needed
"If RESPONSE isn't already a map with keys `:status` and `:body`, wrap it in one (using status 200)."
diff --git a/src/metabase/api/common/throttle.clj b/src/metabase/api/common/throttle.clj
new file mode 100644
index 0000000000000000000000000000000000000000..7e94fefd130967169b61063b40e0484322faac36
--- /dev/null
+++ b/src/metabase/api/common/throttle.clj
@@ -0,0 +1,134 @@
+(ns metabase.api.common.throttle
+ (:require [clojure.math.numeric-tower :as math])
+ (:import (clojure.lang Atom
+ Keyword)))
+
+;;; # THROTTLING
+;;
+;; A `Throttler` is a simple object used for throttling API endpoints. It keeps track of all calls to an API endpoint
+;; with some value over some past period of time. If the number of calls with this value exceeds some threshold,
+;; an exception is thrown, telling a user they must wait some period of time before trying again.
+;;
+;; ### EXAMPLE
+;;
+;; Let's consider the email throttling done by POST /api/session.
+;; The basic concept here is to keep a list of failed logins over the last hour. This list looks like:
+;;
+;; (["cam@metabase.com" 1438045261132]
+;; ["cam@metabase.com" 1438045260450]
+;; ["cam@metabase.com" 1438045259037]
+;; ["cam@metabase.com" 1438045258204])
+;;
+;; Every time there's a login attempt, push a new pair of [email timestamp (milliseconds)] to the front of the list.
+;; The list is thus automatically ordered by date, and we can drop the portion of the list with logins that are over
+;; an hour old as needed.
+;;
+;; Once a User has reached some number of login attempts over the past hour (e.g. 5), calculate some delay before
+;; they're allowed to try to log in again (e.g., 15 seconds). This number will increase exponentially as the number of
+;; recent failures increases (e.g., 40 seconds for 6 failed attempts, 90 for 7 failed attempts, etc).
+;;
+;; If applicable, calucate the time since the last failed attempt, and throw an exception telling the user the number
+;; of seconds they must wait before trying again.
+;;
+;; ### USAGE
+;;
+;; Define a new throttler with `make-throttler`, overriding default settings as needed.
+;;
+;; (require '[metabase.api.common.throttle :as throttle])
+;; (def email-throttler (throttle/make-throttler :email, :attempts-threshold 10))
+;;
+;; Then call `check` within the body of an endpoint with some value to apply throttling.
+;;
+;; (defendpoint POST [:as {{:keys [email]} :body}]
+;; (throttle/check email-throttler email)
+;; ...)
+
+
+;;; # PUBLIC INTERFACE
+
+(declare calculate-delay
+ remove-old-attempts)
+
+(defrecord Throttler [;; Name of the API field/value being checked. Used to generate appropriate API error messages, so
+ ;; they'll be displayed on the right part of the screen
+ ^Keyword exception-field-key
+ ;; [Internal] List of attempt entries. These are pairs of [key timestamp (ms)],
+ ;; e.g. ["cam@metabase.com" 1438045261132]
+ ^Atom attempts
+ ;; Amount of time to keep an entry in ATTEMPTS before dropping it.
+ ^Integer attempt-ttl-ms
+ ;; Number of attempts allowed with a given key before throttling is applied.
+ ^Integer attempts-threshold
+ ;; Once throttling is in effect, initial delay before allowing another attempt. This grows
+ ;; according to DELAY-EXPONENT.
+ ^Integer initial-delay-ms
+ ;; For each subsequent failure past ATTEMPTS-THRESHOLD, increase the delay to
+ ;; INITIAL-DELAY-MS * (num-attempts-over-theshold ^ DELAY-EXPONENT). e.g. if INITIAL-DELAY-MS is 15
+ ;; and DELAY-EXPONENT is 2, the first attempt past ATTEMPTS-THRESHOLD will require the user to wait
+ ;; 15 seconds (15 * 1^2), the next attempt after that 60 seconds (15 * 2^2), then 135, and so on.
+ ^Integer delay-exponent])
+
+;; These are made private because you should use `make-throttler` instead.
+(alter-meta! #'->Throttler assoc :private true)
+(alter-meta! #'map->Throttler assoc :private true)
+
+(def ^:private ^:const throttler-defaults
+ {:initial-delay-ms (* 15 1000)
+ :attempts-threshold 10
+ :delay-exponent 1.5
+ :attempt-ttl-ms (* 1000 60 60)})
+
+(defn make-throttler
+ "Create a new `Throttler`.
+
+ (require '[metabase.api.common.throttle :as throttle])
+ (def email-throttler (throttle/make-throttler :email, :attempts-threshold 10))"
+ [exception-field-key & {:as kwargs}]
+ (map->Throttler (merge throttler-defaults kwargs {:attempts (atom '())
+ :exception-field-key exception-field-key})))
+
+(defn check
+ "Throttle an API call based on values of KEYY. Each call to this function will record KEYY to THROTTLER's internal list;
+ if the number of entires containing KEYY exceed THROTTLER's thresholds, throw an exception.
+
+ (defendpoint POST [:as {{:keys [email]} :body}]
+ (throttle/check email-throttler email)
+ ...)"
+ [^Throttler {:keys [attempts exception-field-key], :as throttler} keyy] ; technically, keyy can be nil so you can record *all* attempts
+ {:pre [(= (type throttler) Throttler)]}
+ (remove-old-attempts throttler)
+ (when-let [delay-ms (calculate-delay throttler keyy)]
+ (let [message (format "Too many attempts! You must wait %d seconds before trying again."
+ (int (math/round (/ delay-ms 1000))))]
+ (throw (ex-info message {:status-code 400
+ :errors {exception-field-key message}}))))
+ (swap! attempts conj [keyy (System/currentTimeMillis)]))
+
+
+;;; # INTERNAL IMPLEMENTATION
+
+(defn- remove-old-attempts
+ "Remove THROTTLER entires past the TTL."
+ [^Throttler {:keys [attempts attempt-ttl-ms]}]
+ (let [old-attempt-cutoff (- (System/currentTimeMillis) attempt-ttl-ms)
+ non-old-attempt? (fn [[_ timestamp]]
+ (> timestamp old-attempt-cutoff))]
+ (reset! attempts (take-while non-old-attempt? @attempts))))
+
+(defn- calculate-delay
+ "Calculate the delay in milliseconds, if any, that should be applied to a given THROTTLER / KEYY combination."
+ ([^Throttler throttler keyy]
+ (calculate-delay throttler keyy (System/currentTimeMillis)))
+
+ ([^Throttler {:keys [attempts initial-delay-ms attempts-threshold delay-exponent]} keyy current-time-ms]
+ (let [[[_ most-recent-attempt-ms], :as keyy-attempts] (filter (fn [[k _]] (= k keyy)) @attempts)]
+ (when most-recent-attempt-ms
+ (let [num-recent-attempts (count keyy-attempts)
+ num-attempts-over-threshold (- (inc num-recent-attempts) attempts-threshold)] ; add one to the sum to account for the current attempt
+ (when (> num-attempts-over-threshold 0)
+ (let [delay-ms (* (math/expt num-attempts-over-threshold delay-exponent)
+ initial-delay-ms)
+ next-login-allowed-at (+ most-recent-attempt-ms delay-ms)
+ ms-till-next-login (- next-login-allowed-at current-time-ms)]
+ (when (> ms-till-next-login 0)
+ ms-till-next-login))))))))
diff --git a/src/metabase/api/dash.clj b/src/metabase/api/dash.clj
index 742cfb841dbf7e19bede9a22d035468db5f5deb5..c2a9cd69270435048854b3feb5d60f2680a25d97 100644
--- a/src/metabase/api/dash.clj
+++ b/src/metabase/api/dash.clj
@@ -1,14 +1,15 @@
(ns metabase.api.dash
"/api/dash endpoints."
(:require [compojure.core :refer [GET POST PUT DELETE]]
- [korma.core :refer :all]
+ [korma.core :as k]
[metabase.api.common :refer :all]
[metabase.db :refer :all]
(metabase.models [hydrate :refer [hydrate]]
[card :refer [Card]]
[common :as common]
[dashboard :refer [Dashboard]]
- [dashboard-card :refer [DashboardCard]])))
+ [dashboard-card :refer [DashboardCard]]
+ [revision :refer [push-revision]])))
(defendpoint GET "/"
"Get `Dashboards`. With filter option `f` (default `all`), restrict results as follows:
@@ -18,10 +19,10 @@
[f]
{f FilterOptionAllOrMine}
(-> (case (or f :all)
- :all (sel :many Dashboard (where (or {:creator_id *current-user-id*}
- {:public_perms [> common/perms-none]})))
+ :all (sel :many Dashboard (k/where (or {:creator_id *current-user-id*}
+ {:public_perms [> common/perms-none]})))
:mine (sel :many Dashboard :creator_id *current-user-id*))
- (hydrate :creator)))
+ (hydrate :creator :can_read :can_write)))
(defendpoint POST "/"
"Create a new `Dashboard`."
@@ -36,7 +37,7 @@
(defendpoint GET "/:id"
"Get `Dashboard` with ID."
[id]
- (let-404 [db (-> (sel :one Dashboard :id id)
+ (let-404 [db (-> (Dashboard id)
read-check
(hydrate :creator [:ordered_cards [:card :creator]] :can_read :can_write))]
{:dashboard db})) ; why is this returned with this {:dashboard} wrapper?
@@ -50,7 +51,7 @@
:description description
:name name
:public_perms public_perms))
- (sel :one Dashboard :id id))
+ (push-revision :entity Dashboard, :object (Dashboard id)))
(defendpoint DELETE "/:id"
"Delete a `Dashboard`."
@@ -64,14 +65,18 @@
{cardId [Required Integer]}
(write-check Dashboard id)
(check-400 (exists? Card :id cardId))
- (ins DashboardCard :card_id cardId :dashboard_id id))
+ (let [result (ins DashboardCard :card_id cardId :dashboard_id id)]
+ (push-revision :entity Dashboard, :object (Dashboard id))
+ result))
(defendpoint DELETE "/:id/cards"
"Remove a `Card` from a `Dashboard`."
[id dashcardId]
{dashcardId [Required String->Integer]}
(write-check Dashboard id)
- (del DashboardCard :id dashcardId :dashboard_id id))
+ (let [result (del DashboardCard :id dashcardId :dashboard_id id)]
+ (push-revision :entity Dashboard, :object (Dashboard id))
+ result))
(defendpoint POST "/:id/reposition"
"Reposition `Cards` on a `Dashboard`. Request body should have the form:
@@ -83,10 +88,10 @@
:col} ...]}"
[id :as {{:keys [cards]} :body}]
(write-check Dashboard id)
- (dorun (map (fn [{:keys [card_id sizeX sizeY row col]}]
- (let [{dashcard-id :id} (sel :one [DashboardCard :id] :card_id card_id :dashboard_id id)]
- (upd DashboardCard dashcard-id :sizeX sizeX :sizeY sizeY :row row :col col)))
- cards))
+ (doseq [{:keys [card_id sizeX sizeY row col]} cards]
+ (let [{dashcard-id :id} (sel :one [DashboardCard :id] :card_id card_id :dashboard_id id)]
+ (upd DashboardCard dashcard-id :sizeX sizeX :sizeY sizeY :row row :col col)))
+ (push-revision :entity Dashboard, :object (Dashboard id))
{:status :ok})
(define-routes)
diff --git a/src/metabase/api/meta/db.clj b/src/metabase/api/meta/db.clj
index 3739dfb28f5c88f43f884dbe62373131bda71ec9..7e9e33a7b5c52ccad82d3505a2030f9676285d8e 100644
--- a/src/metabase/api/meta/db.clj
+++ b/src/metabase/api/meta/db.clj
@@ -1,7 +1,7 @@
(ns metabase.api.meta.db
"/api/meta/db endpoints."
(:require [compojure.core :refer [GET POST PUT DELETE]]
- [korma.core :refer :all]
+ [korma.core :as k]
[metabase.api.common :refer :all]
[metabase.db :refer :all]
[metabase.driver :as driver]
@@ -20,7 +20,7 @@
(defendpoint GET "/"
"Fetch all `Databases`."
[]
- (sel :many Database (order :name)))
+ (sel :many Database (k/order :name)))
(defendpoint POST "/"
"Add a new `Database`."
@@ -64,7 +64,7 @@
(defendpoint GET "/:id"
"Get `Database` with ID."
[id]
- (check-404 (sel :one Database :id id)))
+ (check-404 (Database id)))
(defendpoint PUT "/:id"
"Update a `Database`."
@@ -75,7 +75,7 @@
:name name
:engine engine
:details details))
- (sel :one Database :id id))
+ (Database id))
(defendpoint DELETE "/:id"
"Delete a `Database`."
@@ -112,7 +112,7 @@
"Get a list of all `Tables` in `Database`."
[id]
(read-check Database id)
- (sel :many Table :db_id id :active true (order :name)))
+ (sel :many Table :db_id id :active true (k/order :name)))
(defendpoint GET "/:id/idfields"
"Get a list of all primary key `Fields` for `Database`."
@@ -125,7 +125,7 @@
(defendpoint POST "/:id/sync"
"Update the metadata for this `Database`."
[id]
- (let-404 [db (sel :one Database :id id)]
+ (let-404 [db (Database id)]
(write-check db)
(future (driver/sync-database! db))) ; run sync-tables asynchronously
{:status :ok})
diff --git a/src/metabase/api/meta/field.clj b/src/metabase/api/meta/field.clj
index 36c6f6cbd7d278362999b35f4ce7734fbfa8acc4..98cf3afeb2b2fe0cabc3de12f5366ff662151161 100644
--- a/src/metabase/api/meta/field.clj
+++ b/src/metabase/api/meta/field.clj
@@ -6,7 +6,7 @@
[metabase.db.metadata-queries :as metadata]
(metabase.models [hydrate :refer [hydrate]]
[field :refer [Field] :as field]
- [field-values :refer [FieldValues create-field-values create-field-values-if-needed field-should-have-field-values?]]
+ [field-values :refer [FieldValues create-field-values-if-needed field-should-have-field-values?]]
[foreign-key :refer [ForeignKey] :as fk])
[metabase.util :as u]))
@@ -29,26 +29,29 @@
(defendpoint GET "/:id"
"Get `Field` with ID."
[id]
- (->404 (sel :one Field :id id)
+ (->404 (Field id)
read-check
(hydrate [:table :db])))
(defendpoint PUT "/:id"
"Update `Field` with ID."
- [id :as {{:keys [field_type special_type preview_display description]} :body}]
+ [id :as {{:keys [field_type special_type preview_display description display_name]} :body}]
{field_type FieldType
- special_type FieldSpecialType}
+ special_type FieldSpecialType
+ display_name NonEmptyString}
(write-check Field id)
- (check-500 (m/mapply upd Field id (merge {:description description ; you're allowed to unset description and special_type
- :special_type special_type} ; but field_type and preview_display must be replaced
- (when field_type {:field_type field_type}) ; with new non-nil values
- (when (not (nil? preview_display)) {:preview_display preview_display}))))
- (sel :one Field :id id))
+ ;; update the Field. start with keys that may be set to NULL then conditionally add other keys if they have values
+ (check-500 (m/mapply upd Field id (merge {:description description
+ :special_type special_type}
+ (when display_name {:display_name display_name})
+ (when field_type {:field_type field_type})
+ (when-not (nil? preview_display) {:preview_display preview_display}))))
+ (Field id))
(defendpoint GET "/:id/summary"
"Get the count and distinct count of `Field` with ID."
[id]
- (let-404 [field (sel :one Field :id id)]
+ (let-404 [field (Field id)]
(read-check field)
[[:count (metadata/field-count field)]
[:distincts (metadata/field-distinct-count field)]]))
@@ -79,7 +82,7 @@
"If `Field`'s special type is `category`/`city`/`state`/`country`, or its base type is `BooleanField`, return
all distinct values of the field, and a map of human-readable values defined by the user."
[id]
- (let-404 [field (sel :one Field :id id)]
+ (let-404 [field (Field id)]
(read-check field)
(if-not (field-should-have-field-values? field)
{:values {} :human_readable_values {}}
@@ -91,14 +94,14 @@
or whose base type is `BooleanField`."
[id :as {{:keys [fieldId values_map]} :body}] ; WTF is the reasoning behind client passing fieldId in POST params?
{values_map [Required Dict]}
- (let-404 [field (sel :one Field :id id)]
+ (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'."])
(if-let [field-values-id (sel :one :id FieldValues :field_id id)]
(check-500 (upd FieldValues field-values-id
:human_readable_values values_map))
- (create-field-values field values_map)))
+ (create-field-values-if-needed field values_map)))
{:status :success})
diff --git a/src/metabase/api/meta/fk.clj b/src/metabase/api/meta/fk.clj
new file mode 100644
index 0000000000000000000000000000000000000000..c94c16a63b725f17e10f4c216e595ba8cf530069
--- /dev/null
+++ b/src/metabase/api/meta/fk.clj
@@ -0,0 +1,15 @@
+(ns metabase.api.meta.fk
+ "/api/meta/fk endpoints."
+ (:require [compojure.core :refer [DELETE]]
+ [metabase.api.common :refer :all]
+ [metabase.db :refer :all]
+ (metabase.models [foreign-key :refer [ForeignKey]])
+ [metabase.driver :as driver]))
+
+(defendpoint DELETE "/:id"
+ "Delete a `ForeignKey`."
+ [id]
+ (write-check ForeignKey id)
+ (del ForeignKey :id id))
+
+(define-routes)
diff --git a/src/metabase/api/meta/table.clj b/src/metabase/api/meta/table.clj
index 530e7b75bfac84e6a91c35fc4eb42b8edf4dc7d6..3f2343029d7d3218d16a8d880d0a11b03e96a0e1 100644
--- a/src/metabase/api/meta/table.clj
+++ b/src/metabase/api/meta/table.clj
@@ -1,7 +1,7 @@
(ns metabase.api.meta.table
"/api/meta/table endpoints."
(:require [compojure.core :refer [GET POST PUT]]
- [korma.core :refer :all]
+ [korma.core :as k]
[metabase.api.common :refer :all]
[metabase.db :refer :all]
(metabase.models [hydrate :refer :all]
@@ -16,10 +16,15 @@
[symb value :nillable]
(checkp-contains? table/entity-types symb (keyword value)))
+(defannotation TableVisibilityType
+ "Param must be one of `hidden`, `technical`, or `cruft`."
+ [symb value :nillable]
+ (checkp-contains? table/visibility-types symb (keyword value)))
+
(defendpoint GET "/"
"Get all `Tables`."
[]
- (-> (sel :many Table :active true (order :name :ASC))
+ (-> (sel :many Table :active true (k/order :name :ASC))
(hydrate :db)
;; if for some reason a Table doesn't have rows set then set it to 0 so UI doesn't barf
(#(map (fn [table]
@@ -27,30 +32,32 @@
(not (:rows table)) (assoc :rows 0)))
%))))
-
(defendpoint GET "/:id"
"Get `Table` with ID."
[id]
- (->404 (sel :one Table :id id)
+ (->404 (Table id)
read-check
(hydrate :db :pk_field)))
(defendpoint PUT "/:id"
"Update `Table` with ID."
- [id :as {{:keys [entity_name entity_type description]} :body}]
- {entity_name NonEmptyString, entity_type TableEntityType}
+ [id :as {{:keys [display_name entity_type visibility_type description]} :body}]
+ {display_name NonEmptyString,
+ entity_type TableEntityType,
+ visibility_type TableVisibilityType}
(write-check Table id)
(check-500 (upd-non-nil-keys Table id
- :entity_name entity_name
- :entity_type entity_type
- :description description))
- (sel :one Table :id id))
+ :display_name display_name
+ :entity_type entity_type
+ :description description))
+ (check-500 (upd Table id :visibility_type visibility_type))
+ (Table id))
(defendpoint GET "/:id/fields"
"Get all `Fields` for `Table` with ID."
[id]
(read-check Table id)
- (sel :many Field :table_id id, :active true, :field_type [not= "sensitive"], (order :name :ASC)))
+ (sel :many Field :table_id id, :active true, :field_type [not= "sensitive"], (k/order :name :ASC)))
(defendpoint GET "/:id/query_metadata"
"Get metadata about a `Table` useful for running queries.
@@ -60,9 +67,9 @@
will any of its corresponding values be returned. (This option is provided for use in the Admin Edit Metadata page)."
[id include_sensitive_fields]
{include_sensitive_fields String->Boolean}
- (->404 (sel :one Table :id id)
+ (->404 (Table id)
read-check
- (hydrate :db [:fields [:target]] :field_values)
+ (hydrate :db [:fields :target] :field_values)
(update-in [:fields] (if include_sensitive_fields
;; If someone passes include_sensitive_fields return hydrated :fields as-is
identity
@@ -82,7 +89,7 @@
(defendpoint POST "/:id/sync"
"Re-sync the metadata for this `Table`."
[id]
- (let-404 [table (sel :one Table :id id)]
+ (let-404 [table (Table id)]
(write-check table)
;; run the task asynchronously
(future (driver/sync-table! table)))
@@ -107,7 +114,4 @@
new_order))
{:result "success"}))
-;; TODO - GET /:id/segments
-;; TODO - POST /:id/segments
-
(define-routes)
diff --git a/src/metabase/api/notify.clj b/src/metabase/api/notify.clj
index f155321920c087bac0a85f473b493fc560bbdb5f..c05576c27380f04658b43445a021761f470b2bbf 100644
--- a/src/metabase/api/notify.clj
+++ b/src/metabase/api/notify.clj
@@ -12,7 +12,7 @@
"Notification about a potential schema change to one of our `Databases`.
Caller can optionally specify a `:table_id` or `:table_name` in the body to limit updates to a single `Table`."
[id :as {{:keys [table_id table_name] :as body} :body}]
- (let-404 [database (sel :one Database :id id)]
+ (let-404 [database (Database id)]
(cond
table_id (when-let [table (sel :one Table :db_id id :id (int table_id))]
(future (driver/sync-table! table)))
diff --git a/src/metabase/api/revision.clj b/src/metabase/api/revision.clj
new file mode 100644
index 0000000000000000000000000000000000000000..9fc3f0a0848140ef7e3ddc49e96cd0ff93f2d445
--- /dev/null
+++ b/src/metabase/api/revision.clj
@@ -0,0 +1,33 @@
+(ns metabase.api.revision
+ (:require [compojure.core :refer [GET POST]]
+ [metabase.api.common :refer :all]
+ [metabase.db :refer [exists?]]
+ (metabase.models [card :refer [Card]]
+ [dashboard :refer [Dashboard]]
+ [revision :as revision])))
+
+(def ^:private ^:const entity-kw->entity
+ {:card Card
+ :dashboard Dashboard})
+
+(defannotation Entity
+ "Option must be a valid revisionable entity name. Returns corresponding entity."
+ [symb value]
+ (let [entity (entity-kw->entity (keyword value))]
+ (checkp entity symb (format "Invalid entity: %s" value))
+ entity))
+
+(defendpoint GET "/"
+ "Get revisions of an object."
+ [entity id]
+ {entity Entity, id Integer}
+ (check-404 (exists? entity :id id))
+ (revision/revisions+details entity id))
+
+(defendpoint POST "/revert"
+ "Revert an object to a prior revision."
+ [:as {{:keys [entity id revision_id]} :body}]
+ {entity Entity, id Integer, revision_id Integer}
+ (revision/revert :entity entity, :id id, :revision-id revision_id))
+
+(define-routes)
diff --git a/src/metabase/api/routes.clj b/src/metabase/api/routes.clj
index 470f277d07800456920f616773fc04cbdb1a2c67..1bed4071ed19f42e9e0f759afd4eaa676e9f10c6 100644
--- a/src/metabase/api/routes.clj
+++ b/src/metabase/api/routes.clj
@@ -4,6 +4,7 @@
(metabase.api [card :as card]
[dash :as dash]
[notify :as notify]
+ [revision :as revision]
[session :as session]
[setting :as setting]
[setup :as setup]
@@ -12,21 +13,17 @@
(metabase.api.meta [dataset :as dataset]
[db :as db]
[field :as field]
+ [fk :as fk]
[table :as table])
[metabase.middleware.auth :as auth]))
-(defn- +apikey
+(def ^:private +apikey
"Wrap API-ROUTES so they may only be accessed with proper apikey credentials."
- [api-routes]
- (-> api-routes
- auth/enforce-apikey))
+ auth/enforce-api-key)
-(defn- +auth
+(def ^:private +auth
"Wrap API-ROUTES so they may only be accessed with proper authentiaction credentials."
- [api-routes]
- (-> api-routes
- auth/bind-current-user
- auth/enforce-authentication))
+ auth/enforce-authentication)
(defroutes routes
(context "/card" [] (+auth card/routes))
@@ -35,8 +32,10 @@
(context "/meta/dataset" [] (+auth dataset/routes))
(context "/meta/db" [] (+auth db/routes))
(context "/meta/field" [] (+auth field/routes))
+ (context "/meta/fk" [] (+auth fk/routes))
(context "/meta/table" [] (+auth table/routes))
(context "/notify" [] (+apikey notify/routes))
+ (context "/revision" [] (+auth revision/routes))
(context "/session" [] session/routes)
(context "/setting" [] (+auth setting/routes))
(context "/setup" [] setup/routes)
diff --git a/src/metabase/api/session.clj b/src/metabase/api/session.clj
index 98107437ae7a33c38b3c81459f00d1c720e4474f..87a7e06a602d8731e361c92a3aa73cbcc2ba47bd 100644
--- a/src/metabase/api/session.clj
+++ b/src/metabase/api/session.clj
@@ -1,32 +1,50 @@
(ns metabase.api.session
"/api/session endpoints"
(:require [clojure.tools.logging :as log]
+ [cemerick.friend.credentials :as creds]
[compojure.core :refer [defroutes GET POST DELETE]]
[hiccup.core :refer [html]]
- [korma.core :as korma]
+ [korma.core :as k]
[metabase.api.common :refer :all]
+ [metabase.api.common.throttle :as throttle]
[metabase.db :refer :all]
[metabase.email.messages :as email]
- (metabase.models [user :refer [User set-user-password]]
+ (metabase.models [user :refer [User set-user-password set-user-password-reset-token]]
[session :refer [Session]]
[setting :as setting])
[metabase.util.password :as pass]))
+(defn- create-session
+ "Generate a new `Session` for a given `User`. Returns the newly generated session id value."
+ [user-id]
+ (let [session-id (str (java.util.UUID/randomUUID))]
+ (ins Session
+ :id session-id
+ :user_id user-id)
+ session-id))
+
+
+;;; ## API Endpoints
+
+(def ^:private login-throttlers
+ {:email (throttle/make-throttler :email)
+ :ip-address (throttle/make-throttler :email, :attempts-threshold 50)}) ; IP Address doesn't have an actual UI field so just show error by email
+
(defendpoint POST "/"
"Login."
- [:as {{:keys [email password] :as body} :body}]
+ [:as {{:keys [email password] :as body} :body, remote-address :remote-addr}]
{email [Required Email]
password [Required NonEmptyString]}
- (let [user (sel :one :fields [User :id :password_salt :password] :email email (korma/where {:is_active true}))]
- (checkp (not (nil? user))
- (symbol "email") "no account found for the given email")
- (checkp (pass/verify-password password (:password_salt user) (:password user))
- (symbol "password") "did not match stored password")
- (let [session-id (str (java.util.UUID/randomUUID))]
- (ins Session
- :id session-id
- :user_id (:id user))
+ (throttle/check (login-throttlers :ip-address) remote-address)
+ (throttle/check (login-throttlers :email) email)
+ (let [user (sel :one :fields [User :id :password_salt :password], :email email (k/where {:is_active true}))]
+ ;; Don't leak whether the account doesn't exist or the password was incorrect
+ (when-not (and user
+ (pass/verify-password password (:password_salt user) (:password user)))
+ (throw (ex-info "Password did not match stored password." {:status-code 400
+ :errors {:password "did not match stored password"}})))
+ (let [session-id (create-session (:id user))]
{:id session-id})))
@@ -37,25 +55,29 @@
(check-exists? Session session_id)
(del Session :id session_id))
+;; Reset tokens:
+;; We need some way to match a plaintext token with the a user since the token stored in the DB is hashed.
+;; So we'll make the plaintext token in the format USER-ID_RANDOM-UUID, e.g. "100_8a266560-e3a8-4dc1-9cd1-b4471dcd56d7", before hashing it.
+;; "Leaking" the ID this way is ok because the plaintext token is only sent in the password reset email to the user in question.
+;;
+;; There's also no need to salt the token because it's already random <3
+
+(def ^:private forgot-password-throttlers
+ {:email (throttle/make-throttler :email)
+ :ip-address (throttle/make-throttler :email, :attempts-threshold 50)})
(defendpoint POST "/forgot_password"
"Send a reset email when user has forgotten their password."
- [:as {:keys [server-name] {:keys [email]} :body, {:strs [origin]} :headers}]
- ;; Use the `origin` header, which looks like `http://localhost:3000`, as the base of the reset password URL.
- ;; (Currently, there's no other way to get this info)
- ;;
- ;; This is a bit sketchy. Someone malicious could send a bad origin header and hit this endpoint to send
- ;; a forgotten password email to another User, and take them to some sort of phishing site. Although not sure
- ;; what you could phish from them since they already forgot their password.
+ [:as {:keys [server-name] {:keys [email]} :body, remote-address :remote-addr, :as request}]
{email [Required Email]}
- (let [{user-id :id} (sel :one User :email email)
- reset-token (java.util.UUID/randomUUID)
- password-reset-url (str origin "/auth/reset_password/" reset-token)]
- (checkp (not (nil? user-id))
- (symbol "email") "no account found for the given email")
- (upd User user-id :reset_token reset-token :reset_triggered (System/currentTimeMillis))
- (email/send-password-reset-email email server-name password-reset-url)
- (log/info password-reset-url)))
+ (throttle/check (forgot-password-throttlers :ip-address) remote-address)
+ (throttle/check (forgot-password-throttlers :email) email)
+ ;; Don't leak whether the account doesn't exist, just pretend everything is ok
+ (when-let [user-id (sel :one :id User :email email)]
+ (let [reset-token (set-user-password-reset-token user-id)
+ password-reset-url (str (@(ns-resolve 'metabase.core 'site-url) request) "/auth/reset_password/" reset-token)]
+ (email/send-password-reset-email email server-name password-reset-url)
+ (log/info password-reset-url))))
(defendpoint POST "/reset_password"
@@ -63,20 +85,27 @@
[:as {{:keys [token password] :as body} :body}]
{token Required
password [Required ComplexPassword]}
- (let [user (sel :one :fields [User :id :reset_triggered] :reset_token token)]
- (checkp (not (nil? user))
- (symbol "token") "Invalid reset token")
- ;; check that the reset was triggered within the last 1 HOUR, after that the token is considered expired
- (checkp (> (* 60 60 1000) (- (System/currentTimeMillis) (get user :reset_triggered 0)))
- (symbol "token") "Reset token has expired")
- (set-user-password (:id user) password)
- {:success true}))
+ (api-let [400 "Invalid reset token"] [[_ user-id] (re-matches #"(^\d+)_.+$" token)
+ user-id (Integer/parseInt user-id)
+ {:keys [reset_token reset_triggered]} (sel :one :fields [User :reset_triggered :reset_token] :id user-id)]
+ ;; Make sure the plaintext token matches up with the hashed one for this user
+ (check (try (creds/bcrypt-verify token reset_token)
+ (catch Throwable _))
+ [400 "Invalid reset token"]
+
+ ;; check that the reset was triggered within the last 1 HOUR, after that the token is considered expired
+ (> (* 60 60 1000) (- (System/currentTimeMillis) (or reset_triggered 0)))
+ [400 "Reset token has expired"])
+ (set-user-password user-id password)
+ ;; after a successful password update go ahead and offer the client a new session that they can use
+ {:success true
+ :session_id (create-session user-id)}))
(defendpoint GET "/properties"
"Get all global properties and their values. These are the specific `Settings` which are meant to be public."
[]
- (filter #(= (:key %) :site-name) (setting/all-with-descriptions)))
+ (filter #(contains? #{:site-name :anon-tracking-enabled} (:key %)) (setting/all-with-descriptions)))
(define-routes)
diff --git a/src/metabase/api/setup.clj b/src/metabase/api/setup.clj
index 8bc148f66c36f9820ebd86febba284f64cd4002e..1badddf8e9555a8abe124937d830bd4d80fe3d12 100644
--- a/src/metabase/api/setup.clj
+++ b/src/metabase/api/setup.clj
@@ -16,20 +16,22 @@
(defendpoint POST "/user"
"Special endpoint for creating the first user during setup.
This endpoint both creates the user AND logs them in and returns a session ID."
- [:as {{:keys [token first_name last_name email password] :as body} :body}]
+ [:as {{:keys [token first_name last_name email password] :as body} :body, :as request}]
{first_name [Required NonEmptyString]
last_name [Required NonEmptyString]
email [Required Email]
password [Required ComplexPassword]
token [Required SetupToken]}
- ;; extra check. don't continue if there is already a user in the db.
+ ;; Call (metabase.core/site-url request) to set the Site URL setting if it's not already set
+ (@(ns-resolve 'metabase.core 'site-url) request)
+ ;; Now create the user
(let [session-id (str (java.util.UUID/randomUUID))
- new-user (ins User
- :email email
- :first_name first_name
- :last_name last_name
- :password (str (java.util.UUID/randomUUID))
- :is_superuser true)]
+ new-user (ins User
+ :email email
+ :first_name first_name
+ :last_name last_name
+ :password (str (java.util.UUID/randomUUID))
+ :is_superuser true)]
;; this results in a second db call, but it avoids redundant password code so figure it's worth it
(set-user-password (:id new-user) password)
;; clear the setup token now, it's no longer needed
diff --git a/src/metabase/api/user.clj b/src/metabase/api/user.clj
index b53682ed5d131b84d7ded09020e79ba086a26428..d2ef029148abeed2c4641f10f0563ea5542b2b3c 100644
--- a/src/metabase/api/user.clj
+++ b/src/metabase/api/user.clj
@@ -6,7 +6,6 @@
[metabase.db :refer [sel upd upd-non-nil-keys exists?]]
(metabase.models [hydrate :refer [hydrate]]
[user :refer [User create-user set-user-password]])
- [metabase.util.password :as password]
[ring.util.request :as req]))
(defn ^:private check-self-or-superuser
@@ -30,9 +29,20 @@
last_name [Required NonEmptyString]
email [Required Email]}
(check-superuser)
- (check-400 (not (exists? User :email email :is_active true)))
- (let [password-reset-url (str (java.net.URL. (java.net.URL. (req/request-url request)) "/auth/forgot_password"))]
- (-> (create-user first_name last_name email :send-welcome true :reset-url password-reset-url)
+ (let [existing-user (sel :one [User :id :is_active] :email email)]
+ (-> (cond
+ ;; new user account, so create it
+ (nil? existing-user) (create-user first_name last_name email :send-welcome true :invitor @*current-user*)
+ ;; this user already exists but is inactive, so simply reactivate the account
+ (not (:is_active existing-user)) (do
+ (upd User (:id existing-user)
+ :first_name first_name
+ :last_name last_name
+ :is_active true
+ :is_superuser false)
+ (User (:id existing-user)))
+ ;; account already exists and is active, so do nothing and just return the account
+ :else (User (:id existing-user)))
(hydrate :user :organization))))
@@ -46,7 +56,7 @@
"Fetch a `User`. You must be fetching yourself *or* be a superuser."
[id]
(check-self-or-superuser id)
- (check-404 (sel :one User :id id :is_active true)))
+ (check-404 (sel :one User :id id, :is_active true)))
(defendpoint PUT "/:id"
@@ -65,7 +75,7 @@
:is_superuser (if (:is_superuser @*current-user*)
is_superuser
nil)))
- (sel :one User :id id))
+ (User id))
(defendpoint PUT "/:id/password"
@@ -77,7 +87,7 @@
(let-404 [user (sel :one [User :password_salt :password] :id id :is_active true)]
(checkp (creds/bcrypt-verify (str (:password_salt user) old_password) (:password user)) "old_password" "Invalid password"))
(set-user-password id password)
- (sel :one User :id id))
+ (User id))
(defendpoint DELETE "/:id"
diff --git a/src/metabase/config.clj b/src/metabase/config.clj
index e9cd39175a8d08f7f614eb294ae4e42caa951aa5..171dc4fb3060eaee305af578124447ed4c38937d 100644
--- a/src/metabase/config.clj
+++ b/src/metabase/config.clj
@@ -1,10 +1,9 @@
(ns metabase.config
(:require [environ.core :as environ]
- [medley.core :as medley])
+ [medley.core :as m])
(:import (clojure.lang Keyword)))
-
-(def app-defaults
+(def ^:const app-defaults
"Global application defaults"
{;; Database Configuration (general options? dburl?)
:mb-db-type "h2"
@@ -22,7 +21,7 @@
:mb-jetty-port "3000"
;; Other Application Settings
:mb-password-complexity "normal"
- :mb-password-length "8"
+ ;:mb-password-length "8"
:max-session-age "20160"}) ; session length in minutes (14 days)
@@ -44,7 +43,7 @@
(defn ^Keyword config-kw [k] (when-let [val (config-str k)] (keyword val)))
-(def config-all
+(def ^:const config-all
"Global application configuration as a dictionary.
Combines hard coded defaults with optional user specified overrides from environment variables."
(into {} (map (fn [k] [k (config-str k)]) (keys app-defaults))))
@@ -60,6 +59,6 @@
[prefix]
(let [prefix-regex (re-pattern (str ":" prefix ".*"))]
(->> (merge
- (medley/filter-keys (fn [k] (re-matches prefix-regex (str k))) app-defaults)
- (medley/filter-keys (fn [k] (re-matches prefix-regex (str k))) environ/env))
- (medley/map-keys (fn [k] (let [kstr (str k)] (keyword (subs kstr (+ 1 (count prefix))))))))))
+ (m/filter-keys (fn [k] (re-matches prefix-regex (str k))) app-defaults)
+ (m/filter-keys (fn [k] (re-matches prefix-regex (str k))) environ/env))
+ (m/map-keys (fn [k] (let [kstr (str k)] (keyword (subs kstr (+ 1 (count prefix))))))))))
diff --git a/src/metabase/core.clj b/src/metabase/core.clj
index 2e269bcd1f7b72c9dbc4d0f54eb4fc3e76748101..04f15dddb38d6aaabf7dd312c85756cc1c2e83b3 100644
--- a/src/metabase/core.clj
+++ b/src/metabase/core.clj
@@ -1,19 +1,10 @@
+;; -*- comment-column: 35; -*-
(ns metabase.core
(:gen-class)
- (:require [clojure.tools.logging :as log]
- [clojure.java.browse :refer [browse-url]]
+ (:require [clojure.java.browse :refer [browse-url]]
+ [clojure.string :as s]
+ [clojure.tools.logging :as log]
[colorize.core :as color]
- [medley.core :as medley]
- [metabase.config :as config]
- [metabase.db :as db]
- (metabase.middleware [auth :as auth]
- [log-api-call :refer :all]
- [format :refer :all])
- [metabase.models.setting :refer [defsetting]]
- [metabase.models.user :refer [User]]
- [metabase.routes :as routes]
- [metabase.setup :as setup]
- [metabase.task :as task]
[ring.adapter.jetty :as ring-jetty]
(ring.middleware [cookies :refer [wrap-cookies]]
[gzip :refer [wrap-gzip]]
@@ -21,28 +12,62 @@
wrap-json-body]]
[keyword-params :refer [wrap-keyword-params]]
[params :refer [wrap-params]]
- [session :refer [wrap-session]])))
+ [session :refer [wrap-session]])
+ [medley.core :as medley]
+ (metabase [config :as config]
+ [db :as db]
+ [driver :as driver]
+ [routes :as routes]
+ [setup :as setup]
+ [task :as task])
+ (metabase.middleware [auth :as auth]
+ [log-api-call :refer :all]
+ [format :refer :all])
+ (metabase.models [setting :refer [defsetting]]
+ [database :refer [Database]]
+ [user :refer [User]])))
;; ## CONFIG
(defsetting site-name "The name used for this instance of Metabase." "Metabase")
+(defsetting -site-url "The base URL of this Metabase instance, e.g. \"http://metabase.my-company.com\"")
+
+(defsetting anon-tracking-enabled "Enable the collection of anonymous usage data in order to help Metabase improve." "true")
+
+(defn site-url
+ "Fetch the site base URL that should be used for password reset emails, etc.
+ This strips off any trailing slashes that may have been added.
+
+ The first time this function is called, we'll set the value of the setting `-site-url` with the value of
+ the ORIGIN header (falling back to HOST if needed, i.e. for unit tests) of some API request.
+ Subsequently, the site URL can only be changed via the admin page."
+ {:arglists '([request])}
+ [{{:strs [origin host]} :headers}]
+ {:pre [(or origin host)]
+ :post [(string? %)]}
+ (or (some-> (-site-url)
+ (s/replace #"/$" "")) ; strip off trailing slash if one was included
+ (-site-url (or origin host))))
(def app
"The primary entry point to the HTTP server"
(-> routes/routes
(log-api-call :request :response)
- format-response ; [METABASE] Do formatting before converting to JSON so serializer doesn't barf
- (wrap-json-body ; extracts json POST body and makes it avaliable on request
+ add-security-headers ; [METABASE] Add HTTP headers to API responses to prevent them from being cached
+ format-response ; [METABASE] Do formatting before converting to JSON so serializer doesn't barf
+ (wrap-json-body ; extracts json POST body and makes it avaliable on request
{:keywords? true})
- wrap-json-response ; middleware to automatically serialize suitable objects as JSON in responses
- wrap-keyword-params ; converts string keys in :params to keyword keys
- wrap-params ; parses GET and POST params as :query-params/:form-params and both as :params
- auth/wrap-apikey ; looks for a Metabase API Key on the request and assocs as :metabase-apikey
- auth/wrap-sessionid ; looks for a Metabase sessionid and assocs as :metabase-sessionid
- wrap-cookies ; Parses cookies in the request map and assocs as :cookies
- wrap-session ; reads in current HTTP session and sets :session/key
- wrap-gzip)) ; GZIP response if client can handle it
+ wrap-json-response ; middleware to automatically serialize suitable objects as JSON in responses
+ wrap-keyword-params ; converts string keys in :params to keyword keys
+ wrap-params ; parses GET and POST params as :query-params/:form-params and both as :params
+ auth/bind-current-user ; Binds *current-user* and *current-user-id* if :metabase-user-id is non-nil
+ auth/wrap-current-user-id ; looks for :metabase-session-id and sets :metabase-user-id if Session ID is valid
+ auth/wrap-api-key ; looks for a Metabase API Key on the request and assocs as :metabase-api-key
+ auth/wrap-session-id ; looks for a Metabase Session ID and assoc as :metabase-session-id
+ wrap-cookies ; Parses cookies in the request map and assocs as :cookies
+ wrap-session ; reads in current HTTP session and sets :session/key
+ wrap-gzip)) ; GZIP response if client can handle it
(defn- -init-create-setup-token
"Create and set a new setup token, and open the setup URL on the user's system."
@@ -57,10 +82,7 @@
setup-token)]
(log/info (color/green "Please use the following url to setup your Metabase installation:\n\n"
setup-url
- "\n\n"))
- ;; Attempt to browse URL on user's system; this will just fail silently if we can't do it
- ;(browse-url setup-url)
- ))
+ "\n\n"))))
(defn init
@@ -116,6 +138,29 @@
(.stop ^org.eclipse.jetty.server.Server @jetty-instance)
(reset! jetty-instance nil)))
+(def ^:private ^:const sample-dataset-name "Sample Dataset")
+(def ^:private ^:const sample-dataset-filename "sample-dataset.db.mv.db")
+
+(defn- add-sample-dataset! []
+ (when-not (db/exists? Database :name sample-dataset-name)
+ (try
+ (log/info "Loading sample dataset...")
+ (let [resource (-> (Thread/currentThread) ; hunt down the sample dataset DB file inside the current JAR
+ .getContextClassLoader
+ (.getResource sample-dataset-filename))]
+ (if-not resource
+ (log/error (format "Can't load sample dataset: the DB file '%s' can't be found by the ClassLoader." sample-dataset-filename))
+ (let [h2-file (-> (.getPath resource)
+ (s/replace #"^file:" "zip:") ; to connect to an H2 DB inside a JAR just replace file: with zip:
+ (s/replace #"\.mv\.db$" "") ; strip the .mv.db suffix from the path
+ (str ";USER=GUEST;PASSWORD=guest"))] ; specify the GUEST user account created for the DB
+ (driver/sync-database! (db/ins Database
+ :name sample-dataset-name
+ :details {:db h2-file}
+ :engine :h2)))))
+ (catch Throwable e
+ (log/error (format "Failed to load sample dataset: %s" (.getMessage e)))))))
+
(defn -main
"Launch Metabase in standalone mode."
@@ -124,7 +169,10 @@
(try
;; run our initialization process
(init)
+ ;; add the sample dataset DB if applicable
+ (add-sample-dataset!)
;; launch embedded webserver
(start-jetty)
(catch Exception e
+ (.printStackTrace e)
(log/error "Metabase Initialization FAILED: " (.getMessage e)))))
diff --git a/src/metabase/db.clj b/src/metabase/db.clj
index 4b2016f04e1ec768cb79cee152411d1bbd4c9e1e..4d64736a1b089168cdd83c06cacac779fb9ac2fb 100644
--- a/src/metabase/db.clj
+++ b/src/metabase/db.clj
@@ -2,88 +2,66 @@
"Korma database definition and helper functions for interacting with the database."
(:require [clojure.java.jdbc :as jdbc]
[clojure.tools.logging :as log]
- [clojure.string :as str]
+ (clojure [set :as set]
+ [string :as str])
[environ.core :refer [env]]
- (korma [core :refer :all]
- [db :refer :all])
+ (korma [core :as k]
+ [db :as kdb])
[medley.core :as m]
[metabase.config :as config]
- [metabase.db.internal :refer :all :as i]
- [metabase.util :as u]))
-
-
-(declare post-select)
+ [metabase.db.internal :as i]
+ [metabase.models.interface :as models]
+ [metabase.util :as u])
+ (:import com.metabase.corvus.migrations.LiquibaseMigrations))
;; ## DB FILE, JDBC/KORMA DEFINITONS
-(defn db-file
+(def ^:private db-file
"Path to our H2 DB file from env var or app config."
- []
- (let [db-file-name (config/config-str :mb-db-file)
- db-file (clojure.java.io/file db-file-name)
- options ";AUTO_SERVER=TRUE;MV_STORE=FALSE;DB_CLOSE_DELAY=-1"] ; see http://h2database.com/html/features.html for explanation of options
- (if (.isAbsolute db-file)
- ;; when an absolute path is given for the db file then don't mess with it
- (str "file:" db-file-name options)
- ;; if we don't have an absolute path then make sure we start from "user.dir"
- (str "file:" (str (System/getProperty "user.dir") "/" db-file-name options)))))
-
-
-(defn setup-jdbc-db
- "Configure connection details for JDBC."
- []
- (case (config/config-kw :mb-db-type)
- :h2 {:subprotocol "h2"
- :classname "org.h2.Driver"
- :subname (db-file)}
- :postgres {:subprotocol "postgresql"
- :classname "org.postgresql.Driver"
- :subname (str "//" (config/config-str :mb-db-host)
- ":" (config/config-str :mb-db-port)
- "/" (config/config-str :mb-db-dbname))
- :user (config/config-str :mb-db-user)
- :password (config/config-str :mb-db-pass)}))
-
-
-(defn setup-korma-db
- "Configure connection details for Korma."
- []
- (case (config/config-kw :mb-db-type)
- :h2 (h2 {:db (db-file)
- :naming {:keys str/lower-case
- :fields str/upper-case}})
- :postgres (postgres {:db (config/config-str :mb-db-dbname)
- :port (config/config-int :mb-db-port)
- :user (config/config-str :mb-db-user)
- :password (config/config-str :mb-db-pass)
- :host (config/config-str :mb-db-host)})))
-
-
-;; ## CONNECTION
-
-(defn- metabase-db-connection-details
+ ;; see http://h2database.com/html/features.html for explanation of options
+ (delay (if (config/config-bool :mb-db-in-memory)
+ ;; In-memory (i.e. test) DB
+ "mem:metabase;DB_CLOSE_DELAY=-1"
+ ;; File-based DB
+ (let [db-file-name (config/config-str :mb-db-file)
+ db-file (clojure.java.io/file db-file-name)
+ options ";AUTO_SERVER=TRUE;MV_STORE=FALSE;DB_CLOSE_DELAY=-1"]
+ (apply str "file:" (if (.isAbsolute db-file)
+ ;; when an absolute path is given for the db file then don't mess with it
+ [db-file-name options]
+ ;; if we don't have an absolute path then make sure we start from "user.dir"
+ [(System/getProperty "user.dir") "/" db-file-name options]))))))
+
+(def ^:private db-connection-details
"Connection details that can be used when pretending the Metabase DB is itself a `Database`
(e.g., to use the Generic SQL driver functions on the Metabase DB itself)."
- []
- (case (config/config-kw :mb-db-type)
- :h2 {:db (db-file)}
- :postgres {:host (config/config-str :mb-db-host)
- :port (config/config-int :mb-db-port)
- :dbname (config/config-str :mb-db-dbname)
- :user (config/config-str :mb-db-user)
- :password (config/config-str :mb-db-pass)}))
+ (delay (case (config/config-kw :mb-db-type)
+ :h2 {:db @db-file}
+ :postgres {:host (config/config-str :mb-db-host)
+ :port (config/config-int :mb-db-port)
+ :dbname (config/config-str :mb-db-dbname)
+ :user (config/config-str :mb-db-user)
+ :password (config/config-str :mb-db-pass)})))
+
+(def ^:private jdbc-connection-details
+ "Connection details for Korma / JDBC."
+ (delay (let [details @db-connection-details]
+ (case (config/config-kw :mb-db-type)
+ :h2 (kdb/h2 (assoc details :naming {:keys str/lower-case
+ :fields str/upper-case}))
+ :postgres (kdb/postgres (assoc details :db (:dbname details)))))))
;; ## MIGRATE
(defn migrate
"Migrate the database `:up`, `:down`, or `:print`."
- [jdbc-db direction]
- (let [conn (jdbc/get-connection jdbc-db)]
+ [jdbc-connection-details direction]
+ (let [conn (jdbc/get-connection jdbc-connection-details)]
(case direction
- :up (com.metabase.corvus.migrations.LiquibaseMigrations/setupDatabase conn)
- :down (com.metabase.corvus.migrations.LiquibaseMigrations/teardownDatabase conn)
- :print (com.metabase.corvus.migrations.LiquibaseMigrations/genSqlDatabase conn))))
+ :up (LiquibaseMigrations/setupDatabase conn)
+ :down (LiquibaseMigrations/teardownDatabase conn)
+ :print (LiquibaseMigrations/genSqlDatabase conn))))
;; ## SETUP-DB
@@ -91,7 +69,25 @@
(def ^:private setup-db-has-been-called?
(atom false))
-(def ^:private db-can-connect? (u/runtime-resolved-fn 'metabase.driver 'can-connect?))
+(def ^:dynamic *allow-potentailly-unsafe-connections*
+ "We want to make *every* database connection made by the drivers safe -- read-only, only connect if DB file exists, etc.
+ At the same time, we'd like to be able to use driver functionality like `can-connect?` to check whether we can connect
+ to the Metabase database, in which case we'd like to allow connections to databases that don't exist.
+
+ So we need some way to distinguish the Metabase database from other databases. We could add a key to the details map
+ specifying that it's the Metabase DB, but what if some shady user added that key to another database?
+
+ We could check if a database details map matched `db-connection-details` above, but what if a shady user went Meta-Metabase
+ and added the Metabase DB to Metabase itself? Then when they used it they'd have potentially unsafe access.
+
+ So this is where dynamic variables come to the rescue. We'll make this one `true` when we use `can-connect?` for the
+ Metabase DB, in which case we'll allow connection to non-existent H2 (etc.) files, and leave it `false` happily and
+ forever after, making all other connnections \"safe\"."
+ false)
+
+(defn- db-can-connect? [details]
+ (binding [*allow-potentailly-unsafe-connections* true]
+ ((u/runtime-resolved-fn 'metabase.driver 'can-connect?) details)))
(defn setup-db
"Do general perparation of database by validating that we can connect.
@@ -99,121 +95,41 @@
[& {:keys [auto-migrate]
:or {auto-migrate true}}]
(reset! setup-db-has-been-called? true)
- (log/info "Setting up DB specs...")
- (let [jdbc-db (setup-jdbc-db)
- korma-db (setup-korma-db)]
-
- ;; Test DB connection and throw exception if we have any troubles connecting
- (log/info "Verifying Database Connection ...")
- (assert (db-can-connect? {:engine (config/config-kw :mb-db-type)
- :details (metabase-db-connection-details)})
- "Unable to connect to Metabase DB.")
- (log/info "Verify Database Connection ... CHECK")
-
- ;; Run through our DB migration process and make sure DB is fully prepared
- (if auto-migrate
- (migrate jdbc-db :up)
- ;; if we are not doing auto migrations then print out migration sql for user to run manually
- ;; then throw an exception to short circuit the setup process and make it clear we can't proceed
- (let [sql (migrate jdbc-db :print)]
- (log/info (str "Database Upgrade Required\n\n"
- "NOTICE: Your database requires updates to work with this version of Metabase. "
- "Please execute the following sql commands on your database before proceeding.\n\n"
- sql
- "\n\n"
- "Once your database is updated try running the application again.\n"))
- (throw (java.lang.Exception. "Database requires manual upgrade."))))
- (log/info "Database Migrations Current ... CHECK")
-
- ;; Establish our 'default' Korma DB Connection
- (default-connection (create-db korma-db))))
+
+ ;; Test DB connection and throw exception if we have any troubles connecting
+ (log/info "Verifying Database Connection ...")
+ (assert (db-can-connect? {:engine (config/config-kw :mb-db-type)
+ :details @db-connection-details})
+ "Unable to connect to Metabase DB.")
+ (log/info "Verify Database Connection ... CHECK")
+
+ ;; Run through our DB migration process and make sure DB is fully prepared
+ (if auto-migrate
+ (migrate @jdbc-connection-details :up)
+ ;; if we are not doing auto migrations then print out migration sql for user to run manually
+ ;; then throw an exception to short circuit the setup process and make it clear we can't proceed
+ (let [sql (migrate @jdbc-connection-details :print)]
+ (log/info (str "Database Upgrade Required\n\n"
+ "NOTICE: Your database requires updates to work with this version of Metabase. "
+ "Please execute the following sql commands on your database before proceeding.\n\n"
+ sql
+ "\n\n"
+ "Once your database is updated try running the application again.\n"))
+ (throw (java.lang.Exception. "Database requires manual upgrade."))))
+ (log/info "Database Migrations Current ... CHECK")
+
+ ;; Establish our 'default' Korma DB Connection
+ (kdb/default-connection (kdb/create-db @jdbc-connection-details)))
(defn setup-db-if-needed [& args]
(when-not @setup-db-has-been-called?
(apply setup-db args)))
-;; # UTILITY FUNCTIONS
-
-;; ## CAST-COLUMNS
-
-;; TODO - Doesn't Korma have similar `transformations` functionality? Investigate.
-
-(def ^:const ^:private type-fns
- "A map of column type keywords to the functions that should be used to \"cast\"
- them when going `:in` or `:out` of the database."
- {:json {:in i/write-json
- :out i/read-json}
- :keyword {:in name
- :out keyword}})
-
-(defn types
- "Tag columns in an entity definition with a type keyword.
- This keyword will be used to automatically \"cast\" columns when they are present.
-
- ;; apply ((type-fns :json) :in) -- cheshire/generate-string -- to value of :details before inserting into DB
- ;; apply ((type-fns :json) :out) -- read-json -- to value of :details when reading from DB
- (defentity Database
- (types {:details :json}))"
- [entity types-map]
- {:pre [(every? keyword? (keys types-map))
- (every? (partial contains? type-fns) (vals types-map))]}
- (assoc entity ::types types-map))
-
-(defn apply-type-fns
- "Recursively apply a sequence of functions associated with COLUMN-TYPE-PAIRS to OBJ.
-
- COLUMN-TYPE-PAIRS should be the value of `(seq (::types korma-entity))`.
- DIRECTION should be either `:in` or `:out`."
- {:arglists '([direction column-type-pairs obj])}
- [direction [[column column-type] & rest-pairs] obj]
- (if-not column obj
- (recur direction rest-pairs (if-not (column obj) obj
- (update-in obj [column] (-> type-fns column-type direction))))))
-
-;; TODO - It would be good to allow custom types by just inserting the `{:in fn :out fn}` inline with the
-;; entity definition
-
-;; TODO - hydration-keys should be an entity function for the sake of prettiness
-
-
-;; ## TIMESTAMPED
-
-(defn timestamped
- "Mark ENTITY as having `:created_at` *and* `:updated_at` fields.
-
- (defentity Card
- timestamped)
-
- * When a new object is created via `ins`, values for both fields will be generated.
- * When an object is updated via `upd`, `:updated_at` will be updated."
- [entity]
- (assoc entity ::timestamped true))
-
+;; # ---------------------------------------- UTILITY FUNCTIONS ----------------------------------------
;; ## UPD
-(defmulti pre-update
- "Multimethod that is called by `upd` before DB operations happen.
- A good place to set updated values for fields like `updated_at`, or serialize maps into JSON."
- (fn [entity _] entity))
-
-(defmethod pre-update :default [_ obj]
- obj) ; default impl does no modifications to OBJ
-
-(defmulti post-update
- "Multimethod that is called by `upd` after a SQL `UPDATE` *succeeds*.
- (This gets called with whatever the output of `pre-update` was).
-
- A good place to schedule asynchronous tasks, such as creating a `FieldValues` object for a `Field`
- when it is marked with `special_type` `:category`.
-
- The output of this function is ignored."
- (fn [entity _] entity))
-
-(defmethod post-update :default [_ _] ; default impl does nothing and returns nil
- nil)
-
(defn upd
"Wrapper around `korma.core/update` that updates a single row by its id value and
automatically passes &rest KWARGS to `korma.core/set-fields`.
@@ -224,15 +140,13 @@
[entity entity-id & {:as kwargs}]
{:pre [(integer? entity-id)]}
(let [obj (->> (assoc kwargs :id entity-id)
- (pre-update entity)
- (#(dissoc % :id))
- (apply-type-fns :in (seq (::types entity))))
- obj (cond-> obj
- (::timestamped entity) (assoc :updated_at (u/new-sql-timestamp)))
- result (-> (update entity (set-fields obj) (where {:id entity-id}))
+ (models/pre-update entity)
+ (models/internal-pre-update entity)
+ (#(dissoc % :id)))
+ result (-> (k/update entity (k/set-fields obj) (k/where {:id entity-id}))
(> 0))]
(when result
- (post-update entity (assoc obj :id entity-id)))
+ (models/post-update entity (assoc obj :id entity-id)))
result))
(defn upd-non-nil-keys
@@ -248,28 +162,14 @@
"Wrapper around `korma.core/delete` that makes it easier to delete a row given a single PK value.
Returns a `204 (No Content)` response dictionary."
[entity & {:as kwargs}]
- (delete entity (where kwargs))
+ (k/delete entity (k/where kwargs))
{:status 204
:body nil})
;; ## SEL
-(defmulti post-select
- "Called on the results from a call to `sel`. Default implementation doesn't do anything, but
- you can provide custom implementations to do things like add hydrateable keys or remove sensitive fields."
- (fn [entity _] entity))
-
-;; Default implementation of post-select
-(defmethod post-select :default [_ result]
- result)
-
-(defmulti default-fields
- "The default fields that should be used for ENTITY by calls to `sel` if none are specified."
- identity)
-
-(defmethod default-fields :default [_]
- nil) ; by default return nil, which we'll take to mean "everything"
+(def ^:dynamic *sel-disable-logging* false)
(defmacro sel
"Wrapper for korma `select` that calls `post-select` on results and provides a few other conveniences.
@@ -279,7 +179,8 @@
(sel :one User :id 1) -> returns the User (or nil) whose id is 1
(sel :many OrgPerm :user_id 1) -> returns sequence of OrgPerms whose user_id is 1
- OPTION, if specified, is one of `:field`, `:fields`, `:id`, `:id->field`, `:field->id`, `:field->obj`, or `:id->fields`.
+ OPTION, if specified, is one of `:field`, `:fields`, `:id`, `:id->field`, `:field->id`, `:field->obj`, `:id->fields`,
+ `:field->field`, or `:field->fields`.
;; Only return IDs of objects.
(sel :one :id User :email \"cam@metabase.com\") -> 120
@@ -308,6 +209,11 @@
-> {\"venues\" {:id 1, :name \"venues\", ...}
\"users\" {:id 2, :name \"users\", ...}}
+ ;; Return a map of field value -> other fields.
+ (sel :many :field->fields [Table :name :id :db_id])
+ -> {\"venues\" {:id 1, :db_id 1}
+ \"users\" {:id 2, :db_id 1}}
+
;; Return a map of ID -> specified fields
(sel :many :id->fields [User :first_name :last_name])
-> {1 {:first_name \"Cam\", :last_name \"Saul\"},
@@ -331,91 +237,19 @@
(sel :many Table :db_id 1) -> (select User (where {:id 1}))
(sel :many Table :db_id 1 (order :name :ASC)) -> (select User (where {:id 1}) (order :name ASC))"
- {:arglists '([one-or-many option? entity & forms])}
- [one-or-many & args]
- {:pre [(contains? #{:one :many} one-or-many)]}
- (if (= one-or-many :one)
- `(first (sel :many ~@args (limit 1)))
- (let [[option [entity & forms]] (u/optional keyword? args)]
- (case option
- :field `(let [[entity# field#] ~entity]
- (map field#
- (sel :many [entity# field#] ~@forms)))
- :id `(sel :many :field [~entity :id] ~@forms)
- :id->fields `(->> (sel :many :fields [~@entity :id] ~@forms)
- (map (fn [{id# :id :as obj#}]
- {id# obj#}))
- (into {}))
- :id->field `(let [[entity# field#] ~entity]
- (->> (sel :many :fields [entity# field# :id] ~@forms)
- (map (fn [{id# :id field-val# field#}]
- {id# field-val#}))
- (into {})))
- :field->id `(let [[entity# field#] ~entity]
- (->> (sel :many :fields [entity# field# :id] ~@forms)
- (map (fn [{id# :id field-val# field#}]
- {field-val# id#}))
- (into {})))
- :field->field `(let [[entity# field1# field2#] ~entity]
- (->> (sel :many entity# ~@forms)
- (map (fn [obj#]
- {(field1# obj#) (field2# obj#)}))
- (into {})))
- :field->obj `(let [[entity# field#] ~entity]
- (->> (sel :many entity# ~@forms)
- (map (fn [obj#]
- {(field# obj#) obj#}))
- (into {})))
- :fields `(let [[~'_ & fields# :as entity#] ~entity]
- (map #(select-keys % fields#)
- (sel :many entity# ~@forms)))
- nil `(-sel-select ~entity ~@forms)))))
-
-(defmacro -sel-select
- "Internal macro used by `sel` (don't call this directly).
- Generates the korma `select` form."
- [entity & forms]
- (let [forms (sel-apply-kwargs forms)] ; convert kwargs like `:id 1` to korma `where` clause
- `(let [[entity# field-keys#] (destructure-entity ~entity) ; pull out field-keys if passed entity vector like `[entity & field-keys]`
- entity# (entity->korma entity#) ; entity## is the actual entity like `metabase.models.user/User` that we can dispatch on
- entity-select-form# (-> entity# ; entity-select-form# is the tweaked version we'll pass to korma `select`
- (assoc :fields (or field-keys#
- (default-fields entity#))))] ; tell korma which fields to grab. If `field-keys` weren't passed in vector do lookup at runtime
- (when (config/config-bool :mb-db-logging)
- (log/debug "DB CALL: " (:name entity#)
- (or (:fields entity-select-form#) "*")
- ~@(mapv (fn [[form & args]]
- `[~(name form) ~(apply str (interpose " " args))])
- forms)))
- (->> (select entity-select-form# ~@forms)
- (map (partial apply-type-fns :out (seq (::types entity#))))
- (map (partial post-select entity#)))))) ; map `post-select` over the results
+ {:arglists '([options? entity & forms])}
+ [& args]
+ (let [[option args] (u/optional keyword? args)]
+ `(~(if option
+ ;; if an option was specified, hand off to macro named metabase.db.internal/sel:OPTION
+ (symbol (format "metabase.db.internal/sel:%s" (name option)))
+ ;; otherwise just hand off to low-level sel* macro
+ 'metabase.db.internal/sel*)
+ ~@args)))
;; ## INS
-(defmulti pre-insert
- "Gets called by `ins` immediately before inserting a new object immediately before the korma `insert` call.
- This provides an opportunity to do things like encode JSON or provide default values for certain fields.
-
- (pre-insert Query [_ query]
- (let [defaults {:version 1}]
- (merge defaults query))) ; set some default values"
- (fn [entity _] entity))
-
-(defmethod pre-insert :default [_ obj]
- obj) ; default impl returns object as is
-
-(defmulti post-insert
- "Gets called by `ins` after an object is inserted into the DB. (This object is fetched via `sel`).
- A good place to do asynchronous tasks such as creating related objects.
- Implementations should return the newly created object."
- (fn [entity _] entity))
-
-;; Default implementation returns object as-is
-(defmethod post-insert :default [_ obj]
- obj)
-
(defn ins
"Wrapper around `korma.core/insert` that renames the `:scope_identity()` keyword in output to `:id`
and automatically passes &rest KWARGS to `korma.core/values`.
@@ -423,15 +257,11 @@
Returns newly created object by calling `sel`."
[entity & {:as kwargs}]
(let [vals (->> kwargs
- (pre-insert entity)
- (apply-type-fns :in (seq (::types entity))))
- vals (cond-> vals
- (::timestamped entity) (assoc :created_at (u/new-sql-timestamp)
- :updated_at (u/new-sql-timestamp)))
- {:keys [id]} (-> (insert entity (values vals))
- (clojure.set/rename-keys {(keyword "scope_identity()") :id}))]
- (->> (sel :one entity :id id)
- (post-insert entity))))
+ (models/pre-insert entity)
+ (models/internal-pre-insert entity))
+ {:keys [id]} (-> (k/insert entity (k/values vals))
+ (set/rename-keys {(keyword "scope_identity()") :id}))]
+ (models/post-insert entity (entity id))))
;; ## EXISTS?
@@ -441,39 +271,25 @@
(exists? User :id 100)"
[entity & {:as kwargs}]
- `(not (empty? (select (entity->korma ~entity)
- (fields [:id])
- ~@(when (seq kwargs)
- `[(where ~kwargs)])
- (limit 1)))))
+ `(boolean (seq (k/select (i/entity->korma ~entity)
+ (k/fields [:id])
+ (k/where ~(if (seq kwargs) kwargs {}))
+ (k/limit 1)))))
;; ## CASADE-DELETE
-(defmulti pre-cascade-delete
- "Called by `cascade-delete` for each matching object that is about to be deleted.
- Implementations should delete any objects related to this object by recursively
- calling `cascade-delete`.
-
- (defmethod pre-cascade-delete Database [_ {database-id :id :as database}]
- (cascade-delete Card :database_id database-id)
- ...)"
- (fn [entity _]
- entity))
-
-(defmethod pre-cascade-delete :default [_ instance]
- instance)
+(defn -cascade-delete [entity f]
+ (let [entity (i/entity->korma entity)
+ results (i/sel-exec entity f)]
+ (dorun (for [obj results]
+ (do (models/pre-cascade-delete entity obj)
+ (del entity :id (:id obj))))))
+ {:status 204, :body nil})
-;; TODO - does this *really* need to be a macro?
(defmacro cascade-delete
"Do a cascading delete of object(s). For each matching object, the `pre-cascade-delete` multimethod is called,
which should delete any objects related the object about to be deleted.
Like `del`, this returns a 204/nil reponse so it can be used directly in an API endpoint."
[entity & kwargs]
- `(let [entity# (entity->korma ~entity)
- instances# (sel :many entity# ~@kwargs)]
- (dorun (map (fn [instance#]
- (pre-cascade-delete entity# instance#)
- (del entity# :id (:id instance#)))
- instances#))
- {:status 204, :body nil}))
+ `(-cascade-delete ~entity (i/sel-fn ~@kwargs)))
diff --git a/src/metabase/db/internal.clj b/src/metabase/db/internal.clj
index d4f4bfe440f3527f5721cba9e0120ec6a1182895..42c9e5085f6801a54869a95dc87cc1d15fcbc8eb 100644
--- a/src/metabase/db/internal.clj
+++ b/src/metabase/db/internal.clj
@@ -1,8 +1,11 @@
(ns metabase.db.internal
"Internal functions and macros used by the public-facing functions in `metabase.db`."
- (:require [clojure.walk :as walk]
- [cheshire.core :as cheshire]
- [korma.core :refer [where]]
+ (:require [clojure.string :as s]
+ [clojure.tools.logging :as log]
+ [clojure.walk :as walk]
+ [korma.core :refer [where], :as k]
+ [metabase.config :as config]
+ [metabase.models.interface :as models]
[metabase.util :as u]))
(declare entity->korma)
@@ -32,47 +35,145 @@
(if-not (vector? entity) [entity nil]
[(first entity) (vec (rest entity))]))
-(def entity->korma
+(def ^{:arglists '([entity])} entity->korma
"Convert an ENTITY argument to `sel` into the form we should pass to korma `select` and to various multi-methods such as
`post-select`.
* If entity is a vector like `[User :name]`, only keeps the first arg (`User`)
* Converts fully-qualified entity name strings like `\"metabase.models.user/User\"` to the corresponding entity
and requires their namespace if needed.
- * Symbols like `'metabase.models.user/User` are handled the same way as strings."
+ * Symbols like `'metabase.models.user/User` are handled the same way as strings.
+ * Infers the namespace of unqualified symbols like `'CardFavorite`"
(memoize
(fn -entity->korma [entity]
- {:post [(= (type %) :korma.core/Entity)]}
+ {:post [(:metabase.models.interface/entity %)]}
(cond (vector? entity) (-entity->korma (first entity))
(string? entity) (-entity->korma (symbol entity))
(symbol? entity) (try (eval entity)
(catch clojure.lang.Compiler$CompilerException _ ; a wrapped ClassNotFoundException
- (-> entity
- str
- (.split "/")
- first
- symbol
- require)
- (eval entity)))
+ (let [[_ ns symb] (re-matches #"^(?:([^/]+)/)?([^/]+)$" (str entity))
+ _ (assert symb)
+ ns (symbol (or ns
+ (str "metabase.models." (-> symb
+ (s/replace #"([a-z])([A-Z])" "$1-$2") ; convert something like CardFavorite
+ s/lower-case)))) ; to ns like metabase.models.card_favorite
+ symb (symbol symb)]
+ (require ns)
+ @(ns-resolve ns symb))))
:else entity))))
-;; ## READ-JSON
+;;; ## ---------------------------------------- SEL 2.0 FUNCTIONS ----------------------------------------
-(defn- read-json-str-or-clob
- "If JSON-STRING is a JDBC Clob, convert to a String. Then call `json/read-str`."
- [json-str]
- (some-> (u/jdbc-clob->str json-str)
- cheshire/parse-string))
+;;; Low-level sel implementation
-(defn read-json
- "Read JSON-STRING (or JDBC Clob) as JSON and keywordize keys."
- [json-string]
- (->> (read-json-str-or-clob json-string)
- walk/keywordize-keys))
+(defmacro sel-fn [& forms]
+ (let [forms (sel-apply-kwargs forms)
+ entity (gensym "ENTITY")]
+ (loop [query `(k/select* ~entity), [[f & args] & more] forms]
+ (cond
+ f (recur `(~f ~query ~@args) more)
+ (seq more) (recur query more)
+ :else `[(fn [~entity]
+ ~query) ~(str query)]))))
-(defn write-json
- "If OBJ is not already a string, encode it as JSON."
- [obj]
- (if (string? obj) obj
- (cheshire/generate-string obj)))
+(defn sel-exec [entity [select-fn log-str]]
+ (let [[entity field-keys] (destructure-entity entity)
+ entity (entity->korma entity)
+ entity+fields (assoc entity :fields (or field-keys
+ (:metabase.models.interface/default-fields entity)))]
+ ;; Log if applicable
+ (future
+ (when (config/config-bool :mb-db-logging)
+ (when-not @(resolve 'metabase.db/*sel-disable-logging*)
+ (log/debug "DB CALL: " (:name entity)
+ (or (:fields entity+fields) "*")
+ (s/replace log-str #"korma.core/" "")))))
+
+ (->> (k/exec (select-fn entity+fields))
+ (map (partial models/internal-post-select entity))
+ (map (partial models/post-select entity)))))
+
+(defmacro sel* [entity & forms]
+ `(sel-exec ~entity (sel-fn ~@forms)))
+
+;;; :field
+
+(defmacro sel:field [[entity field] & forms]
+ `(let [field# ~field]
+ (map field# (sel* [~entity field#] ~@forms))))
+
+;;; :id
+
+(defmacro sel:id [entity & forms]
+ `(sel:field [~entity :id] ~@forms))
+
+;;; :fields
+
+(defn sel:fields* [fields results]
+ (for [result results]
+ (select-keys result fields)))
+
+(defmacro sel:fields [[entity & fields] & forms]
+ `(let [fields# ~(vec fields)]
+ (sel:fields* (set fields#) (sel* `[~~entity ~@fields#] ~@forms))))
+
+;;; :id->fields
+
+(defn sel:id->fields* [fields results]
+ (->> results
+ (map (u/rpartial select-keys fields))
+ (zipmap (map :id results))))
+
+(defmacro sel:id->fields [[entity & fields] & forms]
+ `(let [fields# ~(conj (set fields) :id)]
+ (sel:id->fields* fields# (sel* `[~~entity ~@fields#] ~@forms))))
+
+;;; :field->field
+
+(defn sel:field->field* [f1 f2 results]
+ (into {} (for [result results]
+ {(f1 result) (f2 result)})))
+
+(defmacro sel:field->field [[entity f1 f2] & forms]
+ `(let [f1# ~f1
+ f2# ~f2]
+ (sel:field->field* f1# f2# (sel* [~entity f1# f2#] ~@forms))))
+
+;;; :field->fields
+
+(defn sel:field->fields* [key-field other-fields results]
+ (into {} (for [result results]
+ {(key-field result) (select-keys result other-fields)})))
+
+(defmacro sel:field->fields [[entity key-field & other-fields] & forms]
+ `(let [key-field# ~key-field
+ other-fields# ~(vec other-fields)]
+ (sel:field->fields* key-field# other-fields# (sel* `[~~entity ~key-field# ~@other-fields#] ~@forms))))
+
+;;; : id->field
+
+(defmacro sel:id->field [[entity field] & forms]
+ `(sel:field->field [~entity :id ~field] ~@forms))
+
+;;; :field->id
+
+(defmacro sel:field->id [[entity field] & forms]
+ `(sel:field->field [~entity ~field :id] ~@forms))
+
+;;; :field->obj
+
+(defn sel:field->obj* [field results]
+ (into {} (for [result results]
+ {(field result) result})))
+
+(defmacro sel:field->obj [[entity field] & forms]
+ `(sel:field->obj* ~field (sel* ~entity ~@forms)))
+
+;;; :one & :many
+
+(defmacro sel:one [& args]
+ `(first (metabase.db/sel ~@args (k/limit 1))))
+
+(defmacro sel:many [& args]
+ `(metabase.db/sel ~@args))
diff --git a/src/metabase/driver.clj b/src/metabase/driver.clj
index dbaebf4d77bd4186b1ffa38d4aa214f56a0f4f74..c1a5c50e403ec35a9596f6736b821cd4c168da16 100644
--- a/src/metabase/driver.clj
+++ b/src/metabase/driver.clj
@@ -1,11 +1,10 @@
(ns metabase.driver
(:require clojure.java.classpath
[clojure.tools.logging :as log]
- [medley.core :refer :all]
+ [medley.core :as m]
[metabase.db :refer [exists? ins sel upd]]
(metabase.driver [interface :as i]
[query-processor :as qp])
- [metabase.driver.query-processor.expand :as expand]
(metabase.models [database :refer [Database]]
[query-execution :refer [QueryExecution]])
[metabase.models.setting :refer [defsetting]]
@@ -15,39 +14,42 @@
;; ## CONFIG
-(defsetting report-timezone "Connection timezone to use when executing queries. Defaults to system timezone.")
+(defsetting report-timezone "Connection timezone to use when executing queries. Defaults to system timezone.")
;; ## Constants
(def ^:const available-drivers
- "DB drivers that are available as a dictionary. Each key is a driver with dictionary of attributes.
- ex: `:h2 {:id \"h2\" :name \"H2\"}`"
- {:h2 {:id "h2"
- :name "H2"
- :example "file:[filename]"}
- :postgres {:id "postgres"
- :name "Postgres"
- :example "host=[ip address] port=5432 dbname=examples user=corvus password=******"}
- :mongo {:id "mongo"
- :name "MongoDB"
- :example "mongodb://password:username@127.0.0.1:27017/db-name"}})
-
-(def ^:const class->base-type
- "Map of classes returned from DB call to metabase.models.field/base-types"
- {java.lang.Boolean :BooleanField
- java.lang.Double :FloatField
- java.lang.Float :FloatField
- java.lang.Integer :IntegerField
- java.lang.Long :IntegerField
- java.lang.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}) ; this mapping included here since Native QP uses class->base-type directly. TODO - perhaps make *class-base->type* driver specific?
+ "Available DB drivers."
+ {:h2 {:id "h2"
+ :name "H2"}
+ :postgres {:id "postgres"
+ :name "Postgres"}
+ :mongo {:id "mongo"
+ :name "MongoDB"}
+ :mysql {:id "mysql"
+ :name "MySQL"}})
+
+(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)
+ (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))
+ :UnknownField)))
;; ## Driver Lookup
@@ -121,7 +123,7 @@
(let [-sync-database! (u/runtime-resolved-fn 'metabase.driver.sync 'sync-database!)] ; these need to be resolved at runtime to avoid circular deps
(fn [database]
{:pre [(map? database)]}
- (time (-sync-database! (engine->driver (:engine database)) database)))))
+ (-sync-database! (engine->driver (:engine database)) database))))
(def ^{:arglists '([table])} sync-table!
"Sync a `Table` and its `Fields`."
@@ -133,21 +135,7 @@
(defn process-query
"Process a structured or native query, and return the result."
[query]
- {:pre [(map? query)]}
- (try
- (let [driver (database-id->driver (:database query))]
- (binding [qp/*query* query
- qp/*expanded-query* (expand/expand query)
- qp/*internal-context* (atom {})
- qp/*driver* driver]
- (let [query (qp/preprocess query)
- results (binding [qp/*query* query]
- (i/process-query driver (dissoc-in query [:query :cum_sum])))] ; strip out things that individual impls don't need to know about / deal with
- (qp/post-process driver query results))))
- (catch Throwable e
- (.printStackTrace e)
- {:status :failed
- :error (.getMessage e)})))
+ (qp/process (database-id->driver (:database query)) query))
;; ## Query Execution Stuff
@@ -193,10 +181,8 @@
(when (= :failed (:status query-result))
(throw (Exception. ^String (get query-result :error "general error"))))
(query-complete query-execution query-result))
- (catch Exception ex
- (log/warn ex)
- (.printStackTrace ex)
- (query-fail query-execution (.getMessage ex)))))))
+ (catch Exception e
+ (query-fail query-execution (.getMessage e)))))))
(defn query-fail
"Save QueryExecution state and construct a failed query response"
@@ -237,7 +223,7 @@
(if id
;; execution has already been saved, so update it
(do
- (mapply upd QueryExecution id query-execution)
+ (m/mapply upd QueryExecution id query-execution)
query-execution)
;; first time saving execution, so insert it
- (mapply ins QueryExecution query-execution)))
+ (m/mapply ins QueryExecution query-execution)))
diff --git a/src/metabase/driver/context.clj b/src/metabase/driver/context.clj
deleted file mode 100644
index d71cfe9049270637c1145da16ab3c5a974722031..0000000000000000000000000000000000000000
--- a/src/metabase/driver/context.clj
+++ /dev/null
@@ -1,13 +0,0 @@
-(ns metabase.driver.context)
-
-;;; DEPRECATED !
-;; The functionality in this namespace is part of some old QP stuff and no longer serves any important purpose.
-;; TODO - Remove this namespace
-
-(def ^:dynamic *database*
- "Current DB."
- nil)
-
-(def ^:dynamic *table*
- "Current table."
- nil)
diff --git a/src/metabase/driver/generic_sql.clj b/src/metabase/driver/generic_sql.clj
index 94153606acf5d86615255ca59de43e9e9f69e3bd..0c310c75e0bacdbc0d3f34e1a68690f2aa06645c 100644
--- a/src/metabase/driver/generic_sql.clj
+++ b/src/metabase/driver/generic_sql.clj
@@ -1,100 +1,157 @@
(ns metabase.driver.generic-sql
(:require [clojure.java.jdbc :as jdbc]
[clojure.tools.logging :as log]
- [korma.core :refer :all]
+ [korma.core :as k]
[metabase.driver :as driver]
- (metabase.driver [interface :refer :all]
+ (metabase.driver [interface :refer [max-sync-lazy-seq-results IDriver ISyncDriverTableFKs ISyncDriverFieldAvgLength ISyncDriverFieldPercentUrls]]
[sync :as driver-sync])
- (metabase.driver.generic-sql [query-processor :as qp]
- [util :refer :all])))
-
-(defrecord SqlDriver [column->base-type
- connection-details->connection-spec
- database->connection-details
- sql-string-length-fn
- timezone->set-timezone-sql
- ;; These functions take a string name of a Field and return the raw SQL to select it as a DATE
- cast-timestamp-seconds-field-to-date-fn
- cast-timestamp-milliseconds-field-to-date-fn
- ;; This should be a regex that will match the column returned by the driver when unix timestamp -> date casting occured
- ;; e.g. #"CAST\(TIMESTAMPADD\('(?:MILLI)?SECOND', ([^\s]+), DATE '1970-01-01'\) AS DATE\)" for H2
- uncastify-timestamp-regex]
- IDriver
- ;; Connection
- (can-connect? [this database]
- (can-connect-with-details? this (database->connection-details database)))
-
- (can-connect-with-details? [_ details]
- (let [connection (connection-details->connection-spec details)]
- (= 1 (-> (exec-raw connection "SELECT 1" :results)
- first
- vals
- first))))
-
- ;; Query Processing
- (process-query [_ query]
- (qp/process-and-run query))
-
- ;; Syncing
- (sync-in-context [_ database do-sync-fn]
- (with-jdbc-metadata [_ database]
- (do-sync-fn)))
-
- (active-table-names [_ database]
- (with-jdbc-metadata [^java.sql.DatabaseMetaData md database]
- (->> (.getTables md nil nil nil (into-array String ["TABLE"]))
- jdbc/result-set-seq
- (map :table_name)
- set)))
-
- (active-column-names->type [_ table]
- (with-jdbc-metadata [^java.sql.DatabaseMetaData md @(:db table)]
- (->> (.getColumns md nil nil (:name table) nil)
- jdbc/result-set-seq
- (filter #(not= (:table_schem %) "INFORMATION_SCHEMA")) ; filter out internal tables
- (map (fn [{:keys [column_name type_name]}]
- {column_name (or (column->base-type (keyword type_name))
- :UnknownField)}))
- (into {}))))
-
- (table-pks [_ table]
- (with-jdbc-metadata [^java.sql.DatabaseMetaData md @(:db table)]
- (->> (.getPrimaryKeys md nil nil (:name table))
- jdbc/result-set-seq
- (map :column_name)
- set)))
-
- ISyncDriverTableFKs
- (table-fks [_ table]
- (with-jdbc-metadata [^java.sql.DatabaseMetaData md @(:db table)]
- (->> (.getImportedKeys md nil nil (:name table))
- jdbc/result-set-seq
- (map (fn [result]
- {:fk-column-name (:fkcolumn_name result)
- :dest-table-name (:pktable_name result)
- :dest-column-name (:pkcolumn_name result)}))
- set)))
-
- ISyncDriverFieldAvgLength
- (field-avg-length [_ field]
- (or (some-> (korma-entity @(:table field))
- (select (aggregate (avg (sqlfn* sql-string-length-fn
- (raw (format "CAST(\"%s\" AS TEXT)" (name (:name field))))))
- :len))
- first
- :len
- int)
- 0))
-
- ISyncDriverFieldPercentUrls
- (field-percent-urls [_ field]
- (let [korma-table (korma-entity @(:table field))
- total-non-null-count (-> (select korma-table
- (aggregate (count :*) :count)
- (where {(keyword (:name field)) [not= nil]})) first :count)]
- (if (= total-non-null-count 0) 0.0
- (let [url-count (or (-> (select korma-table
- (aggregate (count :*) :count)
- (where {(keyword (:name field)) [like "http%://_%.__%"]})) first :count)
- 0)]
- (float (/ url-count total-non-null-count)))))))
+ (metabase.driver.generic-sql [interface :as i]
+ [query-processor :as qp]
+ [util :refer :all])
+ [metabase.util :as u]))
+
+(def ^:const features
+ "Features supported by *all* Generic SQL drivers."
+ #{:foreign-keys
+ :standard-deviation-aggregations
+ :unix-timestamp-special-type-fields})
+
+(def ^:private ^:const field-values-lazy-seq-chunk-size
+ "How many Field values should we fetch at a time for `field-values-lazy-seq`?"
+ ;; Hopefully this is a good balance between
+ ;; 1. Not doing too many DB calls
+ ;; 2. Not running out of mem
+ ;; 3. Not fetching too many results for things like mark-json-field! which will fail after the first result that isn't valid JSON
+ 500)
+
+(defn- can-connect-with-details? [driver details]
+ (let [connection (i/connection-details->connection-spec driver details)]
+ (= 1 (-> (k/exec-raw connection "SELECT 1" :results)
+ first
+ vals
+ first))))
+
+(defn- can-connect? [driver database]
+ (can-connect-with-details? driver (i/database->connection-details driver database)))
+
+(defn- wrap-process-query-middleware [_ qp]
+ (fn [query]
+ (qp query)))
+
+(defn- process-query [_ query]
+ (qp/process-and-run query))
+
+(defn- sync-in-context [_ database do-sync-fn]
+ (with-jdbc-metadata [_ database]
+ (do-sync-fn)))
+
+(defn- active-table-names [_ database]
+ (with-jdbc-metadata [^java.sql.DatabaseMetaData md database]
+ (->> (.getTables md nil nil nil (into-array String ["TABLE", "VIEW"]))
+ jdbc/result-set-seq
+ (map :table_name)
+ set)))
+
+(defn- active-column-names->type [{:keys [column->base-type]} table]
+ {:pre [(map? column->base-type)]}
+ (with-jdbc-metadata [^java.sql.DatabaseMetaData md @(:db table)]
+ (->> (.getColumns md nil nil (:name table) nil)
+ jdbc/result-set-seq
+ (filter #(not= (:table_schem %) "INFORMATION_SCHEMA")) ; filter out internal tables
+ (map (fn [{:keys [column_name type_name]}]
+ {column_name (or (column->base-type (keyword type_name))
+ :UnknownField)}))
+ (into {}))))
+
+(defn- table-pks [_ table]
+ (with-jdbc-metadata [^java.sql.DatabaseMetaData md @(:db table)]
+ (->> (.getPrimaryKeys md nil nil (:name table))
+ jdbc/result-set-seq
+ (map :column_name)
+ set)))
+
+(defn- field-values-lazy-seq [_ {:keys [qualified-name-components table], :as field}]
+ (assert (and (map? field)
+ (delay? qualified-name-components)
+ (delay? table))
+ (format "Field is missing required information:\n%s" (u/pprint-to-str 'red field)))
+ (let [table @table
+ name-components (rest @qualified-name-components)
+ ;; This function returns a chunked lazy seq that will fetch some range of results, e.g. 0 - 500, then concat that chunk of results
+ ;; with a recursive call to (lazily) fetch the next chunk of results, until we run out of results or hit the limit.
+ fetch-chunk (fn -fetch-chunk [start step limit]
+ (lazy-seq
+ (let [results (->> (k/select (korma-entity table)
+ (k/fields (:name field))
+ (k/offset start)
+ (k/limit (+ start step)))
+ (map (keyword (:name field)))
+ (map (if (contains? #{:TextField :CharField} (:base_type field)) u/jdbc-clob->str
+ identity)))]
+ (concat results (when (and (seq results)
+ (< (+ start step) limit)
+ (= (count results) step))
+ (-fetch-chunk (+ start step) step limit))))))]
+ (fetch-chunk 0 field-values-lazy-seq-chunk-size
+ max-sync-lazy-seq-results)))
+
+(defn- table-fks [_ table]
+ (with-jdbc-metadata [^java.sql.DatabaseMetaData md @(:db table)]
+ (->> (.getImportedKeys md nil nil (:name table))
+ jdbc/result-set-seq
+ (map (fn [result]
+ {:fk-column-name (:fkcolumn_name result)
+ :dest-table-name (:pktable_name result)
+ :dest-column-name (:pkcolumn_name result)}))
+ set)))
+
+(defn- field-avg-length [{:keys [sql-string-length-fn], :as driver} field]
+ {:pre [(keyword? sql-string-length-fn)]}
+ (or (some-> (korma-entity @(:table field))
+ (k/select (k/aggregate (avg (k/sqlfn* sql-string-length-fn
+ (k/raw (format "CAST(%s AS CHAR)" (i/quote-name driver (name (:name field)))))))
+ :len))
+ first
+ :len
+ int)
+ 0))
+
+(defn- field-percent-urls [_ field]
+ (or (let [korma-table (korma-entity @(:table field))]
+ (when-let [total-non-null-count (:count (first (k/select korma-table
+ (k/aggregate (count :*) :count)
+ (k/where {(keyword (:name field)) [not= nil]}))))]
+ (when (> total-non-null-count 0)
+ (when-let [url-count (:count (first (k/select korma-table
+ (k/aggregate (count :*) :count)
+ (k/where {(keyword (:name field)) [like "http%://_%.__%"]}))))]
+ (float (/ url-count total-non-null-count))))))
+ 0.0))
+
+(def ^:const GenericSQLIDriverMixin
+ "Generic SQL implementation of the `IDriver` protocol.
+
+ (extend H2Driver
+ IDriver
+ GenericSQLIDriverMixin)"
+ {:can-connect? can-connect?
+ :can-connect-with-details? can-connect-with-details?
+ :wrap-process-query-middleware wrap-process-query-middleware
+ :process-query process-query
+ :sync-in-context sync-in-context
+ :active-table-names active-table-names
+ :active-column-names->type active-column-names->type
+ :table-pks table-pks
+ :field-values-lazy-seq field-values-lazy-seq})
+
+(def ^:const GenericSQLISyncDriverTableFKsMixin
+ "Generic SQL implementation of the `ISyncDriverTableFKs` protocol."
+ {:table-fks table-fks})
+
+(def ^:const GenericSQLISyncDriverFieldAvgLengthMixin
+ "Generic SQL implementation of the `ISyncDriverFieldAvgLengthMixin` protocol."
+ {:field-avg-length field-avg-length})
+
+(def ^:const GenericSQLISyncDriverFieldPercentUrlsMixin
+ "Generic SQL implementation of the `ISyncDriverFieldPercentUrls` protocol."
+ {:field-percent-urls field-percent-urls})
diff --git a/src/metabase/driver/generic_sql/interface.clj b/src/metabase/driver/generic_sql/interface.clj
new file mode 100644
index 0000000000000000000000000000000000000000..892c7ffa5a9b73c0e76d1f1e8dcec4ba1fe0a2a2
--- /dev/null
+++ b/src/metabase/driver/generic_sql/interface.clj
@@ -0,0 +1,28 @@
+(ns metabase.driver.generic-sql.interface)
+
+(defprotocol ISqlDriverDatabaseSpecific
+ "Methods a DB-specific concrete SQL driver should implement.
+ They should also have the following properties:
+
+ * `column->base-type`
+ * `sql-string-length-fn`"
+ (connection-details->connection-spec [this connection-details])
+ (database->connection-details [this database])
+ (cast-timestamp-to-date [this table-name field-name seconds-or-milliseconds]
+ "Return the raw SQL that should be used to cast a Unix-timestamped column with string
+ TABLE-NAME and string FIELD-NAME to a SQL `DATE`. SECONDS-OR-MILLISECONDS will be either
+ `:seconds` or `:milliseconds`.")
+ (timezone->set-timezone-sql [this timezone]
+ "Return a string that represents the SQL statement that should be used to set the timezone
+ for the current transaction."))
+
+(defprotocol ISqlDriverQuoteName
+ "Optionally protocol to override how the Generic SQL driver quotes the names of databases, tables, and fields."
+ (quote-name [this ^String nm]
+ "Quote a name appropriately for this database."))
+
+;; Default implementation quotes using "
+(extend-protocol ISqlDriverQuoteName
+ Object
+ (quote-name [_ nm]
+ (str \" nm \")))
diff --git a/src/metabase/driver/generic_sql/native.clj b/src/metabase/driver/generic_sql/native.clj
index 184f82ea9fd04cadcb1e60fda91286ff46f4c419..28a95110ffd2f71640dfa480adacd66d9823036f 100644
--- a/src/metabase/driver/generic_sql/native.clj
+++ b/src/metabase/driver/generic_sql/native.clj
@@ -1,51 +1,51 @@
(ns metabase.driver.generic-sql.native
"The `native` query processor."
- (:import com.metabase.corvus.api.ApiException)
(:require [clojure.java.jdbc :as jdbc]
[clojure.tools.logging :as log]
(korma [core :as korma]
db)
[metabase.db :refer [sel]]
[metabase.driver :as driver]
- [metabase.driver.generic-sql.util :refer :all]
+ [metabase.driver.interface :refer [supports?]]
+ (metabase.driver.generic-sql [interface :as i]
+ [util :refer :all])
[metabase.models.database :refer [Database]]))
(defn- value->base-type
"Attempt to match a value we get back from the DB with the corresponding base-type`."
[v]
- (if-not v :UnknownField
- (or (driver/class->base-type (type v))
- (do (log/warn (format "Missing base type mapping for %s in driver/class->base-type. Please add an entry."
- (str (type v))))
- :UnknownField))))
+ (driver/class->base-type (type v)))
(defn process-and-run
"Process and run a native (raw SQL) QUERY."
{:arglists '([query])}
- [{{sql :query} :native
- database-id :database :as query}]
+ [{{sql :query} :native, database-id :database, :as query}]
{:pre [(string? sql)
(integer? database-id)]}
(log/debug "QUERY: \n"
- (with-out-str (clojure.pprint/pprint query)))
- (try (let [database (sel :one Database :id database-id)
+ (with-out-str (clojure.pprint/pprint (update query :driver class))))
+ (try (let [database (sel :one [Database :engine :details] :id database-id)
db (-> database
db->korma-db
korma.db/get-connection)
[columns & [first-row :as rows]] (jdbc/with-db-transaction [conn db :read-only? true]
- ;; If timezone is specified in the Query and the driver supports setting the timezone then execute SQL to set it
+ ;; If timezone is specified in the Query and the driver supports setting the timezone
+ ;; then execute SQL to set it
(when-let [timezone (or (-> query :native :timezone)
(driver/report-timezone))]
- (when-let [timezone->set-timezone-sql (:timezone->set-timezone-sql (driver/database-id->driver database-id))]
- (log/debug "Setting timezone to:" timezone)
- (jdbc/db-do-prepared conn (timezone->set-timezone-sql timezone))))
+ (when (seq timezone)
+ (let [driver (driver/engine->driver (:engine database))]
+ (when (supports? driver :set-timezone)
+ (log/debug "Setting timezone to:" timezone)
+ (jdbc/db-do-prepared conn (i/timezone->set-timezone-sql driver timezone))))))
(jdbc/query conn sql :as-arrays? true))]
- {:rows rows
+ ;; TODO - Why don't we just use annotate?
+ {:rows rows
:columns columns
- :cols (map (fn [column first-value]
- {:name column
- :base_type (value->base-type first-value)})
- columns first-row)})
+ :cols (map (fn [column first-value]
+ {:name column
+ :base_type (value->base-type first-value)})
+ columns first-row)})
(catch java.sql.SQLException e
(let [^String message (or (->> (.getMessage e) ; error message comes back like 'Column "ZID" not found; SQL statement: ... [error-code]' sometimes
(re-find #"^(.*);") ; the user already knows the SQL, and error code is meaningless
diff --git a/src/metabase/driver/generic_sql/query_processor.clj b/src/metabase/driver/generic_sql/query_processor.clj
index 13ce768d8d4d5382edb6812e1ac4d96907532f4b..57ae1170eecc49896f17a52b72c921cb743635a7 100644
--- a/src/metabase/driver/generic_sql/query_processor.clj
+++ b/src/metabase/driver/generic_sql/query_processor.clj
@@ -2,70 +2,66 @@
"The Query Processor is responsible for translating the Metabase Query Language into korma SQL forms."
(:require [clojure.core.match :refer [match]]
[clojure.tools.logging :as log]
- [korma.core :refer :all]
+ [clojure.string :as s]
+ [clojure.walk :as walk]
+ [korma.core :refer :all, :exclude [update]]
[metabase.config :as config]
- [metabase.db :refer :all]
- [metabase.driver.query-processor :as qp]
- (metabase.driver.generic-sql [native :as native]
+ [metabase.driver :as driver]
+ (metabase.driver [interface :refer [supports?]]
+ [query-processor :as qp])
+ (metabase.driver.generic-sql [interface :as i]
+ [native :as native]
[util :refer :all])
- (metabase.models [database :refer [Database]]
- [field :refer [Field]]
- [table :refer [Table]])
- [metabase.util :as u]))
-
+ [metabase.util :as u])
+ (:import (metabase.driver.query_processor.expand Field
+ OrderByAggregateField
+ Value)))
(declare apply-form
- log-query)
+ log-korma-form)
;; # INTERFACE
-(defn process
- "Convert QUERY into a korma `select` form."
- [{{:keys [source_table] :as query} :query}]
- (when-not (zero? source_table)
- (let [forms (->> (map apply-form query) ; call `apply-form` for each clause and strip out nil results
- (filter identity)
- (mapcat (fn [form] (if (vector? form) form ; some `apply-form` implementations return a vector of multiple korma forms; if only one was
- [form]))) ; returned wrap it in a vec so `mapcat` can build a flattened sequence of forms
- doall)]
- (when (config/config-bool :mb-db-logging)
- (log-query query forms))
- `(let [entity# (table-id->korma-entity ~source_table)]
- (select entity# ~@forms)))))
-
-(defn- uncastify
- "Remove CAST statements from a column name if needed.
-
- (uncastify \"DATE\") -> \"DATE\"
- (uncastify \"CAST(DATE AS DATE)\") -> \"DATE\""
- [column-name]
- (let [column-name (name column-name)]
- (keyword (or (second (re-find #"CAST\(([^\s]+) AS [\w]+\)" column-name))
- (second (re-find (:uncastify-timestamp-regex qp/*driver*) column-name))
- column-name))))
+
+(def ^:dynamic ^:private *query* nil)
(defn process-structured
"Convert QUERY into a korma `select` form, execute it, and annotate the results."
- [query]
- {:pre [(integer? (:database query)) ; double check that the query being passed is valid
- (map? (:query query))
- (= (name (:type query)) "query")]}
- (try
- (as-> (process query) results
- (eval results)
- (qp/annotate query results uncastify))
- (catch java.sql.SQLException e
- (let [^String message (or (->> (.getMessage e) ; error message comes back like "Error message ... [status-code]" sometimes
- (re-find #"(?s)(^.*)\s+\[[\d-]+\]$") ; status code isn't useful and makes unit tests hard to write so strip it off
- second) ; (?s) = Pattern.DOTALL - tell regex `.` to match newline characters as well
- (.getMessage e))]
- (throw (Exception. message))))))
-
+ [{{:keys [source-table]} :query, database :database, :as query}]
+ (binding [*query* query]
+ (try
+ ;; Process the expanded query and generate a korma form
+ (let [korma-select-form `(select ~'entity ~@(->> (map apply-form (:query query))
+ (filter identity)
+ (mapcat #(if (vector? %) % [%]))))
+ set-timezone-sql (when-let [timezone (driver/report-timezone)]
+ (when (seq timezone)
+ (let [driver (:driver *query*)]
+ (when (supports? driver :set-timezone)
+ `(exec-raw ~(i/timezone->set-timezone-sql driver timezone))))))
+ korma-form `(let [~'entity (korma-entity ~database ~source-table)]
+ ~(if set-timezone-sql `(korma.db/with-db (:db ~'entity)
+ (korma.db/transaction
+ ~set-timezone-sql
+ ~korma-select-form))
+ korma-select-form))]
+
+ ;; Log generated korma form
+ (when (config/config-bool :mb-db-logging)
+ (log-korma-form korma-form))
+
+ (eval korma-form))
+
+ (catch java.sql.SQLException e
+ (let [^String message (or (->> (.getMessage e) ; error message comes back like "Error message ... [status-code]" sometimes
+ (re-find #"(?s)(^.*)\s+\[[\d-]+\]$") ; status code isn't useful and makes unit tests hard to write so strip it off
+ second) ; (?s) = Pattern.DOTALL - tell regex `.` to match newline characters as well
+ (.getMessage e))]
+ (throw (Exception. message)))))))
(defn process-and-run
"Process and run a query and return results."
[{:keys [type] :as query}]
- ;; we know how to handle :native and :query (structured) type queries
(case (keyword type)
:native (native/process-and-run query)
:query (process-structured query)))
@@ -87,127 +83,149 @@
An implementation of `apply-form` may optionally return a vector of several forms to insert into the generated korma `select` form."
(fn [[clause-name _]] clause-name))
-;; ### `:aggregation`
-;; ex.
-;;
-;; ["distinct" 1412]
-(defmethod apply-form :aggregation [[_ value]]
- (match value
- ["rows"] nil ; don't need to do anything special for `rows` - `select` selects all rows by default
- ["count"] `(aggregate (~'count :*) :count)
- [ag-type field-id] (let [field (field-id->kw field-id)]
- (match ag-type
- "avg" `(aggregate (~'avg ~field) :avg)
- "count" `(aggregate (~'count ~field) :count)
- "distinct" `(aggregate (~'count (sqlfn :DISTINCT ~field)) :count)
- "stddev" `(fields [(sqlfn :stddev ~field) :stddev])
- "sum" `(aggregate (~'sum ~field) :sum))))) ; cumulative sum happens in post-processing (see below)
-
-;; ### `:breakout`
-;; ex.
-;;
-;; [1412 1413]
-(defmethod apply-form :breakout [[_ field-ids]]
- (let [ ;; Group by all the breakout fields
- field-names (map field-id->kw field-ids)
- ;; Add fields form only for fields that weren't specified in :fields clause -- we don't want to include it twice, or korma will barf
- fields-not-in-fields-clause-names (->> field-ids
- (filter (partial (complement contains?) (set (:fields (:query qp/*query*)))))
- (map field-id->kw))]
- `[(group ~@field-names)
- (fields ~@fields-not-in-fields-clause-names)]))
-
-
-;; ### `:fields`
-;; ex.
-;;
-;; [1412 1413]
-(defmethod apply-form :fields [[_ field-ids]]
- (let [field-names (map field-id->kw field-ids)]
- `(fields ~@field-names)))
-
-;; ### `:filter`
-;; ex.
-;;
-;; ["AND"
-;; [">" 1413 1]
-;; [">=" 1412 4]]
+(defmethod apply-form :default [form]) ;; nothing
+
+
+(defprotocol IGenericSQLFormattable
+ (formatted [this] [this include-as?]))
+
+(defn- quote-name [nm]
+ (i/quote-name (:driver *query*) nm))
+
+(extend-protocol IGenericSQLFormattable
+ Field
+ (formatted
+ ([this]
+ (formatted this false))
+ ([{:keys [table-name field-name base-type special-type]} include-as?]
+ (cond
+ (contains? #{:DateField :DateTimeField} base-type) `(raw ~(str (format "CAST(%s.%s AS DATE)" (quote-name table-name) (quote-name field-name))
+ (when include-as?
+ (format " AS %s" (quote-name field-name)))))
+ (= special-type :timestamp_seconds) `(raw ~(str (i/cast-timestamp-to-date (:driver *query*) table-name field-name :seconds)
+ (when include-as?
+ (format " AS %s" (quote-name field-name)))))
+ (= special-type :timestamp_milliseconds) `(raw ~(str (i/cast-timestamp-to-date (:driver *query*) table-name field-name :milliseconds)
+ (when include-as?
+ (format " AS %s" (quote-name field-name)))))
+ :else (keyword (format "%s.%s" table-name field-name)))))
+
+
+ ;; e.g. the ["aggregation" 0] fields we allow in order-by
+ OrderByAggregateField
+ (formatted
+ ([this]
+ (formatted this false))
+ ([_ _]
+ (let [{:keys [aggregation-type]} (:aggregation (:query *query*))] ; determine the name of the aggregation field
+ `(raw ~(quote-name (case aggregation-type
+ :avg "avg"
+ :count "count"
+ :distinct "count"
+ :stddev "stddev"
+ :sum "sum"))))))
+
+
+ Value
+ (formatted
+ ([this]
+ (formatted this false))
+ ([{:keys [value base-type]} _]
+ (cond
+ (instance? java.util.Date value) `(raw ~(format "CAST('%s' AS DATE)" (.toString ^java.util.Date value)))
+ (= base-type :UUIDField) (do (assert (string? value))
+ (java.util.UUID/fromString value))
+ :else value))))
+
+
+(defmethod apply-form :aggregation [[_ {:keys [aggregation-type field]}]]
+ (if-not field
+ ;; aggregation clauses w/o a Field
+ (case aggregation-type
+ :rows nil ; don't need to do anything special for `rows` - `select` selects all rows by default
+ :count `(aggregate (~'count :*) :count))
+ ;; aggregation clauses with a Field
+ (let [field (formatted field)]
+ (case aggregation-type
+ :avg `(aggregate (~'avg ~field) :avg)
+ :count `(aggregate (~'count ~field) :count)
+ :distinct `(aggregate (~'count (sqlfn :DISTINCT ~field)) :count)
+ :stddev `(fields [(sqlfn :stddev ~field) :stddev])
+ :sum `(aggregate (~'sum ~field) :sum)))))
+
+
+(defmethod apply-form :breakout [[_ fields]]
+ `[ ;; Group by all the breakout fields
+ (group ~@(map formatted fields))
+
+ ;; Add fields form only for fields that weren't specified in :fields clause -- we don't want to include it twice, or korma will barf
+ (fields ~@(->> fields
+ (filter (partial (complement contains?) (set (:fields (:query *query*)))))
+ (map (u/rpartial formatted :include-as))))])
+
+
+(defmethod apply-form :fields [[_ fields]]
+ `(fields ~@(map (u/rpartial formatted :include-as) fields)))
+
(defn- filter-subclause->predicate
- "Given a filter SUBCLAUSE, return a Korma filter predicate form for use in korma `where`.
-
- (filter-subclause->predicate [\">\" 1413 1]) -> {:field_name [> 1]} "
- [subclause]
- (match subclause
- ["INSIDE" lat-field lon-field lat-max lon-min lat-min lon-max] (let [lat-kw (field-id->kw lat-field)
- lon-kw (field-id->kw lon-field)]
- `(~'and ~@[{lat-kw ['< lat-max]}
- {lat-kw ['> lat-min]}
- {lon-kw ['< lon-max]}
- {lon-kw ['> lon-min]}]))
- [_ field-id & _] {(field-id->kw field-id)
- ;; If the field in question is a date field we need to cast the YYYY-MM-DD string that comes back from the UI to a SQL date
- (let [cast-value-if-needed (fn [v]
- (if-not (or (= (type v) java.sql.Date)
- (= (type v) java.util.Date)) v
- `(raw ~(format "CAST('%s' AS DATE)" (.toString ^java.sql.Date v)))))]
- (match subclause
- ["NOT_NULL" _] ['not= nil]
- ["IS_NULL" _] ['= nil]
- ["BETWEEN" _ min max] ['between [(cast-value-if-needed min) (cast-value-if-needed max)]]
- [_ _ value] (let [value (cast-value-if-needed value)]
- (match subclause
- [">" _ _] ['> value]
- ["<" _ _] ['< value]
- [">=" _ _] ['>= value]
- ["<=" _ _] ['<= value]
- ["=" _ _] ['= value]
- ["!=" _ _] ['not= value]))))}))
-
-(defmethod apply-form :filter [[_ filter-clause]]
- (match filter-clause
- ["AND" & subclauses] `(where (~'and ~@(map filter-subclause->predicate
- subclauses)))
- ["OR" & subclauses] `(where (~'or ~@(map filter-subclause->predicate
- subclauses)))
- [& subclause] `(where ~(filter-subclause->predicate subclause))))
-
-;; ### `:limit`
-;; ex.
-;;
-;; 10
+ "Given a filter SUBCLAUSE, return a Korma filter predicate form for use in korma `where`."
+ [{:keys [filter-type], :as filter}]
+ (if (= filter-type :inside)
+ ;; INSIDE filter subclause
+ (let [{:keys [lat lon]} filter]
+ (list 'and {(formatted (:field lat)) ['< (formatted (:max lat))]}
+ {(formatted (:field lat)) ['> (formatted (:min lat))]}
+ {(formatted (:field lon)) ['< (formatted (:max lon))]}
+ {(formatted (:field lon)) ['> (formatted (:min lon))]}))
+
+ ;; all other filter subclauses
+ (let [field (formatted (:field filter))
+ value (some-> filter :value formatted)]
+ (case filter-type
+ :between {field ['between [(formatted (:min-val filter)) (formatted (:max-val filter))]]}
+ :not-null {field ['not= nil]}
+ :is-null {field ['= nil]}
+ :starts-with {field ['like (str value \%)]}
+ :contains {field ['like (str \% value \%)]}
+ :ends-with {field ['like (str \% value)]}
+ :> {field ['> value]}
+ :< {field ['< value]}
+ :>= {field ['>= value]}
+ :<= {field ['<= value]}
+ := {field ['= value]}
+ :!= {field ['not= value]}))))
+
+(defn- filter-clause->predicate [{:keys [compound-type subclauses], :as clause}]
+ (case compound-type
+ :and `(~'and ~@(map filter-clause->predicate subclauses))
+ :or `(~'or ~@(map filter-clause->predicate subclauses))
+ nil (filter-subclause->predicate clause)))
+
+(defmethod apply-form :filter [[_ clause]]
+ `(where ~(filter-clause->predicate clause)))
+
+
+(defmethod apply-form :join-tables [[_ join-tables]]
+ (vec (for [{:keys [table-name pk-field source-field]} join-tables]
+ `(join ~table-name
+ (~'= ~(keyword (format "%s.%s" (:name (:source-table (:query *query*))) (:field-name source-field)))
+ ~(keyword (format "%s.%s" table-name (:field-name pk-field))))))))
+
+
(defmethod apply-form :limit [[_ value]]
`(limit ~value))
-;; ### `:order_by`
-;; ex.
-;;
-;; [[1416 "ascending"]
-;; [1412 "descending"]]
-(defmethod apply-form :order_by [[_ order-by-pairs]]
- (when-not (empty? order-by-pairs)
- (->> order-by-pairs
- (map (fn [pair] (when-not (vector? pair) (throw (Exception. "order_by clause must consists of pairs like [field_id \"ascending\"]"))) pair))
- (mapv (fn [[field asc-desc]]
- {:pre [(string? asc-desc)]}
- `(order ~(match [field]
- [field-id :guard integer?] (field-id->kw field-id)
- [["aggregation" 0]] (let [[ag] (:aggregation (:query qp/*query*))]
- `(raw ~(case ag
- "avg" "\"avg\"" ; based on the type of the aggregation
- "count" "\"count\"" ; make sure we ask the DB to order by the
- "distinct" "\"count\"" ; name of the aggregate field
- "stddev" "\"stddev\""
- "sum" "\"sum\""))))
- ~(case asc-desc
- "ascending" :ASC
- "descending" :DESC)))))))
-
-;; ### `:page`
-;; ex.
-;;
-;; {:page 1
-;; :items 20}
+
+(defmethod apply-form :order-by [[_ subclauses]]
+ (vec (for [{:keys [field direction]} subclauses]
+ `(order ~(formatted field)
+ ~(case direction
+ :ascending :ASC
+ :descending :DESC)))))
+
+;; TODO - page can be preprocessed away -- converted to a :limit clause and an :offset clause
+;; implement this at some point.
(defmethod apply-form :page [[_ {:keys [items page]}]]
{:pre [(integer? items)
(> items 0)
@@ -216,22 +234,24 @@
`[(limit ~items)
(offset ~(* items (- page 1)))])
-;; ### `:source_table`
-(defmethod apply-form :source_table [_] ; nothing to do here since getting the `Table` is handled by `process`
- nil)
-
;; ## Debugging Functions (Internal)
-(defn- log-query
- "Log QUERY Dictionary and the korma form and SQL that the Query Processor translates it to."
- [{:keys [source_table] :as query} forms]
+(defn- log-korma-form
+ [korma-form]
(when-not qp/*disable-qp-logging*
(log/debug
- "\n********************"
- "\nSOURCE TABLE: " source_table
- "\nQUERY ->" (with-out-str (clojure.pprint/pprint query))
- "\nKORMA FORM ->" (with-out-str (clojure.pprint/pprint `(select (table-id->korma-entity ~source_table) ~@forms)))
- "\nSQL ->" (eval `(let [entity# (table-id->korma-entity ~source_table)]
- (sql-only (select entity# ~@forms))))
- "\n********************\n")))
+ (u/format-color 'green "\n\nKORMA FORM: ðŸ˜\n%s" (->> (nth korma-form 2) ; korma form is wrapped in a let clause. Discard it
+ (walk/prewalk (fn [form] ; strip korma.core/ qualifications from symbols in the form
+ (if-not (symbol? form) form ; to remove some of the clutter
+ (symbol (name form)))))
+ (u/pprint-to-str)))
+ (u/format-color 'blue "\nSQL: 😈\n%s\n" (-> (eval (let [[let-form binding-form & body] korma-form] ; wrap the (select ...) form in a sql-only clause
+ `(~let-form ~binding-form ; has to go there to work correctly
+ (sql-only ~@body))))
+ (s/replace #"\sFROM" "\nFROM") ; add newlines to the SQL to make it more readable
+ (s/replace #"\sLEFT JOIN" "\nLEFT JOIN")
+ (s/replace #"\sWHERE" "\nWHERE")
+ (s/replace #"\sGROUP BY" "\nGROUP BY")
+ (s/replace #"\sORDER BY" "\nORDER BY")
+ (s/replace #"\sLIMIT" "\nLIMIT"))))))
diff --git a/src/metabase/driver/generic_sql/util.clj b/src/metabase/driver/generic_sql/util.clj
index a184e9ee3eee6d687504ea96e1b3ba1da70e839c..79e55621a6870b608e937523378d5e19b906802d 100644
--- a/src/metabase/driver/generic_sql/util.clj
+++ b/src/metabase/driver/generic_sql/util.clj
@@ -1,37 +1,37 @@
(ns metabase.driver.generic-sql.util
"Shared functions for our generic-sql query processor."
- (:require [clojure.core.memoize :as memo]
- [clojure.java.jdbc :as jdbc]
+ (:require [clojure.java.jdbc :as jdbc]
[clojure.tools.logging :as log]
[colorize.core :as color]
[korma.core :as korma]
[korma.db :as kdb]
- [metabase.db :refer [sel]]
[metabase.driver :as driver]
- [metabase.driver.context :as context]
[metabase.driver.query-processor :as qp]
- (metabase.models [database :refer [Database]]
- [field :refer [Field]]
- [table :refer [Table]])))
+ [metabase.driver.generic-sql.interface :as i]))
-;; Cache the Korma DB connections for a given Database for 60 seconds instead of creating new ones every single time
-(defn- db->connection-spec [database]
+(defn- db->connection-spec [{{:keys [short-lived?]} :details, :as database}]
(let [driver (driver/engine->driver (:engine database))
- database->connection-details (:database->connection-details driver)
- connection-details->connection-spec (:connection-details->connection-spec driver)]
- (-> database database->connection-details connection-details->connection-spec)))
-
-(def ^{:arglists '([database])} db->korma-db
+ database->connection-details (partial i/database->connection-details driver)
+ connection-details->connection-spec (partial i/connection-details->connection-spec driver)]
+ (merge (-> database database->connection-details connection-details->connection-spec)
+ ;; unless this is a temp DB, we need to make a pool or the connection will be closed before we get a chance to unCLOB-er the results during JSON serialization
+ ;; TODO - what will we do once we have CLOBS in temp DBs?
+ {:make-pool? (not short-lived?)})))
+
+(def ^{:arglists '([database])}
+ db->korma-db
"Return a Korma database definition for DATABASE.
- This does a little bit of smart caching (for 60 seconds) to avoid creating new connections when unneeded."
- (let [-db->korma-db (memo/ttl (fn [database]
- (log/debug (color/red "Creating a new DB connection..."))
- (assoc (kdb/create-db (db->connection-spec database))
- :make-pool? true))
- :ttl/threshold (* 60 1000))]
- ;; only :engine and :details are needed for driver/connection so just pass those so memoization works as expected
- (fn [database]
- (-db->korma-db (select-keys database [:engine :details])))))
+ Since Korma/C3PO seems to be bad about cleaning up its connection pools, this function is
+ memoized and will return an existing connection pool on subsequent calls."
+ (let [db->korma-db (fn [database]
+ (log/debug (color/red "Creating a new DB connection..."))
+ (kdb/create-db (db->connection-spec database)))
+ memoized-db->korma-db (memoize db->korma-db)]
+ (fn [{{:keys [short-lived?]} :details, :as database}]
+ ;; Use un-memoized version of function for so-called "short-lived" databases (i.e. temporary ones that we won't create a connection pool for)
+ ((if short-lived?
+ db->korma-db
+ memoized-db->korma-db) (select-keys database [:engine :details]))))) ; only :engine and :details are needed for driver/connection so just pass those so memoization works as expected
(def ^:dynamic ^java.sql.DatabaseMetaData *jdbc-metadata*
"JDBC metadata object for a database. This is set by `with-jdbc-metadata`."
@@ -67,64 +67,17 @@
~@body)))
(defn korma-entity
- "Return a Korma entity for TABLE.
+ "Return a Korma entity for [DB and] TABLE .
(-> (sel :one Table :id 100)
korma-entity
(select (aggregate (count :*) :count)))"
- [{:keys [name db] :as table}]
- {:pre [(delay? db)]}
- {:table name
- :pk :id
- :db (db->korma-db @db)})
-
-(defn table-id->korma-entity
- "Lookup `Table` with TABLE-ID and return a korma entity that can be used in a korma form."
- [table-id]
- {:pre [(integer? table-id)]
- :post [(map? %)]}
- (korma-entity (or (and (= (:id context/*table*) table-id)
- context/*table*)
- (sel :one Table :id table-id)
- (throw (Exception. (format "Table with ID %d doesn't exist!" table-id))))))
-
-(defn castify-field
- "Wrap Field in a SQL `CAST` statement if needed (i.e., it's a `:DateTimeField`).
-
- (castify :name :TextField nil) -> :name
- (castify :date :DateTimeField nil) -> (raw \"CAST(\"date\" AS DATE)
- (castify :timestamp :IntegerField :timestamp_seconds) -> (raw \"CAST(TO_TIMESTAMP(\"timestamp\") AS DATE))"
- [field-name base-type special-type]
- {:pre [(string? field-name)
- (keyword? base-type)]}
- (cond
- (contains? #{:DateField :DateTimeField} base-type) `(korma/raw ~(format "CAST(\"%s\" AS DATE)" field-name))
- (= special-type :timestamp_seconds) `(korma/raw ~((:cast-timestamp-seconds-field-to-date-fn qp/*driver*) field-name))
- (= special-type :timestamp_milliseconds) `(korma/raw ~((:cast-timestamp-milliseconds-field-to-date-fn qp/*driver*) field-name))
- :else (keyword field-name)))
-
-(defn field-name+base-type->castified-key
- "Like `castify-field`, but returns a keyword that should match the one returned in results."
- [field-name field-base-type special-type]
- {:pre [(string? field-name)
- (keyword? field-base-type)]
- :post [(keyword? %)]}
- (keyword
- (cond
- (contains? #{:DateField :DateTimeField} field-base-type) (format "CAST(%s AS DATE)" field-name)
- :else field-name)))
-
-(defn field-id->kw
- "Given a metabase `Field` ID, return a keyword for use in the Korma form (or a casted raw string for date fields)."
- [field-id]
- {:pre [(integer? field-id)]}
- (if-let [{field-name :name, field-type :base_type, special-type :special_type} (sel :one [Field :name :base_type :special_type] :id field-id)]
- (castify-field field-name field-type special-type)
- (throw (Exception. (format "Field with ID %d doesn't exist!" field-id)))))
-
-(def date-field-id?
- "Does FIELD-ID correspond to a field that is a Date?"
- (memoize ; memoize since the base_type of a Field isn't going to change
- (fn [field-id]
- (contains? #{:DateField :DateTimeField}
- (sel :one :field [Field :base_type] :id field-id)))))
+ {:arglists '([table] [db table])}
+ ([{db-delay :db, :as table}]
+ {:pre [(delay? db-delay)]}
+ (korma-entity @db-delay table))
+ ([db {table-name :name}]
+ {:pre [(map? db)]}
+ {:table table-name
+ :pk :id
+ :db (db->korma-db db)}))
diff --git a/src/metabase/driver/h2.clj b/src/metabase/driver/h2.clj
index 655432e402b234074933560640b8aa7063fa5df8..06f7c55538b499f2f87d4d001ebd66132f9a69f2 100644
--- a/src/metabase/driver/h2.clj
+++ b/src/metabase/driver/h2.clj
@@ -1,106 +1,146 @@
(ns metabase.driver.h2
- (:require [korma.db :as kdb]
+ (:require [clojure.string :as s]
+ [korma.db :as kdb]
+ [metabase.db :as db]
[metabase.driver :as driver]
- [metabase.driver.generic-sql :as generic-sql]))
+ (metabase.driver [generic-sql :as generic-sql, :refer [GenericSQLIDriverMixin GenericSQLISyncDriverTableFKsMixin
+ GenericSQLISyncDriverFieldAvgLengthMixin GenericSQLISyncDriverFieldPercentUrlsMixin]]
+ [interface :refer [IDriver ISyncDriverTableFKs ISyncDriverFieldAvgLength ISyncDriverFieldPercentUrls]])
+ [metabase.driver.generic-sql.interface :refer :all]
+ [metabase.models.database :refer [Database]]))
-;; ## CONNECTION
+(def ^:private ^:const column->base-type
+ "Map of H2 Column types -> Field base types. (Add more mappings here as needed)"
+ {: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})
-(defn- connection-details->connection-spec [details-map]
- (korma.db/h2 (assoc details-map
- :db-type :h2 ; what are we using this for again (?)
- :make-pool? false)))
+;; These functions for exploding / imploding the options in the connection strings are here so we can override shady options
+;; users might try to put in their connection string. e.g. if someone sets `ACCESS_MODE_DATA` to `rws` we can replace that
+;; and make the connection read-only.
-(defn- database->connection-details [{:keys [details]}]
- details)
+(defn- connection-string->file+options
+ "Explode a CONNECTION-STRING like `file:my-db;OPTION=100;OPTION_2=TRUE` to a pair of file and an options map.
+ (connection-string->file+options \"file:my-crazy-db;OPTION=100;OPTION_X=TRUE\")
+ -> [\"file:my-crazy-db\" {\"OPTION\" \"100\", \"OPTION_X\" \"TRUE\"}]"
+ [connection-string]
+ (let [[file & options] (s/split connection-string #";+")
+ options (into {} (for [option options]
+ (s/split option #"=")))]
+ [file options]))
-;; ## SYNCING
+(defn- file+options->connection-string
+ "Implode the results of `connection-string->file+options` back into a connection string."
+ [file options]
+ (apply str file (for [[k v] options]
+ (str ";" k "=" v))))
-(def ^:const column->base-type
- "Map of H2 Column types -> Field base types. (Add more mappings here as needed)"
- {: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})
+(defn- connection-string-set-safe-options
+ "Add Metabase Security Settingsâ„¢ to this CONNECTION-STRING (i.e. try to keep shady users from writing nasty SQL)."
+ [connection-string]
+ (let [[file options] (connection-string->file+options connection-string)]
+ (file+options->connection-string file (merge options {"IFEXISTS" "TRUE"
+ "ACCESS_MODE_DATA" "r"}))))
-;; ## QP Functions
+(defrecord H2Driver []
+ ISqlDriverDatabaseSpecific
+ (connection-details->connection-spec [_ details]
+ (kdb/h2 (if db/*allow-potentailly-unsafe-connections* details
+ (update details :db connection-string-set-safe-options))))
-(defn- cast-timestamp-seconds-field-to-date-fn [field-name]
- (format "CAST(TIMESTAMPADD('SECOND', \"%s\", DATE '1970-01-01') AS DATE)" field-name))
+ (database->connection-details [_ {:keys [details]}]
+ details)
-(defn- cast-timestamp-milliseconds-field-to-date-fn [field-name]
- (format "CAST(TIMESTAMPADD('MILLISECOND', \"%s\", DATE '1970-01-01') AS DATE)" field-name))
+ (cast-timestamp-to-date [_ table-name field-name seconds-or-milliseconds]
+ (format "CAST(TIMESTAMPADD('%s', \"%s\".\"%s\", DATE '1970-01-01') AS DATE)"
+ (case seconds-or-milliseconds
+ :seconds "SECOND"
+ :milliseconds "MILLISECOND")
+ table-name field-name)))
-(def ^:private ^:const uncastify-timestamp-regex
- #"CAST\(TIMESTAMPADD\('(?:MILLI)?SECOND', ([^\s]+), DATE '1970-01-01'\) AS DATE\)")
+(defn- wrap-process-query-middleware [_ qp]
+ (fn [{query-type :type, :as query}]
+ {:pre [query-type]}
+ ;; 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)
+ (let [{:keys [db]} (db/sel :one :field [Database :details] :id (:database query))
+ _ (assert db)
+ [_ 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)))
-;; ## DRIVER
+(extend H2Driver
+ ;; Override the generic SQL implementation of wrap-process-query-middleware so we can block unsafe native queries (see above)
+ IDriver (assoc GenericSQLIDriverMixin :wrap-process-query-middleware wrap-process-query-middleware)
+ ISyncDriverTableFKs GenericSQLISyncDriverTableFKsMixin
+ ISyncDriverFieldAvgLength GenericSQLISyncDriverFieldAvgLengthMixin
+ ISyncDriverFieldPercentUrls GenericSQLISyncDriverFieldPercentUrlsMixin)
-(def driver
- (generic-sql/map->SqlDriver
- {:column->base-type column->base-type
- :connection-details->connection-spec connection-details->connection-spec
- :database->connection-details database->connection-details
- :sql-string-length-fn :LENGTH
- :timezone->set-timezone-sql nil
- :cast-timestamp-seconds-field-to-date-fn cast-timestamp-seconds-field-to-date-fn
- :cast-timestamp-milliseconds-field-to-date-fn cast-timestamp-milliseconds-field-to-date-fn
- :uncastify-timestamp-regex uncastify-timestamp-regex}))
+(def ^:const driver
+ (map->H2Driver {:column->base-type column->base-type
+ :features generic-sql/features
+ :sql-string-length-fn :LENGTH}))
diff --git a/src/metabase/driver/interface.clj b/src/metabase/driver/interface.clj
index cdd370f6ee45b510c11500673a988291ac4eb2ab..ff484e630a7240231b1222617c0da674cd040a48 100644
--- a/src/metabase/driver/interface.clj
+++ b/src/metabase/driver/interface.clj
@@ -1,21 +1,41 @@
(ns metabase.driver.interface
- "Protocols that DB drivers implement. Thus, the interface such drivers provide.")
+ "Protocols that DB drivers implement. Thus, the interface such drivers provide."
+ (:import (clojure.lang Keyword)))
+
+(def ^:const driver-optional-features
+ "A set on optional features (as keywords) that may or may not be supported by individual drivers."
+ #{:foreign-keys
+ :nested-fields ; are nested Fields (i.e., Mongo-style nested keys) supported?
+ :set-timezone
+ :standard-deviation-aggregations
+ :unix-timestamp-special-type-fields})
+
+(def ^:const max-sync-lazy-seq-results
+ "The maximum number of values we should return when using `field-values-lazy-seq`.
+ This many is probably fine for inferring special types and what-not; we don't want
+ to scan millions of values at any rate."
+ 10000)
;; ## IDriver Protocol
(defprotocol IDriver
- "Methods all drivers must implement."
+ "Methods all drivers must implement.
+ They should also include the following properties:
+
+ * `features` (optional)
+ A set containing one or more `driver-optional-features`"
+
;; Connection
(can-connect? [this database]
"Check whether we can connect to DATABASE and perform a simple query.
(To check whether we can connect to a database given only its details, use `can-connect-with-details?` instead).
- (can-connect? (sel :one Database :id 1))")
+ (can-connect? driver (sel :one Database :id 1))")
(can-connect-with-details? [this details-map]
"Check whether we can connect to a database and performa a simple query.
Returns true if we can, otherwise returns false or throws an Exception.
- (can-connect-with-details? {:engine :postgres, :dbname \"book\", ...})")
+ (can-connect-with-details? driver {:engine :postgres, :dbname \"book\", ...})")
;; Syncing
(sync-in-context [this database do-sync-fn]
@@ -32,12 +52,22 @@
"Return a map of string names of active columns (or equivalent) -> `Field` `base_type` for TABLE (or equivalent).")
(table-pks [this table]
"Return a set of string names of active Fields that are primary keys for TABLE (or equivalent).")
+ (field-values-lazy-seq [this field]
+ "Return a lazy sequence of all values of Field.
+ This is used to implement `mark-json-field!`, and fallback implentations of `mark-no-preview-display-field!` and `mark-url-field!`
+ if drivers *don't* implement `ISyncDriverFieldAvgLength` or `ISyncDriverFieldPercentUrls`, respectively.")
;; Query Processing
(process-query [this query]
"Process a native or structured query.
(Don't use this directly; instead, use `metabase.driver/process-query`,
- which does things like preprocessing before calling the appropriate implementation.)"))
+ which does things like preprocessing before calling the appropriate implementation.)")
+ (wrap-process-query-middleware [this qp-fn]
+ "Custom QP middleware for this driver.
+ Like `sync-in-context`, but for running queries rather than syncing. This is basically around-advice for the QP pre and post-processing stages.
+ This should be used to do things like open DB connections that need to remain open for the duration of post-processing.
+ This middleware is injected into the QP middleware stack immediately after the Query Expander; in other words, it will receive the expanded query.
+ See the Mongo driver for and example of how this is intended to be used."))
;; ## ISyncDriverTableFKs Protocol (Optional)
@@ -54,29 +84,55 @@
* dest-column-name"))
-;; ## ISyncDriverField Protocols
+(defprotocol ISyncDriverFieldNestedFields
+ "Optional protocol that should provide information about the subfields of a FIELD when applicable.
+ Drivers that declare support for `:nested-fields` should implement this protocol."
+ (active-nested-field-name->type [this field]
+ "Return a map of string names of active child `Fields` of FIELD -> `Field.base_type`."))
-;; Sync drivers need to implement either ISyncDriverFieldValues or ISyncDriverFieldAvgLength *and* ISyncDriverFieldPercentUrls.
-;;
-;; ISyncDriverFieldValues is used to provide a generic fallback implementation of the other two that calculate these values by
-;; iterating over *every* value of the Field in Clojure-land. Since that's slower, it's preferable to provide implementations
-;; of ISyncDriverFieldAvgLength/ISyncDriverFieldPercentUrls when possible. (You can also implement ISyncDriverFieldValues and
-;; *one* of the other two; the optimized implementation will be used for that and the fallback implementation for the other)
-(defprotocol ISyncDriverFieldValues
- "Optional. Used to implement generic fallback implementations of `ISyncDriverFieldAvgLength` and `ISyncDriverFieldPercentUrls`.
- If a sync driver doesn't implement *either* of those protocols, it must implement this one."
- (field-values-lazy-seq [this field]
- "Return a lazy sequence of all values of Field."))
+;; ## ISyncDriverField Protocols (Optional)
+
+;; These are optional protocol that drivers can implement to be used instead of falling back to field-values-lazy-seq for certain Field
+;; syncing operations, which involves iterating over a few thousand values of the Field in Clojure-land. Since that's slower, it's
+;; preferable to provide implementations of ISyncDriverFieldAvgLength/ISyncDriverFieldPercentUrls when possible.
(defprotocol ISyncDriverFieldAvgLength
- "Optional. If this isn't provided, a fallback implementation that calculates average length in Clojure-land will be used instead.
- If a driver doesn't implement this protocol, it *must* implement `ISyncDriverFieldValues`."
+ "Optional. If this isn't provided, a fallback implementation that calculates average length in Clojure-land will be used instead."
(field-avg-length [this field]
"Return the average length of all non-nil values of textual FIELD."))
(defprotocol ISyncDriverFieldPercentUrls
- "Optional. If this isn't provided, a fallback implementation that calculates URL percentage in Clojure-land will be used instead.
- If a driver doesn't implement this protocol, it *must* implement `ISyncDriverFieldValues`."
+ "Optional. If this isn't provided, a fallback implementation that calculates URL percentage in Clojure-land will be used instead."
(field-percent-urls [this field]
"Return the percentage of non-nil values of textual FIELD that are valid URLs."))
+
+
+;;; ## ISyncDriverSpecificSyncField (Optional)
+
+(defprotocol ISyncDriverSpecificSyncField
+ "Optional. Do driver-specific syncing for a FIELD."
+ (driver-specific-sync-field! [this field]
+ "This is a chance for drivers to do custom Field syncing specific to their database.
+ For example, the Postgres driver can mark Postgres JSON fields as `special_type = json`.
+ As with the other Field syncing functions in `metabase.driver.sync`, this method should return the modified
+ FIELD, if any, or `nil`."))
+
+
+;; ## Helper Functions
+
+(def ^:private valid-feature? (partial contains? driver-optional-features))
+
+(defn supports?
+ "Does DRIVER support FEATURE?"
+ [{:keys [features]} ^Keyword feature]
+ {:pre [(set? features)
+ (every? valid-feature? features)
+ (valid-feature? feature)]}
+ (contains? features feature))
+
+(defn assert-driver-supports
+ "Helper fn. Assert that DRIVER supports FEATURE."
+ [driver ^Keyword feature]
+ (when-not (supports? driver feature)
+ (throw (Exception. (format "%s is not supported by this driver." (name feature))))))
diff --git a/src/metabase/driver/mongo.clj b/src/metabase/driver/mongo.clj
index 20358519d30d92d98f9e2bdb4cb112906a18dc9d..60e4e3bd0a84725cf2166cf19060b0d7bcf91f8c 100644
--- a/src/metabase/driver/mongo.clj
+++ b/src/metabase/driver/mongo.clj
@@ -4,6 +4,7 @@
[clojure.set :as set]
[clojure.tools.logging :as log]
[colorize.core :as color]
+ [medley.core :as m]
(monger [collection :as mc]
[command :as cmd]
[conversion :as conv]
@@ -13,7 +14,8 @@
[metabase.driver :as driver]
[metabase.driver.interface :refer :all]
(metabase.driver.mongo [query-processor :as qp]
- [util :refer [*mongo-connection* with-mongo-connection values->base-type]])))
+ [util :refer [*mongo-connection* with-mongo-connection values->base-type]])
+ [metabase.util :as u]))
(declare driver)
@@ -22,9 +24,9 @@
(defn- table->column-names
"Return a set of the column names for TABLE."
[table]
- (with-mongo-connection [^com.mongodb.DBApiLayer conn @(:db table)]
+ (with-mongo-connection [^com.mongodb.DB conn @(:db table)]
(->> (mc/find-maps conn (:name table))
- (take 10000) ; it's probably enough to only consider the first 10,000 docs in the collection instead of iterating over potentially millions of them
+ (take max-sync-lazy-seq-results)
(map keys)
(map set)
(reduce set/union))))
@@ -40,11 +42,11 @@
;;; ## MongoDriver
-(deftype MongoDriver []
+(defrecord MongoDriver []
IDriver
;;; ### Connection
(can-connect? [_ database]
- (with-mongo-connection [^com.mongodb.DBApiLayer conn database]
+ (with-mongo-connection [^com.mongodb.DB conn database]
(= (-> (cmd/db-stats conn)
(conv/from-db-object :keywordize)
:ok)
@@ -54,6 +56,11 @@
(can-connect? this {:details details}))
;;; ### QP
+ (wrap-process-query-middleware [_ qp]
+ (fn [query]
+ (with-mongo-connection [^com.mongodb.DB conn (:database query)]
+ (qp query))))
+
(process-query [_ query]
(qp/process-and-run query))
@@ -63,31 +70,54 @@
(do-sync-fn)))
(active-table-names [_ database]
- (with-mongo-connection [^com.mongodb.DBApiLayer conn database]
+ (with-mongo-connection [^com.mongodb.DB conn database]
(-> (mdb/get-collection-names conn)
(set/difference #{"system.indexes"}))))
(active-column-names->type [_ table]
(with-mongo-connection [_ @(:db table)]
- (->> (table->column-names table)
- (map (fn [column-name]
- {(name column-name)
- (field->base-type {:name (name column-name)
- :table (delay table)})}))
- (into {}))))
+ (into {} (for [column-name (table->column-names table)]
+ {(name column-name)
+ (field->base-type {:name (name column-name)
+ :table (delay table)
+ :qualified-name-components (delay [(:name table) (name column-name)])})}))))
(table-pks [_ _]
#{"_id"})
- ISyncDriverFieldValues
- (field-values-lazy-seq [_ field]
+ (field-values-lazy-seq [_ {:keys [qualified-name-components table], :as field}]
+ (assert (and (map? field)
+ (delay? qualified-name-components)
+ (delay? table))
+ (format "Field is missing required information:\n%s" (u/pprint-to-str 'red field)))
(lazy-seq
- (let [table @(:table field)]
- (map (keyword (:name field))
- (with-mongo-connection [^com.mongodb.DBApiLayer conn @(:db table)]
- (mq/with-collection conn (:name table)
- (mq/fields [(:name field)]))))))))
+ (assert *mongo-connection*
+ "You must have an open Mongo connection in order to get lazy results with field-values-lazy-seq.")
+ (let [table @table
+ name-components (rest @qualified-name-components)]
+ (assert (seq name-components))
+ (map #(get-in % (map keyword name-components))
+ (mq/with-collection *mongo-connection* (:name table)
+ (mq/fields [(apply str (interpose "." name-components))]))))))
+
+ ISyncDriverFieldNestedFields
+ (active-nested-field-name->type [this field]
+ ;; Build a map of nested-field-key -> type -> count
+ ;; TODO - using an atom isn't the *fastest* thing in the world (but is the easiest); consider alternate implementation
+ (let [field->type->count (atom {})]
+ (doseq [val (take max-sync-lazy-seq-results (field-values-lazy-seq this field))]
+ (when (map? val)
+ (doseq [[k v] val]
+ (swap! field->type->count update-in [k (type v)] #(if % (inc %) 1)))))
+ ;; (seq types) will give us a seq of pairs like [java.lang.String 500]
+ (->> @field->type->count
+ (m/map-vals (fn [type->count]
+ (->> (seq type->count) ; convert to pairs of [type count]
+ (sort-by second) ; source by count
+ last ; take last item (highest count)
+ first ; keep just the type
+ driver/class->base-type))))))) ; get corresponding Field base_type
-(def ^:const driver
+(def driver
"Concrete instance of the MongoDB driver."
- (MongoDriver.))
+ (map->MongoDriver {:features #{:nested-fields}}))
diff --git a/src/metabase/driver/mongo/query_processor.clj b/src/metabase/driver/mongo/query_processor.clj
index eb9572e0a4c07796e8811e62b7c3ed8073d1366e..457eaef96bb5fe4d7c51d61a822650fdd0ef522a 100644
--- a/src/metabase/driver/mongo/query_processor.clj
+++ b/src/metabase/driver/mongo/query_processor.clj
@@ -1,7 +1,10 @@
(ns metabase.driver.mongo.query-processor
(:refer-clojure :exclude [find sort])
(:require [clojure.core.match :refer [match]]
+ (clojure [set :as set]
+ [string :as s])
[clojure.tools.logging :as log]
+ [clojure.walk :as walk]
[colorize.core :as color]
(monger [collection :as mc]
[core :as mg]
@@ -10,47 +13,42 @@
[query :refer :all])
[metabase.db :refer :all]
[metabase.driver :as driver]
- [metabase.driver.interface :as i]
- [metabase.driver.query-processor :as qp :refer [*query*]]
+ (metabase.driver [interface :as i]
+ [query-processor :as qp])
+ [metabase.driver.query-processor.expand :as expand]
[metabase.driver.mongo.util :refer [with-mongo-connection *mongo-connection* values->base-type]]
- (metabase.models [database :refer [Database]]
- [field :refer [Field]]
- [table :refer [Table]])
+ [metabase.models.field :refer [Field]]
[metabase.util :as u])
(:import (com.mongodb CommandResult
- DBApiLayer)
+ DB)
(clojure.lang PersistentArrayMap)
(org.bson.types ObjectId)))
(declare apply-clause
- annotate-native-results
- annotate-results
eval-raw-command
- field-id->kw
process-structured
process-and-run-structured)
-;; # DRIVER QP INTERFACE
+;; # DRIVER QP INTERFACE
+(def ^:dynamic ^:private *query* nil)
(defn process-and-run
"Process and run a MongoDB QUERY."
- [{query-type :type database-id :database :as query}]
- {:pre [(contains? #{:native :query} (keyword query-type))
- (integer? database-id)]}
- (with-mongo-connection [_ (sel :one :fields [Database :details] :id database-id)]
+ [{query-type :type, :as query}]
+ (binding [*query* query]
(case (keyword query-type)
- :query (if (zero? (:source_table (:query query))) qp/empty-response
- (let [generated-query (process-structured (:query query))]
- (when-not qp/*disable-qp-logging*
- (log/debug (color/magenta "\n******************** Generated Monger Query: ********************\n"
- (with-out-str (clojure.pprint/pprint generated-query))
- "*****************************************************************\n")))
- (->> (eval generated-query)
- (annotate-results query))))
- :native (->> (eval-raw-command (:query (:native query)))
- annotate-native-results))))
+ :query (let [generated-query (process-structured (:query query))]
+ (when-not qp/*disable-qp-logging*
+ (log/debug (u/format-color 'green "\nMONGER FORM:\n%s\n"
+ (->> generated-query
+ (walk/postwalk #(if (symbol? %) (symbol (name %)) %)) ; strip namespace qualifiers from Monger form
+ u/pprint-to-str) "\n"))) ; so it's easier to read
+ (eval generated-query))
+ :native (let [results (eval-raw-command (:query (:native query)))]
+ (if (sequential? results) results
+ [results])))))
;; # NATIVE QUERY PROCESSOR
@@ -63,30 +61,17 @@
-> {\"_id\" \"01001\", \"city\" \"AGAWAM\", ...}"
[^String command]
(assert *mongo-connection* "eval-raw-command must be ran inside the body of with-mongo-connection.")
- (let [^CommandResult result (.doEval ^DBApiLayer *mongo-connection* command nil)]
+ (let [^CommandResult result (.doEval ^DB *mongo-connection* command nil)]
(when-not (.ok result)
(throw (.getException result)))
(let [{result "retval"} (PersistentArrayMap/create (.toMap result))]
result)))
-(defn annotate-native-results
- "Package up the results in the way the frontend expects."
- [results]
- (if-not (sequential? results) (annotate-native-results [results])
- {:status :completed
- :row_count (count results)
- :data {:rows results
- :columns (keys (first results))}}))
-
;; # STRUCTURED QUERY PROCESSOR
;; ## AGGREGATION IMPLEMENTATIONS
-(def ^:private aggregations
- "Used internally by `defaggregation` to store the different aggregation patterns to match against."
- (atom '()))
-
(def ^:dynamic *collection-name*
"String name of the collection (i.e., `Table`) that we're currently querying against."
nil)
@@ -94,53 +79,45 @@
"Monger clauses generated from query dict `filter` clauses; bound dynamically so we can insert these as appropriate for various types of aggregations."
nil)
-(defmacro defaggregation
- "Define a new function that will be called when the `aggregation` clause in a structured query matches MATCH-BINDING.
- (All functions defined with `defaggregation` are combined into a massive `match` statement inside `match-aggregation`).
-
- These should emit a form that can be `eval`ed to get the query results; the `aggregate` function takes care of some of the
- boilerplate for this form."
- [match-binding & body]
- `(swap! aggregations concat
- (quote [~match-binding (try
- ~@body
- (catch Throwable e#
- (log/error (color/red ~(format "Failed to apply aggregation %s: " match-binding)
- e#))))])))
-
(defn aggregate
"Generate a Monger `aggregate` form."
[& forms]
- `(mc/aggregate ^DBApiLayer *mongo-connection* ~*collection-name* [~@(when *constraints*
+ `(mc/aggregate ^DB *mongo-connection* ~*collection-name* [~@(when *constraints*
[{$match *constraints*}])
~@(filter identity forms)]))
-(defn field-id->$string
- "Given a FIELD-ID, return a `$`-qualified field name for use in a Mongo aggregate query, e.g. `\"$user_id\"`."
- [field-id]
- (format "$%s" (name (field-id->kw field-id))))
+(defn- field->name
+ "Return qualified string name of FIELD, e.g. `venue` or `venue.address`."
+ (^String [field separator]
+ (apply str (interpose separator (rest (expand/qualified-name-components field))))) ; drop the first part, :table-name
+ (^String [field]
+ (field->name field ".")))
+(defn- field->$str
+ "Given a FIELD, return a `$`-qualified field name for use in a Mongo aggregate query, e.g. `\"$user_id\"`."
+ [field]
+ (format "$%s" (field->name field)))
-(defaggregation ["rows"]
- `(doall (with-collection ^DBApiLayer *mongo-connection* ~*collection-name*
+(defn- aggregation:rows []
+ `(doall (with-collection ^DB *mongo-connection* ~*collection-name*
~@(when *constraints* [`(find ~*constraints*)])
~@(mapcat apply-clause (dissoc (:query *query*) :filter)))))
-(defaggregation ["count"]
- `[{:count (mc/count ^DBApiLayer *mongo-connection* ~*collection-name*
- ~*constraints*)}])
+(defn- aggregation:count
+ ([]
+ `[{:count (mc/count ^DB *mongo-connection* ~*collection-name*
+ ~*constraints*)}])
+ ([field]
+ `[{:count (mc/count ^DB *mongo-connection* ~*collection-name*
+ (merge ~*constraints*
+ {~(field->name field) {$exists true}}))}]))
-(defaggregation ["avg" field-id]
+(defn- aggregation:avg [field]
(aggregate {$group {"_id" nil
- "avg" {$avg (field-id->$string field-id)}}}
+ "avg" {$avg (field->$str field)}}}
{$project {"_id" false, "avg" true}}))
-(defaggregation ["count" field-id]
- `[{:count (mc/count ^DBApiLayer *mongo-connection* ~*collection-name*
- (merge ~*constraints*
- {(field-id->kw field-id) {$exists true}}))}])
-
-(defaggregation ["distinct" field-id]
+(defn- aggregation:distinct [field]
;; Unfortunately trying to do a MongoDB distinct aggregation runs out of memory if there are more than a few thousand values
;; because Monger currently doesn't expose any way to enable allowDiskUse in aggregations
;; (see https://groups.google.com/forum/#!searchin/clojure-mongodb/$2BallowDiskUse/clojure-mongodb/3qT34rZSFwQ/tYCxj5coo8gJ).
@@ -151,12 +128,12 @@
;;
;; It's faster and better-behaved to just implement this logic in Clojure-land for the time being.
;; Since it's lazy we can handle large data sets (I've ran this successfully over 500,000+ document collections w/o issue).
- [{:count (let [values (transient (set []))
- limit (:limit (:query *query*))
- keep-taking? (if limit (fn [_]
- (< (count values) limit))
- (constantly true))]
- (->> (i/field-values-lazy-seq @(ns-resolve 'metabase.driver.mongo 'driver) (sel :one Field :id field-id)) ; resolve driver at runtime to avoid circular deps
+ [{:count (let [values (transient (set []))
+ limit (:limit (:query *query*))
+ keep-taking? (if limit (fn [_]
+ (< (count values) limit))
+ (constantly true))]
+ (->> (i/field-values-lazy-seq @(ns-resolve 'metabase.driver.mongo 'driver) (sel :one Field :id (:field-id field))) ; resolve driver at runtime to avoid circular deps
(filter identity)
(map hash)
(map #(conj! values %))
@@ -164,20 +141,24 @@
dorun)
(count values))}])
-(defaggregation ["stddev" field-id]
- nil) ; TODO
-
-(defaggregation ["sum" field-id]
+(defn- aggregation:sum [field]
(aggregate {$group {"_id" nil ; TODO - I don't think this works for _id
- "sum" {$sum (field-id->$string field-id)}}}
+ "sum" {$sum (field->$str field)}}}
{$project {"_id" false, "sum" true}}))
-(defmacro match-aggregation
- "Match structured query `aggregation` clause against the clauses defined by `defaggregation`."
- [aggregation]
- `(match ~aggregation
- ~@@aggregations
- ~'_ nil))
+(defn- match-aggregation [{:keys [aggregation-type field]}]
+ (if-not field
+ ;; aggregations with no Field
+ (case aggregation-type
+ :rows (aggregation:rows)
+ :count (aggregation:count))
+ ;; aggregations with a field
+ ((case aggregation-type
+ :avg aggregation:avg
+ :count aggregation:count
+ :distinct aggregation:distinct
+ :sum aggregation:sum) ; TODO -- stddev isn't implemented for mongo
+ field)))
;; ## BREAKOUT
@@ -186,54 +167,77 @@
;; This is annoying, since it effectively duplicates logic we have in the aggregation definitions above and the
;; clause definitions below, but the query we need to generate is different enough that I haven't found a cleaner
;; way of doing this yet.
-
-;;
-(defn breakout-aggregation->field-name+expression
- "Match AGGREGATION clause of a structured query *that contains a `breakout` clause*, and return
+(defn- breakout-aggregation->field-name+expression
+ "Match AGGREGATION clause of a structured query that contains a `breakout` clause, and return
a pair containing `[field-name aggregation-expression]`, which are used to generate the Mongo aggregate query."
- [aggregation]
- ;; AFAIK these are the only aggregation types that make sense in combination with a breakout clause
- ;; or are we missing something?
+ [{:keys [aggregation-type field]}]
+ ;; AFAIK these are the only aggregation types that make sense in combination with a breakout clause or are we missing something?
;; At any rate these seem to be the most common use cases, so we can add more here if and when they're needed.
- (match aggregation
- ["rows"] nil
- ["count"] ["count" {$sum 1}]
- ["avg" field-id] ["avg" {$avg (field-id->$string field-id)}]
- ["sum" field-id] ["sum" {$sum (field-id->$string field-id)}]))
+ (if-not field
+ (case aggregation-type
+ :rows nil
+ :count ["count" {$sum 1}])
+ (case aggregation-type
+ :avg ["avg" {$avg (field->$str field)}]
+ :sum ["sum" {$sum (field->$str field)}])))
+
+;;; BREAKOUT FIELD NAME ESCAPING FOR $GROUP
+;; We're not allowed to use field names that contain a period in the Mongo aggregation $group stage.
+;; Not OK:
+;; {"$group" {"source.username" {"$first" {"$source.username"}, "_id" "$source.username"}}, ...}
+;;
+;; For *nested* Fields, we'll replace the '.' with '___', and restore the original names afterward.
+;; Escaped:
+;; {"$group" {"source___username" {"$first" {"$source.username"}, "_id" "$source.username"}}, ...}
-(defn do-breakout
+(defn ag-unescape-nested-field-names
+ "Restore the original, unescaped nested Field names in the keys of RESULTS.
+ E.g. `:source___service` becomes `:source.service`"
+ [results]
+ ;; Build a map of escaped key -> unescaped key by looking at the keys in the first result
+ ;; e.g. {:source___username :source.username}
+ (let [replacements (into {} (for [k (keys (first results))]
+ (let [k-str (name k)
+ unescaped (s/replace k-str #"___" ".")]
+ (when-not (= k-str unescaped)
+ {k (keyword unescaped)}))))]
+ ;; If the map is non-empty then map set/rename-keys over the results with it
+ (if-not (seq replacements)
+ results
+ (for [row results]
+ (set/rename-keys row replacements)))))
+
+(defn- do-breakout
"Generate a Monger query from a structured QUERY dictionary that contains a `breakout` clause.
Since the Monger query we generate looks very different from ones we generate when no `breakout` clause
is present, this is essentialy a separate implementation :/"
- [{aggregation :aggregation, field-ids :breakout, order-by :order_by, limit :limit, :as query}]
- {:pre [(sequential? field-ids)
- (every? integer? field-ids)]}
- (let [[ag-field ag-clause] (breakout-aggregation->field-name+expression aggregation)
- fields (->> (map field-id->kw field-ids)
- (map name))
- $fields (map field-id->$string field-ids)
+ [{aggregation :aggregation, breakout-fields :breakout, order-by :order-by, limit :limit, :as query}]
+ (let [;; Shadow the top-level definition of field->name with one that will use "___" as the separator instead of "."
+ field->escaped-name (u/rpartial field->name "___")
+ [ag-field ag-clause] (breakout-aggregation->field-name+expression aggregation)
+ fields (map field->escaped-name breakout-fields)
+ $fields (map field->$str breakout-fields)
fields->$fields (zipmap fields $fields)]
- (aggregate {$group (merge {"_id" (if (= (count fields) 1) (first $fields)
+ `(ag-unescape-nested-field-names
+ ~(aggregate {$group (merge {"_id" (if (= (count fields) 1) (first $fields)
fields->$fields)}
- (when (and ag-field ag-clause)
- {ag-field ag-clause})
- (->> fields->$fields
- (map (fn [[field $field]]
- (when-not (= field "_id")
- {field {$first $field}})))
- (into {})))}
- {$sort (->> order-by
- (mapcat (fn [[field-id asc-or-desc]]
- [(name (field-id->kw field-id)) (case asc-or-desc
- "ascending" 1
- "descending" -1)]))
- (apply sorted-map))}
- {$project (merge {"_id" false}
- (when ag-field
- {ag-field true})
- (zipmap fields (repeat true)))}
- (when limit
- {$limit limit}))))
+ (when (and ag-field ag-clause)
+ {ag-field ag-clause})
+ (into {} (for [[field $field] fields->$fields]
+ (when-not (= field "_id")
+ {field {$first $field}}))))}
+ {$sort (->> order-by
+ (mapcat (fn [{:keys [field direction]}]
+ [(field->escaped-name field) (case direction
+ :ascending 1
+ :descending -1)]))
+ (apply sorted-map))}
+ {$project (merge {"_id" false}
+ (when ag-field
+ {ag-field true})
+ (zipmap fields (repeat true)))}
+ (when limit
+ {$limit limit})))))
;; ## PROCESS-STRUCTURED
@@ -244,38 +248,21 @@
* queries that contain `breakout` clauses are handled by `do-breakout`
* other queries are handled by `match-aggregation`, which hands off to the
appropriate fn defined by a `defaggregation`."
- [{:keys [source_table aggregation breakout] :as query}]
- (binding [*collection-name* (sel :one :field [Table :name] :id source_table)
- *constraints* (when-let [filter-clause (:filter query)]
- (apply-clause [:filter filter-clause]))]
- (if-not (empty? breakout) (do-breakout query)
- (match-aggregation aggregation))))
-
-
-;; ## ANNOTATION
-
-;; TODO - This is similar to the implementation in generic-sql; can we combine them and move it into metabase.driver.query-processor?
-(defn annotate-results
- "Add column information, `row_count`, etc. to the results of a Mongo QP query."
- [query results]
- (qp/annotate query results))
+ [{:keys [source-table aggregation breakout] :as query}]
+ (binding [*collection-name* (:name source-table)
+ *constraints* (when-let [filter-clause (:filter query)]
+ (apply-clause [:filter filter-clause]))]
+ (if (seq breakout) (do-breakout query)
+ (match-aggregation aggregation))))
;; ## CLAUSE APPLICATION 2.0
-(def ^{:arglists '([field-id])} field-id->kw
- "Return the keyword name of a `Field` with ID FIELD-ID. Memoized."
- (memoize
- (fn [field-id]
- {:pre [(integer? field-id)]
- :post [(keyword? %)]}
- (keyword (sel :one :field [Field :name] :id field-id)))))
-
(def ^:private clauses
"Used by `defclause` to store the clause definitions generated by it."
(atom '()))
-(defmacro defclause
+(defmacro ^:private defclause
"Generate a new clause definition that will be called inside of a `match` statement
whenever CLAUSE matches MATCH-BINDING.
@@ -285,75 +272,58 @@
`(swap! clauses concat '[[~clause ~match-binding] (try
~@body
(catch Throwable e#
- (log/error (color/red ~(format "Failed to process clause [%s %s]: " clause match-binding)
+ (log/error (color/red ~(format "Failed to process '%s' clause:" (name clause))
(.getMessage e#)))))]))
;; ### CLAUSE DEFINITIONS
;; ### fields
-(defclause :fields field-ids
- `[(fields ~(mapv field-id->kw field-ids))])
-
-(def ^:private field-id->casting-fn
- "Return a fn that should be used to cast values that match/filter against `Field` with FIELD-ID."
- (let [->ObjectId (fn [^String value]
- `(ObjectId. ~value))]
- (memoize
- (fn [field-id]
- (let [{base-type :base_type, field-name :name, special-type :special_type} (sel :one [Field :base_type :name :special_type] :id field-id)]
- (if (and (= field-name "_id")
- (= base-type :UnknownField)) ->ObjectId
- identity))))))
-
-(defn- cast-value-if-needed
- "* Convert dates (which come back as `YYYY-MM-DD` strings) to `java.sql.Date`
- * Convert ID strings to `ObjectId`
- * Return other values as-is"
- [field-id ^String value]
- ((field-id->casting-fn field-id) value))
-
-;; ### filter
-;; !!! SPECIAL CASE - the results of this clause are bound to *constraints*, which is used differently
-;; by the various defaggregation definitions or by do-breakout. Here, we just return a "constraints" map instead.
-(defclause :filter ["INSIDE" lat-field-id lon-field-id lat-max lon-min lat-min lon-max]
- (let [lat-field (field-id->kw lat-field-id)
- lon-field (field-id->kw lon-field-id)]
- {$and [{lat-field {$gte lat-min, $lte lat-max}}
- {lon-field {$gte lon-min, $lte lon-max}}]}))
-
-(defclause :filter ["IS_NULL" field-id]
- {(field-id->kw field-id) {$exists false}})
-
-(defclause :filter ["NOT_NULL" field-id]
- {(field-id->kw field-id) {$exists true}})
+(defclause :fields fields
+ `[(fields ~(mapv field->name fields))])
-(defclause :filter ["BETWEEN" field-id min max]
- {(field-id->kw field-id) {$gte (cast-value-if-needed field-id min)
- $lte (cast-value-if-needed field-id max)}})
-(defclause :filter ["=" field-id value]
- {(field-id->kw field-id) (cast-value-if-needed field-id value)})
-
-(defclause :filter ["!=" field-id value]
- {(field-id->kw field-id) {$ne (cast-value-if-needed field-id value)}})
-
-(defclause :filter ["<" field-id value]
- {(field-id->kw field-id) {$lt (cast-value-if-needed field-id value)}})
-
-(defclause :filter [">" field-id value]
- {(field-id->kw field-id) {$gt (cast-value-if-needed field-id value)}})
-
-(defclause :filter ["<=" field-id value]
- {(field-id->kw field-id) {$lte (cast-value-if-needed field-id value)}})
-
-(defclause :filter [">=" field-id value]
- {(field-id->kw field-id) {$gte (cast-value-if-needed field-id value)}})
-
-(defclause :filter ["AND" & subclauses]
- {$and (mapv #(apply-clause [:filter %]) subclauses)})
+;; ### filter
-(defclause :filter ["OR" & subclauses]
- {$or (mapv #(apply-clause [:filter %]) subclauses)})
+(defn- format-value
+ "Convert ID strings to `ObjectId`."
+ [{:keys [field-name base-type value]}]
+ (cond
+ (and (= field-name "_id")
+ (= base-type :UnknownField)) `(ObjectId. ~value)
+ (= (type value) java.sql.Timestamp) (java.util.Date. (.getTime ^java.sql.Timestamp value)) ; ugg
+ :else value))
+
+(defn- parse-filter-subclause [{:keys [filter-type field value] :as filter}]
+ (let [field (when field (field->name field))
+ value (when value (format-value value))]
+ (case filter-type
+ :inside (let [lat (:lat filter)
+ lon (:lon filter)]
+ {$and [{(field->name (:field lat)) {$gte (format-value (:min lat)), $lte (format-value (:max lat))}}
+ {(field->name (:field lon)) {$gte (format-value (:min lon)), $lte (format-value (:max lon))}}]})
+ :between {field {$gte (format-value (:min-val filter))
+ $lte (format-value (:max-val filter))}}
+ :is-null {field {$exists false}}
+ :not-null {field {$exists true}}
+ :contains {field (re-pattern value)}
+ :starts-with {field (re-pattern (str \^ value))}
+ :ends-with {field (re-pattern (str value \$))}
+ := {field value}
+ :!= {field {$ne value}}
+ :< {field {$lt value}}
+ :> {field {$gt value}}
+ :<= {field {$lte value}}
+ :>= {field {$gte value}})))
+
+(defn- parse-filter-clause [{:keys [compound-type subclauses], :as clause}]
+ (cond
+ (= compound-type :and) {$and (mapv parse-filter-clause subclauses)}
+ (= compound-type :or) {$or (mapv parse-filter-clause subclauses)}
+ :else (parse-filter-subclause clause)))
+
+
+(defclause :filter filter-clause
+ (parse-filter-clause filter-clause))
;; ### limit
@@ -362,12 +332,12 @@
`[(limit ~value)])
;; ### order_by
-(defclause :order_by field-dir-pairs
- (let [sort-options (mapcat (fn [[field-id direction]]
- [(field-id->kw field-id) (case (keyword direction)
- :ascending 1
- :descending -1)])
- field-dir-pairs)]
+(defclause :order-by subclauses
+ (let [sort-options (mapcat (fn [{:keys [field direction]}]
+ [(field->name field) (case direction
+ :ascending 1
+ :descending -1)])
+ subclauses)]
(when (seq sort-options)
`[(sort (array-map ~@sort-options))])))
diff --git a/src/metabase/driver/mongo/util.clj b/src/metabase/driver/mongo/util.clj
index 5e2e983fc36a081bc2e8d55cb4e23add3ed8abd0..027c09051f83619e15a62601de5eccacf6006809 100644
--- a/src/metabase/driver/mongo/util.clj
+++ b/src/metabase/driver/mongo/util.clj
@@ -3,41 +3,54 @@
(:require [clojure.string :as s]
[clojure.tools.logging :as log]
[colorize.core :as color]
- [monger.core :as mg]
+ (monger [core :as mg]
+ [credentials :as mcred])
[metabase.driver :as driver]))
-(defn- details-map->connection-string
- [{:keys [user pass host port dbname]}]
- {:pre [host
- dbname]}
- (str "mongodb://"
- user
- (when-not (s/blank? pass)
- (assert (not (s/blank? user)) "Can't have a password without a user!")
- (str ":" pass))
- (when-not (s/blank? user) "@")
- host
- (when-not (s/blank? (str port))
- (str ":" port))
- "/"
- dbname
- "?connectTimeoutMS=250")) ; timeout after 250 ms instead of 10s so can-connect? doesn't take forever
+(def ^:const ^:private connection-timeout-ms
+ "Number of milliseconds to wait when attempting to establish a Mongo connection.
+ By default, Monger uses a 10-second timeout, which means `can/connect?` can take
+ forever, especially when called with bad details. This translates to our tests
+ taking longer and the DB setup API endpoints seeming sluggish.
-(def ^:dynamic *mongo-connection*
+ Don't set the timeout too low -- I've have Circle fail when the timeout was 1000ms
+ on *one* occasion."
+ 1500)
+
+(def ^:dynamic ^com.mongodb.DB *mongo-connection*
"Connection to a Mongo database.
Bound by top-level `with-mongo-connection` so it may be reused within its body."
nil)
+(def ^:private mongo-connection-options
+ ;; Have to use the Java builder directly since monger's wrapper method doesn't support .serverSelectionTimeout :unamused:
+ (-> (com.mongodb.MongoClientOptions$Builder.)
+ (.connectTimeout connection-timeout-ms)
+ (.serverSelectionTimeout connection-timeout-ms)
+ (.build)))
+
+;; The arglists metadata for mg/connect are actually *WRONG* -- the function additionally supports a 3-arg airity where you can pass
+;; options and credentials, as we'd like to do. We need to go in and alter the metadata of this function ourselves because otherwise
+;; the Eastwood linter will complain that we're calling the function with the wrong airity :sad: :/
+(alter-meta! #'mg/connect assoc :arglists '([{:keys [host port uri]}]
+ [server-address options]
+ [server-address options credentials]))
+
(defn -with-mongo-connection
"Run F with a new connection (bound to `*mongo-connection*`) to DATABASE.
Don't use this directly; use `with-mongo-connection`."
[f database]
- (let [connection-string (cond
- (string? database) database
- (:dbname (:details database)) (details-map->connection-string (:details database)) ; new-style -- entire Database obj
- (:dbname database) (details-map->connection-string database) ; new-style -- connection details map only
- :else (throw (Exception. (str "with-mongo-connection failed: bad connection details:" (:details database)))))
- {conn :conn mongo-connection :db} (mg/connect-via-uri connection-string)]
+ (let [{:keys [dbname host port user pass]
+ :or {port 27017, pass ""}} (cond
+ (string? database) {:dbname database}
+ (:dbname (:details database)) (:details database) ; entire Database obj
+ (:dbname database) database ; connection details map only
+ :else (throw (Exception. (str "with-mongo-connection failed: bad connection details:" (:details database)))))
+ server-address (mg/server-address host port)
+ credentials (when user
+ (mcred/create user dbname pass))
+ conn (mg/connect server-address mongo-connection-options credentials)
+ mongo-connection (mg/get-db conn dbname)]
(log/debug (color/cyan "<< OPENED NEW MONGODB CONNECTION >>"))
(try
(binding [*mongo-connection* mongo-connection]
@@ -51,11 +64,11 @@
(We're smart about it: DATABASE isn't even evaluated if `*mongo-connection*` is already bound.)
;; delay isn't derefed if *mongo-connection* is already bound
- (with-mongo-connection [^com.mongodb.DBApiLayer conn @(:db (sel :one Table ...))]
+ (with-mongo-connection [^com.mongodb.DB conn @(:db (sel :one Table ...))]
...)
;; You can use a string instead of a Database
- (with-mongo-connection [^com.mongodb.DBApiLayer conn \"mongodb://127.0.0.1:27017/test\"]
+ (with-mongo-connection [^com.mongodb.DB conn \"mongodb://127.0.0.1:27017/test\"]
...)
DATABASE-OR-CONNECTION-STRING can also optionally be the connection details map on its own."
@@ -65,22 +78,25 @@
(if *mongo-connection* (f# *mongo-connection*)
(-with-mongo-connection f# ~database))))
-;; TODO - this is actually more sophisticated than the one used for annotation in the GenericSQL driver, which just takes the
-;; types of the values in the first row.
-;; We should move this somewhere where it can be shared amongst the drivers and rewrite GenericSQL to use it instead.
+;; TODO - this isn't neccesarily Mongo-specific; consider moving
(defn values->base-type
- "Given a sequence of values, return `Field` `base_type` in the most ghetto way possible.
+ "Given a sequence of values, return `Field.base_type` in the most ghetto way possible.
This just gets counts the types of *every* value and returns the `base_type` for class whose count was highest."
[values-seq]
{:pre [(sequential? values-seq)]}
(or (->> values-seq
- (filter identity) ; TODO - why not do a query to return non-nil values of this column instead
- (take 1000) ; it's probably fine just to consider the first 1,000 non-nil values when trying to type a column instead of iterating over the whole collection
+ ;; TODO - why not do a query to return non-nil values of this column instead
+ (filter identity)
+ ;; it's probably fine just to consider the first 1,000 *non-nil* values when trying to type a column instead
+ ;; of iterating over the whole collection. (VALUES-SEQ should be up to 10,000 values, but we don't know how many are
+ ;; nil)
+ (take 1000)
(group-by type)
- (map (fn [[type valus]]
- [type (count valus)]))
+ ;; create tuples like [Integer count].
+ (map (fn [[klass valus]]
+ [klass (count valus)]))
(sort-by second)
- first
- first
- driver/class->base-type)
+ last ; last result will be tuple with highest count
+ first ; keep just the type
+ driver/class->base-type) ; convert to Field base_type
:UnknownField))
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
new file mode 100644
index 0000000000000000000000000000000000000000..ba9c1af691175d6699296263a9ab455872663c3a
--- /dev/null
+++ b/src/metabase/driver/mysql.clj
@@ -0,0 +1,96 @@
+(ns metabase.driver.mysql
+ (:require [clojure.set :as set]
+ (korma [db :as kdb]
+ mysql)
+ (korma.sql [engine :refer [sql-func]]
+ [utils :as korma-utils])
+ (metabase.driver [generic-sql :as generic-sql, :refer [GenericSQLIDriverMixin GenericSQLISyncDriverTableFKsMixin
+ GenericSQLISyncDriverFieldAvgLengthMixin GenericSQLISyncDriverFieldPercentUrlsMixin]]
+ [interface :refer [IDriver ISyncDriverTableFKs ISyncDriverFieldAvgLength ISyncDriverFieldPercentUrls
+ ISyncDriverSpecificSyncField driver-specific-sync-field!]])
+ (metabase.driver.generic-sql [interface :refer :all])))
+
+;;; # Korma 0.4.2 Bug Workaround
+;; (Buggy code @ https://github.com/korma/Korma/blob/684178c386df529558bbf82097635df6e75fb339/src/korma/mysql.clj)
+;; This looks like it's been fixed upstream but until a new release is available we'll have to hack the function here
+
+(defn- mysql-count [query v]
+ (sql-func "COUNT" (if (and (or (instance? clojure.lang.Named v) ; the issue was that name was being called on things that like maps when we tried to get COUNT(DISTINCT(...))
+ (string? v)) ; which would barf since maps don't implement clojure.lang.Named
+ (= (name v) "*"))
+ (korma-utils/generated "*")
+ v)))
+
+(intern 'korma.mysql 'count mysql-count)
+
+
+;;; # IMPLEMENTATION
+
+(def ^:private ^:const column->base-type
+ {:BIGINT :BigIntegerField
+ :BINARY :UnknownField
+ :BIT :UnknownField
+ :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
+ :TEXT :TextField
+ :TIME :TimeField
+ :TIMESTAMP :DateTimeField
+ :TINYBLOB :UnknownField
+ :TINYINT :IntegerField
+ :TINYTEXT :TextField
+ :VARBINARY :UnknownField
+ :VARCHAR :TextField
+ :YEAR :IntegerField})
+
+(defrecord MySQLDriver []
+ ISqlDriverDatabaseSpecific
+ (connection-details->connection-spec [_ details]
+ (-> details
+ (set/rename-keys {:dbname :db})
+ kdb/mysql))
+
+ (database->connection-details [_ {:keys [details]}]
+ details)
+
+ (cast-timestamp-to-date [_ table-name field-name seconds-or-milliseconds]
+ (format (case seconds-or-milliseconds
+ :seconds "CAST(TIMESTAMPADD(SECOND, `%s`.`%s`, DATE '1970-01-01') AS DATE)"
+ :milliseconds "CAST(TIMESTAMPADD(MICROSECOND, (`%s`.`%s` * 1000), DATE '1970-01-01') AS DATE)" )
+ table-name field-name))
+
+ (timezone->set-timezone-sql [_ timezone]
+ ;; If this fails you need to load the timezone definitions from your system into MySQL;
+ ;; run the command `mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql`
+ ;; See https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html for details
+ (format "SET @@session.time_zone = '%s';" timezone))
+
+ ISqlDriverQuoteName
+ (quote-name [_ nm]
+ (str \` nm \`)))
+
+(extend MySQLDriver
+ IDriver GenericSQLIDriverMixin
+ ISyncDriverTableFKs GenericSQLISyncDriverTableFKsMixin
+ ISyncDriverFieldAvgLength GenericSQLISyncDriverFieldAvgLengthMixin
+ ISyncDriverFieldPercentUrls GenericSQLISyncDriverFieldPercentUrlsMixin)
+
+(def ^:const driver
+ (map->MySQLDriver {:column->base-type column->base-type
+ :features (conj generic-sql/features :set-timezone)
+ :sql-string-length-fn :CHAR_LENGTH}))
diff --git a/src/metabase/driver/postgres.clj b/src/metabase/driver/postgres.clj
index c5236d5b344fdff2b55d8bc4e48e64302186e522..204bfd1b575655d4a03134a7bdc0eb8d72bbb7bd 100644
--- a/src/metabase/driver/postgres.clj
+++ b/src/metabase/driver/postgres.clj
@@ -1,18 +1,22 @@
(ns metabase.driver.postgres
- (:require [clojure.tools.logging :as log]
+ (:require [clojure.java.jdbc :as jdbc]
+ [clojure.tools.logging :as log]
(clojure [set :refer [rename-keys]]
[string :as s])
[korma.db :as kdb]
[swiss.arrows :refer :all]
+ [metabase.db :refer [upd]]
+ [metabase.models.field :refer [Field]]
[metabase.driver :as driver]
- (metabase.driver [generic-sql :as generic-sql]
- [interface :as i])))
-
-(declare driver)
-
-;; ## SYNCING
-
-(def ^:const column->base-type
+ (metabase.driver [generic-sql :as generic-sql, :refer [GenericSQLIDriverMixin GenericSQLISyncDriverTableFKsMixin
+ GenericSQLISyncDriverFieldAvgLengthMixin GenericSQLISyncDriverFieldPercentUrlsMixin]]
+ [interface :refer [IDriver ISyncDriverTableFKs ISyncDriverFieldAvgLength ISyncDriverFieldPercentUrls
+ ISyncDriverSpecificSyncField driver-specific-sync-field!]])
+ [metabase.driver.generic-sql :as generic-sql]
+ (metabase.driver.generic-sql [interface :refer :all]
+ [util :refer [with-jdbc-metadata]])))
+
+(def ^:private ^:const column->base-type
"Map of Postgres column types -> Field base types.
Add more mappings here as you come across them."
{:bigint :BigIntegerField
@@ -61,7 +65,7 @@
:tsquery :UnknownField
:tsvector :UnknownField
:txid_snapshot :UnknownField
- :uuid :UnknownField
+ :uuid :UUIDField
:varbit :UnknownField
:varchar :TextField
:xml :TextField
@@ -73,61 +77,56 @@
(keyword "timestamp with timezone") :DateTimeField
(keyword "timestamp without timezone") :DateTimeField})
-
-;; ## CONNECTION
-
(def ^:private ^:const ssl-params
"Params to include in the JDBC connection spec for an SSL connection."
{:ssl true
:sslmode "require"
:sslfactory "org.postgresql.ssl.NonValidatingFactory"}) ; HACK Why enable SSL if we disable certificate validation?
-(defn- connection-details->connection-spec [{:keys [ssl] :as details-map}]
- (-> details-map
- (dissoc :ssl) ; remove :ssl in case it's false; DB will still try (& fail) to connect if the key is there
- (merge (when ssl ; merging ssl-params will add :ssl back in if desirable
- ssl-params))
- (rename-keys {:dbname :db})
- kdb/postgres))
-
-
-(defn- database->connection-details [{:keys [details]}]
- (let [{:keys [host port]} details]
- (-> details
- (assoc :host host
- :make-pool? false
- :db-type :postgres ; What purpose is this serving?
- :ssl (:ssl details)
- :port (if (string? port) (Integer/parseInt port)
- port))
- (rename-keys {:dbname :db}))))
-
-
-;; ## QP
-
-(defn- timezone->set-timezone-sql [timezone]
- (format "SET LOCAL timezone TO '%s';" timezone))
-
-(defn- cast-timestamp-seconds-field-to-date-fn [field-name]
- {:pre [(string? field-name)]}
- (format "CAST(TO_TIMESTAMP(\"%s\") AS DATE)" field-name))
-
-(defn- cast-timestamp-milliseconds-field-to-date-fn [field-name]
- {:pre [(string? field-name)]}
- (format "CAST(TO_TIMESTAMP(\"%s\" / 1000) AS DATE)" field-name))
-
-(def ^:private ^:const uncastify-timestamp-regex
- #"CAST\(TO_TIMESTAMP\(([^\s+])(?: / 1000)?\) AS DATE\)")
-
-;; ## DRIVER
+(defrecord PostgresDriver []
+ ISqlDriverDatabaseSpecific
+ (connection-details->connection-spec [_ {:keys [ssl] :as details-map}]
+ (-> details-map
+ (dissoc :ssl) ; remove :ssl in case it's false; DB will still try (& fail) to connect if the key is there
+ (merge (when ssl ; merging ssl-params will add :ssl back in if desirable
+ ssl-params))
+ (rename-keys {:dbname :db})
+ kdb/postgres))
+
+ (database->connection-details [_ {:keys [details]}]
+ (let [{:keys [host port]} details]
+ (-> details
+ (assoc :host host
+ :ssl (:ssl details)
+ :port (if (string? port) (Integer/parseInt port)
+ port))
+ (rename-keys {:dbname :db}))))
+
+ (cast-timestamp-to-date [_ table-name field-name seconds-or-milliseconds]
+ (format "(TIMESTAMP WITH TIME ZONE 'epoch' + (\"%s\".\"%s\" * INTERVAL '1 %s'))::date" table-name field-name
+ (case seconds-or-milliseconds
+ :seconds "second"
+ :milliseconds "millisecond")))
+
+ (timezone->set-timezone-sql [_ timezone]
+ (format "SET LOCAL timezone TO '%s';" timezone))
+
+ ISyncDriverSpecificSyncField
+ (driver-specific-sync-field! [_ {:keys [table], :as field}]
+ (with-jdbc-metadata [^java.sql.DatabaseMetaData md @(:db @table)]
+ (let [[{:keys [type_name]}] (->> (.getColumns md nil nil (:name @table) (:name field))
+ jdbc/result-set-seq)]
+ (when (= type_name "json")
+ (upd Field (:id field) :special_type :json)
+ (assoc field :special_type :json))))))
+
+(extend PostgresDriver
+ IDriver GenericSQLIDriverMixin
+ ISyncDriverTableFKs GenericSQLISyncDriverTableFKsMixin
+ ISyncDriverFieldAvgLength GenericSQLISyncDriverFieldAvgLengthMixin
+ ISyncDriverFieldPercentUrls GenericSQLISyncDriverFieldPercentUrlsMixin)
(def ^:const driver
- (generic-sql/map->SqlDriver
- {:column->base-type column->base-type
- :connection-details->connection-spec connection-details->connection-spec
- :database->connection-details database->connection-details
- :sql-string-length-fn :CHAR_LENGTH
- :timezone->set-timezone-sql timezone->set-timezone-sql
- :cast-timestamp-seconds-field-to-date-fn cast-timestamp-seconds-field-to-date-fn
- :cast-timestamp-milliseconds-field-to-date-fn cast-timestamp-milliseconds-field-to-date-fn
- :uncastify-timestamp-regex uncastify-timestamp-regex}))
+ (map->PostgresDriver {:column->base-type column->base-type
+ :features (conj generic-sql/features :set-timezone)
+ :sql-string-length-fn :CHAR_LENGTH}))
diff --git a/src/metabase/driver/query_processor.clj b/src/metabase/driver/query_processor.clj
index 9ade17d88533afd0844d9af0690bc132d5c418fc..24f2d52b09b23d0af0f638c117e23da7dcb21cc6 100644
--- a/src/metabase/driver/query_processor.clj
+++ b/src/metabase/driver/query_processor.clj
@@ -3,448 +3,294 @@
(:require [clojure.core.match :refer [match]]
[clojure.string :as s]
[clojure.tools.logging :as log]
- [korma.core :refer :all]
+ [clojure.walk :as walk]
+ [korma.core :as k]
[medley.core :as m]
+ [swiss.arrows :refer [<<-]]
[metabase.db :refer :all]
[metabase.driver.interface :as i]
- [metabase.driver.query-processor.expand :as expand]
- (metabase.models [field :refer [Field]]
+ (metabase.driver.query-processor [annotate :as annotate]
+ [expand :as expand])
+ (metabase.models [field :refer [Field], :as field]
[foreign-key :refer [ForeignKey]])
[metabase.util :as u]))
-(declare add-implicit-breakout-order-by
- add-implicit-limit
- add-implicit-fields
- expand-date-values
- get-special-column-info
- preprocess-cumulative-sum
- preprocess-structured
- remove-empty-clauses)
-
;; # CONSTANTS
-(def ^:const empty-response
- "An empty response dictionary to return when there's no query to run."
- {:rows [], :columns [], :cols []})
-
(def ^:const max-result-rows
"Maximum number of rows the QP should ever return."
10000)
(def ^:const max-result-bare-rows
- "Maximum number of rows the QP should ever return specifically for 'rows' type aggregations."
+ "Maximum number of rows the QP should ever return specifically for `rows` type aggregations."
2000)
;; # DYNAMIC VARS
-(def ^:dynamic *query*
- "The query we're currently processing, in its original, unexpanded form."
- nil)
-
-(def ^:dynamic *expanded-query*
- "The query we're currently processing, in its expanded form."
- nil)
-
(def ^:dynamic *disable-qp-logging*
"Should we disable logging for the QP? (e.g., during sync we probably want to turn it off to keep logs less cluttered)."
false)
-(def ^:dynamic *internal-context*
- "A neat place to store 'notes-to-self': things individual implementations don't need to know about, like if the `fields` clause was added implicitly."
- (atom nil))
-
-(def ^:dynamic *driver*
- "The driver currently being used to process this query."
- (atom nil))
-
-
-;; # PREPROCESSOR
-
-(defn preprocess
- "Preprocess QUERY dict, applying various driver-independent transformations to it before it is passed to specific driver query processor implementations."
- [{query-type :type :as query}]
- (case (keyword query-type)
- :query (preprocess-structured query)
- :native query))
-
-(defn preprocess-structured
- "Preprocess a strucuted QUERY dict."
- [query]
- (let [preprocessed-query (update-in query [:query] #(->> %
- remove-empty-clauses
- add-implicit-breakout-order-by
- add-implicit-limit
- add-implicit-fields
- expand-date-values
- preprocess-cumulative-sum))]
- (when-not *disable-qp-logging*
- (log/debug (colorize.core/cyan "\n******************** PREPROCESSED: ********************\n"
- (with-out-str (clojure.pprint/pprint preprocessed-query)) "\n"
- "*******************************************************\n")))
- preprocessed-query))
-
-
-;; ## PREPROCESSOR FNS
-
-;; ### REMOVE-EMPTY-CLAUSES
-(def ^:private ^:const clause->empty-forms
- "Clause values that should be considered empty and removed during preprocessing."
- {:breakout #{[nil]}
- :filter #{[nil nil]}})
-
-(defn remove-empty-clauses
- "Remove all QP clauses whose value is:
- 1. is `nil`
- 2. is an empty sequence (e.g. `[]`)
- 3. matches a form in `clause->empty-forms`"
- [query]
- (->> query
- (map (fn [[clause clause-value]]
- (when (and clause-value
- (or (not (sequential? clause-value))
- (seq clause-value)))
- (when-not (contains? (clause->empty-forms clause) clause-value)
- [clause clause-value]))))
- (into {})))
-
-
-;; ### ADD-IMPLICIT-BREAKOUT-ORDER-BY
-
-(defn add-implicit-breakout-order-by
- "Field IDs specified in `breakout` should add an implicit ascending `order_by` subclause *unless* that field is *explicitly* referenced in `order_by`."
- [{breakout-field-ids :breakout order-by-subclauses :order_by :as query}]
- (let [order-by-field-ids (set (map first order-by-subclauses))
- implicit-breakout-order-by-field-ids (filter (partial (complement contains?) order-by-field-ids)
- breakout-field-ids)]
- (if-not (seq implicit-breakout-order-by-field-ids) query
- (->> implicit-breakout-order-by-field-ids
- (mapv (fn [field-id]
- [field-id "ascending"]))
- (apply conj (or order-by-subclauses []))
- (assoc query :order_by)))))
-
-
-;;; ### ADD-IMPLICIT-LIMIT
-
-(defn add-implicit-limit
- "Add an implicit `limit` clause to queries with `rows` aggregations."
- [{:keys [limit aggregation] :as query}]
- (if (and (= aggregation ["rows"])
- (not limit))
- (assoc query :limit max-result-bare-rows)
- query))
-
-
-;;; ### ADD-IMPLICIT-FIELDS
-
-(defn add-implicit-fields
- "Add an implicit `fields` clause to queries with `rows` aggregations."
- [{:keys [fields aggregation breakout source_table] :as query}]
- (if-not (and (= aggregation ["rows"])
- (not breakout)
- (not fields))
- query
- ;; If we're doing a "rows" aggregation with no breakout or fields clauses add one that will exclude Fields that are supposed to be hidden
- (do (swap! *internal-context* assoc :fields-is-implicit true)
- (assoc query :fields (sel :many :id Field :table_id source_table, :active true, :preview_display true,
- :field_type [not= "sensitive"], (order :position :asc), (order :id :desc))))))
+;; +----------------------------------------------------------------------------------------------------+
+;; | QP INTERNAL IMPLEMENTATION |
+;; +----------------------------------------------------------------------------------------------------+
-;;; ### EXPAND-DATES
+(defn- wrap-catch-exceptions [qp]
+ (fn [query]
+ (try (qp query)
+ (catch Throwable e
+ {:status :failed
+ :error (.getMessage e)
+ :stacktrace (u/filtered-stacktrace e)
+ :query (dissoc query :database :driver)
+ :expanded-query (try (dissoc (expand/expand query) :database :driver)
+ (catch Throwable _))}))))
-(defn expand-date-values
- "Expand any dates in the `:filter` clause.
- This is done so various implementations can cast date values appropriately by simply checking their types.
- In the future when drivers are re-worked to deal with the Expanded Query directly this step will no longer be needed."
- [query]
- (cond-> query
- (:filter query) (assoc :filter (some-> *expanded-query* :query :filter expand/collapse)))) ; collapse the filter clause from the expanded query and use that as the replacement
+(defn- pre-expand [qp]
+ (fn [query]
+ (qp (expand/expand query))))
-;; ### PREPROCESS-CUMULATIVE-SUM
-(defn preprocess-cumulative-sum
+(defn- post-add-row-count-and-status
+ "Wrap the results of a successfully processed query in the format expected by the frontend (add `row_count` and `status`)."
+ [qp]
+ (fn [query]
+ (let [results (qp query)
+ num-results (count (:rows results))]
+ (cond-> {:row_count num-results
+ :status :completed
+ :data results}
+ ;; Add :rows_truncated if we've hit the limit so the UI can let the user know
+ (= num-results max-result-rows) (assoc-in [:data :rows_truncated] max-result-rows)))))
+
+(defn- should-add-implicit-fields? [{{:keys [fields breakout], {ag-type :aggregation-type} :aggregation} :query}]
+ (and (or (not ag-type)
+ (= ag-type :rows))
+ (not breakout)
+ (not fields)))
+
+(defn- pre-add-implicit-fields
+ "Add an implicit `fields` clause to queries with `rows` aggregations."
+ [qp]
+ (fn [{{:keys [source-table], {source-table-id :id} :source-table} :query, :as query}]
+ (qp (if-not (should-add-implicit-fields? query)
+ query
+ (let [fields (->> (sel :many :fields [Field :name :display_name :base_type :special_type :table_id :id :position :description], :table_id source-table-id, :active true,
+ :preview_display true, :field_type [not= "sensitive"], :parent_id nil, (k/order :position :asc), (k/order :id :desc))
+ (map expand/rename-mb-field-keys)
+ (map expand/map->Field)
+ (map #(expand/resolve-table % {source-table-id source-table})))]
+ (if-not (seq fields)
+ (do (log/warn (format "Table '%s' has no Fields associated with it." (:name source-table)))
+ query)
+ (-> query
+ (assoc-in [:query :fields-is-implicit] true)
+ (assoc-in [:query :fields] fields))))))))
+
+
+(defn- pre-add-implicit-breakout-order-by
+ "`Fields` specified in `breakout` should add an implicit ascending `order-by` subclause *unless* that field is *explicitly* referenced in `order-by`."
+ [qp]
+ (fn [{{breakout-fields :breakout, order-by :order-by} :query, :as query}]
+ (let [order-by-fields (set (map :field order-by))
+ implicit-breakout-order-by-fields (filter (partial (complement contains?) order-by-fields)
+ breakout-fields)]
+ (qp (cond-> query
+ (seq implicit-breakout-order-by-fields) (update-in [:query :order-by] concat (for [field implicit-breakout-order-by-fields]
+ (expand/map->OrderBySubclause {:field field
+ :direction :ascending}))))))))
+
+
+(defn- post-convert-unix-timestamps-to-dates
+ "Convert the values of Unix timestamps (for `Fields` whose `:special_type` is `:timestamp_seconds` or `:timestamp_milliseconds`) to dates."
+ [qp]
+ (fn [query]
+ (let [{:keys [cols rows], :as results} (qp query)
+ timestamp-seconds-col-indecies (u/indecies-satisfying #(= (:special_type %) :timestamp_seconds) cols)
+ timestamp-millis-col-indecies (u/indecies-satisfying #(= (:special_type %) :timestamp_milliseconds) cols)]
+ (if-not (or (seq timestamp-seconds-col-indecies)
+ (seq timestamp-millis-col-indecies))
+ ;; If we don't have any columns whose special type is a seconds or milliseconds timestamp return results as-is
+ results
+ ;; Otherwise go modify the results of each row
+ (update-in results [:rows] #(for [row %]
+ (for [[i val] (m/indexed row)]
+ (cond
+ (instance? java.util.Date val) val ; already converted to Date as part of preprocessing,
+ (contains? timestamp-seconds-col-indecies i) (java.sql.Date. (* val 1000)) ; nothing to do here
+ (contains? timestamp-millis-col-indecies i) (java.sql.Date. val)
+ :else val))))))))
+
+
+(defn- pre-cumulative-sum
"Rewrite queries containing a cumulative sum (`cum_sum`) aggregation to simply fetch the values of the aggregate field instead.
- (Cumulative sum is a special case; it is implemented in post-processing)."
- [{[ag-type ag-field :as aggregation] :aggregation, breakout-fields :breakout, order-by :order_by, :as query}]
- (let [cum-sum? (= ag-type "cum_sum")
+ (Cumulative sum is a special case; it is implemented in post-processing).
+
+ Return a pair of [`cumulative-sum-field?` `query`]."
+ [{{{ag-type :aggregation-type, ag-field :field} :aggregation, breakout-fields :breakout, order-by :order_by} :query, :as query}]
+ (let [cum-sum? (= ag-type :cumulative-sum)
cum-sum-with-breakout? (and cum-sum?
- (not (empty? breakout-fields)))
+ (seq breakout-fields))
cum-sum-with-same-breakout? (and cum-sum-with-breakout?
(= (count breakout-fields) 1)
(= (first breakout-fields) ag-field))]
;; Cumulative sum is only applicable if it has breakout fields
- ;; For these, store the cumulative sum field under the key :cum_sum so we know which one to sum later
+ ;; For these, store the cumulative sum field under the key :cumulative-sum so we know which one to sum later
;; Cumulative summing happens in post-processing
(cond
;; If there's only one breakout field that is the same as the cum_sum field, re-write this as a "rows" aggregation
;; to just fetch all the values of the field in question.
- cum-sum-with-same-breakout? (-> query
- (dissoc :breakout)
- (assoc :cum_sum ag-field ; TODO - move this to *internal-context* instead?
- :aggregation ["rows"]
- :fields [ag-field]))
+ cum-sum-with-same-breakout? [ag-field (update-in query [:query] #(-> %
+ (dissoc :breakout)
+ (assoc :aggregation (expand/map->Aggregation {:aggregation-type :rows})
+ :fields [ag-field])))]
;; Otherwise if we're breaking out on different fields, rewrite the query as a "sum" aggregation
- cum-sum-with-breakout? (assoc query
- :cum_sum ag-field
- :aggregation ["sum" ag-field])
+ cum-sum-with-breakout? [ag-field (-> query
+ (assoc-in [:query :aggregation] (expand/map->Aggregation {:aggregation-type :sum, :field ag-field})))]
;; Cumulative sum without any breakout fields should just be treated the same way as "sum". Rewrite query as such
- cum-sum? (assoc query
- :aggregation ["sum" ag-field])
+ cum-sum? [false (assoc-in query [:query :aggregation] (expand/map->Aggregation {:aggregation-type :sum, :field ag-field}))]
;; Otherwise if this isn't a cum_sum query return it as-is
- :else query)))
-
-
-;; # POSTPROCESSOR
+ :else [false query])))
-;; ### POST-PROCESS-CUMULATIVE-SUM
-(defn post-process-cumulative-sum
+(defn- post-cumulative-sum
"Cumulative sum the values of the aggregate `Field` in RESULTS."
- {:arglists '([query results])}
- [{cum-sum-field :cum_sum, :as query} {rows :rows, cols :cols, :as results}]
- (if-not cum-sum-field results
- (let [ ;; Determine the index of the field we need to cumulative sum
- cum-sum-field-index (->> cols
- (u/indecies-satisfying #(or (= (:name %) "sum")
- (= (:id %) cum-sum-field)))
- first)
- _ (assert (integer? cum-sum-field-index))
- ;; Now make a sequence of cumulative sum values for each row
- values (->> rows
- (map #(nth % cum-sum-field-index))
- (reductions +))
- ;; Update the values in each row
- rows (map (fn [row value]
- (assoc (vec row) cum-sum-field-index value))
- rows values)]
- (assoc results :rows rows))))
-
-;; ### LIMIT-MAX-RESULT-ROWS
-
-(defn limit-max-result-rows
- "Limit the number of rows returned in RESULTS to `max-result-rows`.
- (We want to do this here so we can put a hard limit on native SQL results and other ones where we couldn't add an implicit `:limit` clause)."
- [results]
- {:pre [(map? results)
- (sequential? (:rows results))]}
- (update-in results [:rows] (partial take max-result-rows)))
-
-
-;;; ### CONVERT-TIMESTAMPS-TO-DATES
-
-(defn convert-unix-timestamps-to-dates
- "Convert the values of Unix timestamps (for `Fields` whose `:special_type` is `:timestamp_seconds` or `:timestamp_milliseconds`) to dates."
- [{:keys [cols rows], :as results}]
- (let [timestamp-seconds-col-indecies (u/indecies-satisfying #(= (:special_type %) :timestamp_seconds) cols)
- timestamp-millis-col-indecies (u/indecies-satisfying #(= (:special_type %) :timestamp_milliseconds) cols)]
- (if-not (or (seq timestamp-seconds-col-indecies)
- (seq timestamp-millis-col-indecies))
- ;; If we don't have any columns whose special type is a seconds or milliseconds timestamp return results as-is
- results
- ;; Otherwise go modify the results of each row
- (update-in results [:rows] #(for [row %]
- (for [[i val] (m/indexed row)]
- (cond
- (instance? java.util.Date val) val ; already converted to Date as part of preprocessing,
- (contains? timestamp-seconds-col-indecies i) (java.sql.Date. (* val 1000)) ; nothing to do here
- (contains? timestamp-millis-col-indecies i) (java.sql.Date. val)
- :else val)))))))
-
-
-;; ### ADD-ROW-COUNT-AND-STATUS
-
-(defn add-row-count-and-status
- "Wrap the results of a successfully processed query in the format expected by the frontend (add `row_count` and `status`)."
- [results]
- {:pre [(map? results)
- (sequential? (:columns results))
- (sequential? (:cols results))
- (sequential? (:rows results))]}
- (let [num-results (count (:rows results))]
- (cond-> {:row_count num-results
- :status :completed
- :data results}
- (= num-results max-result-rows) (assoc-in [:data :rows_truncated] max-result-rows)))) ; so the front-end can let the user know why they're being arbitarily limited
-
-;; ### POST-PROCESS
-
-(defn post-process
- "Apply post-processing steps to the RESULTS of a QUERY, such as applying cumulative sum."
- [driver query results]
- {:pre [(map? query)
- (map? results)
- (sequential? (:columns results))
- (sequential? (:cols results))
- (sequential? (:rows results))]}
- ;; Double-check that there are no duplicate columns in results
- (assert (= (count (:columns results))
- (count (set (:columns results))))
- (format "Duplicate columns in results: %s" (vec (:columns results))))
- (->> results
- convert-unix-timestamps-to-dates
- limit-max-result-rows
- (#(case (keyword (:type query))
- :native %
- :query (post-process-cumulative-sum (:query query) %)))
- add-row-count-and-status))
-
-
-;; # ANNOTATION 2.0
-
-;; ## Ordering
+ [cum-sum-field {rows :rows, cols :cols, :as results}]
+ (let [ ;; Determine the index of the field we need to cumulative sum
+ cum-sum-field-index (->> cols
+ (u/indecies-satisfying #(or (= (:name %) "sum")
+ (= (:id %) (:field-id cum-sum-field))))
+ first)
+ _ (assert (integer? cum-sum-field-index))
+ ;; Now make a sequence of cumulative sum values for each row
+ values (->> rows
+ (map #(nth % cum-sum-field-index))
+ (reductions +))
+ ;; Update the values in each row
+ rows (map (fn [row value]
+ (assoc (vec row) cum-sum-field-index value))
+ rows values)]
+ (assoc results :rows rows)))
+
+
+(defn- cumulative-sum [qp]
+ (fn [query]
+ (let [[cumulative-sum-field query] (pre-cumulative-sum query)]
+ (cond->> (qp query)
+ cumulative-sum-field (post-cumulative-sum cumulative-sum-field)))))
+
+
+(defn- limit
+ "Add an implicit `limit` clause to queries with `rows` aggregations, and limit the maximum number of rows that can be returned in post-processing."
+ [qp]
+ (fn [{{{ag-type :aggregation-type} :aggregation, :keys [limit page]} :query, :as query}]
+ (let [query (cond-> query
+ (and (not limit)
+ (not page)
+ (= ag-type :rows)) (assoc-in [:query :limit] max-result-bare-rows))
+ results (qp query)]
+ (update results :rows (partial take max-result-rows)))))
+
+
+(defn- pre-log-query [qp]
+ (fn [query]
+ (when-not *disable-qp-logging*
+ (log/debug (u/format-color 'magenta "\n\nPREPROCESSED/EXPANDED: 😻\n%s"
+ (u/pprint-to-str
+ ;; Remove empty kv pairs because otherwise expanded query is HUGE
+ (walk/prewalk
+ (fn [f]
+ (if-not (map? f) f
+ (m/filter-vals identity (into {} f))))
+ ;; obscure DB details when logging. Just log the class of driver because we don't care about its properties
+ (-> query
+ (assoc-in [:database :details] "😋 ") ; :yum:
+ (update :driver class)))))))
+ (qp query)))
+
+
+;; +------------------------------------------------------------------------------------------------------------------------+
+;; | QUERY PROCESSOR |
+;; +------------------------------------------------------------------------------------------------------------------------+
+
+
+;; The way these functions are applied is actually straight-forward; it matches the middleware pattern used by Compojure.
+;;
+;; (defn- qp-middleware-fn [qp]
+;; (fn [query]
+;; (do-some-postprocessing (qp (do-some-preprocessing query)))))
;;
-;; Fields should be returned in the following order:
-;; 1. Breakout Fields
+;; Each query processor function is passed a single arg, QP, and returns a function that accepts a single arg, QUERY.
;;
-;; 2. Aggregation Fields (e.g. sum, count)
+;; This returned function *pre-processes* QUERY as needed, and then passes it to QP.
+;; The function may then *post-process* the results of (QP QUERY) as neeeded, and returns the results.
;;
-;; 3. Fields clause Fields, if they were added explicitly
+;; Many functions do both pre and post-processing; this middleware pattern allows them to return closures that maintain some sort of
+;; internal state. For example, cumulative-sum can determine if it needs to perform cumulative summing, and, if so, modify the query
+;; before passing it to QP, and modify the results of that call.
;;
-;; 4. All other Fields, sorted by:
-;; A. :position (ascending)
-;; Users can manually specify default Field ordering for a Table in the Metadata admin. In that case, return Fields in the specified
-;; order; most of the time they'll have the default value of 0, in which case we'll compare...
+;; For the sake of clarity, functions are named with the following convention:
+;; * Ones that only do pre-processing are prefixed with pre-
+;; * Ones that only do post-processing are prefixed with post-
+;; * Ones that do both aren't prefixed
;;
-;; B. :special_type "group" -- :id Fields, then :name Fields, then everyting else
-;; Attempt to put the most relevant Fields first. Order the Fields as follows:
-;; 1. :id Fields
-;; 2. :name Fields
-;; 3. all other Fields
+;; The <<- (reverse-threading macro) is used below for clarity.
+;; Pre-processing happens from top-to-bottom, i.e. the QUERY passed to the function returned by POST-ADD-ROW-COUNT-AND-STATUS is the
+;; query as modified by PRE-EXPAND.
;;
-;; C. Field Name
-;; When two Fields have the same :position and :special_type "group", fall back to sorting Fields alphabetically by name.
-;; This is arbitrary, but it makes the QP deterministic by keeping the results in a consistent order, which makes it testable.
-(defn- order-cols
- "Construct a sequence of column keywords that should be used for pulling ordered rows from RESULTS.
- FIELDS should be a sequence of all `Fields` for the `Table` associated with QUERY."
- [{{breakout-ids :breakout, fields-ids :fields, order-by-clauses :order_by} :query} results fields]
- {:post [(= (set %)
- (set (keys (first results))))]}
- (let [field-id->field (zipmap (map :id fields) fields)
-
- ;; Get IDs from Fields clause *if* it was added explicitly and other all other Field IDs for Table.
- fields-ids (when-not (:fields-is-implicit @*internal-context*) fields-ids)
- all-field-ids (->> fields ; Sort the Fields.
- (sort-by (fn [{:keys [position special_type name]}] ; For each field generate a vector of
- [position ; [position special-type-group name]
- (cond ; and Clojure will take care of the rest.
- (= special_type :id) 0
- (= special_type :name) 1
- :else 2)
- name]))
- (map :id)) ; Return the sorted IDs
-
- ;; Concat the Fields clause IDs + the sequence of all Fields ID for the Table.
- ;; Then filter out ones that appear in breakout clause and remove duplicates
- ;; which effectively gives us parts #3 and #4 from above.
- non-breakout-ids (->> (concat fields-ids all-field-ids)
- (filter (complement (partial contains? (set breakout-ids))))
- distinct)
-
- ;; Get all the column name keywords returned by the results
- result-kws (set (keys (first results)))
-
- ;; Make a helper function that will take a sequence of Field IDs and convert them to corresponding column name keywords.
- ;; Don't include names that aren't part of RESULT-KWS: we fetch *all* the Fields for a Table regardless of the Query, so
- ;; there are likely some unused ones.
- ids->kws (fn [field-ids]
- (some->> (map field-id->field field-ids)
- (map :name)
- (map keyword)
- (filter (partial contains? result-kws))))
-
- ;; Use fn above to get the keyword column names of breakout clause fields [#1] + fields clause fields / other non-aggregation fields [#3 and #4]
- breakout-kws (ids->kws breakout-ids)
- non-breakout-kws (ids->kws non-breakout-ids)
-
- ;; Now get all the keyword column names specific to aggregation, such as :sum or :count [#2].
- ;; Just get all the items in RESULT-KWS that *aren't* part of BREAKOUT-KWS or NON-BREAKOUT-KWS
- ag-kws (->> result-kws
- ;; TODO - Currently, this will never be more than a single Field, since we only
- ;; support a single aggregation clause at this point. When we add support for
- ;; multiple aggregation clauses, we'll need to add some logic to make sure they're
- ;; being ordered correctly, e.g. the first aggregate column before the second, etc.
- (filter (complement (partial contains? (set (concat breakout-kws non-breakout-kws))))))]
-
- ;; Now combine the breakout [#1] + aggregate [#2] + "non-breakout" [#3 & #4] column name keywords into a single sequence
- (concat breakout-kws ag-kws non-breakout-kws)))
-
-(defn- add-fields-extra-info
- "Add `:extra_info` about `ForeignKeys` to `Fields` whose `special_type` is `:fk`."
- [fields]
- ;; Get a sequence of add Field IDs that have a :special_type of FK
- (let [fk-field-ids (->> fields
- (filter #(= (:special_type %) :fk))
- (map :id)
- (filter identity))
- ;; Look up the Foreign keys info if applicable.
- ;; Build a map of FK Field IDs -> Destination Field IDs
- field-id->dest-field-id (when (seq fk-field-ids)
- (sel :many :field->field [ForeignKey :origin_id :destination_id], :origin_id [in fk-field-ids]))
-
- ;; Build a map of Destination Field IDs -> Destination Fields
- dest-field-id->field (when (seq fk-field-ids)
- (sel :many :id->fields [Field :id :name :table_id :description :base_type :special_type], :id [in (vals field-id->dest-field-id)]))]
-
- ;; Add the :extra_info + :target to every Field. For non-FK Fields, these are just {} and nil, respectively.
- (for [{field-id :id, :as field} fields]
- (let [dest-field (when (seq fk-field-ids)
- (some->> field-id
- field-id->dest-field-id
- dest-field-id->field))]
- (assoc field
- :target dest-field
- :extra_info (if-not dest-field {}
- {:target_table_id (:table_id dest-field)}))))))
-
-(defn- get-cols-info
- "Get column info for the `:cols` part of the QP results."
- [{{[ag-type ag-field-id] :aggregation} :query} fields ordered-col-kws]
- (let [field-kw->field (zipmap (map #(keyword (:name %)) fields)
- fields)
- field-id->field (delay (zipmap (map :id fields) ; a delay since we probably won't need it
- fields))]
- (->> (for [col-kw ordered-col-kws]
- (or
- ;; If col-kw is a known Field return that
- (field-kw->field col-kw)
- ;; Otherwise it is an aggregation column like :sum, build a map of information to return
- (merge (assert ag-type)
- {:name (name col-kw)
- :id nil
- :table_id nil
- :description nil}
- (cond
- ;; avg, stddev, and sum should inherit the base_type and special_type from the Field they're aggregating
- (contains? #{:avg :stddev :sum} col-kw) (-> (@field-id->field ag-field-id)
- (select-keys [:base_type :special_type]))
- ;; count should always be IntegerField/number
- (= col-kw :count) {:base_type :IntegerField
- :special_type :number}
- ;; Otherwise something went wrong !
- :else (throw (Exception. (format "Annotation failed: don't know what to do with Field '%s'.\nExpected these Fields:\n%s"
- col-kw
- (u/pprint-to-str field-kw->field))))))))
- ;; Add FK info the the resulting Fields
- add-fields-extra-info)))
-
-(defn annotate
- "Take a sequence of RESULTS of executing QUERY and return the \"annotated\" results we pass to postprocessing -- the map with `:cols`, `:columns`, and `:rows`.
- RESULTS should be a sequence of *maps*, keyed by result column -> value."
- [{{:keys [source_table]} :query, :as query}, results & [uncastify-fn]]
- {:pre [(integer? source_table)]}
- (let [results (if-not uncastify-fn results
- (for [row results]
- (m/map-keys uncastify-fn row)))
- fields (sel :many :fields [Field :id :table_id :name :description :base_type :special_type], :table_id source_table, :active true)
- ordered-col-kws (order-cols query results fields)]
- {:rows (for [row results]
- (mapv row ordered-col-kws)) ; might as well return each row and col info as vecs because we're not worried about making
- :columns (mapv name ordered-col-kws) ; making them lazy, and results are easier to play with in the REPL / paste into unit tests
- :cols (vec (get-cols-info query fields ordered-col-kws))})) ; as vecs. Make sure
+;; Pre-processing then happens in order from bottom-to-top; i.e. POST-ANNOTATE gets to modify the results, then LIMIT, then CUMULATIVE-SUM, etc.
+
+(defn- wrap-guard-multiple-calls
+ "Throw an exception if a QP function accidentally calls (QP QUERY) more than once."
+ [qp]
+ (let [called? (atom false)]
+ (fn [query]
+ (assert (not @called?) "(QP QUERY) IS BEING CALLED MORE THAN ONCE!")
+ (reset! called? true)
+ (qp query))))
+
+(defn- process-structured [{:keys [driver], :as query}]
+ (let [driver-process-query (partial i/process-query driver)
+ driver-wrap-process-query (partial i/wrap-process-query-middleware driver)]
+ ((<<- wrap-catch-exceptions
+ pre-expand
+ driver-wrap-process-query
+ post-add-row-count-and-status
+ pre-add-implicit-fields
+ pre-add-implicit-breakout-order-by
+ post-convert-unix-timestamps-to-dates
+ cumulative-sum
+ limit
+ annotate/post-annotate
+ pre-log-query
+ wrap-guard-multiple-calls
+ driver-process-query) query)))
+
+(defn- process-native [{:keys [driver], :as query}]
+ (let [driver-process-query (partial i/process-query driver)
+ driver-wrap-process-query (partial i/wrap-process-query-middleware driver)]
+ ((<<- wrap-catch-exceptions
+ driver-wrap-process-query
+ post-add-row-count-and-status
+ post-convert-unix-timestamps-to-dates
+ limit
+ wrap-guard-multiple-calls
+ driver-process-query) query)))
+
+(defn process
+ "Process a QUERY and return the results."
+ [driver query]
+ (when-not *disable-qp-logging*
+ (log/debug (u/format-color 'blue "\nQUERY: 😎\n%s" (u/pprint-to-str query))))
+ ((case (keyword (:type query))
+ :native process-native
+ :query process-structured)
+ (assoc query
+ :driver driver)))
diff --git a/src/metabase/driver/query_processor/annotate.clj b/src/metabase/driver/query_processor/annotate.clj
new file mode 100644
index 0000000000000000000000000000000000000000..643de6327735cff230a5a2e138f2e5a504fe75f5
--- /dev/null
+++ b/src/metabase/driver/query_processor/annotate.clj
@@ -0,0 +1,271 @@
+(ns metabase.driver.query-processor.annotate
+ (:refer-clojure :exclude [==])
+ (:require [clojure.core.logic :refer :all]
+ (clojure.core.logic [arithmetic :as ar]
+ [fd :as fd])
+ [clojure.tools.macro :refer [macrolet]]
+ (clojure [set :as set]
+ [string :as s])
+ [metabase.db :refer [sel]]
+ [metabase.driver.query-processor.expand :as expand]
+ (metabase.models [field :refer [Field], :as field]
+ [foreign-key :refer [ForeignKey]])
+ [metabase.util :as u]
+ [metabase.util.logic :refer :all]))
+
+;; Fields should be returned in the following order:
+;; 1. Breakout Fields
+;;
+;; 2. Aggregation Fields (e.g. sum, count)
+;;
+;; 3. Fields clause Fields, if they were added explicitly
+;;
+;; 4. All other Fields, sorted by:
+;; A. :position (ascending)
+;; Users can manually specify default Field ordering for a Table in the Metadata admin. In that case, return Fields in the specified
+;; order; most of the time they'll have the default value of 0, in which case we'll compare...
+;;
+;; B. :special_type "group" -- :id Fields, then :name Fields, then everyting else
+;; Attempt to put the most relevant Fields first. Order the Fields as follows:
+;; 1. :id Fields
+;; 2. :name Fields
+;; 3. all other Fields
+;;
+;; C. Field Name
+;; When two Fields have the same :position and :special_type "group", fall back to sorting Fields alphabetically by name.
+;; This is arbitrary, but it makes the QP deterministic by keeping the results in a consistent order, which makes it testable.
+
+;;; # ---------------------------------------- FIELD COLLECTION ----------------------------------------
+
+;; Walk the expanded query and collect the fields found therein. Associate some additional info to each that we'll pass to core.logic so it knows
+;; how to order the results
+
+(defn- field-qualify-name [field]
+ (assoc field :field-name (keyword (apply str (->> (rest (expand/qualified-name-components field))
+ (interpose "."))))))
+
+(defn- flatten-collect-fields [form]
+ (let [fields (transient [])]
+ (clojure.walk/prewalk (fn [f]
+ (if-not (= (type f) metabase.driver.query_processor.expand.Field) f
+ (do
+ (conj! fields f)
+ ;; HACK !!!
+ ;; Nested Mongo fields come back inside of their parent when you specify them in the fields clause
+ ;; e.g. (Q fields venue...name) will return rows like {:venue {:name "Kyle's Low-Carb Grill"}}
+ ;; Until we fix this the right way we'll just include the parent Field in the :query-fields list so the pattern
+ ;; matching works correctly.
+ ;; (This hack was part of the old annotation code too, it just sticks out better because it's no longer hidden amongst the others)
+ (when (:parent f)
+ (conj! fields (:parent f))))))
+ form)
+ (->> (persistent! fields)
+ distinct
+ (map field-qualify-name)
+ (mapv (u/rpartial dissoc :parent :parent-id :table-name)))))
+
+(defn- flatten-collect-ids-domain [form]
+ (apply fd/domain (sort (map :field-id (flatten-collect-fields form)))))
+
+
+;;; # ---------------------------------------- COLUMN RESOLUTION & ORDERING (CORE.LOGIC) ----------------------------------------
+
+;; Use core.logic to determine the appropriate ordering / result Fields
+
+(defn- field-name° [field field-name]
+ (featurec field {:field-name field-name}))
+
+(defn- make-field-in° [items]
+ (if-not (seq items)
+ (constantly fail)
+ (let [ids-domain (flatten-collect-ids-domain items)]
+ (fn [field]
+ (fresh [id]
+ (featurec field {:field-id id})
+ (fd/in id ids-domain))))))
+
+(defn- breakout-field° [{:keys [breakout]}]
+ (make-field-in° breakout))
+
+(defn- explicit-fields-field° [{:keys [fields-is-implicit fields], :as query}]
+ (if fields-is-implicit (constantly fail)
+ (make-field-in° fields)))
+
+(defn- aggregate-field° [{{ag-type :aggregation-type, ag-field :field} :aggregation}]
+ (if-not (contains? #{:avg :count :distinct :stddev :sum} ag-type)
+ (constantly fail)
+ (let [ag-field (if (contains? #{:count :distinct} ag-type)
+ {:base-type :IntegerField
+ :field-name :count
+ :field-display-name "count"
+ :special-type :number}
+ (-> ag-field
+ (select-keys [:base-type :special-type])
+ (assoc :field-name (if (= ag-type :distinct) :count
+ ag-type))
+ (assoc :field-display-name (if (= ag-type :distinct) "count"
+ (name ag-type)))))]
+ (fn [out]
+ (trace-lvars "*" out)
+ (== out ag-field)))))
+
+(defn- unknown-field° [field-name out]
+ (all
+ (== out {:base-type :UnknownField
+ :special-type nil
+ :field-name field-name
+ :field-display-name field-name})
+ (trace-lvars "UNKNOWN FIELD - NOT PRESENT IN EXPANDED QUERY (!)" out)))
+
+(defn- field° [query]
+ (let [ag-field° (aggregate-field° query)
+ normal-field° (let [field-name->field (let [fields (flatten-collect-fields query)]
+ (zipmap (map :field-name fields) fields))]
+ (fn [field-name out]
+ (if-let [field (field-name->field field-name)]
+ (== out field)
+ fail)))]
+ (fn [field-name field]
+ (conda
+ ((normal-field° field-name field))
+ ((ag-field° field))))))
+
+(def ^:const ^:private field-groups
+ {:breakout 0
+ :aggregation 1
+ :explicit-fields 2
+ :other 3})
+
+(defn- field-group° [query]
+ (let [breakout° (breakout-field° query)
+ agg° (aggregate-field° query)
+ xfields° (explicit-fields-field° query)]
+ (fn [field out]
+ (conda
+ ((breakout° field) (== out (field-groups :breakout)))
+ ((agg° field) (== out (field-groups :aggregation)))
+ ((xfields° field) (== out (field-groups :explicit-fields)))
+ (s# (== out (field-groups :other)))))))
+
+(defn- field-position° [field out]
+ (featurec field {:position out}))
+
+(def ^:const ^:private special-type-groups
+ {:id 0
+ :name 1
+ :other 2})
+
+(defn- special-type-group° [field out]
+ (conda
+ ((featurec field {:special-type :id}) (== out (special-type-groups :id)))
+ ((featurec field {:special-type :name}) (== out (special-type-groups :name)))
+ (s# (== out (special-type-groups :other)))))
+
+(defn- field-name< [query]
+ (fn [f1 f2]
+ (fresh [name-1 name-2]
+ (field-name° f1 name-1)
+ (field-name° f2 name-2)
+ (matches-seq-order° name-1 name-2 (:result-keys query)))))
+
+(defn- clause-position< [query]
+ (let [group° (field-group° query)
+ breakout-fields (flatten-collect-fields (:breakout query))
+ fields-fields (flatten-collect-fields (:fields query))]
+ (fn [f1 f2]
+ (conda
+ ((group° f1 (field-groups :breakout)) (matches-seq-order° f1 f2 breakout-fields))
+ ((group° f1 (field-groups :explicit-fields)) (matches-seq-order° f1 f2 fields-fields))))))
+
+(defn- fields-sorted° [query]
+ (let [group° (field-group° query)
+ name< (field-name< query)
+ clause-pos< (clause-position< query)]
+ (fn [f1 f2]
+ (macrolet [(<-or-== [f & ==-clauses] `(conda
+ ((fresh [v#]
+ (~f ~'f1 v#)
+ (~f ~'f2 v#)) ~@==-clauses)
+ ((fresh [v1# v2#]
+ (~f ~'f1 v1#)
+ (~f ~'f2 v2#)
+ (ar/< v1# v2#)) ~'s#)))]
+ (<-or-== group°
+ (<-or-== field-position°
+ (conda
+ ((group° f1 (field-groups :other)) (<-or-== special-type-group°
+ (name< f1 f2)))
+ ((clause-pos< f1 f2)))))))))
+
+(defn- resolve+order-cols [{:keys [result-keys], :as query}]
+ (when (seq result-keys)
+ (first (let [fields (vec (lvars (count result-keys)))
+ known-field° (field° query)]
+ (run 1 [q]
+ (everyg (fn [[result-key field]]
+ (conda
+ ((known-field° result-key field))
+ ((unknown-field° result-key field))))
+ (zipmap result-keys fields))
+ (sorted-permutation° (fields-sorted° query) fields q))))))
+
+
+;;; # ---------------------------------------- COLUMN DETAILS ----------------------------------------
+
+;; Format the results in the way the front-end expects.
+
+(defn- format-col [col]
+ (merge {:description nil
+ :id nil
+ :table_id nil}
+ (-> col
+ (set/rename-keys {:base-type :base_type
+ :field-id :id
+ :field-name :name
+ :field-display-name :display_name
+ :special-type :special_type
+ :table-id :table_id})
+ (dissoc :position))))
+
+(defn- add-fields-extra-info
+ "Add `:extra_info` about `ForeignKeys` to `Fields` whose `special_type` is `:fk`."
+ [fields]
+ ;; Get a sequence of add Field IDs that have a :special_type of FK
+ (let [fk-field-ids (->> fields
+ (filter #(= (:special_type %) :fk))
+ (map :id)
+ (filter identity))
+ ;; Look up the Foreign keys info if applicable.
+ ;; Build a map of FK Field IDs -> Destination Field IDs
+ field-id->dest-field-id (when (seq fk-field-ids)
+ (sel :many :field->field [ForeignKey :origin_id :destination_id], :origin_id [in fk-field-ids], :destination_id [not= nil]))
+
+ ;; Build a map of Destination Field IDs -> Destination Fields
+ dest-field-id->field (when (and (seq fk-field-ids)
+ (seq (vals field-id->dest-field-id)))
+ (sel :many :id->fields [Field :id :name :display_name :table_id :description :base_type :special_type], :id [in (vals field-id->dest-field-id)]))]
+
+ ;; Add the :extra_info + :target to every Field. For non-FK Fields, these are just {} and nil, respectively.
+ (vec (for [{field-id :id, :as field} fields]
+ (let [dest-field (when (seq fk-field-ids)
+ (some->> field-id
+ field-id->dest-field-id
+ dest-field-id->field))]
+ (assoc field
+ :target dest-field
+ :extra_info (if-not dest-field {}
+ {:target_table_id (:table_id dest-field)})))))))
+
+(defn post-annotate [qp]
+ (fn [query]
+ (let [results (qp query)
+ cols (->> (assoc (:query query) :result-keys (vec (sort (keys (first results)))))
+ resolve+order-cols
+ (map format-col)
+ add-fields-extra-info)
+ columns (map :name cols)]
+ {:cols (vec (for [col cols]
+ (update col :name name)))
+ :columns (mapv name columns)
+ :rows (for [row results]
+ (mapv row columns))})))
diff --git a/src/metabase/driver/query_processor/expand.clj b/src/metabase/driver/query_processor/expand.clj
index cf88eb32846135b9df751f1d99d1c79b1fef5c6e..08b5949da55707b3794cdf0acb925fb7f76bf4fe 100644
--- a/src/metabase/driver/query_processor/expand.clj
+++ b/src/metabase/driver/query_processor/expand.clj
@@ -34,121 +34,264 @@
1. Parsing: Various functions parse the query form and replace Field IDs and values with placeholders
2. Field Lookup: A *batched* DB call is made to fetch Fields with IDs found during Parsing
- 3. Field Resolution: Query is walked depth-first and placeholders are replaced with expanded `Field`/`Value` objects
-
- ## Collapsing
-
- Unfortunately, not every part of the QP understands expanded queries. Call `collapse` on an expanded Query form to get the equivalent standard
- QL forms for backwards-compatibility."
+ 3. Field Resolution: Query is walked depth-first and placeholders are replaced with expanded `Field`/`Value` objects"
(:require [clojure.core.match :refer [match]]
(clojure [set :as set]
[string :as s]
[walk :as walk])
[medley.core :as m]
+ [korma.core :as k]
+ [swiss.arrows :refer [-<>]]
[metabase.db :refer [sel]]
- [metabase.models.field :as field]
+ [metabase.driver.interface :as i]
+ (metabase.models [database :refer [Database]]
+ [field :as field]
+ [foreign-key :refer [ForeignKey]]
+ [table :refer [Table]])
[metabase.util :as u])
(:import (clojure.lang Keyword)))
(declare parse-aggregation
parse-breakout
+ parse-fields
parse-filter
- with-resolved-fields)
+ parse-order-by
+ ph)
+
;; ## -------------------- Protocols --------------------
-(defprotocol IResolveField
- "Methods called during `Field` resolution. Placeholder types should implement this protocol."
+(defprotocol IResolve
+ "Methods called during `Field` and `Table` resolution. Placeholder types should implement this protocol."
(resolve-field [this field-id->fields]
"This method is called when walking the Query after fetching `Fields`.
Placeholder objects should lookup the relevant Field in FIELD-ID->FIELDS and
- return their expanded form. Other objects should just return themselves."))
-
-(defprotocol ICollapse
- "Methods called during reverse-expansion.
- `collapse` traverses and expanded form breadth-first and calls `collapse-one`
- on each form. Implementers of `ICollapse` *should-not* call `collapse-one`
- on their subforms."
- (collapse-one [this]
- "Don't call this directly; use `collapse`.
- Return a reverse-expanded version of this object."))
+ return their expanded form. Other objects should just return themselves.")
+ (resolve-table [this table-id->tables]
+ "Called when walking the Query after `Fields` have been resolved and `Tables` have been fetched.
+ Objects like `Fields` can add relevant information like the name of their `Table`."))
;; Default impls are just identity
(extend Object
- IResolveField {:resolve-field (fn [this _] this)}
- ICollapse {:collapse-one identity})
+ IResolve {:resolve-field (fn [this _] this)
+ :resolve-table (fn [this _] this)})
(extend nil
- IResolveField {:resolve-field (constantly nil)})
+ IResolve {:resolve-field (constantly nil)
+ :resolve-table (constantly nil)})
-;; ## -------------------- Public Interface --------------------
+;; ## -------------------- Expansion - Impl --------------------
+
+(def ^:private ^:dynamic *field-ids*
+ "Bound to an atom containing a set of `Field` IDs referenced in the query being expanded."
+ nil)
+
+(def ^:private ^:dynamic *original-query-dict*
+ "The entire original Query dict being expanded."
+ nil)
+
+(def ^:private ^:dynamic *fk-field-ids*
+ "Bound to an atom containing a set of Foreign Key `Field` IDs (on the `source-table`) that we should use for joining to additional `Tables`."
+ nil)
+
+(def ^:private ^:dynamic *table-ids*
+ "Bound to an atom containing a set of `Table` IDs referenced by `Fields` in the query being expanded."
+ nil)
+
+(defn- assert-driver-supports [^Keyword feature]
+ {:pre [(:driver *original-query-dict*)]}
+ (i/assert-driver-supports (:driver *original-query-dict*) feature))
+
+(defn- non-empty-clause? [clause]
+ (and clause
+ (or (not (sequential? clause))
+ (and (seq clause)
+ (not (every? nil? clause))))))
(defn- parse [query-dict]
- (update-in query-dict [:query] #(assoc %
+ ;; TODO - we should parse the Page clause so we can validate it
+ ;; And convert to a limit / offset clauses
+ (update query-dict :query #(-<> (assoc %
:aggregation (parse-aggregation (:aggregation %))
- :breakout (parse-breakout (:breakout %))
- :filter (parse-filter (:filter %)))))
+ :breakout (parse-breakout (:breakout %))
+ :fields (parse-fields (:fields %))
+ :filter (parse-filter (:filter %))
+ :order_by (parse-order-by (:order_by %)))
+ (set/rename-keys <> {:order_by :order-by
+ :source_table :source-table})
+ (m/filter-vals non-empty-clause? <>))))
+
+(defn rename-mb-field-keys
+ "Rename the keys in a Metabase `Field` to match the format of those in Query Expander `Fields`."
+ [field]
+ (set/rename-keys field {:id :field-id
+ :name :field-name
+ :display_name :field-display-name
+ :special_type :special-type
+ :base_type :base-type
+ :table_id :table-id
+ :parent_id :parent-id}))
+
+(defn- resolve-fields
+ "Resolve the `Fields` in an EXPANDED-QUERY-DICT."
+ [expanded-query-dict field-ids]
+ (if-not (seq field-ids)
+ ;; Base case: if there's no field-ids to expand we're done
+ expanded-query-dict
+
+ ;; Re-bind *field-ids* in case we need to do recursive Field resolution
+ (binding [*field-ids* (atom #{})]
+ (let [fields (->> (sel :many :id->fields [field/Field :name :display_name :base_type :special_type :table_id :parent_id :description], :id [in field-ids])
+ (m/map-vals rename-mb-field-keys)
+ (m/map-vals #(assoc % :parent (when (:parent-id %)
+ (ph (:parent-id %))))))]
+ (swap! *table-ids* set/union (set (map :table-id (vals fields))))
+
+ ;; Recurse in case any new [nested] Field placeholders were emitted and we need to do recursive Field resolution
+ ;; We can't use recur here because binding wraps body in try/catch
+ (resolve-fields (walk/postwalk #(resolve-field % fields) expanded-query-dict) @*field-ids*)))))
+
+(defn- resolve-database
+ "Resolve the `Database` in question for an EXPANDED-QUERY-DICT."
+ [{database-id :database, :as expanded-query-dict}]
+ (assoc expanded-query-dict :database (sel :one :fields [Database :name :id :engine :details] :id database-id)))
+
+(defrecord JoinTableField [^Integer field-id
+ ^String field-name])
+
+(defrecord JoinTable [^JoinTableField source-field
+ ^JoinTableField pk-field
+ ^Integer table-id
+ ^String table-name])
+
+(defn- join-tables-fetch-field-info
+ "Fetch info for PK/FK `Fields` for the JOIN-TABLES referenced in a Query."
+ [source-table-id join-tables]
+ (let [ ;; Build a map of source table FK field IDs -> field names
+ fk-field-id->field-name (sel :many :id->field [field/Field :name], :id [in @*fk-field-ids*], :table_id source-table-id, :special_type "fk")
+
+ ;; Build a map of join table PK field IDs -> source table FK field IDs
+ pk-field-id->fk-field-id (sel :many :field->field [ForeignKey :destination_id :origin_id],
+ :origin_id [in (set (keys fk-field-id->field-name))])
+
+ ;; Build a map of join table ID -> PK field info
+ join-table-id->pk-field (let [pk-fields (sel :many :fields [field/Field :id :table_id :name], :id [in (set (keys pk-field-id->fk-field-id))])]
+ (zipmap (map :table_id pk-fields) pk-fields))]
+
+ ;; Now build the :join-tables clause
+ (vec (for [{table-id :id, table-name :name} join-tables]
+ (let [{pk-field-id :id, pk-field-name :name} (join-table-id->pk-field table-id)]
+ (map->JoinTable {:table-id table-id
+ :table-name table-name
+ :pk-field (map->JoinTableField {:field-id pk-field-id
+ :field-name pk-field-name})
+ :source-field (let [fk-field-id (pk-field-id->fk-field-id pk-field-id)]
+ (map->JoinTableField {:field-id fk-field-id
+ :field-name (fk-field-id->field-name fk-field-id)}))}))))))
+
+(defn- resolve-tables
+ "Resolve the `Tables` in an EXPANDED-QUERY-DICT."
+ [{{source-table-id :source-table} :query, database-id :database, :as expanded-query-dict} table-ids]
+ {:pre [(integer? source-table-id)]}
+ (let [table-ids (conj table-ids source-table-id)
+ table-id->table (sel :many :id->fields [Table :name :id] :id [in table-ids])
+ join-tables (vals (dissoc table-id->table source-table-id))]
+ (->> (assoc-in expanded-query-dict [:query :source-table] (or (table-id->table source-table-id)
+ (throw (Exception. (format "Query expansion failed: could not find source table %d." source-table-id)))))
+ (#(if-not join-tables %
+ (assoc-in % [:query :join-tables] (join-tables-fetch-field-info source-table-id join-tables))))
+ (walk/postwalk #(resolve-table % table-id->table)))))
-(defn expand
- "Expand a query-dict."
- [query-dict]
- (with-resolved-fields parse query-dict))
-(defn expand-filter
- "Expand a `filter` clause."
- [filter-clause]
- (with-resolved-fields parse-filter filter-clause))
+;; ## -------------------- Public Interface --------------------
-;; Do a breadth-first walk so we don't walk things that will be tossed anyway. Since
-;; some of these objects can be nil, this saves us from having to write an implentation
-;; of collapse-one for nil as well.
-(defn collapse
- "Collapse an expanded QUERY-FORM returning its standard QL equivalent."
- [query-form]
- (->> query-form
- (walk/prewalk collapse-one) ; do a second pass because some forms might not get fully collapsed the first time around,
- (walk/prewalk collapse-one))) ; e.g. :simple filters return collapse to their (not-yet-collapsed) subclause
+(defn expand
+ "Expand a QUERY-DICT."
+ [query-dict]
+ (binding [*original-query-dict* query-dict
+ *field-ids* (atom #{})
+ *fk-field-ids* (atom #{})
+ *table-ids* (atom #{})]
+ (some-> query-dict
+ parse
+ (resolve-fields @*field-ids*)
+ resolve-database
+ (resolve-tables @*table-ids*))))
;; ## -------------------- Field + Value --------------------
+(defprotocol IField
+ "Methods specific to the Query Expander `Field` record type."
+ (qualified-name-components [this]
+ "Return a vector of name components of the form `[table-name parent-names... field-name]`"))
+
;; Field is the expansion of a Field ID in the standard QL
-(defrecord Field [field-id
- field-name
- base-type
- special-type]
- ICollapse
- (collapse-one [_]
- field-id))
+(defrecord Field [^Integer field-id
+ ^String field-name
+ ^String field-display-name
+ ^Keyword base-type
+ ^Keyword special-type
+ ^Integer table-id
+ ^String table-name
+ ^Integer position
+ ^String description
+ ^Integer parent-id
+ parent] ; Field once its resolved; FieldPlaceholder before that
+ IResolve
+ (resolve-field [this field-id->fields]
+ (cond
+ parent (if (= (type parent) Field)
+ this
+ (resolve-field parent field-id->fields))
+ parent-id (assoc this :parent (or (field-id->fields parent-id)
+ (ph parent-id)))
+ :else this))
+
+ (resolve-table [this table-id->table]
+ (assoc this :table-name (:name (or (table-id->table table-id)
+ (throw (Exception. (format "Query expansion failed: could not find table %d." table-id)))))))
+
+ IField
+ (qualified-name-components [this]
+ (conj (if parent
+ (qualified-name-components parent)
+ [table-name])
+ field-name)))
+
+(defn- Field?
+ "Is this a valid value for a `Field` ID in an unexpanded query? (i.e. an integer or `fk->` form)."
+ ;; ["aggregation" 0] "back-reference" form not included here since its specific to the order_by clause
+ [field]
+ (match field
+ (field-id :guard integer?) true
+ ["fk->" (fk-field-id :guard integer?) (dest-field-id :guard integer?)] true
+ _ false))
;; Value is the expansion of a value within a QL clause
;; Information about the associated Field is included for convenience
(defrecord Value [value ; e.g. parsed Date / timestamp
original-value ; e.g. original YYYY-MM-DD string
- base-type
- special-type]
- ICollapse
- (collapse-one [_]
- ;; Some preprocessing steps modify the parsed value
- ;; So return that value instead of converting date/timestamp back to YYYY-MM-DD
- ;; QPs shouldn't need logic for parsing YYYY-MM-DD strings anymore
- value))
+ ^Keyword base-type
+ ^Keyword special-type
+ ^Integer field-id
+ ^String field-name])
;; ## -------------------- Placeholders --------------------
;; Replace Field IDs with these during first pass
-(defrecord FieldPlaceholder [field-id]
- IResolveField
+(defrecord FieldPlaceholder [^Integer field-id]
+ IResolve
(resolve-field [this field-id->fields]
- (-> (:field-id this)
- field-id->fields
- map->Field))
-
- ICollapse
- (collapse-one [_]
- field-id))
+ (or
+ ;; try to resolve the Field with the ones available in field-id->fields
+ (some->> (field-id->fields field-id)
+ (merge this)
+ map->Field)
+ ;; If that fails just return ourselves as-is
+ this)))
(defn- parse-value
"Convert the `value` of a `Value` to a date or timestamp if needed.
@@ -166,11 +309,7 @@
;; Replace values with these during first pass over Query.
;; Include associated Field ID so appropriate the info can be found during Field resolution
(defrecord ValuePlaceholder [field-id value]
- ICollapse
- (collapse-one [_]
- value)
-
- IResolveField
+ IResolve
(resolve-field [this field-id->fields]
(-> (:field-id this)
field-id->fields
@@ -178,39 +317,24 @@
parse-value
map->Value)))
-(def ^:private ^:dynamic *field-ids*
- "Bound to an atom containing a set when a parsing function is ran"
- nil)
-
(defn- ph
"Create a new placeholder object for a Field ID or value.
If `*field-ids*` is bound, "
([field-id]
- (when *field-ids*
- (swap! *field-ids* conj field-id))
- (->FieldPlaceholder field-id))
+ (match field-id
+ (id :guard integer?)
+ (do (swap! *field-ids* conj id)
+ (->FieldPlaceholder id))
+
+ ["fk->" (fk-field-id :guard integer?) (dest-field-id :guard integer?)]
+ (do (assert-driver-supports :foreign-keys)
+ (swap! *field-ids* conj dest-field-id)
+ (swap! *fk-field-ids* conj fk-field-id)
+ (->FieldPlaceholder dest-field-id))
+
+ _ (throw (Exception. (str "Invalid field: " field-id)))))
([field-id value]
- (->ValuePlaceholder field-id value)))
-
-
-;; ## -------------------- Field Resolution --------------------
-
-(defn- with-resolved-fields
- "Call (PARSER-FN FORM), collecting the `Field` IDs encountered; then fetch the relevant Fields
- and walk the parsed form, calling `resolve-field` on each element."
- [parser-fn form]
- (when form
- (binding [*field-ids* (atom #{})]
- (when-let [parsed-form (parser-fn form)]
- (if-not (seq @*field-ids*) parsed-form ; No need to do a DB call or walk parsed-form if we didn't see any Field IDs
- (let [fields (->> (sel :many :id->fields [field/Field :name :base_type :special_type] :id [in @*field-ids*])
- (m/map-vals #(set/rename-keys % {:id :field-id
- :name :field-name
- :special_type :special-type
- :base_type :base-type})))]
- ;; This is performed depth-first so we don't end up walking the newly-created Field/Value objects
- ;; they may have nil values; this was we don't have to write an implementation of resolve-field for nil
- (walk/postwalk #(resolve-field % fields) parsed-form)))))))
+ (->ValuePlaceholder (:field-id (ph field-id)) value)))
;; # ======================================== CLAUSE DEFINITIONS ========================================
@@ -219,12 +343,10 @@
"Convenience for writing a parser function, i.e. one that pattern-matches against a lone argument."
[fn-name & match-forms]
`(defn ~(vary-meta fn-name assoc :private true) [form#]
- (when (and form#
- (or (not (sequential? form#))
- (and (seq form#)
- (every? identity form#))))
+ (when (non-empty-clause? form#)
(match form#
- ~@match-forms))))
+ ~@match-forms
+ form# (throw (Exception. (format ~(format "%s failed: invalid clause: %%s" fn-name) form#)))))))
;; ## -------------------- Aggregation --------------------
@@ -232,78 +354,61 @@
^Field field])
(defparser parse-aggregation
- ["rows"] (->Aggregation :rows nil)
- ["count"] (->Aggregation :count nil)
- ["avg" field-id] (->Aggregation :avg (ph field-id))
- ["count" field-id] (->Aggregation :count (ph field-id))
- ["distinct" field-id] (->Aggregation :distinct (ph field-id))
- ["stddev" field-id] (->Aggregation :stddev (ph field-id))
- ["sum" field-id] (->Aggregation :sum (ph field-id))
- ["cum_sum" field-id] (->Aggregation :cumulative-sum (ph field-id)))
+ ["rows"] (->Aggregation :rows nil)
+ ["count"] (->Aggregation :count nil)
+ ["avg" (field-id :guard Field?)] (->Aggregation :avg (ph field-id))
+ ["count" (field-id :guard Field?)] (->Aggregation :count (ph field-id))
+ ["distinct" (field-id :guard Field?)] (->Aggregation :distinct (ph field-id))
+ ["stddev" (field-id :guard Field?)] (do (assert-driver-supports :standard-deviation-aggregations)
+ (->Aggregation :stddev (ph field-id)))
+ ["sum" (field-id :guard Field?)] (->Aggregation :sum (ph field-id))
+ ["cum_sum" (field-id :guard Field?)] (->Aggregation :cumulative-sum (ph field-id)))
;; ## -------------------- Breakout --------------------
-(defrecord Breakout [fields])
+;; Breakout + Fields clauses are just regular vectors of Fields
(defparser parse-breakout
- [& field-ids] (mapv ph field-ids))
+ field-ids (mapv ph field-ids))
+
+
+;; ## -------------------- Fields --------------------
+
+(defparser parse-fields
+ field-ids (mapv ph field-ids))
;; ## -------------------- Filter --------------------
;; ### Top-Level Type
(defrecord Filter [^Keyword compound-type ; :and :or :simple
- subclauses]
- ICollapse
- (collapse-one [_]
- (case compound-type
- :simple (first subclauses)
- :and `["AND" ~@subclauses]
- :or `["OR" ~@subclauses])))
+ subclauses])
;; ### Subclause Types
(defrecord Filter:Inside [^Keyword filter-type ; :inside :not-null :is-null :between := :!= :< :> :<= :>=
lat
- lon]
- ICollapse
- (collapse-one [_]
- ["INSIDE" (:field lat) (:field lon) (:max lat) (:min lon) (:min lat) (:max lon)]))
+ lon])
(defrecord Filter:Between [^Keyword filter-type
^Field field
^Value min-val
- ^Value max-val]
- ICollapse
- (collapse-one [_]
- ["BETWEEN" field min-val max-val]))
-
-(defn- collapse-filter-type [^Keyword filter-type]
- (-> filter-type
- name
- (s/replace #"-" "_")
- s/upper-case))
+ ^Value max-val])
(defrecord Filter:Field+Value [^Keyword filter-type
^Field field
- ^Value value]
- ICollapse
- (collapse-one [_]
- [(collapse-filter-type filter-type) field value]))
+ ^Value value])
(defrecord Filter:Field [^Keyword filter-type
- ^Field field]
- ICollapse
- (collapse-one [_]
- [(collapse-filter-type filter-type) field]))
+ ^Field field])
;; ### Parsers
(defparser parse-filter-subclause
- ["INSIDE" lat-field lon-field lat-max lon-min lat-min lon-max]
+ ["INSIDE" (lat-field :guard Field?) (lon-field :guard Field?) (lat-max :guard number?) (lon-min :guard number?) (lat-min :guard number?) (lon-max :guard number?)]
(map->Filter:Inside {:filter-type :inside
:lat {:field (ph lat-field)
:min (ph lat-field lat-min)
@@ -312,18 +417,42 @@
:min (ph lon-field lon-min)
:max (ph lon-field lon-max)}})
- ["BETWEEN" field-id min max]
+ ["BETWEEN" (field-id :guard Field?) (min :guard (complement nil?)) (max :guard (complement nil?))]
(map->Filter:Between {:filter-type :between
:field (ph field-id)
:min-val (ph field-id min)
:max-val (ph field-id max)})
- [filter-type field-id val]
+ [(filter-type :guard (partial contains? #{"!=" "=" "<" ">" "<=" ">="})) (field-id :guard Field?) (val :guard (complement nil?))]
(map->Filter:Field+Value {:filter-type (keyword filter-type)
:field (ph field-id)
:value (ph field-id val)})
- [filter-type field-id]
+ ;; = with more than one value -- Convert to OR and series of = clauses
+ ["=" (field-id :guard Field?) & (values :guard #(and (seq %) (every? (complement nil?) %)))]
+ (map->Filter {:compound-type :or
+ :subclauses (vec (for [value values]
+ (map->Filter:Field+Value {:filter-type :=
+ :field (ph field-id)
+ :value (ph field-id value)})))})
+
+ ;; != with more than one value -- Convert to AND and series of != clauses
+ ["!=" (field-id :guard Field?) & (values :guard #(and (seq %) (every? (complement nil?) %)))]
+ (map->Filter {:compound-type :and
+ :subclauses (vec (for [value values]
+ (map->Filter:Field+Value {:filter-type :!=
+ :field (ph field-id)
+ :value (ph field-id value)})))})
+
+ [(filter-type :guard (partial contains? #{"STARTS_WITH" "CONTAINS" "ENDS_WITH"})) (field-id :guard Field?) (val :guard string?)]
+ (map->Filter:Field+Value {:filter-type (case filter-type
+ "STARTS_WITH" :starts-with
+ "CONTAINS" :contains
+ "ENDS_WITH" :ends-with)
+ :field (ph field-id)
+ :value (ph field-id val)})
+
+ [(filter-type :guard string?) (field-id :guard Field?)]
(map->Filter:Field {:filter-type (case filter-type
"NOT_NULL" :not-null
"IS_NULL" :is-null)
@@ -331,8 +460,38 @@
(defparser parse-filter
["AND" & subclauses] (map->Filter {:compound-type :and
- :subclauses (mapv parse-filter-subclause subclauses)})
+ :subclauses (mapv parse-filter subclauses)})
["OR" & subclauses] (map->Filter {:compound-type :or
- :subclauses (mapv parse-filter-subclause subclauses)})
- subclause (map->Filter {:compound-type :simple
- :subclauses [(parse-filter-subclause subclause)]}))
+ :subclauses (mapv parse-filter subclauses)})
+ subclause (parse-filter-subclause subclause))
+
+
+;; ## -------------------- Order-By --------------------
+
+(defrecord OrderByAggregateField [^Keyword source ; Name used in original query. Always :aggregation for right now
+ ^Integer index ; e.g. 0
+ ^Aggregation aggregation] ; The aggregation clause being referred to
+ IField
+ (qualified-name-components [_]
+ ;; Return something like [nil "count"]
+ ;; nil is used where Table name would normally go
+ [nil (name (:aggregation-type aggregation))]))
+
+
+(defrecord OrderBySubclause [^Field field ; or aggregate Field?
+ ^Keyword direction]) ; either :ascending or :descending
+
+(defn- parse-order-by-direction [direction]
+ (case direction
+ "ascending" :ascending
+ "descending" :descending))
+
+(defparser parse-order-by-subclause
+ [["aggregation" index] direction] (let [{{:keys [aggregation]} :query} *original-query-dict*]
+ (assert aggregation "Query does not contain an aggregation clause.")
+ (->OrderBySubclause (->OrderByAggregateField :aggregation index (parse-aggregation aggregation))
+ (parse-order-by-direction direction)))
+ [(field-id :guard Field?) direction] (->OrderBySubclause (ph field-id)
+ (parse-order-by-direction direction)))
+(defparser parse-order-by
+ subclauses (mapv parse-order-by-subclause subclauses))
diff --git a/src/metabase/driver/sync.clj b/src/metabase/driver/sync.clj
index 758cb2a96383f99433d2007a0280264ad80a14a8..198e01dd5aeb215d55fef64df44d59cb98b7e143 100644
--- a/src/metabase/driver/sync.clj
+++ b/src/metabase/driver/sync.clj
@@ -1,29 +1,37 @@
(ns metabase.driver.sync
"The logic for doing DB and Table syncing itself."
(:require [clojure.math.numeric-tower :as math]
- [clojure.string :as s]
+ (clojure [set :as set]
+ [string :as s])
[clojure.tools.logging :as log]
- [colorize.core :as color]
+ [cheshire.core :as json]
[korma.core :as k]
[medley.core :as m]
[metabase.db :refer :all]
(metabase.driver [interface :refer :all]
[query-processor :as qp])
[metabase.driver.sync.queries :as queries]
- (metabase.models [field :refer [Field] :as field]
+ (metabase.models [common :as common]
+ [field :refer [Field] :as field]
+ [field-values :as field-values]
[foreign-key :refer [ForeignKey]]
[table :refer [Table]])
[metabase.util :as u]))
(declare auto-assign-field-special-type-by-name!
- mark-category-field!
+ mark-category-field-or-update-field-values!
+ mark-json-field!
mark-no-preview-display-field!
mark-url-field!
+ maybe-driver-specific-sync-field!
+ set-field-display-name-if-needed!
sync-database-active-tables!
sync-field!
sync-table-active-fields-and-pks!
sync-table-fks!
sync-table-fields-metadata!
+ update-table-display-name!
+ sync-field-nested-fields!
update-table-row-count!)
;; ## sync-database! and sync-table!
@@ -31,44 +39,45 @@
(defn sync-database!
"Sync DATABASE and all its Tables and Fields."
[driver database]
- (binding [qp/*disable-qp-logging* true]
+ (binding [qp/*disable-qp-logging* true
+ *sel-disable-logging* true]
(sync-in-context driver database
(fn []
- (log/info (color/blue (format "Syncing database %s..." (:name database))))
-
- (let [active-table-names (active-table-names driver database)
- table-name->id (sel :many :field->id [Table :name] :db_id (:id database) :active true)]
- (assert (set? active-table-names) "active-table-names should return a set.")
- (assert (every? string? active-table-names) "active-table-names should return the names of Tables as *strings*.")
-
- ;; First, let's mark any Tables that are no longer active as such.
- ;; These are ones that exist in table-name->id but not in active-table-names.
- (log/debug "Marking inactive tables...")
- (doseq [[table-name table-id] table-name->id]
- (when-not (contains? active-table-names table-name)
- (upd Table table-id :active false)
- (log/info (format "Marked table %s.%s as inactive." (:name database) table-name))
-
- ;; We need to mark driver Table's Fields as inactive so we don't expose them in UI such as FK selector (etc.) This can happen in the background
- (future (k/update Field
- (k/where {:table_id table-id})
- (k/set-fields {:active false})))))
-
- ;; Next, we'll create new Tables (ones that came back in active-table-names but *not* in table-name->id)
- (log/debug "Creating new tables...")
- (let [existing-table-names (set (keys table-name->id))]
- (doseq [active-table-name active-table-names]
- (when-not (contains? existing-table-names active-table-name)
- (ins Table :db_id (:id database), :active true, :name active-table-name)
- (log/info (format "Found new table: %s.%s" (:name database) active-table-name))))))
-
- ;; Now sync the active tables
- (log/debug "Syncing active tables...")
- (->> (sel :many Table :db_id (:id database) :active true)
- (map #(assoc % :db (delay database))) ; replace default delays with ones that reuse database (and don't require a DB call)
- (sync-database-active-tables! driver))
-
- (log/info (color/blue (format "Finished syncing database %s." (:name database))))))))
+ (let [start-time (System/currentTimeMillis)]
+ (log/info (u/format-color 'magenta "Syncing %s database '%s'..." (name (:engine database)) (:name database)))
+
+ (let [active-table-names (active-table-names driver database)
+ table-name->id (sel :many :field->id [Table :name] :db_id (:id database) :active true)]
+ (assert (set? active-table-names) "active-table-names should return a set.")
+ (assert (every? string? active-table-names) "active-table-names should return the names of Tables as *strings*.")
+
+ ;; First, let's mark any Tables that are no longer active as such.
+ ;; These are ones that exist in table-name->id but not in active-table-names.
+ (doseq [[table-name table-id] table-name->id]
+ (when-not (contains? active-table-names table-name)
+ (upd Table table-id :active false)
+ (log/info (u/format-color 'cyan "Marked table %s.%s as inactive." (:name database) table-name))
+
+ ;; We need to mark driver Table's Fields as inactive so we don't expose them in UI such as FK selector (etc.)
+ (k/update Field
+ (k/where {:table_id table-id})
+ (k/set-fields {:active false}))))
+
+ ;; Next, we'll create new Tables (ones that came back in active-table-names but *not* in table-name->id)
+ (let [existing-table-names (set (keys table-name->id))
+ new-table-names (set/difference active-table-names existing-table-names)]
+ (when (seq new-table-names)
+ (log/debug (u/format-color 'blue "Found new tables: %s" new-table-names))
+ (doseq [new-table-name new-table-names]
+ (ins Table :db_id (:id database), :active true, :name new-table-name)))))
+
+ ;; Now sync the active tables
+ (->> (sel :many Table :db_id (:id database) :active true)
+ (map #(assoc % :db (delay database))) ; replace default delays with ones that reuse database (and don't require a DB call)
+ (sync-database-active-tables! driver))
+
+ (log/info (u/format-color 'magenta "Finished syncing %s database %s. (%d ms)" (name (:engine database)) (:name database)
+ (- (System/currentTimeMillis) start-time))))))))
(defn sync-table!
"Sync a *single* TABLE by running all the sync steps for it.
@@ -83,45 +92,83 @@
;; ### sync-database-active-tables! -- runs the sync-table steps over sequence of Tables
-(defn sync-database-active-tables!
+(def ^:private sync-progress-meter-string
+ "Create a string that shows sync progress for a database.
+
+ (sync-progress-meter-string 10 40)
+ -> \"[************······································] 25%\""
+ (let [^:const meter-width 50
+ ^:const progress-emoji ["😱" ; face screaming in fear
+ "😢" ; crying face
+ "😞" ; disappointed face
+ "😒" ; unamused face
+ "😕" ; confused face
+ "ðŸ˜" ; neutral face
+ "😬" ; grimacing face
+ "😌" ; relieved face
+ "ðŸ˜" ; smirking face
+ "😋" ; face savouring delicious food
+ "😊" ; smiling face with smiling eyes
+ "ðŸ˜" ; smiling face with heart shaped eyes
+ "😎"] ; smiling face with sunglasses
+ percent-done->emoji (fn [percent-done]
+ (progress-emoji (int (math/round (* percent-done (dec (count progress-emoji)))))))]
+ (fn [tables-finished total-tables]
+ (let [percent-done (float (/ tables-finished total-tables))
+ filleds (int (* percent-done meter-width))
+ blanks (- meter-width filleds)]
+ (str "["
+ (apply str (repeat filleds "*"))
+ (apply str (repeat blanks "·"))
+ (format "] %s %3.0f%%" (percent-done->emoji percent-done) (* percent-done 100.0)))))))
+
+(defn- sync-database-active-tables!
"Sync active tables by running each of the sync table steps.
Note that we want to completely finish each step for *all* tables before starting the next, since they depend on the results of the previous step.
(e.g., `sync-table-fks!` can't run until all tables have finished `sync-table-active-fields-and-pks!`, since creating `ForeignKeys` to `Fields` of *other*
Tables can't take place before they exist."
[driver active-tables]
- ;; update the row counts for every Table. These *can* happen asynchronously, but since they make a lot of DB calls each so
- ;; going to block while they run for the time being. (TODO - fix this)
- (log/debug (color/green "Updating table row counts..."))
- (doseq [table active-tables]
- (u/try-apply update-table-row-count! table))
-
- ;; Next, create new Fields / mark inactive Fields / mark PKs for each table
- ;; (TODO - this was originally done in parallel but it was only marginally faster, and harder to debug. Should we switch back at some point?)
- (log/debug (color/green "Syncing active Fields + PKs..."))
- (doseq [table active-tables]
- (u/try-apply sync-table-active-fields-and-pks! driver table))
-
- ;; Once that's finished, we can sync FKs
- (log/debug (color/green "Syncing FKs..."))
- (doseq [table active-tables]
- (u/try-apply sync-table-fks! driver table))
-
- ;; After that, we can sync the metadata for all active Fields
- ;; Now sync all active fields
- (let [tables-count (count active-tables)
- finished-tables-count (atom 0)]
- (doseq [table active-tables]
- (log/debug (color/green (format "Syncing metadata for %s.%s..." (:name @(:db table)) (:name table))))
- (sync-table-fields-metadata! driver table)
- (swap! finished-tables-count inc)
- (log/info (color/blue (format "Synced %s.%s (%d/%d)" (:name @(:db table)) (:name table) @finished-tables-count tables-count))))))
+ (let [active-tables (sort-by :name active-tables)]
+ ;; First, create all the Fields / PKs for all of the Tables
+ (u/pdoseq [table active-tables]
+ (u/try-apply sync-table-active-fields-and-pks! driver table))
+
+ ;; After that, we can do all the other syncing for the Tables
+ (let [tables-count (count active-tables)
+ finished-tables-count (atom 0)]
+ (u/pdoseq [table active-tables]
+ ;; make sure table has :display_name
+ (u/try-apply update-table-display-name! table)
+
+ ;; update the row counts for every Table
+ (u/try-apply update-table-row-count! table)
+
+ ;; Sync FKs for this Table
+ (u/try-apply sync-table-fks! driver table)
+
+ (sync-table-fields-metadata! driver table)
+ (swap! finished-tables-count inc)
+ (log/debug (u/format-color 'magenta "%s Synced table '%s'." (sync-progress-meter-string @finished-tables-count tables-count) (:name table)))))))
;; ## sync-table steps.
+;; ### 0) update-table-display-name!
+
+(defn- update-table-display-name!
+ "Update the display_name of TABLE if it doesn't exist."
+ [table]
+ {:pre [(integer? (:id table))]}
+ (try
+ (when (nil? (:display_name table))
+ (upd Table (:id table) :display_name (common/name->human-readable-name (:name table))))
+ (catch Throwable e
+ (log/error (u/format-color 'red "Unable to update display_name for %s: %s" (:name table) (.getMessage e))))))
+
+
;; ### 1) update-table-row-count!
-(defn update-table-row-count!
+(defn- update-table-row-count!
"Update the row count of TABLE if it has changed."
[table]
{:pre [(integer? (:id table))]}
@@ -130,47 +177,57 @@
(when-not (= (:rows table) table-row-count)
(upd Table (:id table) :rows table-row-count)))
(catch Throwable e
- (log/error (color/red (format "Unable to update row_count for %s: %s" (:name table) (.getMessage e)))))))
+ (log/error (u/format-color 'red "Unable to update row_count for '%s': %s" (:name table) (.getMessage e))))))
;; ### 2) sync-table-active-fields-and-pks!
-(defn update-table-pks!
+(defn- update-table-pks!
"Mark primary-key `Fields` for TABLE as `special_type = id` if they don't already have a `special_type`."
[table pk-fields]
{:pre [(set? pk-fields)
(every? string? pk-fields)]}
- (doseq [{field-name :name field-id :id} (sel :many :fields [Field :name :id] :table_id (:id table) :special_type nil :name [in pk-fields])]
- (log/info (format "Field '%s.%s' is a primary key. Marking it as such." (:name table) field-name))
+ (doseq [{field-name :name field-id :id} (sel :many :fields [Field :name :id], :table_id (:id table), :special_type nil, :name [in pk-fields], :parent_id nil)]
+ (log/debug (u/format-color 'green "Field '%s.%s' is a primary key. Marking it as such." (:name table) field-name))
(upd Field field-id :special_type :id)))
-(defn sync-table-active-fields-and-pks!
+(defn- sync-table-active-fields-and-pks!
"Create new Fields (and mark old ones as inactive) for TABLE, and update PK fields."
[driver table]
(let [database @(:db table)]
;; Now do the syncing for Table's Fields
- (log/debug (format "Determining active Fields for Table '%s'..." (:name table)))
- (let [active-column-names->type (active-column-names->type driver table)
- field-name->id (sel :many :field->id [Field :name] :table_id (:id table) :active true)]
+ (let [active-column-names->type (active-column-names->type driver table)
+ existing-field-name->field (sel :many :field->fields [Field :name :base_type :id], :table_id (:id table), :active true, :parent_id nil)]
+
(assert (map? active-column-names->type) "active-column-names->type should return a map.")
(assert (every? string? (keys active-column-names->type)) "The keys of active-column-names->type should be strings.")
(assert (every? (partial contains? field/base-types) (vals active-column-names->type)) "The vals of active-column-names->type should be valid Field base types.")
;; As above, first mark inactive Fields
(let [active-column-names (set (keys active-column-names->type))]
- (doseq [[field-name field-id] field-name->id]
+ (doseq [[field-name {field-id :id}] existing-field-name->field]
(when-not (contains? active-column-names field-name)
(upd Field field-id :active false)
- (log/info (format "Marked field %s.%s.%s as inactive." (:name database) (:name table) field-name)))))
+ (log/info (u/format-color 'cyan "Marked field '%s.%s' as inactive." (:name table) field-name)))))
- ;; Next, create new Fields as needed
- (let [existing-field-names (set (keys field-name->id))]
+ ;; Create new Fields, update existing types if needed
+ (let [existing-field-names (set (keys existing-field-name->field))
+ new-field-names (set/difference (set (keys active-column-names->type)) existing-field-names)]
+ (when (seq new-field-names)
+ (log/debug (u/format-color 'blue "Found new fields for table '%s': %s" (:name table) new-field-names)))
(doseq [[active-field-name active-field-type] active-column-names->type]
- (when-not (contains? existing-field-names active-field-name)
+ ;; If Field doesn't exist create it
+ (if-not (contains? existing-field-names active-field-name)
(ins Field
- :table_id (:id table)
- :name active-field-name
- :base_type active-field-type))))
+ :table_id (:id table)
+ :name active-field-name
+ :base_type active-field-type)
+ ;; Otherwise update the Field type if needed
+ (let [{existing-base-type :base_type, existing-field-id :id} (existing-field-name->field active-field-name)]
+ (when-not (= active-field-type existing-base-type)
+ (log/debug (u/format-color 'blue "Field '%s.%s' has changed from a %s to a %s." (:name table) active-field-name existing-base-type active-field-type))
+ (upd Field existing-field-id :base_type active-field-type))))))
+ ;; TODO - we need to add functionality to update nested Field base types as well!
;; Now mark PK fields as such if needed
(let [pk-fields (table-pks driver table)]
@@ -179,7 +236,7 @@
;; ### 3) sync-table-fks!
-(defn determine-fk-type
+(defn- determine-fk-type
"Determine whether a FK is `:1t1`, or `:Mt1`.
Do this by getting the count and distinct counts of source `Field`.
@@ -191,7 +248,7 @@
(if (= field-count field-distinct-count) :1t1
:Mt1)))
-(defn sync-table-fks! [driver table]
+(defn- sync-table-fks! [driver table]
(when (extends? ISyncDriverTableFKs (type driver))
(let [fks (table-fks driver table)]
(assert (and (set? fks)
@@ -201,29 +258,30 @@
(every? :dest-column-name fks))
"table-fks should return a set of maps with keys :fk-column-name, :dest-table-name, and :dest-column-name.")
(when (seq fks)
- (let [fk-name->id (sel :many :field->id [Field :name] :table_id (:id table), :special_type nil, :name [in (map :fk-column-name fks)])
- table-name->id (sel :many :field->id [Table :name] :name [in (map :dest-table-name fks)])]
+ (let [fk-name->id (sel :many :field->id [Field :name], :table_id (:id table), :special_type nil, :name [in (map :fk-column-name fks)], :parent_id nil)
+ table-name->id (sel :many :field->id [Table :name], :name [in (map :dest-table-name fks)])]
(doseq [{:keys [fk-column-name dest-column-name dest-table-name] :as fk} fks]
(when-let [fk-column-id (fk-name->id fk-column-name)]
(when-let [dest-table-id (table-name->id dest-table-name)]
- (when-let [dest-column-id (sel :one :id Field :table_id dest-table-id :name dest-column-name)]
- (log/info (format "Marking foreign key '%s.%s' -> '%s.%s'." (:name table) fk-column-name dest-table-name dest-column-name))
+ (when-let [dest-column-id (sel :one :id Field, :table_id dest-table-id, :name dest-column-name, :parent_id nil)]
+ (log/debug (u/format-color 'green "Marking foreign key '%s.%s' -> '%s.%s'." (:name table) fk-column-name dest-table-name dest-column-name))
(ins ForeignKey
- :origin_id fk-column-id
+ :origin_id fk-column-id
:destination_id dest-column-id
- :relationship (determine-fk-type {:id fk-column-id, :table (delay table)})) ; fake a Field instance
+ :relationship (determine-fk-type {:id fk-column-id, :table (delay table)})) ; fake a Field instance
(upd Field fk-column-id :special_type :fk))))))))))
;; ### 4) sync-table-fields-metadata!
-(defn sync-table-fields-metadata!
+(defn- sync-table-fields-metadata!
"Call `sync-field!` for every active Field for TABLE."
[driver table]
- (let [active-fields (->> (sel :many Field, :table_id (:id table), :active true)
- (map #(assoc % :table (delay table))))] ; as above, replace the delay that comes back with one that reuses existing table obj
+ {:pre [(map? table)]}
+ (let [active-fields (sel :many Field, :table_id (:id table), :active true, :parent_id nil, (k/order :name))]
(doseq [field active-fields]
- (u/try-apply sync-field! driver field))))
+ ;; replace the normal delay for the Field with one that just returns the existing Table so we don't need to re-fetch
+ (u/try-apply sync-field! driver (assoc field :table (delay table))))))
;; ## sync-field
@@ -239,33 +297,57 @@
(or (u/try-apply ~f ~@args field#)
field#)))))))))
-(defn sync-field!
+(defn- sync-field!
"Sync the metadata for FIELD, marking urls, categories, etc. when applicable."
[driver field]
{:pre [driver
field]}
- (log/debug (format "Syncing field '%s.%s'..." (:name @(:table field)) (:name field)))
(sync-field->> field
+ (maybe-driver-specific-sync-field! driver)
+ set-field-display-name-if-needed!
(mark-url-field! driver)
- mark-category-field!
(mark-no-preview-display-field! driver)
- auto-assign-field-special-type-by-name!))
+ mark-category-field-or-update-field-values!
+ (mark-json-field! driver)
+ auto-assign-field-special-type-by-name!
+ (sync-field-nested-fields! driver)))
;; Each field-syncing function below should return FIELD with any updates that we made, or nil.
;; That way the next fn in the 'pipeline' won't trample over changes made by the last.
+;;; ### maybe-driver-specific-sync-field!
+
+(defn- maybe-driver-specific-sync-field!
+ "If driver implements `ISyncDriverSpecificSyncField`, call `driver-specific-sync-field!`."
+ [driver field]
+ (when (satisfies? ISyncDriverSpecificSyncField driver)
+ (driver-specific-sync-field! driver field)))
+
+;; ### set-field-display-name-if-needed!
+
+(defn- set-field-display-name-if-needed!
+ "If FIELD doesn't yet have a `display_name`, calculate one now and set it."
+ [field]
+ (when (nil? (:display_name field))
+ (let [display-name (common/name->human-readable-name (:name field))]
+ (log/debug (u/format-color 'green "Field '%s.%s' has no display_name. Setting it now." (:name @(:table field)) (:name field) display-name))
+ (upd Field (:id field) :display_name display-name)
+ (assoc field :display_name display-name))))
+
+
;; ### mark-url-field!
(def ^:const ^:private percent-valid-url-threshold
"Fields that have at least this percent of values that are valid URLs should be marked as `special_type = :url`."
0.95)
-(defn percent-valid-urls
+(defn- percent-valid-urls
"Recursively count the values of non-nil values in VS that are valid URLs, and return it as a percentage."
[vs]
- (loop [valid-count 0 non-nil-count 0 [v & more :as vs] vs]
- (cond (not (seq vs)) (float (/ valid-count non-nil-count))
+ (loop [valid-count 0, non-nil-count 0, [v & more :as vs] vs]
+ (cond (not (seq vs)) (if (zero? non-nil-count) 0.0
+ (float (/ valid-count non-nil-count)))
(nil? v) (recur valid-count non-nil-count more)
:else (let [valid? (and (string? v)
(u/is-url? v))]
@@ -276,44 +358,51 @@
(extend-protocol ISyncDriverFieldPercentUrls ; Default implementation
Object
(field-percent-urls [this field]
- (assert (extends? ISyncDriverFieldValues (class this))
- "A sync driver implementation that doesn't implement ISyncDriverFieldPercentURLs must implement ISyncDriverFieldValues.")
(let [field-values (->> (field-values-lazy-seq this field)
(filter identity)
- (take 10000))] ; Considering the first 10,000 rows is probably fine; don't want to have to do a full scan over millions
+ (take max-sync-lazy-seq-results))]
(percent-valid-urls field-values))))
-(defn mark-url-field!
+(defn- mark-url-field!
"If FIELD is texual, doesn't have a `special_type`, and its non-nil values are primarily URLs, mark it as `special_type` `url`."
[driver field]
(when (and (not (:special_type field))
(contains? #{:CharField :TextField} (:base_type field)))
- (let [percent-urls (field-percent-urls driver field)]
+ (when-let [percent-urls (field-percent-urls driver field)]
(assert (float? percent-urls))
(assert (>= percent-urls 0.0))
(assert (<= percent-urls 100.0))
(when (> percent-urls percent-valid-url-threshold)
- (log/info (format "Field '%s.%s' is %d%% URLs. Marking it as a URL." (:name @(:table field)) (:name field) (int (math/round (* 100 percent-urls)))))
+ (log/debug (u/format-color 'green "Field '%s' is %d%% URLs. Marking it as a URL." @(:qualified-name field) (int (math/round (* 100 percent-urls)))))
(upd Field (:id field) :special_type :url)
(assoc field :special_type :url)))))
-;; ### mark-category-field!
+;; ### mark-category-field-or-update-field-values!
(def ^:const ^:private low-cardinality-threshold
"Fields with less than this many distinct values should automatically be marked with `special_type = :category`."
40)
-(defn mark-category-field!
+(defn- mark-category-field!
"If FIELD doesn't yet have a `special_type`, and has low cardinality, mark it as a category."
[field]
- (when-not (:special_type field)
- (let [cardinality (queries/field-distinct-count field low-cardinality-threshold)]
- (when (and (> cardinality 0)
- (< cardinality low-cardinality-threshold))
- (log/info (format "Field '%s.%s' has %d unique values. Marking it as a category." (:name @(:table field)) (:name field) cardinality))
- (upd Field (:id field) :special_type :category)
- (assoc field :special_type :category)))))
+ (let [cardinality (queries/field-distinct-count field low-cardinality-threshold)]
+ (when (and (> cardinality 0)
+ (< cardinality low-cardinality-threshold))
+ (log/debug (u/format-color 'green "Field '%s' has %d unique values. Marking it as a category." @(:qualified-name field) cardinality))
+ (upd Field (:id field) :special_type :category)
+ (assoc field :special_type :category))))
+
+(defn- mark-category-field-or-update-field-values!
+ "If FIELD doesn't yet have a `special_type` and isn't very long (i.e., `preview_display` is `true`), call `mark-category-field!`
+ to (possibly) mark it as a `:category`. Otherwise if FIELD is already a `:category` update its `FieldValues`."
+ [field]
+ (cond
+ (and (not (:special_type field))
+ (:preview_display field)) (mark-category-field! field)
+ (field-values/field-should-have-field-values? field) (do (field-values/update-field-values! field)
+ field)))
;; ### mark-no-preview-display-field!
@@ -325,11 +414,9 @@
(extend-protocol ISyncDriverFieldAvgLength ; Default implementation
Object
(field-avg-length [this field]
- (assert (extends? ISyncDriverFieldValues (class this))
- "A sync driver implementation that doesn't implement ISyncDriverFieldAvgLength must implement ISyncDriverFieldValues.")
(let [field-values (->> (field-values-lazy-seq this field)
(filter identity)
- (take 10000)) ; as with field-percent-urls it's probably fine to consider the first 10,000 values rather than potentially millions
+ (take max-sync-lazy-seq-results)) ; as with field-percent-urls it's probably fine to consider the first 10,000 values rather than potentially millions
field-values-count (count field-values)]
(if (= field-values-count 0) 0
(int (math/round (/ (->> field-values
@@ -338,7 +425,7 @@
(reduce +))
field-values-count)))))))
-(defn mark-no-preview-display-field!
+(defn- mark-no-preview-display-field!
"If FIELD's is textual and its average length is too great, mark it so it isn't displayed in the UI."
[driver field]
(when (and (:preview_display field)
@@ -346,81 +433,141 @@
(let [avg-len (field-avg-length driver field)]
(assert (integer? avg-len) "field-avg-length should return an integer.")
(when (> avg-len average-length-no-preview-threshold)
- (log/info (format "Field '%s.%s' has an average length of %d. Not displaying it in previews." (:name @(:table field)) (:name field) avg-len))
+ (log/debug (u/format-color 'green "Field '%s' has an average length of %d. Not displaying it in previews." @(:qualified-name field) avg-len))
(upd Field (:id field) :preview_display false)
(assoc field :preview_display false)))))
+;; ### mark-json-field!
+
+(defn- values-are-valid-json?
+ "`true` if at every item in VALUES is `nil` or a valid string-encoded JSON dictionary or array, and at least one of those is non-nil."
+ [values]
+ (try
+ (loop [at-least-one-non-nil-value? false, [val & more] values]
+ (cond
+ (and (not val)
+ (not (seq more))) at-least-one-non-nil-value?
+ (s/blank? val) (recur at-least-one-non-nil-value? more)
+ ;; If val is non-nil, check that it's a JSON dictionary or array. We don't want to mark Fields containing other
+ ;; types of valid JSON values as :json (e.g. a string representation of a number or boolean)
+ :else (let [val (json/parse-string val)]
+ (when (not (or (map? val)
+ (sequential? val)))
+ (throw (Exception.)))
+ (recur true more))))
+ (catch Throwable _
+ false)))
+
+(defn- mark-json-field!
+ "Mark FIELD as `:json` if it's textual, doesn't already have a special type, the majority of it's values are non-nil, and all of its non-nil values
+ are valid serialized JSON dictionaries or arrays."
+ [driver field]
+ (when (and (not (:special_type field))
+ (contains? #{:CharField :TextField} (:base_type field))
+ (values-are-valid-json? (->> (field-values-lazy-seq driver field)
+ (take max-sync-lazy-seq-results))))
+ (log/debug (u/format-color 'green "Field '%s' looks like it contains valid JSON objects. Setting special_type to :json." @(:qualified-name field)))
+ (upd Field (:id field) :special_type :json, :preview_display false)
+ (assoc field :special_type :json, :preview_display false)))
+
+
;; ### auto-assign-field-special-type-by-name!
-(def ^{:arglists '([field])}
+(def ^:private ^{:arglists '([field])}
field->name-inferred-special-type
"If FIELD has a `name` and `base_type` that matches a known pattern, return the `special_type` we should assign to it."
(let [bool-or-int #{:BooleanField :BigIntegerField :IntegerField}
float #{:DecimalField :FloatField}
int-or-text #{:BigIntegerField :IntegerField :CharField :TextField}
text #{:CharField :TextField}
- ;; tuples of [pattern set-of-valid-base-types special-type]
+ ;; tuples of [pattern set-of-valid-base-types special-type [& top-level-only?]
;; * Convert field name to lowercase before matching against a pattern
;; * consider a nil set-of-valid-base-types to mean "match any base type"
- pattern+base-types+special-type [[#"^.*_lat$" float :latitude]
- [#"^.*_lon$" float :longitude]
- [#"^.*_lng$" float :longitude]
- [#"^.*_long$" float :longitude]
- [#"^.*_longitude$" float :longitude]
- [#"^.*_rating$" int-or-text :category]
- [#"^.*_type$" int-or-text :category]
- [#"^.*_url$" text :url]
- [#"^_latitude$" float :latitude]
- [#"^active$" bool-or-int :category]
- [#"^city$" text :city]
- [#"^country$" text :country]
- [#"^countrycode$" text :country]
- [#"^currency$" int-or-text :category]
- [#"^first_name$" text :name]
- [#"^full_name$" text :name]
- [#"^gender$" int-or-text :category]
- [#"^id$" nil :id]
- [#"^last_name$" text :name]
- [#"^lat$" float :latitude]
- [#"^latitude$" float :latitude]
- [#"^lon$" float :longitude]
- [#"^lng$" float :longitude]
- [#"^long$" float :longitude]
- [#"^longitude$" float :longitude]
- [#"^name$" text :name]
- [#"^postalCode$" int-or-text :zip_code]
- [#"^postal_code$" int-or-text :zip_code]
- [#"^rating$" int-or-text :category]
- [#"^role$" int-or-text :category]
- [#"^sex$" int-or-text :category]
- [#"^state$" text :state]
- [#"^status$" int-or-text :category]
- [#"^type$" int-or-text :category]
- [#"^url$" text :url]
- [#"^zip_code$" int-or-text :zip_code]
- [#"^zipcode$" int-or-text :zip_code]]]
+ pattern+base-types+special-type+top-level-only? [[#"^.*_lat$" float :latitude]
+ [#"^.*_lon$" float :longitude]
+ [#"^.*_lng$" float :longitude]
+ [#"^.*_long$" float :longitude]
+ [#"^.*_longitude$" float :longitude]
+ [#"^.*_rating$" int-or-text :category]
+ [#"^.*_type$" int-or-text :category]
+ [#"^.*_url$" text :url]
+ [#"^_latitude$" float :latitude]
+ [#"^active$" bool-or-int :category]
+ [#"^city$" text :city]
+ [#"^country$" text :country]
+ [#"^countrycode$" text :country]
+ [#"^currency$" int-or-text :category]
+ [#"^first_name$" text :name]
+ [#"^full_name$" text :name]
+ [#"^gender$" int-or-text :category]
+ [#"^id$" nil :id :top-level-only]
+ [#"^last_name$" text :name]
+ [#"^lat$" float :latitude]
+ [#"^latitude$" float :latitude]
+ [#"^lon$" float :longitude]
+ [#"^lng$" float :longitude]
+ [#"^long$" float :longitude]
+ [#"^longitude$" float :longitude]
+ [#"^name$" text :name]
+ [#"^postalCode$" int-or-text :zip_code]
+ [#"^postal_code$" int-or-text :zip_code]
+ [#"^rating$" int-or-text :category]
+ [#"^role$" int-or-text :category]
+ [#"^sex$" int-or-text :category]
+ [#"^state$" text :state]
+ [#"^status$" int-or-text :category]
+ [#"^type$" int-or-text :category]
+ [#"^url$" text :url]
+ [#"^zip_code$" int-or-text :zip_code]
+ [#"^zipcode$" int-or-text :zip_code]]]
;; Check that all the pattern tuples are valid
- (doseq [[name-pattern base-types special-type] pattern+base-types+special-type]
+ (doseq [[name-pattern base-types special-type] pattern+base-types+special-type+top-level-only?]
(assert (= (type name-pattern) java.util.regex.Pattern))
(assert (every? (partial contains? field/base-types) base-types))
(assert (contains? field/special-types special-type)))
- (fn [{base-type :base_type, field-name :name}]
+ (fn [{base-type :base_type, field-name :name, :as field}]
{:pre [(string? field-name)
(keyword? base-type)]}
- (m/find-first (fn [[name-pattern valid-base-types _]]
- (and (or (nil? valid-base-types)
- (contains? valid-base-types base-type))
- (re-matches name-pattern (s/lower-case field-name))))
- pattern+base-types+special-type))))
-
-(defn auto-assign-field-special-type-by-name!
+ (or (m/find-first (fn [[name-pattern valid-base-types _ top-level-only?]]
+ (and (or (nil? valid-base-types)
+ (contains? valid-base-types base-type))
+ (re-matches name-pattern (s/lower-case field-name))
+ (or (not top-level-only?)
+ (nil? (:parent_id field)))))
+ pattern+base-types+special-type+top-level-only?)))))
+
+(defn- auto-assign-field-special-type-by-name!
"If FIELD doesn't have a special type, but has a name that matches a known pattern like `latitude`, mark it as having the specified special type."
[field]
(when-not (:special_type field)
(when-let [[pattern _ special-type] (field->name-inferred-special-type field)]
- (log/info (format "%s '%s.%s' matches '%s'. Setting special_type to '%s'."
- (name (:base_type field)) (:name @(:table field)) (:name field) pattern (name special-type)))
+ (log/debug (u/format-color 'green "%s '%s' matches '%s'. Setting special_type to '%s'."
+ (name (:base_type field)) @(:qualified-name field) pattern (name special-type)))
(upd Field (:id field) :special_type special-type)
(assoc field :special_type special-type))))
+
+
+(defn- sync-field-nested-fields! [driver field]
+ (when (and (= (:base_type field) :DictionaryField)
+ (supports? driver :nested-fields) ; if one of these is true
+ (satisfies? ISyncDriverFieldNestedFields driver)) ; the other should be :wink:
+ (let [nested-field-name->type (active-nested-field-name->type driver field)]
+ ;; fetch existing nested fields
+ (let [existing-nested-field-name->id (sel :many :field->id [Field :name], :table_id (:table_id field), :active true, :parent_id (:id field))]
+
+ ;; mark existing nested fields as inactive if they didn't come back from active-nested-field-name->type
+ (doseq [[nested-field-name nested-field-id] existing-nested-field-name->id]
+ (when-not (contains? (set (map keyword (keys nested-field-name->type))) (keyword nested-field-name))
+ (log/info (u/format-color 'cyan "Marked nested field '%s.%s' as inactive." @(:qualified-name field) nested-field-name))
+ (upd Field nested-field-id :active false)))
+
+ ;; OK, now create new Field objects for ones that came back from active-nested-field-name->type but *aren't* in existing-nested-field-name->id
+ (doseq [[nested-field-name nested-field-type] nested-field-name->type]
+ (when-not (contains? (set (map keyword (keys existing-nested-field-name->id))) (keyword nested-field-name))
+ (log/debug (u/format-color 'blue "Found new nested field: '%s.%s'" @(:qualified-name field) (name nested-field-name)))
+ (let [nested-field (ins Field, :table_id (:table_id field), :parent_id (:id field), :name (name nested-field-name) :base_type (name nested-field-type), :active true)]
+ ;; Now recursively sync this nested Field
+ ;; Replace parent so deref doesn't need to do a DB call
+ (sync-field! driver (assoc nested-field :parent (delay field))))))))))
diff --git a/src/metabase/driver/sync/queries.clj b/src/metabase/driver/sync/queries.clj
index 06ce6ffcd3b5aac3abe925872687257d945f1768..1e03179e791310dd70b5703b33277549c01f5712 100644
--- a/src/metabase/driver/sync/queries.clj
+++ b/src/metabase/driver/sync/queries.clj
@@ -1,17 +1,14 @@
(ns metabase.driver.sync.queries
"Predefined QP queries that can be used to get metadata for syncing."
- (:require [metabase.driver :as driver]
- [metabase.driver.context :as context]))
+ (:require [metabase.driver :as driver]))
(defn- qp-query [table query-dict]
- (binding [context/*table* table
- context/*database* @(:db table)]
- (-> (driver/process-query {:database (:db_id table)
- :type "query"
- :query (assoc query-dict
- :source_table (:id table))})
- :data
- :rows)))
+ (-> (driver/process-query {:database (:db_id table)
+ :type "query"
+ :query (assoc query-dict
+ :source_table (:id table))})
+ :data
+ :rows))
(defn table-row-count
"Fetch the row count of TABLE via the query processor."
diff --git a/src/metabase/email/messages.clj b/src/metabase/email/messages.clj
index 8032475f720754a91a28580d45b03190d3f310eb..2be5670f36ceec49ccbcb6404c98be6647825507 100644
--- a/src/metabase/email/messages.clj
+++ b/src/metabase/email/messages.clj
@@ -3,28 +3,35 @@
NOTE: we want to keep this about email formatting, so don't put heavy logic here RE: building data for emails."
(:require [hiccup.core :refer [html]]
[metabase.email :as email]
- [metabase.util :as u]))
+ [metabase.models.setting :as setting]
+ [metabase.util :as u]
+ [metabase.util.quotation :as q]
+ [stencil.core :as stencil]))
;;; ### Public Interface
(defn send-new-user-email
"Format and Send an welcome email for newly created users."
- [first_name email password-reset-url]
- {:pre [(string? first_name)
- (string? email)
- (u/is-email? email)
- (string? password-reset-url)]}
- (let [message-body (html [:html
- [:body
- [:p (format "Welcome to Metabase %s!" first_name)]
- [:p "Your account is setup and ready to go, you just need to set a password so you can login. Follow the link below to reset your account password."]
- [:p [:a {:href password-reset-url} password-reset-url]]]])]
+ [invited invitor join-url]
+ (let [tmpl (slurp (clojure.java.io/resource "metabase/email/new_user_invite.html"))
+ data-quote (rand-nth q/quotations)
+ company (or (setting/get :site-name)
+ "Unknown")
+ message-body (->> {:invitedName (:first_name invited)
+ :invitorName (:first_name invitor)
+ :invitorEmail (:email invitor)
+ :company company
+ :joinUrl join-url
+ :quotation (:quote data-quote)
+ :quotationAuthor (:author data-quote)
+ :today (u/now-with-format "MMM' 'dd,' 'yyyy")}
+ (stencil/render-string tmpl))]
(email/send-message
- :subject "Your new Metabase account is all set up"
- :recipients [email]
- :message-type :html
- :message message-body)))
+ :subject (str "You're invited to join " company "'s Metabase")
+ :recipients [(:email invited)]
+ :message-type :html
+ :message message-body)))
(defn send-password-reset-email
"Format and Send an email informing the user how to reset their password."
diff --git a/src/metabase/email/new_user_invite.html b/src/metabase/email/new_user_invite.html
new file mode 100644
index 0000000000000000000000000000000000000000..1173ee83cecb219244793fc02be1ba879e89add1
--- /dev/null
+++ b/src/metabase/email/new_user_invite.html
@@ -0,0 +1,35 @@
+<html>
+<body style="font-family: 'Helvetica Neue', Helvetica, sans-serif; font-size: 0.875rem; color: #727479; padding-top: 2em; padding-bottom: 1em; background-color: #F9FBFC; ">
+ <div style="padding-bottom: 2em; text-align: center;">
+ <img width="32" height="40" src="http://static.metabase.com/email_logo.png"/>
+ </div>
+ <div style="margin: 0 auto; max-width: 560px; padding: 2em 4em 2em 4em; text-align: center; color: #9F9F9F; border: 1px solid #dddddd; background-color: #FFFFFF; box-shadow: 0 1px 2px rgba(0, 0, 0, .08);">
+ <div style="padding-bottom: 1em;">
+ <h2 style="font-weight: normal; color: #4C545B;line-height: 1.65rem;">{{invitedName}}, you're invited to {{company}}'s Metabase</h2>
+ <h4 style="font-weight: normal;"><a style="color: #4A90E2; text-decoration: none;" href="mailto:{{invitorEmail}}">{{invitorName}} ({{invitorEmail}})</a> invited you to join them.</h4>
+ </div>
+ <div style="border-top: 1px solid #ededed; border-bottom: 1px solid #ededed; padding: 3em 0em 2em 0em; text-align: center; margin-left: auto; margin-right: auto; max-width: 400px; position: relative;">
+ <table width="296" height="141" cellpadding="0" cellspacing="0" style="display:block;margin:0 auto;">
+ <tr><td colspan="3"><img src="http://static.metabase.com/email_graph_top.png" width="296" height="73" style="display:block" /></td></tr>
+ <tr>
+ <td height="15" width="60"><img src="http://static.metabase.com/email_graph_left.png" width="60" height="15" style="display:block" /></td>
+ <td height="15" width="68" valign="middle" align="center" style="font-weight: bold; font-size: 0.72rem; line-height:15px;color: #fff; background-color:#333">{{{today}}}</td>
+ <td height="15" width="168"><img src="http://static.metabase.com/email_graph_right.png" width="168" height="15" style="display:block" /></td></tr>
+ <tr><td colspan="3" height="46"><img src="http://static.metabase.com/email_graph_bottom.png" width="296" height="56" style="display:block" /></td></tr>
+ </table>
+ <p style="line-height: 1.3rem;">{{invitedName}}'s Happiness and Productivity Over Time</p>
+ </div>
+ <div style="max-width: 400px; margin-left: auto; margin-right: auto; padding-top: 1em; line-height: 1.2rem;">
+ <p>Metabase is a simple and powerful analytics tool which lets <span style="color: #595959;">anyone</span> learn and <span style="color: #595959;">make decisions</span> from their company's data.</p>
+ <p>No technical knowledge required!</p>
+ </div>
+ <div style="padding: 1em;">
+ <a style="display: inline-block; box-sizing: border-box; text-decoration: none; font-size: 1.063rem; padding: 0.5rem 1.375rem; background: #FBFCFD; border: 1px solid #ddd; color: #444; cursor: pointer; text-decoration: none; font-weight: bold; border-radius: 4px; background-color: #4990E2; border-color: #4990E2; color: #fff;" href="{{joinUrl}}">Join Now</a>
+ </div>
+ <div style="padding-bottom: 2em; font-size: x-small;">
+ Or you can paste this link into your browser:<br/>{{joinUrl}}
+ </div>
+ </div>
+ <div style="padding: 3em; text-align: center; color: #CCCCCC; font-size: small;">"{{quotation}}"<br/>- {{quotationAuthor}}</div>
+</body>
+</html>
diff --git a/src/metabase/middleware/auth.clj b/src/metabase/middleware/auth.clj
index 080a10fc3eecf837cfb84403c0a227f89dc8daf2..3e99d6eb9cb4ec201e44fc5bca2b46d70ba30356 100644
--- a/src/metabase/middleware/auth.clj
+++ b/src/metabase/middleware/auth.clj
@@ -1,6 +1,6 @@
(ns metabase.middleware.auth
"Middleware for dealing with authentication and session management."
- (:require [korma.core :as korma]
+ (:require [korma.core :as k]
[metabase.config :as config]
[metabase.db :refer [sel]]
[metabase.api.common :refer [*current-user* *current-user-id*]]
@@ -8,16 +8,16 @@
[user :refer [User current-user-fields]])))
-(def metabase-session-cookie "metabase.SESSION_ID")
-(def metabase-session-header "x-metabase-session")
-(def metabase-apikey-header "x-metabase-apikey")
+(def ^:const metabase-session-cookie "metabase.SESSION_ID")
+(def ^:const metabase-session-header "x-metabase-session")
+(def ^:const metabase-api-key-header "x-metabase-apikey")
-(def response-unauthentic {:status 401 :body "Unauthenticated"})
-(def response-forbidden {:status 403 :body "Forbidden"})
+(def ^:const response-unauthentic {:status 401 :body "Unauthenticated"})
+(def ^:const response-forbidden {:status 403 :body "Forbidden"})
-(defn wrap-sessionid
- "Middleware that sets the :metabase-sessionid keyword on the request if a session id can be found.
+(defn wrap-session-id
+ "Middleware that sets the `:metabase-session-id` keyword on the request if a session id can be found.
We first check the request :cookies for `metabase.SESSION_ID`, then if no cookie is found we look in the
http headers for `X-METABASE-SESSION`. If neither is found then then no keyword is bound to the request."
@@ -25,32 +25,34 @@
(fn [{:keys [cookies headers] :as request}]
(if-let [session-id (or (get-in cookies [metabase-session-cookie :value]) (headers metabase-session-header))]
;; alternatively we could always associate the keyword and just let it be nil if there is no value
- (handler (assoc request :metabase-sessionid session-id))
+ (handler (assoc request :metabase-session-id session-id))
(handler request))))
+(defn wrap-current-user-id
+ "Add `:metabase-user-id` to the request if a valid session token was passed."
+ [handler]
+ (fn [{:keys [metabase-session-id] :as request}]
+ ;; TODO - what kind of validations can we do on the sessionid to make sure it's safe to handle? str? alphanumeric?
+ (handler (or (when metabase-session-id
+ (when-let [session (first (k/select Session
+ ;; NOTE: we join with the User table and ensure user.is_active = true
+ (k/with User (k/where {:is_active true}))
+ (k/fields :created_at :user_id)
+ (k/where {:id metabase-session-id})))]
+ (let [session-age-ms (- (System/currentTimeMillis) (.getTime ^java.util.Date (get session :created_at (java.util.Date. 0))))]
+ ;; If the session exists and is not expired (max-session-age > session-age) then validation is good
+ (when (and session (> (config/config-int :max-session-age) (quot session-age-ms 60000)))
+ (assoc request :metabase-user-id (:user_id session))))))
+ request))))
-(defn enforce-authentication
- "Middleware that enforces authentication of the client, cancelling the request processing if auth fails.
-
- Authentication is determined by validating the :metabase-sessionid on the request against the db session list.
- If the session is valid then we associate a :metabase-userid on the request and carry on, but if the validation
- fails then we return an HTTP 401 response indicating that the client is not authentic.
- NOTE: we are purposely not associating the full current user object here so that we can be modular."
+(defn enforce-authentication
+ "Middleware that returns a 401 response if REQUEST has no associated `:metabase-user-id`."
[handler]
- (fn [{:keys [metabase-sessionid] :as request}]
- ;; TODO - what kind of validations can we do on the sessionid to make sure it's safe to handle? str? alphanumeric?
- (let [session (first (korma/select Session
- ;; NOTE: we join with the User table and ensure user.is_active = true
- (korma/with User (korma/where {:is_active true}))
- (korma/fields :created_at :user_id)
- (korma/where {:id metabase-sessionid})))
- session-age-ms (- (System/currentTimeMillis) (.getTime ^java.util.Date (get session :created_at (java.util.Date. 0))))]
- ;; If the session exists and is not expired (max-session-age > session-age) then validation is good
- (if (and session (> (config/config-int :max-session-age) (quot session-age-ms 60000)))
- (handler (assoc request :metabase-userid (:user_id session)))
- ;; default response is 401
- response-unauthentic))))
+ (fn [{:keys [metabase-user-id] :as request}]
+ (if metabase-user-id
+ (handler request)
+ response-unauthentic)))
(defmacro sel-current-user [current-user-id]
@@ -65,35 +67,35 @@
*current-user* delay that returns current user (or nil) from DB"
[handler]
(fn [request]
- (let [current-user-id (:metabase-userid request)]
+ (if-let [current-user-id (:metabase-user-id request)]
(binding [*current-user-id* current-user-id
- *current-user* (if-not current-user-id (atom nil)
- (delay (sel-current-user current-user-id)))]
- (handler request)))))
+ *current-user* (delay (sel-current-user current-user-id))]
+ (handler request))
+ (handler request))))
-(defn wrap-apikey
- "Middleware that sets the :metabase-apikey keyword on the request if a valid API Key can be found.
+(defn wrap-api-key
+ "Middleware that sets the :metabase-api-key keyword on the request if a valid API Key can be found.
We check the request headers for `X-METABASE-APIKEY` and if it's not found then then no keyword is bound to the request."
[handler]
(fn [{:keys [headers] :as request}]
- (if-let [api-key (headers metabase-apikey-header)]
- (handler (assoc request :metabase-apikey api-key))
+ (if-let [api-key (headers metabase-api-key-header)]
+ (handler (assoc request :metabase-api-key api-key))
(handler request))))
-(defn enforce-apikey
+(defn enforce-api-key
"Middleware that enforces validation of the client via API Key, cancelling the request processing if the check fails.
- Validation is handled by first checking for the presence of the :metabase-apikey on the request. If the api key
+ Validation is handled by first checking for the presence of the :metabase-api-key on the request. If the api key
is available then we validate it by checking it against the configured :mb-api-key value set in our global config.
- If the request :metabase-apikey matches the configured :mb-api-key value then the request continues, otherwise we
+ If the request :metabase-api-key matches the configured :mb-api-key value then the request continues, otherwise we
reject the request and return a 403 Forbidden response."
[handler]
- (fn [{:keys [metabase-apikey] :as request}]
- (if (= (config/config-str :mb-api-key) metabase-apikey)
+ (fn [{:keys [metabase-api-key] :as request}]
+ (if (= (config/config-str :mb-api-key) metabase-api-key)
(handler request)
;; default response is 403
response-forbidden)))
diff --git a/src/metabase/middleware/format.clj b/src/metabase/middleware/format.clj
index f6a372d76a1db96f4aacf0508348eada9c6d7a57..36117d5967d117c96f98f5f5bceb58b93adfc064 100644
--- a/src/metabase/middleware/format.clj
+++ b/src/metabase/middleware/format.clj
@@ -3,6 +3,8 @@
(cheshire factory
[generate :refer [add-encoder encode-str]])
[medley.core :refer [filter-vals map-vals]]
+ [metabase.middleware.log-api-call :refer [api-call?]]
+ [metabase.models.interface :refer [api-serialize]]
[metabase.util :as util]))
(declare -format-response)
@@ -31,6 +33,15 @@
(add-encoder java.sql.Date (fn [^java.sql.Date date ^com.fasterxml.jackson.core.JsonGenerator json-generator]
(.writeString json-generator (.toString date))))
+(defn add-security-headers
+ "Add HTTP headers to tell browsers not to cache API responses."
+ [handler]
+ (fn [request]
+ (let [response (handler request)]
+ (update response :headers merge (when (api-call? request)
+ {"Cache-Control" "max-age=0, no-cache, must-revalidate, proxy-revalidate"
+ "Expires" "Tue, 03 Jul 2001 06:00:00 GMT" ; rando date in the past
+ "Last-Modified" "{now} GMT"})))))
;; ## FORMAT RESPONSE MIDDLEWARE
(defn format-response
@@ -45,11 +56,14 @@
[m]
(filter-vals #(not (or (delay? %)
(fn? %)))
- m))
+ ;; Convert typed maps such as metabase.models.database/DatabaseInstance to plain maps because empty, which is used internally by filter-vals,
+ ;; will fail otherwise
+ (into {} m)))
(defn- -format-response [obj]
(cond
- (map? obj) (->> (remove-fns-and-delays obj) ; recurse over all vals in the map
- (map-vals -format-response))
- (coll? obj) (map -format-response obj) ; recurse over all items in the collection
+ (map? obj) (->> (api-serialize obj)
+ remove-fns-and-delays
+ (map-vals -format-response)) ; recurse over all vals in the map
+ (coll? obj) (map -format-response obj) ; recurse over all items in the collection
:else obj))
diff --git a/src/metabase/middleware/log_api_call.clj b/src/metabase/middleware/log_api_call.clj
index 816e6a026e6e2ead2124be7df6668e9e34077f88..4e096109054f30f9124bad21a653f3760453dc67 100644
--- a/src/metabase/middleware/log_api_call.clj
+++ b/src/metabase/middleware/log_api_call.clj
@@ -50,7 +50,7 @@
(log-response request response elapsed-time))
response))))))
-(defn- api-call?
+(defn api-call?
"Is this ring request an API call (does path start with `/api`)?"
[{:keys [^String uri]}]
(and (>= (count uri) 4)
diff --git a/src/metabase/models/card.clj b/src/metabase/models/card.clj
index 97ab1ff8de6d537f9511c5b070e670b647803224..64af94fdef8d44a6c57f418602ff6c6803399207 100644
--- a/src/metabase/models/card.clj
+++ b/src/metabase/models/card.clj
@@ -1,8 +1,8 @@
(ns metabase.models.card
- (:require [korma.core :refer :all]
+ (:require [korma.core :refer :all, :exclude [defentity update]]
[metabase.api.common :refer [*current-user-id*]]
[metabase.db :refer :all]
- (metabase.models [common :refer :all]
+ (metabase.models [interface :refer :all]
[user :refer [User]])))
(def ^:const display-types
@@ -18,19 +18,25 @@
:table
:timeseries})
+(defrecord CardInstance []
+ clojure.lang.IFn
+ (invoke [this k]
+ (get this k)))
+
+(extend-ICanReadWrite CardInstance :read :public-perms, :write :public-perms)
+
+
(defentity Card
- (table :report_card)
- (types {:dataset_query :json
- :display :keyword
- :visualization_settings :json})
- timestamped
- (assoc :hydration-keys #{:card}))
-
-(defmethod post-select Card [_ {:keys [creator_id] :as card}]
- (-> (assoc card
- :creator (delay (sel :one User :id creator_id)))
- assoc-permissions-sets))
-
-(defmethod pre-cascade-delete Card [_ {:keys [id]}]
- (cascade-delete 'metabase.models.dashboard-card/DashboardCard :card_id id)
- (cascade-delete 'metabase.models.card-favorite/CardFavorite :card_id id))
+ [(table :report_card)
+ (hydration-keys card)
+ (types :dataset_query :json, :display :keyword, :visualization_settings :json)
+ timestamped]
+
+ (post-select [_ {:keys [creator_id] :as card}]
+ (map->CardInstance (assoc card :creator (delay (User creator_id)))))
+
+ (pre-cascade-delete [_ {:keys [id]}]
+ (cascade-delete 'metabase.models.dashboard-card/DashboardCard :card_id id)
+ (cascade-delete 'metabase.models.card-favorite/CardFavorite :card_id id)))
+
+(extend-ICanReadWrite CardEntity :read :public-perms, :write :public-perms)
diff --git a/src/metabase/models/card_favorite.clj b/src/metabase/models/card_favorite.clj
index 42bd82ad488789cd6de6d11308d1e29b1aa899ec..df0d592264c5e347747598ef3299898bbb603ed5 100644
--- a/src/metabase/models/card_favorite.clj
+++ b/src/metabase/models/card_favorite.clj
@@ -1,14 +1,15 @@
(ns metabase.models.card-favorite
- (:require [korma.core :refer :all]
+ (:require [korma.core :refer :all, :exclude [defentity update]]
[metabase.db :refer :all]
(metabase.models [card :refer [Card]]
+ [interface :refer :all]
[user :refer [User]])))
(defentity CardFavorite
- (table :report_cardfavorite)
- timestamped)
+ [(table :report_cardfavorite)
+ timestamped]
-(defmethod post-select CardFavorite [_ {:keys [card_id owner_id] :as card-favorite}]
- (assoc card-favorite
- :owner (delay (sel :one User :id owner_id))
- :card (delay (sel :one Card :id card_id))))
+ (post-select [_ {:keys [card_id owner_id] :as card-favorite}]
+ (assoc card-favorite
+ :owner (delay (User owner_id))
+ :card (delay (Card card_id)))))
diff --git a/src/metabase/models/common.clj b/src/metabase/models/common.clj
index 93c47e80a33ba6820887bfdcb37d52c2c997bf8c..61dfbf8c19892b6e6bb42e6890e0582a1da3f7a2 100644
--- a/src/metabase/models/common.clj
+++ b/src/metabase/models/common.clj
@@ -1,8 +1,9 @@
(ns metabase.models.common
- (:require [metabase.api.common :refer [*current-user* *current-user-id* check]]
+ (:require [clojure.string :as s]
+ [metabase.api.common :refer [*current-user* *current-user-id* check]]
[metabase.util :as u]))
-(def timezones
+(def ^:const timezones
["GMT"
"UTC"
"US/Alaska"
@@ -14,57 +15,23 @@
"US/Pacific"
"America/Costa_Rica"])
-;;; ALLEN'S PERMISSIONS IMPLEMENTATION
+(def ^:const perms-none 0)
+(def ^:const perms-read 1)
+(def ^:const perms-readwrite 2)
-(def perms-none 0)
-(def perms-read 1)
-(def perms-readwrite 2)
-
-(def permissions
+(def ^:const permissions
[{:id perms-none :name "None"},
{:id perms-read :name "Read Only"},
{:id perms-readwrite :name "Read & Write"}])
-
-;;; CAM'S PERMISSIONS IMPL
-;; (TODO - need to use one or the other)
-
-(defn public-permissions
- "Return the set of public permissions for some object with key `:public_perms`. Possible permissions are `:read` and `:write`."
- [{:keys [public_perms]}]
- (check public_perms 500 "Can't check public permissions: object doesn't have :public_perms.")
- ({0 #{}
- 1 #{:read}
- 2 #{:read :write}} public_perms))
-
-(defn user-permissions
- "Return the set of current user's permissions for some object with keys `:creator_id` and `:public_perms`."
- [{:keys [creator_id public_perms] :as obj}]
- (check creator_id 500 "Can't check user permissions: object doesn't have :creator_id."
- public_perms 500 "Can't check user permissions: object doesn't have :public_perms.")
- (cond (:is_superuser *current-user*) #{:read :write} ; superusers have full access to everything
- (= creator_id *current-user-id*) #{:read :write} ; if user created OBJ they have all permissions
- (<= perms-read public_perms) #{:read} ; if the object is public then everyone gets :read
- :else #{})) ; default is user has no permissions a.k.a private
-
-(defn user-can?
- "Check if *current-user* has a given PERMISSION for OBJ.
- PERMISSION should be either `:read` or `:write`."
- [permission obj]
- (contains? @(:user-permissions-set obj) permission))
-
-(defn assoc-permissions-sets
- "Associates the following delays with OBJ:
-
- * `:public-permissions-set`
- * `:user-permissions-set`
- * `:can_read`
- * `:can_write`
-
- Note that these delays depend upon the presence of `creator_id`, and `public_perms` fields in OBJ."
- [obj]
- (u/assoc* obj
- :public-permissions-set (delay (public-permissions <>))
- :user-permissions-set (delay (user-permissions <>))
- :can_read (delay (user-can? :read <>))
- :can_write (delay (user-can? :write <>))))
+(defn name->human-readable-name
+ "Convert a string NAME of some object like a `Table` or `Field` to one more friendly to humans.
+
+ (name->human-readable-name \"admin_users\") -> \"Admin Users\""
+ [^String n]
+ (when (seq n)
+ (->> (for [[first-letter & rest-letters] (->> (s/split n #"_|-") ; explode string on underscores and hyphens
+ (filter (complement s/blank?)))] ; for each part of the string,
+ (apply str (s/upper-case first-letter) (map s/lower-case rest-letters))) ; upcase the first char and downcase the rest
+ (interpose " ") ; add a space between each part
+ (apply str)))) ; convert back to a single string
diff --git a/src/metabase/models/dashboard.clj b/src/metabase/models/dashboard.clj
index 4c769ca7628153a32ca3d1882c8374ecc830f880..7c90e7b5f57dbbaf16230d59c24428b6a5896259 100644
--- a/src/metabase/models/dashboard.clj
+++ b/src/metabase/models/dashboard.clj
@@ -1,21 +1,97 @@
(ns metabase.models.dashboard
- (:require [korma.core :refer :all]
+ (:require (clojure [data :refer [diff]]
+ [string :as s])
+ [korma.core :refer :all, :exclude [defentity update]]
+ [medley.core :as m]
[metabase.db :refer :all]
(metabase.models [common :refer :all]
[dashboard-card :refer [DashboardCard]]
+ [interface :refer :all]
+ [revision :refer [IRevisioned]]
[user :refer [User]])
+ [metabase.models.revision.diff :refer [build-sentence]]
[metabase.util :as u]))
+(defrecord DashboardInstance []
+ clojure.lang.IFn
+ (invoke [this k]
+ (get this k)))
+
+(extend-ICanReadWrite DashboardInstance :read :public-perms, :write :public-perms)
+
+
(defentity Dashboard
- (table :report_dashboard)
- timestamped)
-
-(defmethod post-select Dashboard [_ {:keys [id creator_id description] :as dash}]
- (-> dash
- (assoc :creator (delay (sel :one User :id creator_id))
- :description (u/jdbc-clob->str description)
- :ordered_cards (delay (sel :many DashboardCard :dashboard_id id (order :created_at :asc))))
- assoc-permissions-sets))
-
-(defmethod pre-cascade-delete Dashboard [_ {:keys [id]}]
- (cascade-delete DashboardCard :dashboard_id id))
+ [(table :report_dashboard)
+ timestamped]
+
+ (post-select [_ {:keys [id creator_id description] :as dash}]
+ (-> dash
+ (assoc :creator (delay (User creator_id))
+ :description (u/jdbc-clob->str description)
+ :ordered_cards (delay (sel :many DashboardCard :dashboard_id id (order :created_at :asc))))
+ map->DashboardInstance))
+
+ (pre-cascade-delete [_ {:keys [id]}]
+ (cascade-delete DashboardCard :dashboard_id id)))
+
+(extend-ICanReadWrite DashboardEntity :read :public-perms, :write :public-perms)
+
+(defn- serialize-instance [_ id {:keys [ordered_cards], :as dashboard}]
+ (-> dashboard
+ (select-keys [:description :name :public_perms])
+ (assoc :cards (for [card @ordered_cards]
+ (select-keys card [:sizeX :sizeY :row :col :id :card_id])))))
+
+(defn- revert-to-revision [_ dashboard-id serialized-dashboard]
+ ;; Update the dashboard description / name / permissions
+
+ ;; Now update the cards as needed
+ (let [serialized-cards (:cards serialized-dashboard)
+ id->serialized-card (zipmap (map :id serialized-cards) serialized-cards)
+ current-cards (sel :many :fields [DashboardCard :sizeX :sizeY :row :col :id :card_id], :dashboard_id dashboard-id)
+ id->current-card (zipmap (map :id current-cards) current-cards)
+ all-dashcard-ids (concat (map :id serialized-cards)
+ (map :id current-cards))]
+ (doseq [dashcard-id all-dashcard-ids]
+ (let [serialized-card (id->serialized-card dashcard-id)
+ current-card (id->current-card dashcard-id)]
+ (cond
+ ;; If card is in current-cards but not serialized-cards then we need to delete it
+ (not serialized-card) (del DashboardCard :id dashcard-id)
+
+ ;; If card is in serialized-cards but not current-cards we need to add it
+ (not current-card) (m/mapply ins DashboardCard :dashboard_id dashboard-id, serialized-card)
+
+ ;; If card is in both we need to change :sizeX, :sizeY, :row, and :col to match serialized-card as needed
+ :else (let [[_ changes] (diff current-card serialized-card)]
+ (m/mapply upd DashboardCard dashcard-id changes))))))
+
+ serialized-dashboard)
+
+(defn- describe-diff [_ username dashboardâ‚ dashboardâ‚‚]
+ (let [[removals changes] (diff dashboardâ‚ dashboardâ‚‚)]
+ (->> [(when (:name changes)
+ (format "renamed it from \"%s\" to \"%s\"" (:name dashboardâ‚) (:name dashboardâ‚‚)))
+ (when (:description changes)
+ (format "changed the description from \"%s\" to \"%s\"" (:description dashboardâ‚) (:description dashboardâ‚‚)))
+ (when (:public_perms changes)
+ (if (zero? (:public_perms dashboardâ‚‚))
+ "made it private"
+ "made it public")) ; TODO - are both 1 and 2 "public" now ?
+ (when (or (:cards changes) (:cards removals))
+ (let [num-cardsâ‚ (count (:cards dashboardâ‚))
+ num-cardsâ‚‚ (count (:cards dashboardâ‚‚))]
+ (cond
+ (< num-cardsâ‚ num-cardsâ‚‚) "added a card"
+ (> num-cardsâ‚ num-cardsâ‚‚) "removed a card"
+ :else "rearranged the cards")))]
+ (filter identity)
+ build-sentence
+ (apply str username " ")
+ (#(s/replace-first % "it " "this dashboard ")))))
+
+(extend DashboardEntity
+ IRevisioned
+ {:serialize-instance serialize-instance
+ :revert-to-revision revert-to-revision
+ :describe-diff describe-diff})
diff --git a/src/metabase/models/dashboard_card.clj b/src/metabase/models/dashboard_card.clj
index 8b336ec46b1d61e99accc7fbd14bdc6877d80c81..3b4fd9ea74933b838c1f0c3907e52e6bca49a40a 100644
--- a/src/metabase/models/dashboard_card.clj
+++ b/src/metabase/models/dashboard_card.clj
@@ -1,32 +1,22 @@
(ns metabase.models.dashboard-card
- (:require [korma.core :refer :all]
+ (:require [clojure.set :as set]
+ [korma.core :refer :all, :exclude [defentity update]]
[metabase.db :refer :all]
- (metabase.models [card :refer [Card]])))
+ (metabase.models [card :refer [Card]]
+ [interface :refer :all])))
(defentity DashboardCard
- (table :report_dashboardcard)
- timestamped)
+ [(table :report_dashboardcard)
+ timestamped]
-;; #### fields:
-;; * `id`
-;; * `created_at`
-;; * `updated_at`
-;; * `sizeX`
-;; * `sizeY`
-;; * `row`
-;; * `col`
-;; * `card_id`
-;; * `dashboard_id`
+ (pre-insert [_ dashcard]
+ (let [defaults {:sizeX 2
+ :sizeY 2}]
+ (merge defaults dashcard)))
-
-(defmethod post-select DashboardCard [_ {:keys [card_id dashboard_id] :as dashcard}]
- (-> dashcard
- (clojure.set/rename-keys {:sizex :sizeX ; mildly retarded: H2 columns are all uppercase, we're converting them
- :sizey :sizeY}) ; to all downcase, and the Angular app expected mixed-case names here
- (assoc :card (delay (sel :one Card :id card_id))
- :dashboard (delay (sel :one 'metabase.models.dashboard/Dashboard :id dashboard_id)))))
-
-(defmethod pre-insert DashboardCard [_ dashcard]
- (let [defaults {:sizeX 2
- :sizeY 2}]
- (merge defaults dashcard)))
+ (post-select [_ {:keys [card_id dashboard_id] :as dashcard}]
+ (-> dashcard
+ (set/rename-keys {:sizex :sizeX ; mildly retarded: H2 columns are all uppercase, we're converting them
+ :sizey :sizeY}) ; to all downcase, and the Angular app expected mixed-case names here
+ (assoc :card (delay (Card card_id))
+ :dashboard (delay (sel :one 'metabase.models.dashboard/Dashboard :id dashboard_id))))))
diff --git a/src/metabase/models/dashboard_subscription.clj b/src/metabase/models/dashboard_subscription.clj
deleted file mode 100644
index a791ae6a87e684cb0544bcfd6a27d1fb60497115..0000000000000000000000000000000000000000
--- a/src/metabase/models/dashboard_subscription.clj
+++ /dev/null
@@ -1,5 +0,0 @@
-(ns metabase.models.dashboard-subscription
- (:require [korma.core :refer :all]))
-
-(defentity DashboardSubscription
- (table :report_dashboardsubscription))
diff --git a/src/metabase/models/database.clj b/src/metabase/models/database.clj
index 9291b9fdb3877839062cef93df28782c7796bbd9..f757f81b5316d51a52c5dc4db7c0058ad1617c94 100644
--- a/src/metabase/models/database.clj
+++ b/src/metabase/models/database.clj
@@ -1,22 +1,33 @@
(ns metabase.models.database
- (:require [korma.core :refer :all]
+ (:require [korma.core :refer :all, :exclude [defentity update]]
[metabase.api.common :refer [*current-user*]]
[metabase.db :refer :all]
- [metabase.models.common :refer [assoc-permissions-sets]]))
+ [metabase.models.interface :refer :all]))
+(defrecord DatabaseInstance []
+ ;; preserve normal IFn behavior so things like ((sel :one Database) :id) work correctly
+ clojure.lang.IFn
+ (invoke [this k]
+ (get this k))
+
+ IModelInstanceApiSerialize
+ (api-serialize [this]
+ ;; If current user isn't an admin strip out DB details which may include things like password
+ (cond-> this
+ (not (:is_superuser @*current-user*)) (dissoc :details))))
+
+(extend-ICanReadWrite DatabaseInstance :read :always, :write :superuser)
(defentity Database
- (table :metabase_database)
- (types {:details :json
- :engine :keyword})
- timestamped
- (assoc :hydration-keys #{:database
- :db}))
+ [(table :metabase_database)
+ (hydration-keys database db)
+ (types :details :json, :engine :keyword)
+ timestamped]
+
+ (post-select [_ db]
+ (map->DatabaseInstance db))
-(defmethod post-select Database [_ db]
- (assoc db
- :can_read (delay true)
- :can_write (delay (:is_superuser @*current-user*))))
+ (pre-cascade-delete [_ {:keys [id] :as database}]
+ (cascade-delete 'metabase.models.table/Table :db_id id)))
-(defmethod pre-cascade-delete Database [_ {:keys [id] :as database}]
- (cascade-delete 'metabase.models.table/Table :db_id id))
+(extend-ICanReadWrite DatabaseEntity :read :always, :write :superuser)
diff --git a/src/metabase/models/field.clj b/src/metabase/models/field.clj
index b04e4126813a74b9bdc914a0986789936de46f73..cf96e1982e679af96993225c161e72df5f1788fc 100644
--- a/src/metabase/models/field.clj
+++ b/src/metabase/models/field.clj
@@ -1,15 +1,20 @@
(ns metabase.models.field
- (:require [korma.core :refer :all]
+ (:require [korma.core :refer :all, :exclude [defentity update]]
[metabase.api.common :refer [check]]
[metabase.db :refer :all]
- (metabase.models [database :refer [Database]]
- [field-values :refer [field-should-have-field-values? create-field-values create-field-values-if-needed]]
+ (metabase.models [common :as common]
+ [database :refer [Database]]
+ [field-values :refer [field-should-have-field-values? create-field-values-if-needed]]
+ [foreign-key :refer [ForeignKey]]
[hydrate :refer [hydrate]]
- [foreign-key :refer [ForeignKey]])
+ [interface :refer :all])
[metabase.util :as u]))
+(declare field->fk-field
+ qualified-name-components)
+
(def ^:const special-types
- "Possible values for `Field` `:special_type`."
+ "Possible values for `Field.special_type`."
#{:avatar
:category
:city
@@ -50,17 +55,19 @@
:zip_code "Zip Code"})
(def ^:const base-types
- "Possible values for `Field` `:base_type`."
+ "Possible values for `Field.base_type`."
#{:BigIntegerField
:BooleanField
:CharField
:DateField
:DateTimeField
:DecimalField
+ :DictionaryField
:FloatField
:IntegerField
:TextField
:TimeField
+ :UUIDField ; e.g. a Postgres 'UUID' column
:UnknownField})
(def ^:const field-types
@@ -70,15 +77,60 @@
:info ; Non-numerical value that is not meant to be used
:sensitive}) ; A Fields that should *never* be shown *anywhere*
+(defrecord FieldInstance []
+ clojure.lang.IFn
+ (invoke [this k]
+ (get this k)))
+
+(extend-ICanReadWrite FieldInstance :read :always, :write :superuser)
+
+
(defentity Field
- (table :metabase_field)
- timestamped
- (types {:base_type :keyword
- :field_type :keyword
- :special_type :keyword})
- (assoc :hydration-keys #{:destination
- :field
- :origin}))
+ [(table :metabase_field)
+ (hydration-keys destination field origin)
+ (types :base_type :keyword, :field_type :keyword, :special_type :keyword)
+ timestamped]
+
+ (pre-insert [_ field]
+ (let [defaults {:active true
+ :preview_display true
+ :field_type :info
+ :position 0
+ :display_name (common/name->human-readable-name (:name field))}]
+ (merge defaults field)))
+
+ (post-insert [_ field]
+ (when (field-should-have-field-values? field)
+ (create-field-values-if-needed field))
+ field)
+
+ (post-update [this {:keys [id] :as field}]
+ ;; if base_type or special_type were affected then we should asynchronously create corresponding FieldValues objects if need be
+ (when (or (contains? field :base_type)
+ (contains? field :field_type)
+ (contains? field :special_type))
+ (create-field-values-if-needed (sel :one [this :id :table_id :base_type :special_type :field_type] :id id))))
+
+ (post-select [this {:keys [table_id parent_id] :as field}]
+ (map->FieldInstance
+ (u/assoc* field
+ :table (delay (sel :one 'metabase.models.table/Table :id table_id))
+ :db (delay @(:db @(:table <>)))
+ :target (delay (field->fk-field field))
+ :parent (when parent_id
+ (delay (this parent_id)))
+ :children (delay (sel :many this :parent_id (:id field)))
+ :qualified-name-components (delay (qualified-name-components <>))
+ :qualified-name (delay (apply str (interpose "." @(:qualified-name-components <>)))))))
+
+ (pre-cascade-delete [this {:keys [id]}]
+ (cascade-delete this :parent_id id)
+ (cascade-delete ForeignKey (where (or (= :origin_id id)
+ (= :destination_id id))))
+ (cascade-delete 'metabase.models.field-values/FieldValues :field_id id)))
+
+(extend-ICanReadWrite FieldEntity :read :always, :write :superuser)
+
(defn field->fk-field
"Attempts to follow a `ForeignKey` from the the given `Field` to a destination `Field`.
@@ -87,36 +139,30 @@
[{:keys [id special_type] :as field}]
(when (= :fk special_type)
(let [dest-id (sel :one :field [ForeignKey :destination_id] :origin_id id)]
- (sel :one Field :id dest-id))))
-
-(defmethod post-select Field [_ {:keys [table_id] :as field}]
- (u/assoc* field
- :table (delay (sel :one 'metabase.models.table/Table :id table_id))
- :db (delay @(:db @(:table <>)))
- :target (delay (field->fk-field field))
- :can_read (delay @(:can_read @(:table <>)))
- :can_write (delay @(:can_write @(:table <>)))))
-
-(defmethod pre-insert Field [_ field]
- (let [defaults {:active true
- :preview_display true
- :field_type :info
- :position 0}]
- (merge defaults field)))
-
-(defmethod post-insert Field [_ field]
- (when (field-should-have-field-values? field)
- (future (create-field-values field)))
- field)
-
-(defmethod post-update Field [_ {:keys [id] :as field}]
- ;; if base_type or special_type were affected then we should asynchronously create corresponding FieldValues objects if need be
- (when (or (contains? field :base_type)
- (contains? field :field_type)
- (contains? field :special_type))
- (future (create-field-values-if-needed (sel :one [Field :id :table_id :base_type :special_type :field_type] :id id)))))
-
-(defmethod pre-cascade-delete Field [_ {:keys [id]}]
- (cascade-delete ForeignKey (where (or (= :origin_id id)
- (= :destination_id id))))
- (cascade-delete 'metabase.models.field-values/FieldValues :field_id id))
+ (Field dest-id))))
+
+(defn unflatten-nested-fields
+ "Take a sequence of both top-level and nested FIELDS, and return a sequence of top-level `Fields`
+ with nested `Fields` moved into sequences keyed by `:children` in their parents.
+
+ (unflatten-nested-fields [{:id 1, :parent_id nil}, {:id 2, :parent_id 1}])
+ -> [{:id 1, :parent_id nil, :children [{:id 2, :parent_id 1, :children nil}]}]
+
+ You may optionally specify a different PARENT-ID-KEY; the default is `:parent_id`."
+ ([fields]
+ (unflatten-nested-fields fields :parent_id))
+ ([fields parent-id-key]
+ (let [parent-id->fields (group-by parent-id-key fields)
+ resolve-children (fn resolve-children [field]
+ (assoc field :children (map resolve-children
+ (parent-id->fields (:id field)))))]
+ (map resolve-children (parent-id->fields nil)))))
+
+(defn- qualified-name-components
+ "Return the pieces that represent a path to FIELD, of the form `[table-name parent-fields-name* field-name]`."
+ [{:keys [table parent], :as field}]
+ {:pre [(delay? table)]}
+ (conj (if parent
+ (qualified-name-components @parent)
+ [(:name @table)])
+ (:name field)))
diff --git a/src/metabase/models/field_values.clj b/src/metabase/models/field_values.clj
index 9d7ac98d4aab1e54bb4a3df0dc2afa61803207c3..2cffb9b11342db9984d477b2951e83ee71260530 100644
--- a/src/metabase/models/field_values.clj
+++ b/src/metabase/models/field_values.clj
@@ -1,16 +1,19 @@
(ns metabase.models.field-values
(:require [clojure.tools.logging :as log]
- [korma.core :refer :all]
- [metabase.db :refer :all]
- [metabase.util :as u]))
+ [korma.core :refer :all, :exclude [defentity update]]
+ (metabase [db :refer :all]
+ [util :as u])
+ [metabase.models.interface :refer :all]))
;; ## Entity + DB Multimethods
(defentity FieldValues
- (table :metabase_fieldvalues)
- timestamped
- (types {:human_readable_values :json
- :values :json}))
+ [(table :metabase_fieldvalues)
+ timestamped
+ (types :human_readable_values :json, :values :json)]
+
+ (post-select [_ field-values]
+ (update-in field-values [:human_readable_values] #(or % {}))))
;; columns:
;; * :id
@@ -20,10 +23,6 @@
;; * :values (JSON-encoded array like ["table" "scalar" "pie"])
;; * :human_readable_values (JSON-encoded map like {:table "Table" :scalar "Scalar"}
-(defmethod post-select FieldValues [_ field-values]
- (update-in field-values [:human_readable_values] #(or % {}))) ; return an empty map for :human_readable_values in cases where it is nil
-
-
;; ## `FieldValues` Helper Functions
(defn field-should-have-field-values?
@@ -40,19 +39,28 @@
(def ^:private field-distinct-values
(u/runtime-resolved-fn 'metabase.db.metadata-queries 'field-distinct-values))
-(defn create-field-values
+(defn- create-field-values
"Create `FieldValues` for a `Field`."
- {:arglists '([field]
- [field human-readable-values])}
- [{field-id :id :as field} & [human-readable-values]]
+ {:arglists '([field] [field human-readable-values])}
+ [{field-id :id, field-name :name, :as field} & [human-readable-values]]
{:pre [(integer? field-id)
- (:table field)]} ; need to pass a full `Field` object with delays beause the `metadata/` functions need those
- (log/debug (format "Creating FieldValues for Field %d..." field-id))
+ (:table field)]} ; need to pass a full `Field` object with delays beause the `metadata/` functions need those
+ (log/debug (format "Creating FieldValues for Field %s..." (or field-name field-id))) ; use field name if available
(ins FieldValues
- :field_id field-id
- :values (field-distinct-values field)
+ :field_id field-id
+ :values (field-distinct-values field)
:human_readable_values human-readable-values))
+(defn update-field-values!
+ "Update the `FieldValues` for FIELD, creating them if needed"
+ [{field-id :id, :as field}]
+ {:pre [(integer? field-id)
+ (field-should-have-field-values? field)]}
+ (if-let [field-values (sel :one FieldValues :field_id field-id)]
+ (upd FieldValues (:id field-values)
+ :values (field-distinct-values field))
+ (create-field-values field)))
+
(defn create-field-values-if-needed
"Create `FieldValues` for a `Field` if they *should* exist but don't already exist.
Returns the existing or newly created `FieldValues` for `Field`."
diff --git a/src/metabase/models/foreign_key.clj b/src/metabase/models/foreign_key.clj
index 9532345cd6bf5c77e7863d3d857846fc5d25a559..8a3ed2b429450a5bc1267f96d486204144e14e1f 100644
--- a/src/metabase/models/foreign_key.clj
+++ b/src/metabase/models/foreign_key.clj
@@ -1,25 +1,27 @@
(ns metabase.models.foreign-key
- (:require [korma.core :refer :all]
- [metabase.db :refer :all]))
+ (:require [korma.core :refer :all, :exclude [defentity update]]
+ [metabase.db :refer :all]
+ [metabase.models.interface :refer :all]))
-(def relationships
+(def ^:const relationships
"Valid values for `ForeginKey.relationship`."
#{:1t1
:Mt1
:MtM})
-(def relationship->name
+(def ^:const relationship->name
{:1t1 "One to One"
:Mt1 "Many to One"
:MtM "Many to Many"})
(defentity ForeignKey
- (table :metabase_foreignkey)
- timestamped
- (types {:relationship :keyword}))
+ [(table :metabase_foreignkey)
+ (types :relationship :keyword)
+ timestamped]
+ (post-select [_ {:keys [origin_id destination_id] :as fk}]
+ (assoc fk
+ :origin (delay (sel :one 'metabase.models.field/Field :id origin_id))
+ :destination (delay (sel :one 'metabase.models.field/Field :id destination_id)))))
-(defmethod post-select ForeignKey [_ {:keys [origin_id destination_id] :as fk}]
- (assoc fk
- :origin (delay (sel :one 'metabase.models.field/Field :id origin_id))
- :destination (delay (sel :one 'metabase.models.field/Field :id destination_id))))
+(extend-ICanReadWrite ForeignKeyEntity :read :always, :write :superuser)
diff --git a/src/metabase/models/hydrate.clj b/src/metabase/models/hydrate.clj
index 1c684efec9f4172b884879564cd2490217b1d43e..740920171156a8f3073e3bea308a72c20c0c61c4 100644
--- a/src/metabase/models/hydrate.clj
+++ b/src/metabase/models/hydrate.clj
@@ -1,6 +1,7 @@
(ns metabase.models.hydrate
"Functions for deserializing and hydrating fields in objects fetched from the DB."
(:require [metabase.db :refer [sel]]
+ [metabase.models.interface :as models]
[metabase.util :as u]))
(declare batched-hydrate
@@ -25,16 +26,10 @@
**Batched Hydration**
Hydration attempts to do a *batched hydration* where possible.
- If the key being hydrated is defined as one of some entity's `:hydration-keys`,
+ If the key being hydrated is defined as one of some entity's `:metabase.models.interface/hydration-keys`,
`hydrate` will do a batched `sel` if a corresponding key ending with `_id`
is found in the objects being hydrated.
- `defentity` threads the resulting map through its forms using `->`, so define
- `:hydration-keys` with `assoc`:
-
- (defentity User
- (assoc :hydration-keys #{:user}))
-
(hydrate [{:user_id 100}, {:user_id 101}] :user)
Since `:user` is a hydration key for `User`, a single `sel` will used to
@@ -117,7 +112,10 @@
(defn- hydrate-vector
"Hydrate a nested hydration form (vector) by recursively calling `hydrate`."
- [results [k & more]]
+ [results [k & more :as vect]]
+ ;; TODO - it would be super snazzy if we could make this a compile-time check
+ (assert (> (count vect) 1)
+ (format "Replace '%s' with '%s'. Vectors are for nested hydration. There's no need to use one when you only have a single key." vect (first vect)))
(let [results (hydrate results k)]
(if-not (seq more) results
(counts-apply results k #(apply hydrate % more)))))
@@ -128,14 +126,22 @@
(if (can-batched-hydrate? results k) (batched-hydrate results k)
(simple-hydrate results k)))
+(def ^:private hydration-k->method
+ "Methods that can be used to hydrate corresponding keys."
+ {:can_read #(models/can-read? %)
+ :can_write #(models/can-write? %)})
+
(defn- simple-hydrate
"Hydrate keyword K in results by dereferencing corresponding delays when applicable."
[results k]
{:pre [(keyword? k)]}
(map (fn [result]
(let [v (k result)]
- (if-not (delay? v) result ; if v isn't a delay it's either already hydrated or nil.
- (assoc result k @v)))) ; don't barf on nil; just no-op
+ (cond
+ (delay? v) (assoc result k @v) ; hydrate delay if possible
+ (and (not v)
+ (hydration-k->method k)) (assoc result k ((hydration-k->method k) result)) ; otherwise if no value exists look for a method we can use for hydration
+ :else result))) ; otherwise don't barf, v may already be hydrated
results))
(defn- already-hydrated?
@@ -171,34 +177,6 @@
(assoc result dest-key obj))))
results))))
-;; #### Possible Improvements
-;; TODO - It would be *nice* to extend this to work with one-to-many relationships. e.g. `Dashboard -> Cards`
-;;
-;; It could work like this:
-;;
-;; (defentity Card
-;; (assoc :hydration-keys {:1t1 {:keys #{:card}} ; (hydrate obj :card) -> obj.card_id <-> Card.id
-;; :1tM {:keys #{:cards}
-;; :fks #{:table_id}}})) ; (hydrate table :cards) -> obj.id <-> Card.table_id
-;;
-;; (-> (sel :many Table ...)
-;; (hydrate :cards))
-;;
-;; 1. `:hydration-keys` can be reworked to differentiate between one-to-one hydrations and one-to-many hydrations
-;; (not sure on the exact format yet)
-;;
-;; 2. one-to-many hydrations will additionally need to know what fields it has that can be used as Foreign Keys
-;; - Could we reflect on the DB and add this info at runtime?
-;; - Could we just use `belongs-to` / `has-one` / etc? (or an augmented version thereof) to specify foreign keys?
-;;
-;; 3. We can infer that `:table_id` is an FK to `Table` because `Table` has `:table` defined as a hydration key.
-;; `:table <-> :table_id`
-;;
-;; 4. (This is the tricky part)
-;; If we could somehow know that we are trying to hydrate `Tables`, we would know we could use `:id -> :table_id`
-;; and could do a `(sel Card :table_id [in ids])`
-;; - We could add a key like `:_type :Table` (?) to results so we know the type
-
;; ### Helper Fns
@@ -206,16 +184,15 @@
"Delay that returns map of `hydration-key` -> korma entity.
e.g. `:user -> User`.
- This is built pulling the `:hydration-keys` set from all korma entities."
+ This is built pulling the `::hydration-keys` set from all of our entities."
(delay (->> (all-ns)
(mapcat ns-publics)
vals
(map var-get)
- (filter #(= (type %) :korma.core/Entity))
- (filter :hydration-keys)
- (mapcat (fn [{:keys [hydration-keys] :as entity}]
+ (filter :metabase.models.interface/hydration-keys)
+ (mapcat (fn [{hydration-keys :metabase.models.interface/hydration-keys, :as entity}]
(assert (and (set? hydration-keys) (every? keyword? hydration-keys))
- (str ":hydration-keys should be a set of keywords. In: " entity))
+ (str "::hydration-keys should be a set of keywords. In: " entity))
(map (u/rpartial vector entity)
hydration-keys)))
(into {}))))
diff --git a/src/metabase/models/interface.clj b/src/metabase/models/interface.clj
new file mode 100644
index 0000000000000000000000000000000000000000..89346f5f1847b11e66c08dff58ca7c75556e0c62
--- /dev/null
+++ b/src/metabase/models/interface.clj
@@ -0,0 +1,235 @@
+(ns metabase.models.interface
+ (:require (clojure.tools [logging :as log]
+ [macro :refer [macrolet]])
+ [clojure.walk :refer [macroexpand-all], :as walk]
+ [cheshire.core :as cheshire]
+ [korma.core :as k]
+ [medley.core :as m]
+ [metabase.config :as config]
+ [metabase.util :as u]))
+
+;;; ## ---------------------------------------- PERMISSIONS CHECKING ----------------------------------------
+
+(defprotocol ICanReadWrite
+ (can-read? [obj] [entity ^Integer id])
+ (can-write? [obj] [entity ^Integer id]))
+
+(defn- superuser? [& _]
+ (:is_superuser @@(resolve 'metabase.api.common/*current-user*)))
+
+(defn- owner?
+ ([{:keys [creator_id], :as obj}]
+ (assert creator_id "Can't check user permissions: object doesn't have :creator_id.")
+ (or (superuser?)
+ (= creator_id @(resolve 'metabase.api.common/*current-user-id*))))
+ ([entity id]
+ (or (superuser?)
+ (owner? (entity id)))))
+
+(defn- has-public-perms? [rw]
+ (let [perms (delay (require 'metabase.models.common)
+ (case rw
+ :r @(resolve 'metabase.models.common/perms-read)
+ :w @(resolve 'metabase.models.common/perms-readwrite)))]
+ (fn -has-public-perms?
+ ([{:keys [public_perms], :as obj}]
+ (assert public_perms "Can't check user permissions: object doesn't have :public_perms.")
+ (or (owner? obj)
+ (>= public_perms @perms)))
+ ([entity id]
+ (or (owner? entity id)
+ (-has-public-perms? (entity id)))))))
+
+(defn extend-ICanReadWrite
+ "Add standard implementations of `can-read?` and `can-write?` to KLASS."
+ [klass & {:keys [read write]}]
+ (let [key->method (fn [rw v]
+ (case v
+ :always (constantly true)
+ :public-perms (has-public-perms? rw)
+ :owner #'owner?
+ :superuser #'superuser?))]
+ (extend klass
+ ICanReadWrite {:can-read? (key->method :r read)
+ :can-write? (key->method :w write)})))
+
+
+;;; ## ---------------------------------------- ENTITIES ----------------------------------------
+
+(defprotocol IEntity
+ (pre-insert [this instance]
+ "Gets called by `ins` immediately before inserting a new object immediately before the korma `insert` call.
+ This provides an opportunity to do things like encode JSON or provide default values for certain fields.
+
+ (pre-insert [_ query]
+ (let [defaults {:version 1}]
+ (merge defaults query))) ; set some default values")
+
+ (post-insert [this instance]
+ "Gets called by `ins` after an object is inserted into the DB. (This object is fetched via `sel`).
+ A good place to do asynchronous tasks such as creating related objects.
+ Implementations should return the newly created object.")
+
+ (pre-update [this instance]
+ "Called by `upd` before DB operations happen. A good place to set updated values for fields like `updated_at`, or serialize maps into JSON.")
+
+ (post-update [this instance]
+ "Called by `upd` after a SQL `UPDATE` *succeeds*. (This gets called with whatever the output of `pre-update` was).
+
+ A good place to schedule asynchronous tasks, such as creating a `FieldValues` object for a `Field`
+ when it is marked with `special_type` `:category`.
+
+ The output of this function is ignored.")
+
+ (post-select [this instance]
+ "Called on the results from a call to `sel`. Default implementation doesn't do anything, but
+ you can provide custom implementations to do things like add hydrateable keys or remove sensitive fields.")
+
+ (pre-cascade-delete [this instance]
+ "Called by `cascade-delete` for each matching object that is about to be deleted.
+ Implementations should delete any objects related to this object by recursively
+ calling `cascade-delete`.
+
+ The output of this function is ignored.
+
+ (pre-cascade-delete [_ {database-id :id :as database}]
+ (cascade-delete Card :database_id database-id)
+ ...)")
+
+ (internal-pre-insert [this instance])
+ (internal-pre-update [this instance])
+ (internal-post-select [this instance]))
+
+(defn- identity-second [_ obj] obj)
+(def ^:private constantly-nil (constantly nil))
+
+(def ^:const ^:private default-entity-method-implementations
+ {:pre-insert #'identity-second
+ :post-insert #'identity-second
+ :pre-update #'identity-second
+ :post-update #'constantly-nil
+ :post-select #'identity-second
+ :pre-cascade-delete #'constantly-nil})
+
+;; ## ---------------------------------------- READ-JSON ----------------------------------------
+
+(defn- read-json-str-or-clob
+ "If JSON-STRING is a JDBC Clob, convert to a String. Then call `json/read-str`."
+ [json-str]
+ (some-> (u/jdbc-clob->str json-str)
+ cheshire/parse-string))
+
+(defn- read-json
+ "Read JSON-STRING (or JDBC Clob) as JSON and keywordize keys."
+ [json-string]
+ (->> (read-json-str-or-clob json-string)
+ walk/keywordize-keys))
+
+(defn- write-json
+ "If OBJ is not already a string, encode it as JSON."
+ [obj]
+ (if (string? obj) obj
+ (cheshire/generate-string obj)))
+
+(def ^:const ^:private type-fns
+ {:json {:in #'write-json
+ :out #'read-json}
+ :keyword {:in `name
+ :out `keyword}})
+
+(defmacro apply-type-fns [obj-binding direction entity-map]
+ {:pre [(symbol? obj-binding)
+ (keyword? direction)
+ (map? entity-map)]}
+ (let [fns (m/map-vals #(direction (type-fns %)) (::types entity-map))]
+ (if-not (seq fns) obj-binding
+ `(cond-> ~obj-binding
+ ~@(mapcat (fn [[k f]]
+ [`(~k ~obj-binding) `(update-in [~k] ~f)])
+ fns)))))
+
+(defn -invoke-entity
+ "Basically the same as `(sel :one Entity :id id)`." ; TODO - deduplicate with sel
+ [entity id]
+ (when id
+ (when (metabase.config/config-bool :mb-db-logging)
+ (when-not @(resolve 'metabase.db/*sel-disable-logging*)
+ (clojure.tools.logging/debug
+ "DB CALL: " (:name entity) id)))
+ (let [[obj] (k/select (assoc entity :fields (::default-fields entity))
+ (k/where {:id id})
+ (k/limit 1))]
+ (some->> obj
+ (internal-post-select entity)
+ (post-select entity)))))
+
+(defn- update-updated-at [obj]
+ (assoc obj :updated_at (u/new-sql-timestamp)))
+
+(defn- update-created-at-updated-at [obj]
+ (let [ts (u/new-sql-timestamp)]
+ (assoc obj :created_at ts, :updated_at ts)))
+
+(defmacro macrolet-entity-map [entity & entity-forms]
+ `(macrolet [(~'default-fields [m# & fields#] `(assoc ~m# ::default-fields [~@(map keyword fields#)]))
+ (~'timestamped [m#] `(assoc ~m# ::timestamped true))
+ (~'types [m# & {:as fields#}] `(assoc ~m# ::types ~fields#))
+ (~'hydration-keys [m# & fields#] `(assoc ~m# ::hydration-keys #{~@(map keyword fields#)}))]
+ (-> (k/create-entity ~(name entity))
+ ~@entity-forms)))
+
+(defmacro defentity
+ "Similar to korma `defentity`, but creates a new record type where you can specify protocol implementations."
+ [entity entity-forms & methods+specs]
+ {:pre [(vector? entity-forms)]}
+ (let [entity-symb (symbol (format "%sEntity" (name entity)))
+ internal-post-select-symb (symbol (format "internal-post-select-%s" (name entity)))
+ unevaled-entity-map (macroexpand-all `(macrolet-entity-map ~entity ~@entity-forms))
+ entity-map (eval unevaled-entity-map)
+ [methods specs] (split-with list? methods+specs)]
+ `(do
+ (defrecord ~entity-symb []
+ clojure.lang.IFn
+ (~'invoke [~'this ~'id]
+ (-invoke-entity ~'this ~'id))
+
+ ~@specs)
+
+ (extend ~entity-symb
+ IEntity ~(merge default-entity-method-implementations
+ {:internal-pre-insert `(fn [~'_ obj#]
+ (-> obj#
+ (apply-type-fns :in ~entity-map)
+ ~@(when (::timestamped entity-map)
+ [update-created-at-updated-at])))
+ :internal-pre-update `(fn [~'_ obj#]
+ (-> obj#
+ (apply-type-fns :in ~entity-map)
+ ~@(when (::timestamped entity-map)
+ [update-updated-at])))
+ :internal-post-select `(fn [~'_ obj#]
+ (apply-type-fns obj# :out ~entity-map))}
+ (into {}
+ (for [[method-name & impl] methods]
+ {(keyword method-name) `(fn ~@impl)}))))
+ (def ~entity
+ (~(symbol (format "map->%sEntity" (name entity))) (assoc ~unevaled-entity-map ::entity true))))))
+
+(defn metabase-entity?
+ "Is ENTITY a valid metabase model entity?"
+ [entity]
+ (::entity entity))
+
+
+;;; # ---------------------------------------- INSTANCE ----------------------------------------
+
+(defprotocol IModelInstanceApiSerialize
+ (api-serialize [this]
+ "Called on all objects being written out by the API. Default implementations return THIS as-is, but models can provide
+ custom methods to strip sensitive data, from non-admins, etc."))
+
+(extend Object
+ IModelInstanceApiSerialize {:api-serialize identity})
+
+(extend nil
+ IModelInstanceApiSerialize {:api-serialize identity})
diff --git a/src/metabase/models/query_execution.clj b/src/metabase/models/query_execution.clj
index 122c68b89a013d77e0d5ab81da649013eacc5e4b..6384bfef0629de26078f249b02744cd679b7aef8 100644
--- a/src/metabase/models/query_execution.clj
+++ b/src/metabase/models/query_execution.clj
@@ -1,32 +1,18 @@
(ns metabase.models.query-execution
- (:require [korma.core :refer :all]
+ (:require [korma.core :refer :all, :exclude [defentity update]]
[metabase.api.common :refer [check]]
[metabase.db :refer :all]
(metabase.models [common :refer :all]
- [database :refer [Database]])))
+ [database :refer [Database]]
+ [interface :refer :all])))
(defentity QueryExecution
- (table :query_queryexecution)
- (types {:json_query :json
- :result_data :json
- :status :keyword}))
+ [(table :query_queryexecution)
+ (default-fields id uuid version json_query raw_query status started_at finished_at running_time error result_rows)
+ (types :json_query :json, :result_data :json, :status :keyword)]
-;; default fields to return for `sel QueryExecution
-;; specifically excludes stored data columns
-(defmethod default-fields QueryExecution [_]
- [:id
- :uuid
- :version
- :json_query
- :raw_query
- :status
- :started_at
- :finished_at
- :running_time
- :error
- :result_rows])
-
-(defmethod post-select QueryExecution [_ {:keys [result_rows] :as query-execution}]
- (assoc query-execution
- :row_count (or result_rows 0))) ; sadly we have 2 ways to reference the row count :(
+ (post-select [_ {:keys [result_rows] :as query-execution}]
+ ;; sadly we have 2 ways to reference the row count :(
+ (assoc query-execution
+ :row_count (or result_rows 0))))
diff --git a/src/metabase/models/revision.clj b/src/metabase/models/revision.clj
new file mode 100644
index 0000000000000000000000000000000000000000..961b5d17d7ce133aa30cc1f185386410c0a0a922
--- /dev/null
+++ b/src/metabase/models/revision.clj
@@ -0,0 +1,132 @@
+(ns metabase.models.revision
+ (:require [korma.core :refer :all, :exclude [defentity update], :as k]
+ [medley.core :as m]
+ [metabase.db :refer [sel ins upd] :as db]
+ [metabase.api.common :refer [*current-user-id* let-404]]
+ (metabase.models [hydrate :refer [hydrate]]
+ [interface :refer :all]
+ [user :refer [User]])
+ [metabase.models.revision.diff :refer [diff-str]]
+ [metabase.util :as u]))
+
+(def ^:const max-revisions
+ "Maximum number of revisions to keep for each individual object. After this limit is surpassed, the oldest revisions will be deleted."
+ 15)
+
+;;; # IRevisioned Protocl
+
+(defprotocol IRevisioned
+ "Methods an entity may optionally implement to control how revisions of an instance are saved and reverted to."
+ (serialize-instance [this id instance]
+ "Prepare an instance for serialization in a `Revision`.")
+ (revert-to-revision [this id serialized-instance]
+ "Return an object to the state recorded by SERIALIZED-INSTANCE.")
+ (describe-diff [this username object1 object2]
+ "Return a string describing the difference between OBJECT1 and OBJECT2."))
+
+;;; ## Default Impl
+
+(extend-protocol IRevisioned
+ Object
+ (serialize-instance [_ _ instance]
+ (->> (dissoc instance :created_at :updated_at)
+ (into {}) ; if it's a record type like CardInstance we need to convert it to a regular map or filter-vals won't work
+ (m/filter-vals (complement delay?))))
+ (revert-to-revision [entity id serialized-instance]
+ (m/mapply upd entity id serialized-instance))
+ (describe-diff [entity username o1 o2]
+ (diff-str username (:name entity) o1 o2)))
+
+
+;;; # Revision Entity
+
+(defentity Revision
+ [(table :revision)
+ (types :object :json)]
+
+ (pre-insert [_ revision]
+ (assoc revision :timestamp (u/new-sql-timestamp)))
+
+ (pre-update [_ _]
+ (throw (Exception. "You cannot update a Revision!"))))
+
+
+;;; # Functions
+
+(defn revisions
+ "Get the revisions for ENTITY with ID in reverse chronological order."
+ [entity id]
+ {:pre [(metabase-entity? entity)
+ (integer? id)]}
+ (sel :many Revision :model (:name entity), :model_id id, (order :id :DESC)))
+
+(defn- revisions-add-diff-strs [entity revisions]
+ (loop [acc [], [r1 r2 & more] revisions]
+ (if-not r2
+ (conj acc (assoc r1 :description "First revision."))
+ (let [username (str (or (:common_name (:user r1))
+ "An unknown user")
+ (when (:is_reversion r1)
+ " reverted to an earlier revision and"))]
+ (recur (conj acc (assoc r1 :description (describe-diff entity username (:object r2) (:object r1))))
+ (conj more r2))))))
+
+(defn- add-details
+ "Hydrate `user` and add `:description` to a sequence of REVISIONS."
+ [entity revisions]
+ (->> (hydrate revisions :user)
+ (revisions-add-diff-strs entity)
+ ;; Filter out revisions where nothing changed from the one before it
+ (filter :description)
+ ;; Filter out irrelevant info
+ (map (fn [revision]
+ (-> revision
+ (dissoc :model :model_id :user_id :object)
+ (update :user (u/rpartial select-keys [:id :common_name :first_name :last_name])))))))
+
+(defn revisions+details
+ "Fetch `revisions` for ENTITY with ID and add details."
+ [entity id]
+ (add-details entity (revisions entity id)))
+
+(defn- delete-old-revisions
+ "Delete old revisions of ENTITY with ID when there are more than `max-revisions` in the DB."
+ [entity id]
+ {:pre [(metabase-entity? entity)
+ (integer? id)]}
+ ;; for some reason (offset max-revisions isn't working)
+ (let [old-revisions (drop max-revisions (sel :many :id Revision, :model (:name entity), :model_id id, (order :timestamp :DESC)))]
+ (when (seq old-revisions)
+ (delete Revision (where {:id [in old-revisions]})))))
+
+(defn push-revision
+ "Record a new `Revision` for ENTITY with ID.
+ Returns OBJECT."
+ {:arglists '([& {:keys [object entity id user-id skip-serialization? is-reversion?]}])}
+ [& {object :object, :keys [entity id user-id skip-serialization? is-reversion?], :or {user-id *current-user-id*, id (:id object), skip-serialization? false, is-reversion? false}}]
+ {:pre [(metabase-entity? entity)
+ (integer? user-id)
+ (db/exists? User :id user-id)
+ (integer? id)
+ (db/exists? entity :id id)
+ (map? object)]}
+ (let [object (if skip-serialization? object
+ (serialize-instance entity id object))]
+ (assert (map? object))
+ (ins Revision :model (:name entity) :model_id id, :user_id user-id, :object object, :is_reversion is-reversion?))
+ (delete-old-revisions entity id)
+ object)
+
+(defn revert
+ "Revert ENTITY with ID to a given `Revision`."
+ [& {:keys [entity id user-id revision-id], :or {user-id *current-user-id*}}]
+ {:pre [(metabase-entity? entity)
+ (integer? id)
+ (db/exists? entity :id id)
+ (integer? user-id)
+ (db/exists? User :id user-id)
+ (integer? revision-id)]}
+ (let-404 [serialized-instance (sel :one :field [Revision :object] :model (:name entity), :model_id id, :id revision-id)]
+ (revert-to-revision entity id serialized-instance)
+ ;; Push a new revision to record this reversion
+ (push-revision :entity entity, :id id, :object serialized-instance, :user-id user-id, :skip-serialization? true, :is-reversion? true)))
diff --git a/src/metabase/models/revision/diff.clj b/src/metabase/models/revision/diff.clj
new file mode 100644
index 0000000000000000000000000000000000000000..43e7eac5c8a8814d265799168945ed949652f2b9
--- /dev/null
+++ b/src/metabase/models/revision/diff.clj
@@ -0,0 +1,50 @@
+(ns metabase.models.revision.diff
+ (:require [clojure.core.match :refer [match]]
+ (clojure [data :as data]
+ [string :as s])))
+
+(defn- diff-str* [t k v1 v2]
+ (match [t k v1 v2]
+ [_ :name _ _]
+ (format "renamed it from \"%s\" to \"%s\"" v1 v2)
+
+ [_ :private true false]
+ "made it public"
+
+ [_ :private false true]
+ "made it private"
+
+ [_ :updated_at _ _]
+ nil
+
+ [_ :dataset_query _ _]
+ "modified the query"
+
+ [_ :visualization_settings _ _]
+ "changed the visualization settings"
+
+ [_ _ _ _]
+ (format "changed %s from \"%s\" to \"%s\"" (name k) v1 v2)))
+
+(defn build-sentence
+ "Join parts of a sentence together to build a compound one."
+ [parts]
+ (when (seq parts)
+ (cond
+ (= (count parts) 1) (str (first parts) \.)
+ (= (count parts) 2) (format "%s and %s." (first parts) (second parts))
+ :else (format "%s, %s" (first parts) (build-sentence (rest parts))))))
+
+(defn diff-str
+ ([t o1 o2]
+ (let [[before after] (data/diff o1 o2)]
+ (when before
+ (let [ks (keys before)]
+ (some-> (filter identity (for [k ks]
+ (diff-str* t k (k before) (k after))))
+ build-sentence
+ (s/replace-first #" it " (format " this %s " t)))))))
+ ([username t o1 o2]
+ (let [s (diff-str t o1 o2)]
+ (when (seq s)
+ (str username " " s)))))
diff --git a/src/metabase/models/session.clj b/src/metabase/models/session.clj
index 2b6a2e510685344e8de78d26e55068f72b1922f1..ba533264261d5de956c4ba3435715ebf3164856f 100644
--- a/src/metabase/models/session.clj
+++ b/src/metabase/models/session.clj
@@ -1,14 +1,15 @@
(ns metabase.models.session
- (:require [korma.core :refer :all]
+ (:require [korma.core :refer :all, :exclude [defentity update]]
[metabase.db :refer :all]
(metabase.models [common :refer :all]
+ [interface :refer :all]
[user :refer [User]])
[metabase.util :as u]))
(defentity Session
- (table :core_session)
- (belongs-to User {:fk :user_id}))
+ [(table :core_session)
+ (belongs-to User {:fk :user_id})]
-(defmethod pre-insert Session [_ session]
- (let [defaults {:created_at (u/new-sql-timestamp)}]
- (merge defaults session)))
+ (pre-insert [_ session]
+ (let [defaults {:created_at (u/new-sql-timestamp)}]
+ (merge defaults session))))
diff --git a/src/metabase/models/setting.clj b/src/metabase/models/setting.clj
index f6e0b55a2c63c31eb1c5685344c6dfb1aafae9f5..905aea20d8886be3b970798532261bf9a04ba70b 100644
--- a/src/metabase/models/setting.clj
+++ b/src/metabase/models/setting.clj
@@ -3,8 +3,9 @@
(:require [clojure.core.match :refer [match]]
[clojure.string :as s]
[environ.core :as env]
- [korma.core :refer :all :exclude [delete]]
- [metabase.db :refer [sel del]]))
+ [korma.core :as k]
+ [metabase.db :refer [sel del]]
+ [metabase.models.interface :refer :all]))
;; Settings are a fast + simple way to create a setting that can be set
;; from the SuperAdmin page. They are saved to the Database, but intelligently
@@ -66,12 +67,12 @@
[k v]
{:pre [(keyword? k)
(string? v)]}
- (if (get k) (update Setting
- (set-fields {:value v})
- (where {:key (name k)}))
- (insert Setting
- (values {:key (name k)
- :value v})))
+ (if (get k) (k/update Setting
+ (k/set-fields {:value v})
+ (k/where {:key (name k)}))
+ (k/insert Setting
+ (k/values {:key (name k)
+ :value v})))
(restore-cache-if-needed)
(swap! cached-setting->value assoc k v)
v)
@@ -157,7 +158,7 @@
(atom nil))
(defentity Setting
- (table :setting))
+ [(k/table :setting)])
(defn- settings-list
"Return a list of all Settings (as created with `defsetting`)."
@@ -168,10 +169,10 @@
(map meta)
(filter ::is-setting?)
(map (fn [{k :name desc :doc default ::default-value}]
- {:key (keyword k)
+ {:key (keyword k)
:description desc
- :default (or (when (get-from-env-var k)
- (format "Using $MB_%s" (-> (name k)
- (s/replace "-" "_")
- s/upper-case)))
- default)}))))
+ :default (or (when (get-from-env-var k)
+ (format "Using $MB_%s" (-> (name k)
+ (s/replace "-" "_")
+ s/upper-case)))
+ default)}))))
diff --git a/src/metabase/models/table.clj b/src/metabase/models/table.clj
index 5f987b21c0bd6e92c61335c53f369a812bf164cb..c91ce185d292ded060f65d23c4901c90a90ffc0f 100644
--- a/src/metabase/models/table.clj
+++ b/src/metabase/models/table.clj
@@ -1,40 +1,55 @@
(ns metabase.models.table
- (:require [korma.core :refer :all]
+ (:require [korma.core :refer :all, :exclude [defentity update]]
[metabase.db :refer :all]
- (metabase.models [database :as db]
+ (metabase.models [common :as common]
+ [database :as db]
[field :refer [Field]]
- [field-values :refer [FieldValues]])
+ [field-values :refer [FieldValues]]
+ [interface :refer :all])
[metabase.util :as u]))
-(def entity-types
+(def ^:const entity-types
"Valid values for `Table.entity_type` (field may also be `nil`)."
#{:person :event :photo :place})
+(def ^:const visibility-types
+"Valid values for `Table.visibility_type` (field may also be `nil`)."
+#{:hidden :technical :cruft})
+
+(defrecord TableInstance []
+ clojure.lang.IFn
+ (invoke [this k]
+ (get this k)))
+
+(extend-ICanReadWrite TableInstance :read :always, :write :superuser)
+
(defentity Table
- (table :metabase_table)
- timestamped
- (types {:entity_type :keyword})
- (assoc :hydration-keys #{:table}))
-
-
-; also missing :active and :pk_field
-(defmethod post-select Table [_ {:keys [id db db_id description] :as table}]
- (u/assoc* table
- :db (or db (delay (sel :one db/Database :id db_id)))
- :fields (delay (sel :many Field :table_id id :active true (order :position :ASC) (order :name :ASC)))
- :field_values (delay
- (let [field-ids (sel :many :field [Field :id]
- :table_id id
- :active true
- :field_type [not= "sensitive"]
- (order :position :asc)
- (order :name :asc))]
- (sel :many :field->field [FieldValues :field_id :values] :field_id [in field-ids])))
- :description (u/jdbc-clob->str description)
- :pk_field (delay (:id (sel :one :fields [Field :id] :table_id id (where {:special_type "id"}))))
- :can_read (delay @(:can_read @(:db <>)))
- :can_write (delay @(:can_write @(:db <>)))))
-
-
-(defmethod pre-cascade-delete Table [_ {:keys [id] :as table}]
- (cascade-delete Field :table_id id))
+ [(table :metabase_table)
+ (hydration-keys table)
+ (types :entity_type :keyword, :visibility_type :keyword)
+ timestamped]
+
+ (post-select [_ {:keys [id db db_id description] :as table}]
+ (map->TableInstance
+ (u/assoc* table
+ :db (or db (delay (sel :one db/Database :id db_id)))
+ :fields (delay (sel :many Field :table_id id :active true (order :position :ASC) (order :name :ASC)))
+ :field_values (delay
+ (let [field-ids (sel :many :field [Field :id]
+ :table_id id
+ :active true
+ :field_type [not= "sensitive"]
+ (order :position :asc)
+ (order :name :asc))]
+ (sel :many :field->field [FieldValues :field_id :values] :field_id [in field-ids])))
+ :description (u/jdbc-clob->str description)
+ :pk_field (delay (:id (sel :one :fields [Field :id] :table_id id (where {:special_type "id"})))))))
+
+ (pre-insert [_ table]
+ (let [defaults {:display_name (common/name->human-readable-name (:name table))}]
+ (merge defaults table)))
+
+ (pre-cascade-delete [_ {:keys [id] :as table}]
+ (cascade-delete Field :table_id id)))
+
+(extend-ICanReadWrite TableEntity :read :always, :write :superuser)
diff --git a/src/metabase/models/table_segment.clj b/src/metabase/models/table_segment.clj
deleted file mode 100644
index 8a726b48fe5f14159252327956ce079ffe54856d..0000000000000000000000000000000000000000
--- a/src/metabase/models/table_segment.clj
+++ /dev/null
@@ -1,5 +0,0 @@
-(ns metabase.models.table-segment
- (:require [korma.core :refer :all]))
-
-(defentity TableSegment
- (table :metabase_tablesegment))
diff --git a/src/metabase/models/user.clj b/src/metabase/models/user.clj
index 2358f4b3ff352a2e0cdf6889266ff8376b870ef7..c42f66fe0a6a1cfef95c58e8a653caf16089ed99 100644
--- a/src/metabase/models/user.clj
+++ b/src/metabase/models/user.clj
@@ -1,66 +1,71 @@
(ns metabase.models.user
- (:require [cemerick.friend.credentials :as creds]
- [korma.core :refer :all]
+ (:require [clojure.string :as s]
+ [cemerick.friend.credentials :as creds]
+ [korma.core :refer :all, :exclude [defentity update]]
[metabase.db :refer :all]
[metabase.email.messages :as email]
+ (metabase.models [interface :refer :all]
+ [setting :as setting])
[metabase.util :as u]))
;; ## Enity + DB Multimethods
(defentity User
- (table :core_user)
- (assoc :hydration-keys #{:author :creator :user}))
+ [(table :core_user)
+ (default-fields id email date_joined first_name last_name last_login is_superuser)
+ (hydration-keys author creator user)]
-;; fields to return for Users other `*than current-user*`
-(defmethod default-fields User [_]
- [:id
- :email
- :date_joined
- :first_name
- :last_name
- :last_login
- :is_superuser])
+ (pre-insert [_ {:keys [email password reset_token] :as user}]
+ (assert (u/is-email? email))
+ (assert (and (string? password)
+ (not (s/blank? password))))
+ (assert (not (:password_salt user))
+ "Don't try to pass an encrypted password to (ins User). Password encryption is handled by pre-insert.")
+ (let [salt (.toString (java.util.UUID/randomUUID))
+ defaults {:date_joined (u/new-sql-timestamp)
+ :last_login (u/new-sql-timestamp)
+ :is_staff true
+ :is_active true
+ :is_superuser false}]
+ ;; always salt + encrypt the password before putting new User in the DB
+ ;; TODO - we should do password encryption in pre-update too instead of in the session code
+ (merge defaults user
+ {:password_salt salt
+ :password (creds/hash-bcrypt (str salt password))}
+ (when reset_token
+ {:reset_token (creds/hash-bcrypt reset_token)}))))
-(def current-user-fields
- "The fields we should return for `*current-user*` (used by `metabase.middleware.current-user`)"
- (concat (default-fields User)
- [:is_active
- :is_staff])) ; but not `password` !
+ (pre-update [_ {:keys [email reset_token] :as user}]
+ (when email
+ (assert (u/is-email? email)))
+ (cond-> user
+ reset_token (assoc :reset_token (creds/hash-bcrypt reset_token))))
-(defmethod post-select User [_ user]
- (-> user
- (assoc :common_name (str (:first_name user) " " (:last_name user)))))
+ (post-select [_ {:keys [first_name last_name], :as user}]
+ (cond-> user
+ (or first_name last_name) (assoc :common_name (str first_name " " last_name))))
-(defmethod pre-insert User [_ {:keys [email password] :as user}]
- (assert (u/is-email? email))
- (assert (and (string? password)
- (not (clojure.string/blank? password))))
- (assert (not (:password_salt user))
- "Don't try to pass an encrypted password to (ins User). Password encryption is handled by pre-insert.")
- (let [salt (.toString (java.util.UUID/randomUUID))
- defaults {:date_joined (u/new-sql-timestamp)
- :last_login (u/new-sql-timestamp)
- :is_staff true
- :is_active true
- :is_superuser false}]
- ;; always salt + encrypt the password before put new User in the DB
- (merge defaults user {:password_salt salt
- :password (creds/hash-bcrypt (str salt password))})))
+ (pre-cascade-delete [_ {:keys [id]}]
+ (cascade-delete 'Session :user_id id)))
-(defmethod pre-update User [_ {:keys [email] :as user}]
- (when email
- (assert (u/is-email? email)))
- user)
-(defmethod pre-cascade-delete User [_ {:keys [id]}]
- (cascade-delete 'metabase.models.session/Session :user_id id))
+(def ^:const current-user-fields
+ "The fields we should return for `*current-user*` (used by `metabase.middleware.current-user`)"
+ (concat (:metabase.models.interface/default-fields User)
+ [:is_active
+ :is_staff])) ; but not `password` !
;; ## Related Functions
+(declare create-user
+ form-password-reset-url
+ set-user-password
+ set-user-password-reset-token)
+
(defn create-user
"Convenience function for creating a new `User` and sending out the welcome email."
- [first-name last-name email-address & {:keys [send-welcome reset-url]
+ [first-name last-name email-address & {:keys [send-welcome invitor]
:or {send-welcome false}}]
{:pre [(string? first-name)
(string? last-name)
@@ -70,8 +75,11 @@
:first_name first-name
:last_name last-name
:password (str (java.util.UUID/randomUUID)))]
- (if send-welcome
- (email/send-new-user-email first-name email-address reset-url))
+ (when send-welcome
+ (let [reset-token (set-user-password-reset-token (:id new-user))
+ ;; NOTE: the new user join url is just a password reset with an indicator that this is a first time user
+ join-url (str (form-password-reset-url reset-token) "#new")]
+ (email/send-new-user-email new-user invitor join-url)))
;; return the newly created user
new-user))
@@ -86,3 +94,18 @@
:password password
:reset_token nil
:reset_triggered nil)))
+
+(defn set-user-password-reset-token
+ "Updates a given `User` and generates a password reset token for them to use. Returns the url for password reset."
+ [user-id]
+ {:pre [(integer? user-id)]}
+ (let [reset-token (str user-id "_" (java.util.UUID/randomUUID))]
+ (upd User user-id, :reset_token reset-token, :reset_triggered (System/currentTimeMillis))
+ ;; return the token
+ reset-token))
+
+(defn form-password-reset-url
+ "Generate a properly formed password reset url given a password reset token."
+ [reset-token]
+ {:pre [(string? reset-token)]}
+ (str (setting/get :-site-url) "/auth/reset_password/" reset-token))
diff --git a/src/metabase/util.clj b/src/metabase/util.clj
index 15210e9d713f55eeb6619dffadaf1760608134fb..2b6de3451fbf6b464a2eca17e82719bb297a7bf1 100644
--- a/src/metabase/util.clj
+++ b/src/metabase/util.clj
@@ -109,10 +109,7 @@
(do (.close reader)
acc))))
-(defn
- ^{:arglists ([pred? args]
- [pred? args default])}
- optional
+(defn optional
"Helper function for defining functions that accept optional arguments.
If PRED? is true of the first item in ARGS, a pair like `[first-arg other-args]`
is returned; otherwise, a pair like `[DEFAULT other-args]` is returned.
@@ -126,6 +123,8 @@
{k nums}))
(wrap-nums 1 2 3) -> {:nums [1 2 3]}
(wrap-nums :numbers 1 2 3) -> {:numbers [1 2 3]}"
+ {:arglists '([pred? args]
+ [pred? args default])}
[pred? args & [default]]
(if (pred? (first args)) [(first args) (next args)]
[default args]))
@@ -268,4 +267,19 @@
([color-symb x]
((ns-resolve 'colorize.core color-symb) (pprint-to-str x))))
+(defmacro cond-let
+ "Like `if-let` or `when-let`, but for `cond`."
+ [binding-form then-form & more]
+ `(if-let ~binding-form ~then-form
+ ~(when (seq more)
+ `(cond-let ~@more))))
+
+(defn filtered-stacktrace
+ "Get the stack trace associated with E and return it as a vector with non-metabase frames filtered out."
+ [^Throwable e]
+ (when e
+ (when-let [stacktrace (.getStackTrace e)]
+ (->> (map str (.getStackTrace e))
+ (filterv (partial re-find #"metabase"))))))
+
(require-dox-in-this-namespace)
diff --git a/src/metabase/util/logic.clj b/src/metabase/util/logic.clj
new file mode 100644
index 0000000000000000000000000000000000000000..1acdb153a9c394e4405b8715ee79747db21563eb
--- /dev/null
+++ b/src/metabase/util/logic.clj
@@ -0,0 +1,61 @@
+(ns metabase.util.logic
+ "Useful relations for `core.logic`."
+ (:refer-clojure :exclude [==])
+ (:require [clojure.core.logic :refer :all]))
+
+(defna butlast°
+ "A relation such that BUSTLASTV is all items but the last item LASTV of list L."
+ [butlastv lastv l]
+ ([[] ?x [?x]])
+ ([_ _ [?x . ?more]] (fresh [more-butlast]
+ (butlast° more-butlast lastv ?more)
+ (conso ?x more-butlast butlastv))))
+
+(defna split°
+ "A relation such that HALF1 and HALF2 are even divisions of list L.
+ If L has an odd number of items, HALF1 will have one more item than HALF2."
+ [half1 half2 l]
+ ([[] [] []])
+ ([[?x] [] [?x]])
+ ([[?x] [?y] [?x ?y]])
+ ([[?x ?y . ?more-half1-butlast] [?more-half1-last . ?more-half2] [?x ?y . ?more]]
+ (fresh [more-half1]
+ (split° more-half1 ?more-half2 ?more)
+ (butlast° ?more-half1-butlast ?more-half1-last more-half1))))
+
+(defn sorted-into°
+ "A relation such that OUT is the list L with V sorted into it doing comparisons with PRED-F."
+ [pred-f l v out]
+ (matche [l]
+ ([[]] (== out [v]))
+ ([[?x . ?more]] (conda
+ ((pred-f v ?x) (conso v (lcons ?x ?more) out))
+ (s# (fresh [more]
+ (sorted-into° pred-f ?more v more)
+ (conso ?x more out)))))))
+
+(defna sorted-permutation°
+ "A relation such that OUT is a permutation of L where all items are sorted by PRED-F."
+ [pred-f l out]
+ ([_ [] []])
+ ([_ [?x . ?more] _] (fresh [more]
+ (sorted-permutation° pred-f ?more more)
+ (sorted-into° pred-f more ?x out))))
+
+(defn matches-seq-order°
+ "A relation such that V1 is present and comes before V2 in list L."
+ [v1 v2 l]
+ (conda
+ ;; This is just an optimization for cases where L isn't a logic var; it's much faster <3
+ ((nonlvaro l) ((fn -ordered° [[item & more]]
+ (conda
+ ((== v1 item) s#)
+ ((== v2 item) fail)
+ ((when (seq more) s#) (-ordered° more))))
+ l))
+ (s# (conda
+ ((firsto l v1))
+ ((firsto l v2) fail)
+ ((fresh [more]
+ (resto l more)
+ (matches-seq-order° v1 v2 more)))))))
diff --git a/src/metabase/util/password.clj b/src/metabase/util/password.clj
index 4a02695516001308ac65b82fe7a44b368a716b62..c7b426c39540b489108dd0da5b4936a6356fd0e3 100644
--- a/src/metabase/util/password.clj
+++ b/src/metabase/util/password.clj
@@ -4,28 +4,54 @@
(defn- count-occurrences
- "Takes in a Character predicate function which is applied to all characters in the supplied string and uses
- map/reduce to count the number of characters which return `true` for the given predicate function."
- [f s]
- {:pre [(fn? f)
- (string? s)]}
- (reduce + (map #(if (true? (f %)) 1 0) s)))
-
-(defn is-complex?
- "Check if a given password meets complexity standards for the application."
+ "Return a map of the counts of each class of character for PASSWORD.
+
+ (count-occurrences \"GoodPw!!\")
+ -> {:total 8, :lower 4, :upper 2, :letter 6, :digit 0, :special 2}"
[password]
- {:pre [(string? password)]}
- (let [complexity (config/config-kw :mb-password-complexity)
- length (config/config-int :mb-password-length)
- lowers (count-occurrences #(Character/isLowerCase ^Character %) password)
- uppers (count-occurrences #(Character/isUpperCase ^Character %) password)
- digits (count-occurrences #(Character/isDigit ^Character %) password)
- specials (count-occurrences #(not (Character/isLetterOrDigit ^Character %)) password)]
- (if-not (>= (count password) length) false
- (case complexity
- :weak (and (> lowers 0) (> digits 0) (> uppers 0)) ; weak = 1 lower, 1 digit, 1 uppercase
- :normal (and (> lowers 0) (> digits 0) (> uppers 0) (> specials 0)) ; normal = 1 lower, 1 digit, 1 uppercase, 1 special
- :strong (and (> lowers 1) (> digits 0) (> uppers 1) (> specials 0)))))) ; strong = 2 lower, 1 digit, 2 uppercase, 1 special
+ (loop [[^Character c & more] password, {:keys [total, lower, upper, letter, digit, special], :as counts} {:total 0, :lower 0, :upper 0, :letter 0, :digit 0, :special 0}]
+ (if-not c counts
+ (recur more (merge (update counts :total inc)
+ (cond
+ (Character/isLowerCase c) {:lower (inc lower), :letter (inc letter)}
+ (Character/isUpperCase c) {:upper (inc upper), :letter (inc letter)}
+ (Character/isDigit c) {:digit (inc digit)}
+ :else {:special (inc special)}))))))
+
+(def ^:private ^:const complexity->char-type->min
+ "Minimum counts of each class of character a password should have for a given password complexity level."
+ {:weak {:total 6} ; total here effectively means the same thing as a minimum password length
+ :normal {:total 6
+ :digit 1}
+ :strong {:total 8
+ :lower 2
+ :upper 2
+ :digit 1
+ :special 1}})
+
+(defn- password-has-char-counts?
+ "Check that PASSWORD satisfies the minimum count requirements for each character class.
+
+ (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} \"abc\")
+ -> false
+ (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} \"passworD1!\")
+ -> true"
+ [char-type->min password]
+ {:pre [(map? char-type->min)
+ (string? password)]}
+ (let [occurances (count-occurrences password)]
+ (boolean (loop [[[char-type min-count] & more] (seq char-type->min)]
+ (if-not char-type true
+ (when (>= (occurances char-type) min-count)
+ (recur more)))))))
+
+(def ^{:arglists '([password])} is-complex?
+ "Check if a given password meets complexity standards for the application."
+ (partial password-has-char-counts? (merge (complexity->char-type->min (config/config-kw :mb-password-complexity))
+ ;; Setting MB_PASSWORD_LENGTH overrides the default :total for a given password complexity class
+ (when-let [min-len (config/config-int :mb-password-length)]
+ {:total min-len}))))
+
(defn verify-password
"Verify if a given unhashed password + salt matches the supplied hashed-password. Returns true if matched, false otherwise."
diff --git a/src/metabase/util/quotation.clj b/src/metabase/util/quotation.clj
new file mode 100644
index 0000000000000000000000000000000000000000..ac8c824770874ca09784fbbc68609bb7e1093ab8
--- /dev/null
+++ b/src/metabase/util/quotation.clj
@@ -0,0 +1,36 @@
+(ns metabase.util.quotation)
+
+
+(def ^:const quotations
+ [{:quote "The world is one big data problem."
+ :author "Andrew McAfee"}
+ {:quote "Data really powers everything that we do."
+ :author "Jeff Weiner"}
+ {:quote "I keep saying that the sexy job in the next 10 years will be statisticians, and I'm not kidding."
+ :author "Hal Varian"}
+ {:quote "Data is the new oil!"
+ :author "Clive Humby"}
+ {:quote "If we have data, let's look at data. If all we have are opinions, let's go with mine."
+ :author "Jim Barksdale"}
+ {:quote "Data that is loved tends to survive."
+ :author "Kurt Bollacker"}
+ {:quote "Torture the data, and it will confess to anything."
+ :author "Ronald Coase"}
+ {:quote "The price of light is less than the cost of darkness."
+ :author "Arthur C. Nielsen"}
+ {:quote "Information is the oil of the 21st century, and analytics is the combustion engine."
+ :author "Peter Sondergaard"}
+ {:quote "Facts do not cease to exist because they are ignored."
+ :author "Aldous Huxley"}
+ {:quote "It's easy to lie with statistics. It's hard to tell the truth without statistics."
+ :author "Andrejs Dunkels"}
+ {:quote "What gets measured gets managed"
+ :author "Peter Drucker"}
+ {:quote "Anything that is measured and watched improves."
+ :author "Bob Parsons"}])
+
+
+(defn random-quote
+ "Get a randomized quotation about working with data."
+ []
+ (rand-nth quotations))
diff --git a/test/metabase/api/card_test.clj b/test/metabase/api/card_test.clj
index 93ab8edbf0f68ebdd5f114f2c785f3f9760773d7..5f4bfd6293f684da31e64f8d01e0f5bc3df3e741 100644
--- a/test/metabase/api/card_test.clj
+++ b/test/metabase/api/card_test.clj
@@ -1,7 +1,6 @@
(ns metabase.api.card-test
"Tests for /api/card endpoints."
(:require [expectations :refer :all]
- [korma.core :refer :all]
[metabase.db :refer :all]
(metabase.models [card :refer [Card]]
[common :as common])
@@ -122,7 +121,7 @@
(expect-eval-actual-first nil
(let [{:keys [id]} (post-card (random-name))]
((user->client :rasta) :delete 204 (format "card/%d" id))
- (sel :one Card :id id)))
+ (Card id)))
;; # CARD FAVORITE STUFF
diff --git a/test/metabase/api/common/internal_test.clj b/test/metabase/api/common/internal_test.clj
index 841f2a3a14c461b7d780df82c7ac0acfe9e5607f..a3d65224c2e0ecb28f013dcb0572e64fe4b20f9b 100644
--- a/test/metabase/api/common/internal_test.clj
+++ b/test/metabase/api/common/internal_test.clj
@@ -1,6 +1,6 @@
(ns metabase.api.common.internal-test
(:require [expectations :refer :all]
- [medley.core :as medley]
+ [medley.core :as m]
(metabase.api.common [internal :refer :all])))
;;; TESTS FOR ROUTE-FN-NAME
@@ -32,8 +32,8 @@
;; expectations (internally, `clojure.data/diff`) doesn't think two regexes with the same exact pattern are equal.
;; so in order to make sure we're getting back the right output we'll just change them to strings, e.g. `#"[0-9]+" -> "#[0-9]+"`
(defmacro no-regex [& body]
- `(binding [*auto-parse-types* (medley/map-vals #(medley/update % :route-param-regex (partial str "#"))
- *auto-parse-types*) ]
+ `(binding [*auto-parse-types* (m/map-vals #(update % :route-param-regex (partial str "#"))
+ *auto-parse-types*) ]
~@body))
(expect nil
diff --git a/test/metabase/api/common/throttle_test.clj b/test/metabase/api/common/throttle_test.clj
new file mode 100644
index 0000000000000000000000000000000000000000..b23ef36ae2fc6dafc39933e38447f540585febcf
--- /dev/null
+++ b/test/metabase/api/common/throttle_test.clj
@@ -0,0 +1,116 @@
+(ns metabase.api.common.throttle-test
+ (:require [expectations :refer :all]
+ [metabase.api.common.throttle :as throttle]
+ [metabase.test.util :refer [resolve-private-fns]]))
+
+(def ^:private test-throttler (throttle/make-throttler :test, :initial-delay-ms 5, :attempts-threshold 3, :delay-exponent 2, :attempt-ttl-ms 25))
+
+;;; # tests for calculate-delay
+(resolve-private-fns metabase.api.common.throttle calculate-delay)
+
+;; no delay should be calculated for the 3rd attempt
+(expect nil
+ (do (reset! (:attempts test-throttler) '([:x 100], [:x 99]))
+ (calculate-delay test-throttler :x 101)))
+
+;; 4 ms delay on 4th attempt 1ms after the last
+(expect 4
+ (do (reset! (:attempts test-throttler) '([:x 100], [:x 99], [:x 98]))
+ (calculate-delay test-throttler :x 101)))
+
+;; 5 ms after last attempt, they should be allowed to try again
+(expect nil
+ (do (reset! (:attempts test-throttler) '([:x 100], [:x 99], [:x 98]))
+ (calculate-delay test-throttler :x 105)))
+
+;; However if this was instead the 5th attempt delay should grow exponentially (5 * 2^2 = 20), - 2ms = 18ms
+(expect 18
+ (do (reset! (:attempts test-throttler) '([:x 100], [:x 99], [:x 98], [:x 97]))
+ (calculate-delay test-throttler :x 102)))
+
+;; Should be allowed after 18 more secs
+(expect nil
+ (do (reset! (:attempts test-throttler) '([:x 100], [:x 99], [:x 98], [:x 97]))
+ (calculate-delay test-throttler :x 120)))
+
+;; Check that delay keeps growing according to delay-exponent (5 * 3^2 = 5 * 9 = 45)
+(expect 45
+ (do (reset! (:attempts test-throttler) '([:x 108], [:x 100], [:x 99], [:x 98], [:x 97]))
+ (calculate-delay test-throttler :x 108)))
+
+
+;;; # tests for check
+
+(defn- attempt
+ ([n]
+ (attempt n (gensym)))
+ ([n k]
+ (let [attempt-once (fn []
+ (try
+ (throttle/check test-throttler k)
+ :success
+ (catch Throwable e
+ (:test (:errors (ex-data e))))))]
+ (vec (repeatedly n attempt-once)))))
+
+;; a couple of quick "attempts" shouldn't trigger the throttler
+(expect [:success :success]
+ (attempt 2))
+
+;; nor should 3
+(expect [:success :success :success]
+ (attempt 3))
+
+;; 4 in quick succession should trigger it
+(expect [:success :success :success "Too many attempts! You must wait 0 seconds before trying again."] ; rounded down
+ (attempt 4))
+
+;; Check that throttling correctly lets you try again after certain delay
+(expect [[:success :success :success "Too many attempts! You must wait 0 seconds before trying again."]
+ [:success]]
+ [(attempt 4 :a)
+ (do
+ (Thread/sleep 6)
+ (attempt 1 :a))])
+
+;; Next attempt should be throttled, however
+(expect [:success "Too many attempts! You must wait 0 seconds before trying again."]
+ (do
+ (attempt 4 :b)
+ (Thread/sleep 6)
+ (attempt 2 :b)))
+
+;; Sleeping 5+ ms after that shouldn't work due to exponential growth
+(expect ["Too many attempts! You must wait 0 seconds before trying again."]
+ (do
+ (attempt 4 :c)
+ (Thread/sleep 6)
+ (attempt 2 :c)
+ (Thread/sleep 6)
+ (attempt 1 :c)))
+
+;; Sleeping 20+ ms however should work
+(expect [:success]
+ (do
+ (attempt 4 :d)
+ (Thread/sleep 6)
+ (attempt 2 :d)
+ (Thread/sleep 21)
+ (attempt 1 :d)))
+
+;; Check that the interal list for the throttler doesn't keep growing after throttling starts
+(expect [0 3]
+ [(do (reset! (:attempts test-throttler) '()) ; reset it to 0
+ (count @(:attempts test-throttler)))
+ (do (attempt 5)
+ (count @(:attempts test-throttler)))])
+
+;; Check that attempts clear after the TTL
+(expect [0 3 1]
+ [(do (reset! (:attempts test-throttler) '()) ; reset it to 0
+ (count @(:attempts test-throttler)))
+ (do (attempt 3)
+ (count @(:attempts test-throttler)))
+ (do (Thread/sleep 25)
+ (attempt 1)
+ (count @(:attempts test-throttler)))])
diff --git a/test/metabase/api/common_test.clj b/test/metabase/api/common_test.clj
index be6cb53e2120097a215bb1c9802b64f131dee546..2ebdc99484e28449dfc0c7da90e9db50a7ba091a 100644
--- a/test/metabase/api/common_test.clj
+++ b/test/metabase/api/common_test.clj
@@ -3,8 +3,7 @@
[metabase.api.common :refer :all]
[metabase.api.common.internal :refer :all]
[metabase.test.data :refer :all]
- [metabase.test.util :refer :all])
- (:import com.metabase.corvus.api.ApiException))
+ [metabase.test.util :refer :all]))
;;; TESTS FOR CHECK (ETC)
diff --git a/test/metabase/api/dash_test.clj b/test/metabase/api/dash_test.clj
index 0f68968cd0ade016940446a6c742dfc4b8907fb0..1df2460c3f153b1d17b0d627a4c9122152168a88 100644
--- a/test/metabase/api/dash_test.clj
+++ b/test/metabase/api/dash_test.clj
@@ -1,7 +1,6 @@
(ns metabase.api.dash-test
"Tests for /api/dash endpoints."
(:require [expectations :refer :all]
- [korma.core :refer :all]
[metabase.api.card-test :refer [post-card]]
[metabase.db :refer :all]
(metabase.models [hydrate :refer [hydrate]]
@@ -44,8 +43,8 @@
{:description nil
:can_read true
:ordered_cards []
- :creator (-> (sel :one User :id (user->id :rasta))
- (select-keys [:email :first_name :last_login :is_superuser :id :last_name :date_joined :common_name]))
+ :creator (-> (User (user->id :rasta))
+ (select-keys [:email :first_name :last_login :is_superuser :id :last_name :date_joined :common_name]))
:can_write true
:organization_id nil
:name $
@@ -99,7 +98,7 @@
(expect-let [{:keys [id]} (create-dash (random-name))]
nil
(do ((user->client :rasta) :delete 204 (format "dash/%d" id))
- (sel :one Dashboard :id id)))
+ (Dashboard id)))
;; # DASHBOARD CARD ENDPOINTS
@@ -115,7 +114,7 @@
{:sizeX 2
:card (match-$ card
{:description nil
- :creator (-> (sel :one User :id (user->id :rasta))
+ :creator (-> (User (user->id :rasta))
(select-keys [:date_joined :last_name :id :is_superuser :last_login :first_name :email :common_name]))
:organization_id nil
:name $
diff --git a/test/metabase/api/meta/dataset_test.clj b/test/metabase/api/meta/dataset_test.clj
index b21c18da7f62fb45d995f1ec9d1a6dd3eacf7693..2e8de2111218467ed29d8ac100ecd81b30c5063f 100644
--- a/test/metabase/api/meta/dataset_test.clj
+++ b/test/metabase/api/meta/dataset_test.clj
@@ -1,7 +1,7 @@
(ns metabase.api.meta.dataset-test
"Unit tests for /api/meta/dataset endpoints."
(:require [expectations :refer :all]
- [korma.core :refer :all]
+ [korma.core :as k]
[metabase.db :refer :all]
[metabase.models.query-execution :refer [QueryExecution]]
[metabase.test.data :refer :all]
@@ -11,10 +11,10 @@
;;; ## POST /api/meta/dataset
;; Just a basic sanity check to make sure Query Processor endpoint is still working correctly.
(expect-eval-actual-first
- (match-$ (sel :one :fields [QueryExecution :id :uuid] (order :id :desc))
+ (match-$ (sel :one :fields [QueryExecution :id :uuid] (k/order :id :desc))
{:data {:rows [[1000]]
:columns ["count"]
- :cols [{:base_type "IntegerField", :special_type "number", :name "count", :id nil, :table_id nil,
+ :cols [{:base_type "IntegerField", :special_type "number", :name "count", :display_name "count", :id nil, :table_id nil,
:description nil, :target nil, :extra_info {}}]}
:row_count 1
:status "completed"
@@ -30,7 +30,7 @@
;; Even if a query fails we still expect a 200 response from the api
(expect-eval-actual-first
- (match-$ (sel :one QueryExecution (order :id :desc))
+ (match-$ (sel :one QueryExecution (k/order :id :desc))
{:data {:rows []
:cols []
:columns []}
diff --git a/test/metabase/api/meta/db_test.clj b/test/metabase/api/meta/db_test.clj
index 88a4ef9f795311a787ccd867110c1f47ff192b95..1f39cdc6857697a3ab90923c7ecb15206b939d00 100644
--- a/test/metabase/api/meta/db_test.clj
+++ b/test/metabase/api/meta/db_test.clj
@@ -40,18 +40,31 @@
;; # DB LIFECYCLE ENDPOINTS
;; ## GET /api/meta/db/:id
+;; regular users *should not* see DB details
(expect
(match-$ (db)
- {:created_at $
- :engine "h2"
- :id $
- :details $
- :updated_at $
- :name "Test Database"
+ {:created_at $
+ :engine "h2"
+ :id $
+ :updated_at $
+ :name "Test Database"
:organization_id nil
- :description nil})
+ :description nil})
((user->client :rasta) :get 200 (format "meta/db/%d" (db-id))))
+;; superusers *should* see DB details
+(expect
+ (match-$ (db)
+ {:created_at $
+ :engine "h2"
+ :id $
+ :details $
+ :updated_at $
+ :name "Test Database"
+ :organization_id nil
+ :description nil})
+ ((user->client :crowberto) :get 200 (format "meta/db/%d" (db-id))))
+
;; ## POST /api/meta/db
;; Check that we can create a Database
(let [db-name (random-name)]
@@ -106,49 +119,38 @@
;; ## GET /api/meta/db
;; Test that we can get all the DBs for an Org, ordered by name
+;; Database details *should not* come back for Rasta since she's not a superuser
(let [db-name (str "A" (random-name))] ; make sure this name comes before "Test Database"
(expect-eval-actual-first
- (filter identity
- [(datasets/when-testing-dataset :generic-sql
- (match-$ (sel :one Database :name db-name)
- {:created_at $
- :engine "postgres"
- :id $
- :details {:host "localhost", :port 5432, :dbname "fakedb", :user "cam"}
- :updated_at $
- :name $
- :organization_id nil
- :description nil}))
- (datasets/when-testing-dataset :mongo
- (match-$ @mongo-test-data/mongo-test-db
- {:created_at $
- :engine "mongo"
- :id $
- :details $
- :updated_at $
- :name "Test Database"
- :organization_id nil
- :description nil}))
- (match-$ (db)
- {:created_at $
- :engine "h2"
- :id $
- :details $
- :updated_at $
- :name "Test Database"
- :organization_id nil
- :description nil})])
+ (set (filter identity
+ (conj (for [dataset-name datasets/all-valid-dataset-names]
+ (datasets/when-testing-dataset dataset-name
+ (match-$ (datasets/db (datasets/dataset-name->dataset dataset-name))
+ {:created_at $
+ :engine (name $engine)
+ :id $
+ :updated_at $
+ :name "Test Database"
+ :organization_id nil
+ :description nil})))
+ (match-$ (sel :one Database :name db-name)
+ {:created_at $
+ :engine "postgres"
+ :id $
+ :updated_at $
+ :name $
+ :organization_id nil
+ :description nil}))))
(do
;; Delete all the randomly created Databases we've made so far
(cascade-delete Database :id [not-in (set (filter identity
- [(datasets/when-testing-dataset :generic-sql
- (db-id))
- (datasets/when-testing-dataset :mongo
- @mongo-test-data/mongo-test-db-id)]))])
+ (for [dataset-name datasets/all-valid-dataset-names]
+ (datasets/when-testing-dataset dataset-name
+ (:id (datasets/db (datasets/dataset-name->dataset dataset-name)))))))])
;; Add an extra DB so we have something to fetch besides the Test DB
(create-db db-name)
;; Now hit the endpoint
- ((user->client :rasta) :get 200 "meta/db"))))
+ (set ((user->client :rasta) :get 200 "meta/db")))))
;; # DB TABLES ENDPOINTS
@@ -157,12 +159,12 @@
;; These should come back in alphabetical order
(expect
(let [db-id (db-id)]
- [(match-$ (sel :one Table :id (id :categories))
- {:description nil, :entity_type nil, :name "CATEGORIES", :rows 75, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $})
- (match-$ (sel :one Table :id (id :checkins))
- {:description nil, :entity_type nil, :name "CHECKINS", :rows 1000, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $})
- (match-$ (sel :one Table :id (id :users))
- {:description nil, :entity_type nil, :name "USERS", :rows 15, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $})
- (match-$ (sel :one Table :id (id :venues))
- {:description nil, :entity_type nil, :name "VENUES", :rows 100, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $})])
+ [(match-$ (Table (id :categories))
+ {:description nil, :entity_type nil, :visibility_type nil, :name "CATEGORIES", :rows 75, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Categories"})
+ (match-$ (Table (id :checkins))
+ {:description nil, :entity_type nil, :visibility_type nil, :name "CHECKINS", :rows 1000, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Checkins"})
+ (match-$ (Table (id :users))
+ {:description nil, :entity_type nil, :visibility_type nil, :name "USERS", :rows 15, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Users"})
+ (match-$ (Table (id :venues))
+ {:description nil, :entity_type nil, :visibility_type nil, :name "VENUES", :rows 100, :updated_at $, :entity_name nil, :active true, :id $, :db_id db-id, :created_at $, :display_name "Venues"})])
((user->client :rasta) :get 200 (format "meta/db/%d/tables" (db-id))))
diff --git a/test/metabase/api/meta/field_test.clj b/test/metabase/api/meta/field_test.clj
index 09134c7bf6f42bd03dbfe8e86e78e80e39d8c5bb..35b6717f75f0af8c2c657e0123e14e31ef8433ce 100644
--- a/test/metabase/api/meta/field_test.clj
+++ b/test/metabase/api/meta/field_test.clj
@@ -12,22 +12,23 @@
;; ## GET /api/meta/field/:id
(expect
- (match-$ (sel :one Field :id (id :users :name))
+ (match-$ (Field (id :users :name))
{:description nil
:table_id (id :users)
- :table (match-$ (sel :one Table :id (id :users))
+ :table (match-$ (Table (id :users))
{:description nil
:entity_type nil
+ :visibility_type nil
:db (match-$ (db)
{:created_at $
:engine "h2"
:id $
- :details $
:updated_at $
:name "Test Database"
:organization_id nil
:description nil})
:name "USERS"
+ :display_name "Users"
:rows 15
:updated_at $
:entity_name nil
@@ -37,14 +38,17 @@
:created_at $})
:special_type "category" ; metabase.driver.generic-sql.sync/check-for-low-cardinality should have marked this as such because it had no other special_type
:name "NAME"
+ :display_name "Name"
:updated_at $
:active true
:id (id :users :name)
:field_type "info"
:position 0
:preview_display true
- :created_at $
- :base_type "TextField"})
+ :created_at $
+ :base_type "TextField"
+ :parent_id nil
+ :parent nil})
((user->client :rasta) :get 200 (format "meta/field/%d" (id :users :name))))
@@ -58,23 +62,26 @@
;; Check that we can update a Field
;; TODO - this should NOT be modifying a field from our test data, we should create new data to mess with
(expect-eval-actual-first
- (match-$ (let [field (sel :one Field :id (id :venues :latitude))]
+ (match-$ (let [field (Field (id :venues :latitude))]
;; this is sketchy. But return the Field back to its unmodified state so it won't affect other unit tests
(upd Field (id :venues :latitude) :special_type "latitude")
;; match against the modified Field
field)
- {:description nil
- :table_id (id :venues)
- :special_type "fk"
- :name "LATITUDE"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :preview_display true
- :created_at $
- :base_type "FloatField"})
+ {:description nil
+ :table_id (id :venues)
+ :special_type "fk"
+ :name "LATITUDE"
+ :display_name "Latitude"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :preview_display true
+ :created_at $
+ :base_type "FloatField"
+ :parent_id nil
+ :parent nil})
((user->client :crowberto) :put 200 (format "meta/field/%d" (id :venues :latitude)) {:special_type :fk}))
(defn- field->field-values
@@ -86,18 +93,18 @@
;; Should return something useful for a field that has special_type :category
(expect-eval-actual-first
(match-$ (field->field-values :venues :price)
- {:field_id (id :venues :price)
+ {:field_id (id :venues :price)
:human_readable_values {}
- :values [1 2 3 4]
- :updated_at $
- :created_at $
- :id $})
- (do (upd FieldValues (:id (field->field-values :venues :price)) :human_readable_values nil) ; clear out existing human_readable_values in case they're set
+ :values [1 2 3 4]
+ :updated_at $
+ :created_at $
+ :id $})
+ (do (upd FieldValues (:id (field->field-values :venues :price)) :human_readable_values nil) ; clear out existing human_readable_values in case they're set
((user->client :rasta) :get 200 (format "meta/field/%d/values" (id :venues :price)))))
;; Should return nothing for a field whose special_type is *not* :category
(expect
- {:values {}
+ {:values {}
:human_readable_values {}}
((user->client :rasta) :get 200 (format "meta/field/%d/values" (id :venues :id))))
@@ -108,32 +115,32 @@
(expect-eval-actual-first
[{:status "success"}
(match-$ (sel :one FieldValues :field_id (id :venues :price))
- {:field_id (id :venues :price)
+ {:field_id (id :venues :price)
:human_readable_values {:1 "$"
:2 "$$"
:3 "$$$"
:4 "$$$$"}
- :values [1 2 3 4]
- :updated_at $
- :created_at $
- :id $})]
+ :values [1 2 3 4]
+ :updated_at $
+ :created_at $
+ :id $})]
[((user->client :crowberto) :post 200 (format "meta/field/%d/value_map_update" (id :venues :price)) {:values_map {:1 "$"
- :2 "$$"
- :3 "$$$"
- :4 "$$$$"}})
+ :2 "$$"
+ :3 "$$$"
+ :4 "$$$$"}})
((user->client :rasta) :get 200 (format "meta/field/%d/values" (id :venues :price)))])
;; Check that we can unset values
(expect-eval-actual-first
[{:status "success"}
(match-$ (sel :one FieldValues :field_id (id :venues :price))
- {:field_id (id :venues :price)
+ {:field_id (id :venues :price)
:human_readable_values {}
- :values [1 2 3 4]
- :updated_at $
- :created_at $
- :id $})]
- [(do (upd FieldValues (:id (field->field-values :venues :price)) :human_readable_values {:1 "$" ; make sure they're set
+ :values [1 2 3 4]
+ :updated_at $
+ :created_at $
+ :id $})]
+ [(do (upd FieldValues (:id (field->field-values :venues :price)) :human_readable_values {:1 "$" ; make sure they're set
:2 "$$"
:3 "$$$"
:4 "$$$$"})
diff --git a/test/metabase/api/meta/table_test.clj b/test/metabase/api/meta/table_test.clj
index 4f8d3d232ccbe5ed0f418f20a604e2bb2929a76a..d2659b0e1f0718095612228bf82f3815c3531a8d 100644
--- a/test/metabase/api/meta/table_test.clj
+++ b/test/metabase/api/meta/table_test.clj
@@ -10,7 +10,7 @@
[table :refer [Table]])
[metabase.test.data :refer :all]
(metabase.test.data [data :as data]
- [datasets :as datasets, :refer [*dataset* with-dataset-when-testing]]
+ [datasets :as datasets]
[users :refer :all])
[metabase.test.util :refer [match-$ expect-eval-actual-first]]))
@@ -25,123 +25,155 @@
;; ## GET /api/meta/table?org
;; These should come back in alphabetical order and include relevant metadata
-(expect (set (mapcat (fn [dataset-name]
- (with-dataset-when-testing dataset-name
- (let [db-id (:id (datasets/db *dataset*))]
- [{:name (datasets/format-name *dataset* "categories"), :db_id db-id, :active true, :rows 75, :id (datasets/table-name->id *dataset* :categories)}
- {:name (datasets/format-name *dataset* "checkins"), :db_id db-id, :active true, :rows 1000, :id (datasets/table-name->id *dataset* :checkins)}
- {:name (datasets/format-name *dataset* "users"), :db_id db-id, :active true, :rows 15, :id (datasets/table-name->id *dataset* :users)}
- {:name (datasets/format-name *dataset* "venues"), :db_id db-id, :active true, :rows 100, :id (datasets/table-name->id *dataset* :venues)}])))
- @datasets/test-dataset-names))
+(expect (set (reduce concat (for [dataset-name datasets/test-dataset-names]
+ (datasets/with-dataset-when-testing dataset-name
+ [{:name (format-name "categories")
+ :display_name "Categories"
+ :db_id (db-id)
+ :active true
+ :rows 75
+ :id (id :categories)}
+ {:name (format-name "checkins")
+ :display_name "Checkins"
+ :db_id (db-id)
+ :active true
+ :rows 1000
+ :id (id :checkins)}
+ {:name (format-name "users")
+ :display_name "Users"
+ :db_id (db-id)
+ :active true
+ :rows 15
+ :id (id :users)}
+ {:name (format-name "venues")
+ :display_name "Venues"
+ :db_id (db-id)
+ :active true
+ :rows 100
+ :id (id :venues)}]))))
(->> ((user->client :rasta) :get 200 "meta/table")
- (map #(dissoc % :db :created_at :updated_at :entity_name :description :entity_type))
+ (map #(dissoc % :db :created_at :updated_at :entity_name :description :entity_type :visibility_type))
set))
;; ## GET /api/meta/table/:id
(expect
- (match-$ (sel :one Table :id (id :venues))
+ (match-$ (Table (id :venues))
{:description nil
:entity_type nil
- :db (match-$ (db)
- {:created_at $
- :engine "h2"
- :id $
- :details $
- :updated_at $
- :name "Test Database"
- :organization_id nil
- :description nil})
- :name "VENUES"
- :rows 100
- :updated_at $
+ :visibility_type nil
+ :db (match-$ (db)
+ {:created_at $
+ :engine "h2"
+ :id $
+ :updated_at $
+ :name "Test Database"
+ :organization_id nil
+ :description nil})
+ :name "VENUES"
+ :display_name "Venues"
+ :rows 100
+ :updated_at $
:entity_name nil
- :active true
- :pk_field (deref $pk_field)
- :id (id :venues)
- :db_id (db-id)
- :created_at $})
+ :active true
+ :pk_field (deref $pk_field)
+ :id (id :venues)
+ :db_id (db-id)
+ :created_at $})
((user->client :rasta) :get 200 (format "meta/table/%d" (id :venues))))
;; ## GET /api/meta/table/:id/fields
-(expect [(match-$ (sel :one Field :id (id :categories :id))
- {:description nil
- :table_id (id :categories)
- :special_type "id"
- :name "ID"
- :updated_at $
- :active true
- :id (id :categories :id)
- :field_type "info"
- :position 0
- :preview_display true
- :created_at $
- :base_type "BigIntegerField"})
- (match-$ (sel :one Field :id (id :categories :name))
- {:description nil
- :table_id (id :categories)
- :special_type "name"
- :name "NAME"
- :updated_at $
- :active true
- :id (id :categories :name)
- :field_type "info"
- :position 0
- :preview_display true
- :created_at $
- :base_type "TextField"})]
+(expect [(match-$ (Field (id :categories :id))
+ {:description nil
+ :table_id (id :categories)
+ :special_type "id"
+ :name "ID"
+ :display_name "Id"
+ :updated_at $
+ :active true
+ :id (id :categories :id)
+ :field_type "info"
+ :position 0
+ :preview_display true
+ :created_at $
+ :base_type "BigIntegerField"
+ :parent_id nil
+ :parent nil})
+ (match-$ (Field (id :categories :name))
+ {:description nil
+ :table_id (id :categories)
+ :special_type "name"
+ :name "NAME"
+ :display_name "Name"
+ :updated_at $
+ :active true
+ :id (id :categories :name)
+ :field_type "info"
+ :position 0
+ :preview_display true
+ :created_at $
+ :base_type "TextField"
+ :parent_id nil
+ :parent nil})]
((user->client :rasta) :get 200 (format "meta/table/%d/fields" (id :categories))))
;; ## GET /api/meta/table/:id/query_metadata
(expect
- (match-$ (sel :one Table :id (id :categories))
- {:description nil
- :entity_type nil
- :db (match-$ (db)
- {:created_at $
- :engine "h2"
- :id $
- :details $
- :updated_at $
- :name "Test Database"
- :organization_id nil
- :description nil})
- :name "CATEGORIES"
- :fields [(match-$ (sel :one Field :id (id :categories :id))
- {:description nil
- :table_id (id :categories)
- :special_type "id"
- :name "ID"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "BigIntegerField"})
- (match-$ (sel :one Field :id (id :categories :name))
- {:description nil
- :table_id (id :categories)
- :special_type "name"
- :name "NAME"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "TextField"})]
+ (match-$ (Table (id :categories))
+ {:description nil
+ :entity_type nil
+ :visibility_type nil
+ :db (match-$ (db)
+ {:created_at $
+ :engine "h2"
+ :id $
+ :updated_at $
+ :name "Test Database"
+ :organization_id nil
+ :description nil})
+ :name "CATEGORIES"
+ :display_name "Categories"
+ :fields [(match-$ (Field (id :categories :id))
+ {:description nil
+ :table_id (id :categories)
+ :special_type "id"
+ :name "ID"
+ :display_name "Id"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "BigIntegerField"
+ :parent_id nil
+ :parent nil})
+ (match-$ (Field (id :categories :name))
+ {:description nil
+ :table_id (id :categories)
+ :special_type "name"
+ :name "NAME"
+ :display_name "Name"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "TextField"
+ :parent_id nil
+ :parent nil})]
:field_values {}
- :rows 75
- :updated_at $
- :entity_name nil
- :active true
- :id (id :categories)
- :db_id (db-id)
- :created_at $})
+ :rows 75
+ :updated_at $
+ :entity_name nil
+ :active true
+ :id (id :categories)
+ :db_id (db-id)
+ :created_at $})
((user->client :rasta) :get 200 (format "meta/table/%d/query_metadata" (id :categories))))
@@ -167,80 +199,93 @@
;;; Make sure that getting the User table *does* include info about the password field, but not actual values themselves
(expect
(match-$ (sel :one Table :id (id :users))
- {:description nil
- :entity_type nil
- :db (match-$ (db)
- {:created_at $
- :engine "h2"
- :id $
- :details $
- :updated_at $
- :name "Test Database"
- :organization_id nil
- :description nil})
- :name "USERS"
- :fields [(match-$ (sel :one Field :id (id :users :id))
- {:description nil
- :table_id (id :users)
- :special_type "id"
- :name "ID"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "BigIntegerField"})
- (match-$ (sel :one Field :id (id :users :last_login))
- {:description nil
- :table_id (id :users)
- :special_type "category"
- :name "LAST_LOGIN"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "DateTimeField"})
- (match-$ (sel :one Field :id (id :users :name))
- {:description nil
- :table_id (id :users)
- :special_type "category"
- :name "NAME"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "TextField"})
- (match-$ (sel :one Field :table_id (id :users) :name "PASSWORD")
- {:description nil
- :table_id (id :users)
- :special_type "category"
- :name "PASSWORD"
- :updated_at $
- :active true
- :id $
- :field_type "sensitive"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "TextField"})]
- :rows 15
- :updated_at $
- :entity_name nil
- :active true
- :id (id :users)
- :db_id (db-id)
+ {:description nil
+ :entity_type nil
+ :visibility_type nil
+ :db (match-$ (db)
+ {:created_at $
+ :engine "h2"
+ :id $
+ :updated_at $
+ :name "Test Database"
+ :organization_id nil
+ :description nil})
+ :name "USERS"
+ :display_name "Users"
+ :fields [(match-$ (sel :one Field :id (id :users :id))
+ {:description nil
+ :table_id (id :users)
+ :special_type "id"
+ :name "ID"
+ :display_name "Id"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "BigIntegerField"
+ :parent_id nil
+ :parent nil})
+ (match-$ (sel :one Field :id (id :users :last_login))
+ {:description nil
+ :table_id (id :users)
+ :special_type "category"
+ :name "LAST_LOGIN"
+ :display_name "Last Login"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "DateTimeField"
+ :parent_id nil
+ :parent nil})
+ (match-$ (sel :one Field :id (id :users :name))
+ {:description nil
+ :table_id (id :users)
+ :special_type "category"
+ :name "NAME"
+ :display_name "Name"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "TextField"
+ :parent_id nil
+ :parent nil})
+ (match-$ (sel :one Field :table_id (id :users) :name "PASSWORD")
+ {:description nil
+ :table_id (id :users)
+ :special_type "category"
+ :name "PASSWORD"
+ :display_name "Password"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "sensitive"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "TextField"
+ :parent_id nil
+ :parent nil})]
+ :rows 15
+ :updated_at $
+ :entity_name nil
+ :active true
+ :id (id :users)
+ :db_id (db-id)
:field_values {(keyword (str (id :users :last_login)))
user-last-login-date-strs
@@ -260,73 +305,83 @@
"Simcha Yan"
"Spiros Teofil"
"Szymon Theutrich"]}
- :created_at $})
+ :created_at $})
((user->client :rasta) :get 200 (format "meta/table/%d/query_metadata?include_sensitive_fields=true" (id :users))))
;;; GET api/meta/table/:id/query_metadata
;;; Make sure that getting the User table does *not* include password info
(expect
- (match-$ (sel :one Table :id (id :users))
- {:description nil
- :entity_type nil
- :db (match-$ (db)
- {:created_at $
- :engine "h2"
- :id $
- :details $
- :updated_at $
- :name "Test Database"
- :organization_id nil
- :description nil})
- :name "USERS"
- :fields [(match-$ (sel :one Field :id (id :users :id))
- {:description nil
- :table_id (id :users)
- :special_type "id"
- :name "ID"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "BigIntegerField"})
- (match-$ (sel :one Field :id (id :users :last_login))
- {:description nil
- :table_id (id :users)
- :special_type "category"
- :name "LAST_LOGIN"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "DateTimeField"})
- (match-$ (sel :one Field :id (id :users :name))
- {:description nil
- :table_id (id :users)
- :special_type "category"
- :name "NAME"
- :updated_at $
- :active true
- :id $
- :field_type "info"
- :position 0
- :target nil
- :preview_display true
- :created_at $
- :base_type "TextField"})]
- :rows 15
- :updated_at $
- :entity_name nil
- :active true
- :id (id :users)
- :db_id (db-id)
+ (match-$ (Table (id :users))
+ {:description nil
+ :entity_type nil
+ :visibility_type nil
+ :db (match-$ (db)
+ {:created_at $
+ :engine "h2"
+ :id $
+ :updated_at $
+ :name "Test Database"
+ :organization_id nil
+ :description nil})
+ :name "USERS"
+ :display_name "Users"
+ :fields [(match-$ (Field (id :users :id))
+ {:description nil
+ :table_id (id :users)
+ :special_type "id"
+ :name "ID"
+ :display_name "Id"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "BigIntegerField"
+ :parent_id nil
+ :parent nil})
+ (match-$ (Field (id :users :last_login))
+ {:description nil
+ :table_id (id :users)
+ :special_type "category"
+ :name "LAST_LOGIN"
+ :display_name "Last Login"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "DateTimeField"
+ :parent_id nil
+ :parent nil})
+ (match-$ (Field (id :users :name))
+ {:description nil
+ :table_id (id :users)
+ :special_type "category"
+ :name "NAME"
+ :display_name "Name"
+ :updated_at $
+ :active true
+ :id $
+ :field_type "info"
+ :position 0
+ :target nil
+ :preview_display true
+ :created_at $
+ :base_type "TextField"
+ :parent_id nil
+ :parent nil})]
+ :rows 15
+ :updated_at $
+ :entity_name nil
+ :active true
+ :id (id :users)
+ :db_id (db-id)
:field_values {(keyword (str (id :users :last_login)))
user-last-login-date-strs
@@ -346,39 +401,42 @@
"Simcha Yan"
"Spiros Teofil"
"Szymon Theutrich"]}
- :created_at $})
+ :created_at $})
((user->client :rasta) :get 200 (format "meta/table/%d/query_metadata" (id :users))))
;; ## PUT /api/meta/table/:id
(expect-eval-actual-first
- (match-$ (let [table (sel :one Table :id (id :users))]
+ (match-$ (let [table (Table (id :users))]
;; reset Table back to its original state
- (upd Table (id :users) :entity_name nil :entity_type nil :description nil)
+ (upd Table (id :users) :display_name "Users" :entity_type nil :visibility_type nil :description nil)
table)
{:description "What a nice table!"
:entity_type "person"
- :db (match-$ (db)
- {:description nil
- :organization_id $
- :name "Test Database"
- :updated_at $
- :details $
- :id $
- :engine "h2"
- :created_at $})
- :name "USERS"
- :rows 15
- :updated_at $
- :entity_name "Userz"
- :active true
- :pk_field (deref $pk_field)
- :id $
- :db_id (db-id)
- :created_at $})
- (do ((user->client :crowberto) :put 200 (format "meta/table/%d" (id :users)) {:entity_name "Userz"
- :entity_type "person"
- :description "What a nice table!"})
+ :visibility_type "hidden"
+ :db (match-$ (db)
+ {:description nil
+ :organization_id $
+ :name "Test Database"
+ :updated_at $
+ :details $
+ :id $
+ :engine "h2"
+ :created_at $})
+ :name "USERS"
+ :rows 15
+ :updated_at $
+ :entity_name nil
+ :display_name "Userz"
+ :active true
+ :pk_field (deref $pk_field)
+ :id $
+ :db_id (db-id)
+ :created_at $})
+ (do ((user->client :crowberto) :put 200 (format "meta/table/%d" (id :users)) {:display_name "Userz"
+ :entity_type "person"
+ :visibility_type "hidden"
+ :description "What a nice table!"})
((user->client :crowberto) :get 200 (format "meta/table/%d" (id :users)))))
@@ -387,79 +445,88 @@
(expect-let [checkins-user-field (sel :one Field :table_id (id :checkins) :name "USER_ID")
users-id-field (sel :one Field :table_id (id :users) :name "ID")]
[(match-$ (sel :one ForeignKey :destination_id (:id users-id-field))
- {:id $
- :origin_id (:id checkins-user-field)
+ {:id $
+ :origin_id (:id checkins-user-field)
:destination_id (:id users-id-field)
- :relationship "Mt1"
- :created_at $
- :updated_at $
- :origin (match-$ checkins-user-field
- {:id $
- :table_id $
- :name "USER_ID"
- :description nil
- :base_type "IntegerField"
- :preview_display $
- :position $
- :field_type "info"
- :active true
- :special_type "fk"
- :created_at $
- :updated_at $
- :table (match-$ (sel :one Table :id (id :checkins))
- {:description nil
- :entity_type nil
- :name "CHECKINS"
- :rows 1000
- :updated_at $
- :entity_name nil
- :active true
- :id $
- :db_id $
- :created_at $
- :db (match-$ (db)
- {:description nil,
- :organization_id nil,
- :name "Test Database",
- :updated_at $,
- :id $,
- :engine "h2",
- :created_at $
- :details $})})})
- :destination (match-$ users-id-field
- {:id $
- :table_id $
- :name "ID"
- :description nil
- :base_type "BigIntegerField"
- :preview_display $
- :position $
- :field_type "info"
- :active true
- :special_type "id"
- :created_at $
- :updated_at $
- :table (match-$ (sel :one Table :id (id :users))
- {:description nil
- :entity_type nil
- :name "USERS"
- :rows 15
- :updated_at $
- :entity_name nil
- :active true
- :id $
- :db_id $
- :created_at $})})})]
+ :relationship "Mt1"
+ :created_at $
+ :updated_at $
+ :origin (match-$ checkins-user-field
+ {:id $
+ :table_id $
+ :parent_id nil
+ :parent nil
+ :name "USER_ID"
+ :display_name "User Id"
+ :description nil
+ :base_type "IntegerField"
+ :preview_display $
+ :position $
+ :field_type "info"
+ :active true
+ :special_type "fk"
+ :created_at $
+ :updated_at $
+ :table (match-$ (Table (id :checkins))
+ {:description nil
+ :entity_type nil
+ :visibility_type nil
+ :name "CHECKINS"
+ :display_name "Checkins"
+ :rows 1000
+ :updated_at $
+ :entity_name nil
+ :active true
+ :id $
+ :db_id $
+ :created_at $
+ :db (match-$ (db)
+ {:description nil,
+ :organization_id nil,
+ :name "Test Database",
+ :updated_at $,
+ :id $,
+ :engine "h2",
+ :created_at $})})})
+ :destination (match-$ users-id-field
+ {:id $
+ :table_id $
+ :parent_id nil
+ :parent nil
+ :name "ID"
+ :display_name "Id"
+ :description nil
+ :base_type "BigIntegerField"
+ :preview_display $
+ :position $
+ :field_type "info"
+ :active true
+ :special_type "id"
+ :created_at $
+ :updated_at $
+ :table (match-$ (Table (id :users))
+ {:description nil
+ :entity_type nil
+ :visibility_type nil
+ :name "USERS"
+ :display_name "Users"
+ :rows 15
+ :updated_at $
+ :entity_name nil
+ :active true
+ :id $
+ :db_id $
+ :created_at $})})})]
((user->client :rasta) :get 200 (format "meta/table/%d/fks" (id :users))))
;; ## POST /api/meta/table/:id/reorder
(expect-eval-actual-first
- {:result "success"}
- (let [categories-id-field (sel :one Field :table_id (id :categories) :name "ID")
+ {:result "success"}
+ (let [categories-id-field (sel :one Field :table_id (id :categories) :name "ID")
categories-name-field (sel :one Field :table_id (id :categories) :name "NAME")
- api-response ((user->client :crowberto) :post 200 (format "meta/table/%d/reorder" (id :categories))
- {:new_order [(:id categories-name-field) (:id categories-id-field)]})]
+ api-response ((user->client :crowberto) :post 200 (format "meta/table/%d/reorder" (id :categories))
+ {:new_order [(:id categories-name-field) (:id categories-id-field)]})]
;; check the modified values (have to do it here because the api response tells us nothing)
(assert (= 0 (:position (sel :one :fields [Field :position] :id (:id categories-name-field)))))
(assert (= 1 (:position (sel :one :fields [Field :position] :id (:id categories-id-field)))))
diff --git a/test/metabase/api/revision_test.clj b/test/metabase/api/revision_test.clj
new file mode 100644
index 0000000000000000000000000000000000000000..cf92bcb9181e7d8b22cedbf764ad610839c61cd5
--- /dev/null
+++ b/test/metabase/api/revision_test.clj
@@ -0,0 +1,87 @@
+(ns metabase.api.revision-test
+ (:require [expectations :refer :all]
+ [korma.core :as k]
+ [medley.core :as m]
+ [metabase.api.revision :refer :all]
+ [metabase.db :as db]
+ (metabase.models [dashboard :refer [Dashboard]]
+ [dashboard-card :refer [DashboardCard]]
+ [revision-test :refer [with-fake-card]])
+ [metabase.test.data.users :refer :all]))
+
+(defn- fake-dashboard [& {:as kwargs}]
+ (m/mapply db/ins Dashboard (merge {:name (str (java.util.UUID/randomUUID))
+ :public_perms 0
+ :creator_id (user->id :rasta)}
+ kwargs)))
+
+(defmacro with-fake-dashboard [[binding & {:as kwargs}] & body]
+ `(let [dash# (fake-dashboard ~@kwargs)
+ ~binding dash#]
+ (try ~@body
+ (finally
+ (db/cascade-delete Dashboard :id (:id dash#))))))
+
+(def ^:private rasta-revision-info
+ (delay {:id (user->id :rasta) :common_name "Rasta Toucan", :first_name "Rasta", :last_name "Toucan"}))
+
+;;; # TESTS FOR GET /api/revision
+(expect [{:description "First revision.", :user {}}]
+ (with-fake-card [{card-id :id}]
+ ((user->client :rasta) :get 200 "revision", :entity :card, :id card-id)))
+
+(defn- get-dashboard-revisions [dashboard-id]
+ (->> ((user->client :rasta) :get 200 "revision", :entity :dashboard, :id dashboard-id)
+ (mapv #(dissoc % :timestamp :id))))
+
+(defn- post-dashcard [dash-id card-id]
+ ((user->client :rasta) :post 200 (format "dash/%d/cards" dash-id), {:cardId card-id}))
+
+(defn- delete-dashcard [dash-id card-id]
+ ((user->client :rasta) :delete 204 (format "dash/%d/cards" dash-id), :dashcardId (db/sel :one :id DashboardCard :dashboard_id dash-id, :card_id card-id)))
+
+(expect [{:is_reversion false, :user @rasta-revision-info, :description "First revision."}]
+ (with-fake-dashboard [{dash-id :id}]
+ (with-fake-card [{card-id :id}]
+ (post-dashcard dash-id card-id)
+ (get-dashboard-revisions dash-id))))
+
+(expect [{:is_reversion false, :user @rasta-revision-info, :description "Rasta Toucan added a card."}
+ {:is_reversion false, :user @rasta-revision-info, :description "First revision."}]
+ (with-fake-dashboard [{dash-id :id}]
+ (with-fake-card [{card-idâ‚ :id}]
+ (with-fake-card [{card-idâ‚‚ :id}]
+ (post-dashcard dash-id card-idâ‚)
+ (post-dashcard dash-id card-idâ‚‚)
+ (get-dashboard-revisions dash-id)))))
+
+(expect [{:is_reversion false, :user @rasta-revision-info, :description "Rasta Toucan removed a card."}
+ {:is_reversion false, :user @rasta-revision-info, :description "Rasta Toucan added a card."}
+ {:is_reversion false, :user @rasta-revision-info, :description "First revision."}]
+ (with-fake-dashboard [{dash-id :id}]
+ (with-fake-card [{card-idâ‚ :id}]
+ (with-fake-card [{card-idâ‚‚ :id}]
+ (post-dashcard dash-id card-idâ‚)
+ (post-dashcard dash-id card-idâ‚‚)
+ (delete-dashcard dash-id card-idâ‚‚)
+ (get-dashboard-revisions dash-id)))))
+
+;;; # TESTS FOR POST /api/revision/revert
+(expect [2
+ [{:is_reversion true, :user @rasta-revision-info, :description "Rasta Toucan reverted to an earlier revision and added a card."}
+ {:is_reversion false, :user @rasta-revision-info, :description "Rasta Toucan removed a card."}
+ {:is_reversion false, :user @rasta-revision-info, :description "Rasta Toucan added a card."}
+ {:is_reversion false, :user @rasta-revision-info, :description "First revision."}]]
+ (with-fake-dashboard [{dash-id :id}]
+ (with-fake-card [{card-idâ‚ :id}]
+ (with-fake-card [{card-idâ‚‚ :id}]
+ (post-dashcard dash-id card-idâ‚)
+ (post-dashcard dash-id card-idâ‚‚)
+ (delete-dashcard dash-id card-idâ‚‚)
+ (let [[_ {previous-revision-id :id}] (metabase.models.revision/revisions Dashboard dash-id)]
+ ;; Revert to the previous revision
+ ((user->client :rasta) :post 200 "revision/revert", {:entity :dashboard, :id dash-id, :revision_id previous-revision-id})
+ [ ;; [1] There should be 2 cards again
+ (count @(:ordered_cards (Dashboard dash-id)))
+ ;; [2] A new revision recording the reversion should have been pushed
+ (get-dashboard-revisions dash-id)])))))
diff --git a/test/metabase/api/session_test.clj b/test/metabase/api/session_test.clj
index f3633a0d1cf0c70b06be5ebb46183803b9f0d83d..2bfb3796fae768a8eff3cdfd366c44c3f2dea8cb 100644
--- a/test/metabase/api/session_test.clj
+++ b/test/metabase/api/session_test.clj
@@ -1,7 +1,7 @@
(ns metabase.api.session-test
"Tests for /api/session"
- (:require [expectations :refer :all]
- [korma.core :refer :all]
+ (:require [cemerick.friend.credentials :as creds]
+ [expectations :refer :all]
[metabase.db :refer :all]
[metabase.http-client :refer :all]
(metabase.models [session :refer [Session]]
@@ -25,7 +25,8 @@
(client :post 400 "session" {:email "anything@metabase.com"}))
;; Test for inactive user (user shouldn't be able to login if :is_active = false)
-(expect {:errors {:email "no account found for the given email"}}
+;; Return same error as incorrect password to avoid leaking existence of user
+(expect {:errors {:password "did not match stored password"}}
(client :post 400 "session" (user->credentials :trashbird)))
;; Test for password checking
@@ -33,6 +34,19 @@
(client :post 400 "session" (-> (user->credentials :rasta)
(assoc :password "something else"))))
+;; Test that people get blocked from attempting to login if they try too many times
+;; (Check that throttling works at the API level -- more tests in metabase.api.common.throttle-test)
+(expect
+ [{:errors {:email "Too many attempts! You must wait 15 seconds before trying again."}}
+ {:errors {:email "Too many attempts! You must wait 15 seconds before trying again."}}]
+ (let [login #(client :post 400 "session" {:email "fakeaccount3000@metabase.com", :password "toucans"})]
+ ;; attempt to log in 10 times
+ (dorun (repeatedly 10 login))
+ ;; throttling should now be triggered
+ [(login)
+ ;; Trying to login immediately again should still return throttling error
+ (login)]))
+
;; ## DELETE /api/session
;; Test that we can logout
@@ -40,7 +54,7 @@
(let [{session_id :id} ((user->client :rasta) :post 200 "session" (user->credentials :rasta))]
(assert session_id)
((user->client :rasta) :delete 204 "session" :session_id session_id)
- (sel :one Session :id session_id)))
+ (Session session_id)))
;; ## POST /api/session/forgot_password
@@ -62,9 +76,9 @@
(expect {:errors {:email "field is a required param."}}
(client :post 400 "session/forgot_password" {}))
-;; Test that email not found gives 404
-(expect {:errors {:email "no account found for the given email"}}
- (client :post 400 "session/forgot_password" {:email "not-found@metabase.com"}))
+;; Test that email not found also gives 200 as to not leak existence of user
+(expect nil
+ (client :post 200 "session/forgot_password" {:email "not-found@metabase.com"}))
;; POST /api/session/reset_password
@@ -72,15 +86,16 @@
(expect
{:reset_token nil
:reset_triggered nil}
- (let [user-last-name (random-name)
- token (.toString (java.util.UUID/randomUUID))
- password {:old "password"
- :new "whateverUP12!!"}
- {:keys [email id] :as user} (create-user :password (:old password) :last_name user-last-name :reset_token token :reset_triggered (System/currentTimeMillis))
- creds {:old {:password (:old password)
- :email email}
- :new {:password (:new password)
- :email email}}]
+ (let [user-last-name (random-name)
+ password {:old "password"
+ :new "whateverUP12!!"}
+ {:keys [email id]} (create-user :password (:old password), :last_name user-last-name, :reset_triggered (System/currentTimeMillis))
+ token (str id "_" (java.util.UUID/randomUUID))
+ _ (upd User id :reset_token token)
+ creds {:old {:password (:old password)
+ :email email}
+ :new {:password (:new password)
+ :email email}}]
;; Check that creds work
(metabase.http-client/client :post 200 "session" (:old creds))
;; Change the PW
@@ -94,6 +109,20 @@
;; Double check that reset token was cleared
(sel :one :fields [User :reset_token :reset_triggered] :id id)))
+;; Check that password reset returns a valid session token
+(let [user-last-name (random-name)]
+ (expect-eval-actual-first
+ (let [{:keys [id]} (sel :one :fields [User :id] :last_name user-last-name)
+ session (sel :one :fields [Session :id] :user_id id)]
+ {:success true
+ :session_id (:id session)})
+ (let [{:keys [email id]} (create-user :password "password", :last_name user-last-name, :reset_triggered (System/currentTimeMillis))
+ token (str id "_" (java.util.UUID/randomUUID))
+ _ (upd User id :reset_token token)]
+ ;; run the password reset
+ (metabase.http-client/client :post 200 "session/reset_password" {:token token
+ :password "whateverUP12!!"}))))
+
;; Test that token and password are required
(expect {:errors {:token "field is a required param."}}
(client :post 400 "session/reset_password" {}))
@@ -101,15 +130,20 @@
(expect {:errors {:password "field is a required param."}}
(client :post 400 "session/reset_password" {:token "anything"}))
-;; Test that invalid token returns 400
-(expect {:errors {:token "Invalid reset token"}}
+;; Test that malformed token returns 400
+(expect "Invalid reset token"
(client :post 400 "session/reset_password" {:token "not-found"
:password "whateverUP12!!"}))
+;; Test that invalid token returns 400
+(expect "Invalid reset token"
+ (client :post 400 "session/reset_password" {:token "1_not-found"
+ :password "whateverUP12!!"}))
+
;; Test that old token can expire
-(expect {:errors {:token "Reset token has expired"}}
- (let [token (.toString (java.util.UUID/randomUUID))]
- (upd User (user->id :rasta) :reset_token token :reset_triggered 0)
+(expect "Reset token has expired"
+ (let [token (str (user->id :rasta) "_" (java.util.UUID/randomUUID))]
+ (upd User (user->id :rasta) :reset_token token, :reset_triggered 0)
(client :post 400 "session/reset_password" {:token token
:password "whateverUP12!!"})))
@@ -118,6 +152,10 @@
;; Check that a non-superuser can't read settings
(expect
[{:value nil
+ :key "anon-tracking-enabled"
+ :description "Enable the collection of anonymous usage data in order to help Metabase improve."
+ :default "true"}
+ {:value "Metabase Test"
:key "site-name"
:description "The name used for this instance of Metabase."
:default "Metabase"}]
diff --git a/test/metabase/api/user_test.clj b/test/metabase/api/user_test.clj
index 97d28a2f13e3e57b5ec17f59c666502a53bf6ac5..3c3dabee270215cc7364e2d0db2c93321e92f3fd 100644
--- a/test/metabase/api/user_test.clj
+++ b/test/metabase/api/user_test.clj
@@ -1,7 +1,7 @@
(ns metabase.api.user-test
"Tests for /api/user endpoints."
(:require [expectations :refer :all]
- [korma.core :refer :all]
+ [korma.core :as k]
[metabase.db :refer :all]
[metabase.http-client :as http]
[metabase.middleware.auth :as auth]
@@ -82,6 +82,28 @@
:is_superuser false})
(create-user-api rand-name)))
+;; Test that reactivating a disabled account works
+(let [rand-name (random-name)]
+ (expect-eval-actual-first
+ (match-$ (sel :one User :first_name rand-name :is_active true)
+ {:id $
+ :email $
+ :first_name rand-name
+ :last_name "whatever"
+ :date_joined $
+ :last_login $
+ :common_name $
+ :is_superuser false})
+ (when-let [user (create-user-api rand-name)]
+ ;; create a random user then set them to :inactive
+ (upd User (:id user)
+ :is_active false
+ :is_superuser true)
+ ;; then try creating the same user again
+ ((user->client :crowberto) :post 200 "user" {:first_name (:first_name user)
+ :last_name "whatever"
+ :email (:email user)}))))
+
;; Check that non-superusers are denied access
(expect "You don't have permissions to do that."
((user->client :rasta) :post 403 "user" {:first_name "whatever"
@@ -195,7 +217,7 @@
(let [user-last-name (random-name)]
(expect-eval-actual-first
(let [{user-id :id} (sel :one User :last_name user-last-name)]
- (sel :one :fields [Session :id] :user_id user-id (order :created_at :desc))) ; get the latest Session for this User
+ (sel :one :fields [Session :id] :user_id user-id (k/order :created_at :desc))) ; get the latest Session for this User
(let [password {:old "password"
:new "whateverUP12!!"}
{:keys [email id] :as user} (create-user :password (:old password) :last_name user-last-name)
diff --git a/test/metabase/driver/generic_sql/native_test.clj b/test/metabase/driver/generic_sql/native_test.clj
index 1a92deaa5f05c4fcb18e23d2ddcd1c191824c8ce..07245c805aad00f3add0d608578b7fae908da092 100644
--- a/test/metabase/driver/generic_sql/native_test.clj
+++ b/test/metabase/driver/generic_sql/native_test.clj
@@ -2,7 +2,9 @@
(:require [clojure.tools.logging :as log]
[colorize.core :as color]
[expectations :refer :all]
+ [metabase.db :refer [ins cascade-delete]]
[metabase.driver :as driver]
+ [metabase.models.database :refer [Database]]
[metabase.test.data :refer :all]))
;; Just check that a basic query works
@@ -33,7 +35,19 @@
;; Check that we get proper error responses for malformed SQL
(expect {:status :failed
:error "Column \"ZID\" not found"}
- (do (log/info (color/green "NOTE: The following stacktrace is expected <3")) ; this will print a stacktrace
- (driver/process-query {:native {:query "SELECT ZID FROM CHECKINS LIMIT 2;"} ; make sure people know it's to be expected
- :type :native
- :database (db-id)})))
+ (dissoc (driver/process-query {:native {:query "SELECT ZID FROM CHECKINS LIMIT 2;"} ; make sure people know it's to be expected
+ :type :native
+ :database (db-id)})
+ :stacktrace
+ :query
+ :expanded-query))
+
+;; Check that we're not allowed to run SQL against an H2 database with a non-admin account
+(expect "Running SQL queries against H2 databases using the default (admin) database user is forbidden."
+ ;; Insert a fake Database. It doesn't matter that it doesn't actually exist since query processing should
+ ;; fail immediately when it realizes this DB doesn't have a USER
+ (let [db (ins Database :name "Fake-H2-DB", :engine "h2", :details {:db "mem:fake-h2-db"})]
+ (try (:error (driver/process-query {:database (:id db)
+ :type :native
+ :native {:query "SELECT 1;"}}))
+ (finally (cascade-delete Database :name "Fake-H2-DB")))))
diff --git a/test/metabase/driver/generic_sql/query_processor_test.clj b/test/metabase/driver/generic_sql/query_processor_test.clj
deleted file mode 100644
index dcaf76c72baa12fd78a9a958ea941cd72b021b16..0000000000000000000000000000000000000000
--- a/test/metabase/driver/generic_sql/query_processor_test.clj
+++ /dev/null
@@ -1,25 +0,0 @@
-(ns metabase.driver.generic-sql.query-processor-test
- (:require [clojure.tools.logging :as log]
- [colorize.core :as color]
- [expectations :refer :all]
- [metabase.driver :as driver]
- [metabase.driver.query-processor :refer [max-result-bare-rows]]
- [metabase.test.data :as d]
- [metabase.test.data.datasets :as datasets]))
-
-;; # ERROR RESPONSES
-
-;; Check that we get an error response formatted the way we'd expect
-(expect
- {:status :failed
- :error (str "Column \"CHECKINS.NAME\" not found; SQL statement:\nSELECT \"CHECKINS\".\"ID\", CAST(\"DATE\" AS DATE), "
- "\"CHECKINS\".\"VENUE_ID\", \"CHECKINS\".\"USER_ID\" FROM \"CHECKINS\" WHERE (\"CHECKINS\".\"NAME\" = ?) LIMIT "
- max-result-bare-rows)}
- ;; This will print a stacktrace. Better to reassure people that that's on purpose than to make people question whether the tests are working
- (do (log/info (color/green "NOTE: The following stacktrace is expected <3"))
- (datasets/with-dataset :generic-sql
- (driver/process-query {:database (d/db-id)
- :type :query
- :query {:source_table (d/id :checkins)
- :filter ["=" (d/id :venues :name) 1] ; wrong Field
- :aggregation ["rows"]}}))))
diff --git a/test/metabase/driver/generic_sql_test.clj b/test/metabase/driver/generic_sql_test.clj
index 350119284a9873238a347640c9ad42d45b5de994..f9026bc67a747701f1ad86928875e2a50d70533e 100644
--- a/test/metabase/driver/generic_sql_test.clj
+++ b/test/metabase/driver/generic_sql_test.clj
@@ -1,6 +1,5 @@
(ns metabase.driver.generic-sql-test
(:require [expectations :refer :all]
- [korma.core :refer :all]
[metabase.db :refer :all]
[metabase.driver :as driver]
(metabase.driver [h2 :as h2]
@@ -22,7 +21,7 @@
(delay (korma-entity @users-table)))
(def users-name-field
- (delay (sel :one Field :id (id :users :name))))
+ (delay (Field (id :users :name))))
;; ACTIVE-TABLE-NAMES
(expect
@@ -49,21 +48,3 @@
;; ## TEST FIELD-AVG-LENGTH
(expect 13
(i/field-avg-length h2/driver @users-name-field))
-
-
-;; ## TEST CHECK-FOR-URLS
-;; (expect 0.375
-;; (with-temp-table [table {:url "VARCHAR(254)"}]
-;; (insert table
-;; (values [{:url "http://www.google.com"} ; 1/1 *
-;; {:url nil} ; 1/1 (ignored)
-;; {:url "https://amazon.co.uk"} ; 2/2 *
-;; {:url "http://what.com?ok=true"} ; 3/3 *
-;; {:url "http://missing-period"} ; 3/4
-;; {:url "ftp://not-http"} ; 3/5
-;; {:url "http//amazon.com.uk"} ; 3/6
-;; {:url "Not a URL"} ; 3/7
-;; {:url "Not-a-url"}])) ; 3/8
-;; (i/field-percent-urls h2/driver {:name "URL"
-;; :table (delay (assoc table
-;; :db test-db))})))
diff --git a/test/metabase/driver/h2_test.clj b/test/metabase/driver/h2_test.clj
index 2b6fee5277e3d4e82472d82bd5374492a97b1c2e..50b1d06cc6329693a224dc88220b3276ab376a53 100644
--- a/test/metabase/driver/h2_test.clj
+++ b/test/metabase/driver/h2_test.clj
@@ -1,12 +1,47 @@
(ns metabase.driver.h2-test
(:require [expectations :refer :all]
- [metabase.driver.h2 :refer :all]
+ [metabase.db :as db]
+ (metabase.driver [h2 :refer :all]
+ [interface :refer [can-connect?]])
+ [metabase.driver.generic-sql.interface :as i]
[metabase.test.util :refer [resolve-private-fns]]))
-(resolve-private-fns metabase.driver.h2 database->connection-details)
+(resolve-private-fns metabase.driver.h2 connection-string->file+options file+options->connection-string connection-string-set-safe-options)
;; # Check that database->connection-details works
-;; ## new-style
(expect {:db
"file:/Users/cam/birdly/bird_sightings.db;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1"}
- (database->connection-details {:details {:db "file:/Users/cam/birdly/bird_sightings.db;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1"}}))
+ (i/database->connection-details driver {:details {:db "file:/Users/cam/birdly/bird_sightings.db;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1"}}))
+
+
+;; Check that the functions for exploding a connection string's options work as expected
+(expect
+ ["file:my-file" {"OPTION_1" "TRUE", "OPTION_2" "100", "LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON" "NICE_TRY"}]
+ (connection-string->file+options "file:my-file;OPTION_1=TRUE;OPTION_2=100;;LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON=NICE_TRY"))
+
+(expect "file:my-file;OPTION_1=TRUE;OPTION_2=100;LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON=NICE_TRY"
+ (file+options->connection-string "file:my-file" {"OPTION_1" "TRUE", "OPTION_2" "100", "LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON" "NICE_TRY"}))
+
+
+;; Check that we add safe connection options to connection strings
+(expect "file:my-file;LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON=NICE_TRY;IFEXISTS=TRUE;ACCESS_MODE_DATA=r"
+ (connection-string-set-safe-options "file:my-file;;LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON=NICE_TRY"))
+
+;; Check that we override shady connection string options set by shady admins with safe ones
+(expect "file:my-file;LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON=NICE_TRY;IFEXISTS=TRUE;ACCESS_MODE_DATA=r"
+ (connection-string-set-safe-options "file:my-file;;LOOK_I_INCLUDED_AN_EXTRA_SEMICOLON=NICE_TRY;IFEXISTS=FALSE;ACCESS_MODE_DATA=rws"))
+
+
+;; Make sure we *cannot* connect to a non-existent database
+(expect :exception-thrown
+ (try (can-connect? driver {:engine :h2
+ :details {:db (str (System/getProperty "user.dir") "/toucan_sightings")}})
+ (catch org.h2.jdbc.JdbcSQLException e
+ (and (re-matches #"Database .+ not found .+" (.getMessage e))
+ :exception-thrown))))
+
+;; Check that we can connect to a non-existent Database when we enable potentailly unsafe connections (e.g. to the Metabase database)
+(expect true
+ (binding [db/*allow-potentailly-unsafe-connections* true]
+ (can-connect? driver {:engine :h2
+ :details {:db (str (System/getProperty "user.dir") "/pigeon_sightings")}})))
diff --git a/test/metabase/driver/mongo_test.clj b/test/metabase/driver/mongo_test.clj
index f97fe8275c35ad114dca50ae5578f7966b93eab2..7f460990eea55f8f5922fc8cc993bb38f1ff9a59 100644
--- a/test/metabase/driver/mongo_test.clj
+++ b/test/metabase/driver/mongo_test.clj
@@ -59,8 +59,10 @@
[table-name field-name]
{:pre [(keyword? table-name)
(keyword? field-name)]}
- {:name (name field-name)
- :table (delay (table-name->fake-table table-name))})
+ (let [table-delay (delay (table-name->fake-table table-name))]
+ {:name (name field-name)
+ :table table-delay
+ :qualified-name-components (delay [(name (:name @table-delay)) (name field-name)])}))
;; ## Tests for connection functions
diff --git a/test/metabase/driver/postgres_test.clj b/test/metabase/driver/postgres_test.clj
index d70d2a63baaf04afeb7b8b3f162896399f4780fd..8447d1ad9aaf50fe326176f13238e0ec364e0045 100644
--- a/test/metabase/driver/postgres_test.clj
+++ b/test/metabase/driver/postgres_test.clj
@@ -1,54 +1,80 @@
(ns metabase.driver.postgres-test
(:require [expectations :refer :all]
+ [metabase.driver.generic-sql.interface :as i]
[metabase.driver.postgres :refer :all]
- [metabase.test.util :refer [resolve-private-fns]]))
-
-(resolve-private-fns metabase.driver.postgres
- connection-details->connection-spec
- database->connection-details)
+ [metabase.test.data.interface :refer [def-database-definition]]
+ [metabase.test.util.q :refer [Q]]))
;; # Check that database->connection details still works whether we're dealing with new-style or legacy details
;; ## new-style
-(expect {:db "bird_sightings"
- :db-type :postgres
- :make-pool? false
- :ssl false
+(expect {:db "bird_sightings"
+ :ssl false
:port 5432
:host "localhost"
:user "camsaul"}
- (database->connection-details {:details {:ssl false
- :host "localhost"
- :port 5432
- :dbname "bird_sightings"
- :user "camsaul"}}))
+ (i/database->connection-details driver {:details {:ssl false
+ :host "localhost"
+ :port 5432
+ :dbname "bird_sightings"
+ :user "camsaul"}}))
;; # Check that SSL params get added the connection details in the way we'd like
;; ## no SSL -- this should *not* include the key :ssl (regardless of its value) since that will cause the PG driver to use SSL anyway
(expect
- {:user "camsaul"
- :classname "org.postgresql.Driver"
+ {:user "camsaul"
+ :classname "org.postgresql.Driver"
:subprotocol "postgresql"
- :subname "//localhost:5432/bird_sightings"
- :make-pool? true}
- (connection-details->connection-spec {:ssl false
- :host "localhost"
- :port 5432
- :dbname "bird_sightings"
- :user "camsaul"}))
+ :subname "//localhost:5432/bird_sightings"
+ :make-pool? true}
+ (i/connection-details->connection-spec driver {:ssl false
+ :host "localhost"
+ :port 5432
+ :dbname "bird_sightings"
+ :user "camsaul"}))
;; ## ssl - check that expected params get added
(expect
- {:ssl true
- :make-pool? true
- :sslmode "require"
- :classname "org.postgresql.Driver"
+ {:ssl true
+ :make-pool? true
+ :sslmode "require"
+ :classname "org.postgresql.Driver"
:subprotocol "postgresql"
- :user "camsaul"
- :sslfactory "org.postgresql.ssl.NonValidatingFactory"
- :subname "//localhost:5432/bird_sightings"}
- (connection-details->connection-spec {:ssl true
- :host "localhost"
- :port 5432
- :dbname "bird_sightings"
- :user "camsaul"}))
+ :user "camsaul"
+ :sslfactory "org.postgresql.ssl.NonValidatingFactory"
+ :subname "//localhost:5432/bird_sightings"}
+ (i/connection-details->connection-spec driver {:ssl true
+ :host "localhost"
+ :port 5432
+ :dbname "bird_sightings"
+ :user "camsaul"}))
+;;; # UUID Support
+(def-database-definition ^:private with-uuid
+ ["users"
+ [{:field-name "user_id", :base-type :UUIDField}]
+ [[#uuid "4f01dcfd-13f7-430c-8e6f-e505c0851027"]
+ [#uuid "4652b2e7-d940-4d55-a971-7e484566663e"]
+ [#uuid "da1d6ecc-e775-4008-b366-c38e7a2e8433"]
+ [#uuid "7a5ce4a2-0958-46e7-9685-1a4eaa3bd08a"]
+ [#uuid "84ed434e-80b4-41cf-9c88-e334427104ae"]]])
+
+;; Check that we can load a Postgres Database with a :UUIDField
+(expect {:cols [{:description nil, :base_type :IntegerField, :name "id", :display_name "Id", :special_type :id, :target nil, :extra_info {}}
+ {:description nil, :base_type :UUIDField, :name "user_id", :display_name "User Id", :special_type :category, :target nil, :extra_info {}}],
+ :columns ["id" "user_id"],
+ :rows [[1 #uuid "4f01dcfd-13f7-430c-8e6f-e505c0851027"]
+ [2 #uuid "4652b2e7-d940-4d55-a971-7e484566663e"]
+ [3 #uuid "da1d6ecc-e775-4008-b366-c38e7a2e8433"]
+ [4 #uuid "7a5ce4a2-0958-46e7-9685-1a4eaa3bd08a"]
+ [5 #uuid "84ed434e-80b4-41cf-9c88-e334427104ae"]]}
+ (-> (Q dataset metabase.driver.postgres-test/with-uuid use postgres
+ return :data
+ aggregate rows of users)
+ (update :cols (partial mapv #(dissoc % :id :table_id)))))
+
+;; Check that we can filter by a UUID Field
+(expect [[2 #uuid "4652b2e7-d940-4d55-a971-7e484566663e"]]
+ (Q dataset metabase.driver.postgres-test/with-uuid use postgres
+ return rows
+ aggregate rows of users
+ filter = user_id "4652b2e7-d940-4d55-a971-7e484566663e"))
diff --git a/test/metabase/driver/query_processor_test.clj b/test/metabase/driver/query_processor_test.clj
index f4aba4dc9286275257403b56387f220bd5957f10..e1a033e003750e18d827967202d74f6f10b48081 100644
--- a/test/metabase/driver/query_processor_test.clj
+++ b/test/metabase/driver/query_processor_test.clj
@@ -1,6 +1,7 @@
(ns metabase.driver.query-processor-test
"Query processing tests that can be ran between any of the available drivers, and should give the same results."
- (:require [expectations :refer :all]
+ (:require [clojure.walk :as walk]
+ [expectations :refer :all]
[metabase.db :refer :all]
[metabase.driver :as driver]
[metabase.driver.query-processor :refer :all]
@@ -8,44 +9,32 @@
[table :refer [Table]])
[metabase.test.data :refer :all]
(metabase.test.data [dataset-definitions :as defs]
- [datasets :as datasets :refer [*dataset*]])))
-
-
+ [datasets :as datasets :refer [*dataset*]])
+ [metabase.test.util.q :refer [Q]]
+ [metabase.util :as u]))
;; ## Dataset-Independent QP Tests
;; ### Helper Fns + Macros
-(defmacro qp-expect-with-datasets
- "Slightly more succinct way of writing QP tests. Adds standard boilerplate to run QP tests against DATASETS."
- [datasets {:keys [rows] :as data} query]
- {:pre [(set? datasets)
- (map? data)
- (sequential? rows)
- (map? query)]}
+(defmacro ^:private qp-expect-with-all-datasets [data q-form & post-process-fns]
+ `(datasets/expect-with-all-datasets
+ {:status :completed
+ :row_count ~(count (:rows data))
+ :data ~data}
+ (-> ~q-form
+ ~@post-process-fns)))
+
+(defmacro ^:private qp-expect-with-datasets [datasets data q-form]
`(datasets/expect-with-datasets ~datasets
{:status :completed
- :row_count ~(count rows)
+ :row_count ~(count (:rows data))
:data ~data}
- (driver/process-query
- {:type :query
- :database (db-id)
- :query ~query})))
-
-(defmacro qp-expect-with-all-datasets
- "Like `qp-expect-with-datasets`, but tests against *all* datasets."
- [data query]
- `(datasets/expect-with-all-datasets
- {:status :completed
- :row_count ~(count (:rows data))
- :data ~data}
- (driver/process-query {:type :query
- :database (db-id)
- :query ~query})))
+ ~q-form))
-(defn ->columns
+(defn- ->columns
"Generate the vector that should go in the `columns` part of a QP result; done by calling `format-name` against each column name."
[& names]
(mapv (partial format-name)
@@ -56,17 +45,17 @@
;; These are meant for inclusion in the expected output of the QP tests, to save us from writing the same results several times
;; #### categories
-(defn categories-col
+(defn- categories-col
"Return column information for the `categories` column named by keyword COL."
[col]
(case col
- :id {:extra_info {} :target nil :special_type :id, :base_type (id-field-type), :description nil, :name (format-name "id")
- :table_id (id :categories), :id (id :categories :id)}
- :name {:extra_info {} :target nil :special_type :name, :base_type :TextField, :description nil, :name (format-name "name")
- :table_id (id :categories), :id (id :categories :name)}))
+ :id {:extra_info {} :target nil :special_type :id, :base_type (id-field-type), :description nil,
+ :name (format-name "id") :display_name "Id" :table_id (id :categories), :id (id :categories :id)}
+ :name {:extra_info {} :target nil :special_type :name, :base_type :TextField, :description nil,
+ :name (format-name "name") :display_name "Name" :table_id (id :categories), :id (id :categories :name)}))
;; #### users
-(defn users-col
+(defn- users-col
"Return column information for the `users` column named by keyword COL."
[col]
(case col
@@ -76,6 +65,7 @@
:base_type (id-field-type)
:description nil
:name (format-name "id")
+ :display_name "Id"
:table_id (id :users)
:id (id :users :id)}
:name {:extra_info {}
@@ -84,6 +74,7 @@
:base_type :TextField
:description nil
:name (format-name "name")
+ :display_name "Name"
:table_id (id :users)
:id (id :users :name)}
:last_login {:extra_info {}
@@ -92,16 +83,17 @@
:base_type (timestamp-field-type)
:description nil
:name (format-name "last_login")
+ :display_name "Last Login"
:table_id (id :users)
:id (id :users :last_login)}))
;; #### venues
-(defn venues-columns
+(defn- venues-columns
"Names of all columns for the `venues` table."
[]
(->columns "id" "name" "category_id" "latitude" "longitude" "price"))
-(defn venues-col
+(defn- venues-col
"Return column information for the `venues` column named by keyword COL."
[col]
(case col
@@ -111,6 +103,7 @@
:base_type (id-field-type)
:description nil
:name (format-name "id")
+ :display_name "Id"
:table_id (id :venues)
:id (id :venues :id)}
:category_id {:extra_info (if (fks-supported?) {:target_table_id (id :categories)}
@@ -123,6 +116,7 @@
:base_type :IntegerField
:description nil
:name (format-name "category_id")
+ :display_name "Category Id"
:table_id (id :venues)
:id (id :venues :category_id)}
:price {:extra_info {}
@@ -131,6 +125,7 @@
:base_type :IntegerField
:description nil
:name (format-name "price")
+ :display_name "Price"
:table_id (id :venues)
:id (id :venues :price)}
:longitude {:extra_info {}
@@ -139,6 +134,7 @@
:base_type :FloatField,
:description nil
:name (format-name "longitude")
+ :display_name "Longitude"
:table_id (id :venues)
:id (id :venues :longitude)}
:latitude {:extra_info {}
@@ -147,6 +143,7 @@
:base_type :FloatField
:description nil
:name (format-name "latitude")
+ :display_name "Latitude"
:table_id (id :venues)
:id (id :venues :latitude)}
:name {:extra_info {}
@@ -155,16 +152,17 @@
:base_type :TextField
:description nil
:name (format-name "name")
+ :display_name "Name"
:table_id (id :venues)
:id (id :venues :name)}))
-(defn venues-cols
+(defn- venues-cols
"`cols` information for all the columns in `venues`."
[]
(mapv venues-col [:id :name :category_id :latitude :longitude :price]))
;; #### checkins
-(defn checkins-col
+(defn- checkins-col
"Return column information for the `checkins` column named by keyword COL."
[col]
(case col
@@ -174,6 +172,7 @@
:base_type (id-field-type)
:description nil
:name (format-name "id")
+ :display_name "Id"
:table_id (id :checkins)
:id (id :checkins :id)}
:venue_id {:extra_info (if (fks-supported?) {:target_table_id (id :venues)}
@@ -186,6 +185,7 @@
:base_type :IntegerField
:description nil
:name (format-name "venue_id")
+ :display_name "Venue Id"
:table_id (id :checkins)
:id (id :checkins :venue_id)}
:user_id {:extra_info (if (fks-supported?) {:target_table_id (id :users)}
@@ -198,13 +198,14 @@
:base_type :IntegerField
:description nil
:name (format-name "user_id")
+ :display_name "User Id"
:table_id (id :checkins)
:id (id :checkins :user_id)}))
;;; #### aggregate columns
-(defn aggregate-col
+(defn- aggregate-col
"Return the column information we'd expect for an aggregate column. For all columns besides `:count`, you'll need to pass the `Field` in question as well.
(aggregate-col :count)
@@ -215,6 +216,7 @@
:count {:base_type :IntegerField
:special_type :number
:name "count"
+ :display_name "count"
:id nil
:table_id nil
:description nil
@@ -231,6 +233,10 @@
:extra_info {}
:target nil
:name (case ag-col-kw
+ :avg "avg"
+ :stddev "stddev"
+ :sum "sum")
+ :display_name (case ag-col-kw
:avg "avg"
:stddev "stddev"
:sum "sum")}))
@@ -243,22 +249,19 @@
{:rows [[100]]
:columns ["count"]
:cols [(aggregate-col :count)]}
- {:source_table (id :venues)
- :filter [nil nil]
- :aggregation ["count"]
- :breakout [nil]
- :limit nil})
+ (Q aggregate count of venues))
+
;; ### "SUM" AGGREGATION
(qp-expect-with-all-datasets
{:rows [[203]]
:columns ["sum"]
:cols [(aggregate-col :sum (venues-col :price))]}
- {:source_table (id :venues)
- :filter [nil nil]
- :aggregation ["sum" (id :venues :price)]
- :breakout [nil]
- :limit nil})
+ (Q aggregate sum price of venues)
+ ;; for some annoying reason SUM(`venues`.`price`) in MySQL comes back from JDBC as a BigDecimal.
+ ;; Cast results as int regardless because ain't nobody got time for dat
+ (update-in [:data :rows] vec)
+ (update-in [:data :rows 0 0] int))
;; ## "AVG" AGGREGATION
@@ -266,11 +269,7 @@
{:rows [[35.50589199999998]]
:columns ["avg"]
:cols [(aggregate-col :avg (venues-col :latitude))]}
- {:source_table (id :venues)
- :filter [nil nil]
- :aggregation ["avg" (id :venues :latitude)]
- :breakout [nil]
- :limit nil})
+ (Q aggregate avg latitude of venues))
;; ### "DISTINCT COUNT" AGGREGATION
@@ -278,34 +277,27 @@
{:rows [[15]]
:columns ["count"]
:cols [(aggregate-col :count)]}
- {:source_table (id :checkins)
- :filter [nil nil]
- :aggregation ["distinct" (id :checkins :user_id)]
- :breakout [nil]
- :limit nil})
+ (Q aggregate distinct user_id of checkins))
;; ## "ROWS" AGGREGATION
;; Test that a rows aggregation just returns rows as-is.
(qp-expect-with-all-datasets
- {:rows [[1 "Red Medicine" 4 10.0646 -165.374 3]
- [2 "Stout Burgers & Beers" 11 34.0996 -118.329 2]
- [3 "The Apple Pan" 11 34.0406 -118.428 2]
- [4 "Wurstküche" 29 33.9997 -118.465 2]
- [5 "Brite Spot Family Restaurant" 20 34.0778 -118.261 2]
- [6 "The 101 Coffee Shop" 20 34.1054 -118.324 2]
- [7 "Don Day Korean Restaurant" 44 34.0689 -118.305 2]
- [8 "25°" 11 34.1015 -118.342 2]
- [9 "Krua Siri" 71 34.1018 -118.301 1]
- [10 "Fred 62" 20 34.1046 -118.292 2]]
- :columns (venues-columns)
- :cols (venues-cols)}
- {:source_table (id :venues)
- :filter nil
- :aggregation ["rows"]
- :breakout [nil]
- :limit 10
- :order_by [[(id :venues :id) "ascending"]]})
+ {:rows [[1 "Red Medicine" 4 10.0646 -165.374 3]
+ [2 "Stout Burgers & Beers" 11 34.0996 -118.329 2]
+ [3 "The Apple Pan" 11 34.0406 -118.428 2]
+ [4 "Wurstküche" 29 33.9997 -118.465 2]
+ [5 "Brite Spot Family Restaurant" 20 34.0778 -118.261 2]
+ [6 "The 101 Coffee Shop" 20 34.1054 -118.324 2]
+ [7 "Don Day Korean Restaurant" 44 34.0689 -118.305 2]
+ [8 "25°" 11 34.1015 -118.342 2]
+ [9 "Krua Siri" 71 34.1018 -118.301 1]
+ [10 "Fred 62" 20 34.1046 -118.292 2]]
+ :columns (venues-columns)
+ :cols (venues-cols)}
+ (Q aggregate rows of venues
+ limit 10
+ order id+))
;; ## "PAGE" CLAUSE
@@ -313,239 +305,182 @@
;; ### PAGE - Get the first page
(qp-expect-with-all-datasets
- {:rows [[1 "African"]
- [2 "American"]
- [3 "Artisan"]
- [4 "Asian"]
- [5 "BBQ"]]
- :columns (->columns "id" "name")
- :cols [(categories-col :id)
- (categories-col :name)]}
- {:source_table (id :categories)
- :aggregation ["rows"]
- :page {:items 5
- :page 1}
- :order_by [[(id :categories :name) "ascending"]]})
+ {:rows [[1 "African"]
+ [2 "American"]
+ [3 "Artisan"]
+ [4 "Asian"]
+ [5 "BBQ"]]
+ :columns (->columns "id" "name")
+ :cols [(categories-col :id)
+ (categories-col :name)]}
+ (Q aggregate rows of categories
+ page 1 items 5
+ order id+))
;; ### PAGE - Get the second page
(qp-expect-with-all-datasets
- {:rows [[6 "Bakery"]
- [7 "Bar"]
- [8 "Beer Garden"]
- [9 "Breakfast / Brunch"]
- [10 "Brewery"]]
- :columns (->columns "id" "name")
- :cols [(categories-col :id)
- (categories-col :name)]}
- {:source_table (id :categories)
- :aggregation ["rows"]
- :page {:items 5
- :page 2}
- :order_by [[(id :categories :name) "ascending"]]})
+ {:rows [[6 "Bakery"]
+ [7 "Bar"]
+ [8 "Beer Garden"]
+ [9 "Breakfast / Brunch"]
+ [10 "Brewery"]]
+ :columns (->columns "id" "name")
+ :cols [(categories-col :id)
+ (categories-col :name)]}
+ (Q aggregate rows of categories
+ page 2 items 5
+ order id+))
;; ## "ORDER_BY" CLAUSE
;; Test that we can tell the Query Processor to return results ordered by multiple fields
(qp-expect-with-all-datasets
- {:rows [[1 12 375] [1 9 139] [1 1 72] [2 15 129] [2 12 471] [2 11 325] [2 9 590] [2 9 833] [2 8 380] [2 5 719]],
- :columns (->columns "venue_id" "user_id" "id")
- :cols [(checkins-col :venue_id)
- (checkins-col :user_id)
- (checkins-col :id)]}
- {:source_table (id :checkins)
- :aggregation ["rows"]
- :limit 10
- :fields [(id :checkins :venue_id)
- (id :checkins :user_id)
- (id :checkins :id)]
- :order_by [[(id :checkins :venue_id) "ascending"]
- [(id :checkins :user_id) "descending"]
- [(id :checkins :id) "ascending"]]})
+ {:rows [[1 12 375] [1 9 139] [1 1 72] [2 15 129] [2 12 471] [2 11 325] [2 9 590] [2 9 833] [2 8 380] [2 5 719]],
+ :columns (->columns "venue_id" "user_id" "id")
+ :cols [(checkins-col :venue_id)
+ (checkins-col :user_id)
+ (checkins-col :id)]}
+ (Q aggregate rows of checkins
+ fields venue_id user_id id
+ order venue_id+ user_id- id+
+ limit 10))
;; ## "FILTER" CLAUSE
;; ### FILTER -- "AND", ">", ">="
(qp-expect-with-all-datasets
- {:rows [[55 "Dal Rae Restaurant" 67 33.983 -118.096 4]
- [61 "Lawry's The Prime Rib" 67 34.0677 -118.376 4]
- [77 "Sushi Nakazawa" 40 40.7318 -74.0045 4]
- [79 "Sushi Yasuda" 40 40.7514 -73.9736 4]
- [81 "Tanoshi Sushi & Sake Bar" 40 40.7677 -73.9533 4]]
- :columns (venues-columns)
- :cols (venues-cols)}
- {:source_table (id :venues)
- :filter ["AND"
- [">" (id :venues :id) 50]
- [">=" (id :venues :price) 4]]
- :aggregation ["rows"]
- :breakout [nil]
- :limit nil})
+ {:rows [[55 "Dal Rae Restaurant" 67 33.983 -118.096 4]
+ [61 "Lawry's The Prime Rib" 67 34.0677 -118.376 4]
+ [77 "Sushi Nakazawa" 40 40.7318 -74.0045 4]
+ [79 "Sushi Yasuda" 40 40.7514 -73.9736 4]
+ [81 "Tanoshi Sushi & Sake Bar" 40 40.7677 -73.9533 4]]
+ :columns (venues-columns)
+ :cols (venues-cols)}
+ (Q aggregate rows of venues
+ filter and > id 50, >= price 4))
;; ### FILTER -- "AND", "<", ">", "!="
(qp-expect-with-all-datasets
- {:rows [[21 "PizzaHacker" 58 37.7441 -122.421 2]
- [23 "Taqueria Los Coyotes" 50 37.765 -122.42 2]]
- :columns (venues-columns)
- :cols (venues-cols)}
- {:source_table (id :venues)
- :filter ["AND"
- ["<" (id :venues :id) 24]
- [">" (id :venues :id) 20]
- ["!=" (id :venues :id) 22]]
- :aggregation ["rows"]
- :breakout [nil]
- :limit nil})
+ {:rows [[21 "PizzaHacker" 58 37.7441 -122.421 2]
+ [23 "Taqueria Los Coyotes" 50 37.765 -122.42 2]]
+ :columns (venues-columns)
+ :cols (venues-cols)}
+ (Q aggregate rows of venues
+ filter and < id 24, > id 20, != id 22))
+
+;; ### FILTER WITH A FALSE VALUE
+;; Check that we're checking for non-nil values, not just logically true ones.
+;; There's only one place (out of 3) that I don't like
+(datasets/expect-with-all-datasets
+ [1]
+ (Q dataset places-cam-likes
+ return first-row
+ aggregate count of places
+ filter = liked false))
;; ### FILTER -- "BETWEEN", single subclause (neither "AND" nor "OR")
(qp-expect-with-all-datasets
- {:rows [[21 "PizzaHacker" 58 37.7441 -122.421 2]
- [22 "Gordo Taqueria" 50 37.7822 -122.484 1]]
- :columns (venues-columns)
- :cols (venues-cols)}
- {:source_table (id :venues)
- :filter ["BETWEEN" (id :venues :id) 21 22]
- :aggregation ["rows"]
- :breakout [nil]
- :limit nil})
+ {:rows [[21 "PizzaHacker" 58 37.7441 -122.421 2]
+ [22 "Gordo Taqueria" 50 37.7822 -122.484 1]]
+ :columns (venues-columns)
+ :cols (venues-cols)}
+ (Q aggregate rows of venues
+ filter between id 21 22))
;; ### FILTER -- "BETWEEN" with dates
(qp-expect-with-all-datasets
- {:rows [[29]]
- :columns ["count"]
- :cols [(aggregate-col :count)]}
- {:source_table (id :checkins)
- :filter ["AND" ["BETWEEN" (id :checkins :date) "2015-04-01" "2015-05-01"]]
- :aggregation ["count"]})
+ {:rows [[29]]
+ :columns ["count"]
+ :cols [(aggregate-col :count)]}
+ (Q aggregate count of checkins
+ filter and between date "2015-04-01" "2015-05-01"))
;; ### FILTER -- "OR", "<=", "="
(qp-expect-with-all-datasets
- {:rows [[1 "Red Medicine" 4 10.0646 -165.374 3]
- [2 "Stout Burgers & Beers" 11 34.0996 -118.329 2]
- [3 "The Apple Pan" 11 34.0406 -118.428 2]
- [5 "Brite Spot Family Restaurant" 20 34.0778 -118.261 2]]
- :columns (venues-columns)
- :cols (venues-cols)}
- {:source_table (id :venues)
- :filter ["OR"
- ["<=" (id :venues :id) 3]
- ["=" (id :venues :id) 5]]
- :aggregation ["rows"]
- :breakout [nil]
- :limit nil})
-
-;; TODO - These are working, but it would be nice to have some tests that covered
-;; * NOT_NULL
-;; * NULL
+ {:rows [[1 "Red Medicine" 4 10.0646 -165.374 3]
+ [2 "Stout Burgers & Beers" 11 34.0996 -118.329 2]
+ [3 "The Apple Pan" 11 34.0406 -118.428 2]
+ [5 "Brite Spot Family Restaurant" 20 34.0778 -118.261 2]]
+ :columns (venues-columns)
+ :cols (venues-cols)}
+ (Q aggregate rows of venues
+ filter or <= id 3 = id 5))
;; ### FILTER -- "INSIDE"
(qp-expect-with-all-datasets
- {:rows [[1 "Red Medicine" 4 10.0646 -165.374 3]]
- :columns (venues-columns)
- :cols (venues-cols)}
- {:source_table (id :venues)
- :filter ["INSIDE"
- (id :venues :latitude)
- (id :venues :longitude)
- 10.0649
- -165.379
- 10.0641
- -165.371]
- :aggregation ["rows"]
- :breakout [nil]
- :limit nil})
+ {:rows [[1 "Red Medicine" 4 10.0646 -165.374 3]]
+ :columns (venues-columns)
+ :cols (venues-cols)}
+ (Q aggregate rows of venues
+ filter inside {:lat {:field latitude, :min 10.0641, :max 10.0649}
+ :lon {:field longitude, :min -165.379, :max -165.371}}))
;; ## "FIELDS" CLAUSE
;; Test that we can restrict the Fields that get returned to the ones specified, and that results come back in the order of the IDs in the `fields` clause
(qp-expect-with-all-datasets
- {:rows [["Red Medicine" 1]
- ["Stout Burgers & Beers" 2]
- ["The Apple Pan" 3]
- ["Wurstküche" 4]
- ["Brite Spot Family Restaurant" 5]
- ["The 101 Coffee Shop" 6]
- ["Don Day Korean Restaurant" 7]
- ["25°" 8]
- ["Krua Siri" 9]
- ["Fred 62" 10]],
- :columns (->columns "name" "id")
- :cols [(venues-col :name)
- (venues-col :id)]}
- {:source_table (id :venues)
- :filter [nil nil]
- :aggregation ["rows"]
- :fields [(id :venues :name)
- (id :venues :id)]
- :breakout [nil]
- :limit 10
- :order_by [[(id :venues :id) "ascending"]]})
+ {:rows [["Red Medicine" 1]
+ ["Stout Burgers & Beers" 2]
+ ["The Apple Pan" 3]
+ ["Wurstküche" 4]
+ ["Brite Spot Family Restaurant" 5]
+ ["The 101 Coffee Shop" 6]
+ ["Don Day Korean Restaurant" 7]
+ ["25°" 8]
+ ["Krua Siri" 9]
+ ["Fred 62" 10]],
+ :columns (->columns "name" "id")
+ :cols [(venues-col :name)
+ (venues-col :id)]}
+ (Q aggregate rows of venues
+ fields name id
+ limit 10
+ order id+))
;; ## "BREAKOUT"
;; ### "BREAKOUT" - SINGLE COLUMN
(qp-expect-with-all-datasets
- {:rows [[1 31] [2 70] [3 75] [4 77] [5 69] [6 70] [7 76] [8 81] [9 68] [10 78] [11 74] [12 59] [13 76] [14 62] [15 34]],
- :columns [(format-name "user_id")
- "count"]
- :cols [(checkins-col :user_id)
- (aggregate-col :count)]}
- {:source_table (id :checkins)
- :filter [nil nil]
- :aggregation ["count"]
- :breakout [(id :checkins :user_id)]
- :order_by [[(id :checkins :user_id) "ascending"]]
- :limit nil})
+ {:rows [[1 31] [2 70] [3 75] [4 77] [5 69] [6 70] [7 76] [8 81] [9 68] [10 78] [11 74] [12 59] [13 76] [14 62] [15 34]],
+ :columns [(format-name "user_id")
+ "count"]
+ :cols [(checkins-col :user_id)
+ (aggregate-col :count)]}
+ (Q aggregate count of checkins
+ breakout user_id
+ order user_id+))
;; ### "BREAKOUT" - MULTIPLE COLUMNS W/ IMPLICT "ORDER_BY"
;; Fields should be implicitly ordered :ASC for all the fields in `breakout` that are not specified in `order_by`
(qp-expect-with-all-datasets
- {:rows [[1 1 1] [1 5 1] [1 7 1] [1 10 1] [1 13 1] [1 16 1] [1 26 1] [1 31 1] [1 35 1] [1 36 1]],
- :columns [(format-name "user_id")
- (format-name "venue_id")
- "count"]
- :cols [(checkins-col :user_id)
- (checkins-col :venue_id)
- (aggregate-col :count)]}
- {:source_table (id :checkins)
- :limit 10
- :aggregation ["count"]
- :breakout [(id :checkins :user_id)
- (id :checkins :venue_id)]})
+ {:rows [[1 1 1] [1 5 1] [1 7 1] [1 10 1] [1 13 1] [1 16 1] [1 26 1] [1 31 1] [1 35 1] [1 36 1]],
+ :columns [(format-name "user_id")
+ (format-name "venue_id")
+ "count"]
+ :cols [(checkins-col :user_id)
+ (checkins-col :venue_id)
+ (aggregate-col :count)]}
+ (Q aggregate count of checkins
+ breakout user_id venue_id
+ limit 10))
;; ### "BREAKOUT" - MULTIPLE COLUMNS W/ EXPLICIT "ORDER_BY"
;; `breakout` should not implicitly order by any fields specified in `order_by`
(qp-expect-with-all-datasets
- {:rows [[15 2 1] [15 3 1] [15 7 1] [15 14 1] [15 16 1] [15 18 1] [15 22 1] [15 23 2] [15 24 1] [15 27 1]],
- :columns [(format-name "user_id")
- (format-name "venue_id")
- "count"]
- :cols [(checkins-col :user_id)
- (checkins-col :venue_id)
- (aggregate-col :count)]}
- {:source_table (id :checkins)
- :limit 10
- :aggregation ["count"]
- :breakout [(id :checkins :user_id)
- (id :checkins :venue_id)]
- :order_by [[(id :checkins :user_id) "descending"]
- [(id :checkins :venue_id) "ascending"]]})
-
-
-;; ## EMPTY QUERY
-;; Just don't barf
-(datasets/expect-with-all-datasets
- {:status :completed
- :row_count 0
- :data {:rows [], :columns [], :cols []}}
- (driver/process-query {:type :query
- :database (db-id)
- :native {}
- :query {:source_table 0
- :filter [nil nil]
- :aggregation ["rows"]
- :breakout [nil]
- :limit nil}}))
+ {:rows [[15 2 1] [15 3 1] [15 7 1] [15 14 1] [15 16 1] [15 18 1] [15 22 1] [15 23 2] [15 24 1] [15 27 1]],
+ :columns [(format-name "user_id")
+ (format-name "venue_id")
+ "count"]
+ :cols [(checkins-col :user_id)
+ (checkins-col :venue_id)
+ (aggregate-col :count)]}
+ (Q aggregate count of checkins
+ breakout user_id venue_id
+ order user_id- venue_id+
+ limit 10))
+
+
;; # POST PROCESSING TESTS
@@ -553,97 +488,100 @@
;; ## LIMIT-MAX-RESULT-ROWS
;; Apply limit-max-result-rows to an infinite sequence and make sure it gets capped at `max-result-rows`
(expect max-result-rows
- (count (->> {:rows (repeat [:ok])}
- limit-max-result-rows
- :rows)))
+ (->> (((u/runtime-resolved-fn 'metabase.driver.query-processor 'limit) identity) {:rows (repeat [:ok])})
+ :rows
+ count))
;; ## CUMULATIVE SUM
-;; TODO - Should we move this into IDataset? It's only used here, but the logic might get a little more compilcated when we add more drivers
(defn- ->sum-type
- "Since summed integer fields come back as different types depending on which DB we're using, cast value V appropriately."
+ "Since summed integer fields come back as different types depending on which DB we're use, cast value V appropriately."
[v]
- (case (id-field-type)
- :IntegerField (int v)
- :BigIntegerField (bigdec v)))
+ ((case (sum-field-type)
+ :IntegerField int
+ :BigIntegerField bigdec) v))
;; ### cum_sum w/o breakout should be treated the same as sum
(qp-expect-with-all-datasets
- {:rows [[(->sum-type 120)]]
- :columns ["sum"]
- :cols [(aggregate-col :sum (users-col :id))]}
- {:source_table (id :users)
- :aggregation ["cum_sum" (id :users :id)]})
+ {:rows [[(->sum-type 120)]]
+ :columns ["sum"]
+ :cols [(aggregate-col :sum (users-col :id))]}
+ (Q aggregate cum-sum id of users))
;; ### Simple cumulative sum where breakout field is same as cum_sum field
(qp-expect-with-all-datasets
- {:rows [[1] [3] [6] [10] [15] [21] [28] [36] [45] [55] [66] [78] [91] [105] [120]]
- :columns (->columns "id")
- :cols [(users-col :id)]}
- {:source_table (id :users)
- :breakout [(id :users :id)]
- :aggregation ["cum_sum" (id :users :id)]})
+ {:rows [[1] [3] [6] [10] [15] [21] [28] [36] [45] [55] [66] [78] [91] [105] [120]]
+ :columns (->columns "id")
+ :cols [(users-col :id)]}
+ (Q aggregate cum-sum id of users
+ breakout id))
;; ### Cumulative sum w/ a different breakout field
(qp-expect-with-all-datasets
- {:rows [["Broen Olujimi" (->sum-type 14)]
- ["Conchúr Tihomir" (->sum-type 21)]
- ["Dwight Gresham" (->sum-type 34)]
- ["Felipinho Asklepios" (->sum-type 36)]
- ["Frans Hevel" (->sum-type 46)]
- ["Kaneonuskatew Eiran" (->sum-type 49)]
- ["Kfir Caj" (->sum-type 61)]
- ["Nils Gotam" (->sum-type 70)]
- ["Plato Yeshua" (->sum-type 71)]
- ["Quentin Sören" (->sum-type 76)]
- ["Rüstem Hebel" (->sum-type 91)]
- ["Shad Ferdynand" (->sum-type 97)]
- ["Simcha Yan" (->sum-type 101)]
- ["Spiros Teofil" (->sum-type 112)]
- ["Szymon Theutrich" (->sum-type 120)]]
- :columns [(format-name "name")
- "sum"]
- :cols [(users-col :name)
- (aggregate-col :sum (users-col :id))]}
- {:source_table (id :users)
- :breakout [(id :users :name)]
- :aggregation ["cum_sum" (id :users :id)]})
+ {:rows [["Broen Olujimi" (->sum-type 14)]
+ ["Conchúr Tihomir" (->sum-type 21)]
+ ["Dwight Gresham" (->sum-type 34)]
+ ["Felipinho Asklepios" (->sum-type 36)]
+ ["Frans Hevel" (->sum-type 46)]
+ ["Kaneonuskatew Eiran" (->sum-type 49)]
+ ["Kfir Caj" (->sum-type 61)]
+ ["Nils Gotam" (->sum-type 70)]
+ ["Plato Yeshua" (->sum-type 71)]
+ ["Quentin Sören" (->sum-type 76)]
+ ["Rüstem Hebel" (->sum-type 91)]
+ ["Shad Ferdynand" (->sum-type 97)]
+ ["Simcha Yan" (->sum-type 101)]
+ ["Spiros Teofil" (->sum-type 112)]
+ ["Szymon Theutrich" (->sum-type 120)]]
+ :columns [(format-name "name")
+ "sum"]
+ :cols [(users-col :name)
+ (aggregate-col :sum (users-col :id))]}
+ (Q aggregate cum-sum id of users
+ breakout name))
;; ### Cumulative sum w/ a different breakout field that requires grouping
(qp-expect-with-all-datasets
- {:columns [(format-name "price")
- "sum"]
- :cols [(venues-col :price)
- (aggregate-col :sum (venues-col :id))]
- :rows [[1 (->sum-type 1211)]
- [2 (->sum-type 4066)]
- [3 (->sum-type 4681)]
- [4 (->sum-type 5050)]]}
- {:source_table (id :venues)
- :breakout [(id :venues :price)]
- :aggregation ["cum_sum" (id :venues :id)]})
+ {:columns [(format-name "price")
+ "sum"]
+ :cols [(venues-col :price)
+ (aggregate-col :sum (venues-col :id))]
+ :rows [[1 (->sum-type 1211)]
+ [2 (->sum-type 4066)]
+ [3 (->sum-type 4681)]
+ [4 (->sum-type 5050)]]}
+ (Q aggregate cum-sum id of venues
+ breakout price))
;;; ## STDDEV AGGREGATION
;;; SQL-Only for the time being
;; ## "STDDEV" AGGREGATION
-(qp-expect-with-datasets #{:generic-sql}
+(qp-expect-with-datasets #{:h2 :postgres :mysql}
{:columns ["stddev"]
:cols [(aggregate-col :stddev (venues-col :latitude))]
- :rows [[3.43467255295115]]}
- {:source_table (id :venues)
- :aggregation ["stddev" (id :venues :latitude)]})
+ :rows [[(datasets/dataset-case
+ :h2 3.43467255295115 ; annoying :/
+ :postgres 3.4346725529512736
+ :mysql 3.417456040761316)]]}
+ (Q aggregate stddev latitude of venues))
+
+;; Make sure standard deviation fails for the Mongo driver since its not supported
+(datasets/expect-with-dataset :mongo
+ {:status :failed
+ :error "standard-deviation-aggregations is not supported by this driver."}
+ (select-keys (Q aggregate stddev latitude of venues) [:status :error]))
;;; ## order_by aggregate fields (SQL-only for the time being)
;;; ### order_by aggregate ["count"]
-(qp-expect-with-datasets #{:generic-sql}
+(qp-expect-with-datasets #{:h2 :postgres :mysql}
{:columns [(format-name "price")
"count"]
:rows [[4 6]
@@ -652,14 +590,13 @@
[2 59]]
:cols [(venues-col :price)
(aggregate-col :count)]}
- {:source_table (id :venues)
- :aggregation ["count"]
- :breakout [(id :venues :price)]
- :order_by [[["aggregation" 0] "ascending"]]})
+ (Q aggregate count of venues
+ breakout price
+ order ag.0+))
;;; ### order_by aggregate ["sum" field-id]
-(qp-expect-with-datasets #{:generic-nsql}
+(qp-expect-with-datasets #{:h2 :postgres :mysql}
{:columns [(format-name "price")
"sum"]
:rows [[2 (->sum-type 2855)]
@@ -668,14 +605,13 @@
[4 (->sum-type 369)]]
:cols [(venues-col :price)
(aggregate-col :sum (venues-col :id))]}
- {:source_table (id :venues)
- :aggregation ["sum" (id :venues :id)]
- :breakout [(id :venues :price)]
- :order_by [[["aggregation" 0] "descending"]]})
+ (Q aggregate sum id of venues
+ breakout price
+ order ag.0-))
;;; ### order_by aggregate ["distinct" field-id]
-(qp-expect-with-datasets #{:generic-sql}
+(qp-expect-with-datasets #{:h2 :postgres :mysql}
{:columns [(format-name "price")
"count"]
:rows [[4 6]
@@ -684,14 +620,13 @@
[2 59]]
:cols [(venues-col :price)
(aggregate-col :count)]}
- {:source_table (id :venues)
- :aggregation ["distinct" (id :venues :id)]
- :breakout [(id :venues :price)]
- :order_by [[["aggregation" 0] "ascending"]]})
+ (Q aggregate distinct id of venues
+ breakout price
+ order ag.0+))
;;; ### order_by aggregate ["avg" field-id]
-(qp-expect-with-datasets #{:generic-sql}
+(datasets/expect-with-dataset :h2
{:columns [(format-name "price")
"avg"]
:rows [[3 22]
@@ -700,13 +635,30 @@
[4 53]]
:cols [(venues-col :price)
(aggregate-col :avg (venues-col :category_id))]}
- {:source_table (id :venues)
- :aggregation ["avg" (id :venues :category_id)]
- :breakout [(id :venues :price)]
- :order_by [[["aggregation" 0] "ascending"]]})
+ (Q return :data
+ of venues
+ aggregate avg category_id
+ breakout price
+ order ag.0+))
+
+;; Values are slightly different for Postgres
+(datasets/expect-with-dataset :postgres
+ {:rows [[3 22.0000000000000000M]
+ [2 28.2881355932203390M]
+ [1 32.8181818181818182M]
+ [4 53.5000000000000000M]]
+ :columns [(format-name "price")
+ "avg"]
+ :cols [(venues-col :price)
+ (aggregate-col :avg (venues-col :category_id))]}
+ (Q return :data
+ of venues
+ aggregate avg category_id
+ breakout price
+ order ag.0+))
;;; ### order_by aggregate ["stddev" field-id]
-(qp-expect-with-datasets #{:generic-sql}
+(datasets/expect-with-dataset :h2
{:columns [(format-name "price")
"stddev"]
:rows [[3 26.19160170741759]
@@ -715,10 +667,26 @@
[4 14.788509052639485]]
:cols [(venues-col :price)
(aggregate-col :stddev (venues-col :category_id))]}
- {:source_table (id :venues)
- :aggregation ["stddev" (id :venues :category_id)]
- :breakout [(id :venues :price)]
- :order_by [[["aggregation" 0] "descending"]]})
+ (Q return :data
+ of venues
+ aggregate stddev category_id
+ breakout price
+ order ag.0-))
+
+(datasets/expect-with-dataset :postgres
+ {:columns [(format-name "price")
+ "stddev"]
+ :rows [[3 26.1916017074175897M]
+ [1 24.1121118816651851M]
+ [2 21.4186921647952867M]
+ [4 14.7885090526394851M]]
+ :cols [(venues-col :price)
+ (aggregate-col :stddev (venues-col :category_id))]}
+ (Q return :data
+ of venues
+ aggregate stddev category_id
+ breakout price
+ order ag.0-))
;;; ### make sure that rows where preview_display = false don't get displayed
@@ -726,15 +694,10 @@
[(set (->columns "category_id" "name" "latitude" "id" "longitude" "price"))
(set (->columns "category_id" "name" "latitude" "id" "longitude"))
(set (->columns "category_id" "name" "latitude" "id" "longitude" "price"))]
- (let [get-col-names (fn [] (-> (driver/process-query {:database (db-id)
- :type "query"
- :query {:aggregation ["rows"]
- :source_table (id :venues)
- :order_by [[(id :venues :id) "ascending"]]
- :limit 1}})
- :data
- :columns
- set))]
+ (let [get-col-names (fn [] (Q aggregate rows of venues
+ order id+
+ limit 1
+ return :data :columns set))]
[(get-col-names)
(do (upd Field (id :venues :price) :preview_display false)
(get-col-names))
@@ -744,76 +707,368 @@
;;; ## :sensitive fields
;;; Make sure :sensitive information fields are never returned by the QP
-(datasets/expect-with-all-datasets
- {:status :completed,
- :row_count 15
- :data {:columns (->columns "id" "last_login" "name")
- :cols [(users-col :id)
- (users-col :last_login)
- (users-col :name)],
- :rows [[1 "Plato Yeshua"]
- [2 "Felipinho Asklepios"]
- [3 "Kaneonuskatew Eiran"]
- [4 "Simcha Yan"]
- [5 "Quentin Sören"]
- [6 "Shad Ferdynand"]
- [7 "Conchúr Tihomir"]
- [8 "Szymon Theutrich"]
- [9 "Nils Gotam"]
- [10 "Frans Hevel"]
- [11 "Spiros Teofil"]
- [12 "Kfir Caj"]
- [13 "Dwight Gresham"]
- [14 "Broen Olujimi"]
- [15 "Rüstem Hebel"]]}}
- ;; Filter out the timestamps from the results since they're hard to test :/
- (-> (driver/process-query
- {:type :query,
- :database (db-id),
- :query {:source_table (id :users),
- :aggregation ["rows"],
- :order_by [[(id :users :id) "ascending"]]}})
- (update-in [:data :rows] (partial mapv (partial filterv #(not (isa? (type %) java.util.Date)))))))
-
-
-;; ## Unix timestamp special type fields <3
+(qp-expect-with-all-datasets
+ {:columns (->columns "id" "last_login" "name")
+ :cols [(users-col :id)
+ (users-col :last_login)
+ (users-col :name)],
+ :rows [[1 "Plato Yeshua"]
+ [2 "Felipinho Asklepios"]
+ [3 "Kaneonuskatew Eiran"]
+ [4 "Simcha Yan"]
+ [5 "Quentin Sören"]
+ [6 "Shad Ferdynand"]
+ [7 "Conchúr Tihomir"]
+ [8 "Szymon Theutrich"]
+ [9 "Nils Gotam"]
+ [10 "Frans Hevel"]
+ [11 "Spiros Teofil"]
+ [12 "Kfir Caj"]
+ [13 "Dwight Gresham"]
+ [14 "Broen Olujimi"]
+ [15 "Rüstem Hebel"]]}
+ ;; Filter out the timestamps from the results since they're hard to test :/
+ (-> (Q aggregate rows of users
+ order id+)
+ (update-in [:data :rows] (partial mapv (partial filterv #(not (isa? (type %) java.util.Date)))))))
+
+
+;; +------------------------------------------------------------------------------------------------------------------------+
+;; | UNIX TIMESTAMP SPECIAL_TYPE FIELDS |
+;; +------------------------------------------------------------------------------------------------------------------------+
;; There were 9 "sad toucan incidents" on 2015-06-02
-(datasets/expect-with-datasets #{:generic-sql}
- 9
- (with-temp-db [db (dataset-loader) defs/sad-toucan-incidents]
- (->> (driver/process-query {:database (:id db)
- :type "query"
- :query {:source_table (:id &incidents)
- :filter ["AND"
- [">" (:id &incidents.timestamp) "2015-06-01"]
- ["<" (:id &incidents.timestamp) "2015-06-03"]]
- :order_by [[(:id &incidents.timestamp) "ascending"]]}})
- :data
- :rows
- count)))
+(datasets/expect-with-datasets #{:h2 :postgres :mysql}
+ (datasets/dataset-case
+ :h2 9
+ :postgres 9
+ :mysql 10) ; not sure exactly these disagree
+ (Q dataset sad-toucan-incidents
+ of incidents
+ filter and > timestamp "2015-06-01"
+ < timestamp "2015-06-03"
+ order timestamp+
+ return rows count))
;;; Unix timestamp breakouts -- SQL only
-(datasets/expect-with-datasets #{:generic-sql}
- [["2015-06-01" 6]
- ["2015-06-02" 9]
- ["2015-06-03" 5]
- ["2015-06-04" 9]
- ["2015-06-05" 8]
- ["2015-06-06" 9]
- ["2015-06-07" 8]
- ["2015-06-08" 9]
- ["2015-06-09" 7]
- ["2015-06-10" 8]]
- (with-temp-db [db (dataset-loader) defs/sad-toucan-incidents]
- (->> (driver/process-query {:database (:id db)
- :type "query"
- :query {:source_table (:id &incidents)
- :aggregation ["count"]
- :breakout [(:id &incidents.timestamp)]
- :limit 10}})
- :data
- :rows
- (map (fn [[^java.util.Date date count]]
- [(.toString date) (int count)])))))
+(let [do-query (fn [] (->> (Q dataset sad-toucan-incidents
+ aggregate count of incidents
+ breakout timestamp
+ limit 10
+ return rows)
+ (map (fn [[^java.util.Date date count]]
+ [(.toString date) (int count)]))))]
+
+ (datasets/expect-with-dataset :h2
+ [["2015-06-01" 6]
+ ["2015-06-02" 9]
+ ["2015-06-03" 5]
+ ["2015-06-04" 9]
+ ["2015-06-05" 8]
+ ["2015-06-06" 9]
+ ["2015-06-07" 8]
+ ["2015-06-08" 9]
+ ["2015-06-09" 7]
+ ["2015-06-10" 8]]
+ (do-query))
+
+ ;; postgres gives us *slightly* different answers because I think it's actually handling UNIX timezones properly (with timezone = UTC)
+ ;; as opposed to H2 which is giving us the wrong timezome. TODO - verify this
+ (datasets/expect-with-dataset :postgres
+ [["2015-06-01" 8]
+ ["2015-06-02" 9]
+ ["2015-06-03" 9]
+ ["2015-06-04" 4]
+ ["2015-06-05" 11]
+ ["2015-06-06" 8]
+ ["2015-06-07" 6]
+ ["2015-06-08" 10]
+ ["2015-06-09" 6]
+ ["2015-06-10" 10]]
+ (do-query)))
+
+
+;; +------------------------------------------------------------------------------------------------------------------------+
+;; | JOINS |
+;; +------------------------------------------------------------------------------------------------------------------------+
+
+;; The top 10 cities by number of Tupac sightings
+;; Test that we can breakout on an FK field (Note how the FK Field is returned in the results)
+(datasets/expect-with-datasets #{:h2 :postgres :mysql}
+ [["Arlington" 16]
+ ["Albany" 15]
+ ["Portland" 14]
+ ["Louisville" 13]
+ ["Philadelphia" 13]
+ ["Anchorage" 12]
+ ["Lincoln" 12]
+ ["Houston" 11]
+ ["Irvine" 11]
+ ["Lakeland" 11]]
+ (Q dataset tupac-sightings
+ return rows
+ of sightings
+ aggregate count
+ breakout city_id->cities.name
+ order ag.0-
+ limit 10))
+
+
+;; Number of Tupac sightings in the Expa office
+;; (he was spotted here 60 times)
+;; Test that we can filter on an FK field
+(datasets/expect-with-datasets #{:h2 :postgres :mysql}
+ 60
+ (Q dataset tupac-sightings
+ return first-row first
+ aggregate count of sightings
+ filter = category_id->categories.id 8))
+
+
+;; THE 10 MOST RECENT TUPAC SIGHTINGS (!)
+;; (What he was doing when we saw him, sighting ID)
+;; Check that we can include an FK field in the :fields clause
+(datasets/expect-with-datasets #{:h2 :postgres :mysql}
+ [[772 "In the Park"]
+ [894 "Working at a Pet Store"]
+ [684 "At the Airport"]
+ [199 "At a Restaurant"]
+ [33 "Working as a Limo Driver"]
+ [902 "At Starbucks"]
+ [927 "On TV"]
+ [996 "At a Restaurant"]
+ [897 "Wearing a Biggie Shirt"]
+ [499 "In the Expa Office"]]
+ (Q dataset tupac-sightings
+ return rows
+ of sightings
+ fields id category_id->categories.name
+ order timestamp-
+ limit 10))
+
+
+;; 1. Check that we can order by Foreign Keys
+;; (this query targets sightings and orders by cities.name and categories.name)
+;; 2. Check that we can join MULTIPLE tables in a single query
+;; (this query joins both cities and categories)
+(datasets/expect-with-datasets #{:h2 :postgres :mysql}
+ ;; CITY_ID, CATEGORY_ID, ID
+ ;; Cities are already alphabetized in the source data which is why CITY_ID is sorted
+ [[1 12 6]
+ [1 11 355]
+ [1 11 596]
+ [1 13 379]
+ [1 5 413]
+ [1 1 426]
+ [2 11 67]
+ [2 11 524]
+ [2 13 77]
+ [2 13 202]]
+ (Q dataset tupac-sightings
+ return rows (map butlast) (map reverse) ; drop timestamps. reverse ordering to make the results columns order match order_by
+ of sightings
+ order city_id->cities.name+ category_id->categories.name- id+
+ limit 10))
+
+
+;; Check that trying to use a Foreign Key fails for Mongo
+(datasets/expect-with-dataset :mongo
+ {:status :failed
+ :error "foreign-keys is not supported by this driver."}
+ (select-keys (Q dataset tupac-sightings
+ of sightings
+ order city_id->cities.name+ category_id->categories.name- id+
+ limit 10)
+ [:status :error]))
+
+
+;; +------------------------------------------------------------------------------------------------------------------------+
+;; | MONGO NESTED-FIELD ACCESS |
+;; +------------------------------------------------------------------------------------------------------------------------+
+
+;;; Nested Field in FILTER
+;; Get the first 10 tips where tip.venue.name == "Kyle's Low-Carb Grill"
+(datasets/expect-when-testing-dataset :mongo
+ [[8 "Kyle's Low-Carb Grill"]
+ [67 "Kyle's Low-Carb Grill"]
+ [80 "Kyle's Low-Carb Grill"]
+ [83 "Kyle's Low-Carb Grill"]
+ [295 "Kyle's Low-Carb Grill"]
+ [342 "Kyle's Low-Carb Grill"]
+ [417 "Kyle's Low-Carb Grill"]
+ [426 "Kyle's Low-Carb Grill"]
+ [470 "Kyle's Low-Carb Grill"]]
+ (Q dataset geographical-tips use mongo
+ return rows (map (fn [[id _ _ {venue-name :name}]] [id venue-name]))
+ aggregate rows of tips
+ filter = venue...name "Kyle's Low-Carb Grill"
+ order id
+ limit 10))
+
+;;; Nested Field in ORDER
+;; Let's get all the tips Kyle posted on Twitter sorted by tip.venue.name
+(datasets/expect-when-testing-dataset :mongo
+ [[446
+ {:mentions ["@cams_mexican_gastro_pub"], :tags ["#mexican" "#gastro" "#pub"], :service "twitter", :username "kyle"}
+ {:large "http://cloudfront.net/6e3a5256-275f-4056-b61a-25990b4bb484/large.jpg",
+ :medium "http://cloudfront.net/6e3a5256-275f-4056-b61a-25990b4bb484/med.jpg",
+ :small "http://cloudfront.net/6e3a5256-275f-4056-b61a-25990b4bb484/small.jpg"}
+ {:phone "415-320-9123", :name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}]
+ [230
+ {:mentions ["@haight_european_grill"], :tags ["#european" "#grill"], :service "twitter", :username "kyle"}
+ {:large "http://cloudfront.net/1dcef7de-a1c4-405b-a9e1-69c92d686ef1/large.jpg",
+ :medium "http://cloudfront.net/1dcef7de-a1c4-405b-a9e1-69c92d686ef1/med.jpg",
+ :small "http://cloudfront.net/1dcef7de-a1c4-405b-a9e1-69c92d686ef1/small.jpg"}
+ {:phone "415-191-2778", :name "Haight European Grill", :categories ["European" "Grill"], :id "7e6281f7-5b17-4056-ada0-85453247bc8f"}]
+ [319
+ {:mentions ["@haight_soul_food_pop_up_food_stand"], :tags ["#soul" "#food" "#pop-up" "#food" "#stand"], :service "twitter", :username "kyle"}
+ {:large "http://cloudfront.net/8f613909-550f-4d79-96f6-dc498ff65d1b/large.jpg",
+ :medium "http://cloudfront.net/8f613909-550f-4d79-96f6-dc498ff65d1b/med.jpg",
+ :small "http://cloudfront.net/8f613909-550f-4d79-96f6-dc498ff65d1b/small.jpg"}
+ {:phone "415-741-8726", :name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :id "9735184b-1299-410f-a98e-10d9c548af42"}]
+ [224
+ {:mentions ["@pacific_heights_free_range_eatery"], :tags ["#free-range" "#eatery"], :service "twitter", :username "kyle"}
+ {:large "http://cloudfront.net/cedd4221-dbdb-46c3-95a9-935cce6b3fe5/large.jpg",
+ :medium "http://cloudfront.net/cedd4221-dbdb-46c3-95a9-935cce6b3fe5/med.jpg",
+ :small "http://cloudfront.net/cedd4221-dbdb-46c3-95a9-935cce6b3fe5/small.jpg"}
+ {:phone "415-901-6541", :name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}]]
+ (Q dataset geographical-tips use mongo
+ return rows
+ aggregate rows of tips
+ filter and = source...service "twitter"
+ = source...username "kyle"
+ order venue...name))
+
+;; Nested Field in AGGREGATION
+;; Let's see how many *distinct* venue names are mentioned
+(datasets/expect-when-testing-dataset :mongo
+ 99
+ (Q dataset geographical-tips use mongo
+ return first-row first
+ aggregate distinct venue...name of tips))
+
+;; Now let's just get the regular count
+(datasets/expect-when-testing-dataset :mongo
+ 500
+ (Q dataset geographical-tips use mongo
+ return first-row first
+ aggregate count venue...name of tips))
+
+;;; Nested Field in BREAKOUT
+;; Let's see how many tips we have by source.service
+(datasets/expect-when-testing-dataset :mongo
+ {:rows [["facebook" 107]
+ ["flare" 105]
+ ["foursquare" 100]
+ ["twitter" 98]
+ ["yelp" 90]]
+ :columns ["source.service" "count"]}
+ (Q dataset geographical-tips use mongo
+ return :data (#(dissoc % :cols))
+ aggregate count of tips
+ breakout source...service))
+
+;;; Nested Field in FIELDS
+;; Return the first 10 tips with just tip.venue.name
+(datasets/expect-when-testing-dataset :mongo
+ [[{:name "Lucky's Gluten-Free Café"} 1]
+ [{:name "Joe's Homestyle Eatery"} 2]
+ [{:name "Lower Pac Heights Cage-Free Coffee House"} 3]
+ [{:name "Oakland European Liquor Store"} 4]
+ [{:name "Tenderloin Gormet Restaurant"} 5]
+ [{:name "Marina Modern Sushi"} 6]
+ [{:name "Sunset Homestyle Grill"} 7]
+ [{:name "Kyle's Low-Carb Grill"} 8]
+ [{:name "Mission Homestyle Churros"} 9]
+ [{:name "Sameer's Pizza Liquor Store"} 10]]
+ (Q dataset geographical-tips use mongo
+ return rows
+ aggregate rows of tips
+ order id
+ fields venue...name
+ limit 10))
+
+
+;;; Nested Field w/ ordering by aggregation
+(datasets/expect-when-testing-dataset :mongo
+ [["jane" 4]
+ ["kyle" 5]
+ ["tupac" 5]
+ ["jessica" 6]
+ ["bob" 7]
+ ["lucky_pigeon" 7]
+ ["joe" 8]
+ ["mandy" 8]
+ ["amy" 9]
+ ["biggie" 9]
+ ["sameer" 9]
+ ["cam_saul" 10]
+ ["rasta_toucan" 13]
+ [nil 400]]
+ (Q dataset geographical-tips use mongo
+ return rows
+ aggregate count of tips
+ breakout source...mayor
+ order ag.0))
+
+
+;;; # New Filter Types - CONTAINS, STARTS_WITH, ENDS_WITH
+
+;;; ## STARTS_WITH
+(datasets/expect-with-all-datasets
+ [[41 "Cheese Steak Shop" 18 37.7855 -122.44 1]
+ [74 "Chez Jay" 2 34.0104 -118.493 2]]
+ (Q return rows
+ aggregate rows of venues
+ filter starts-with name "Che"
+ order id))
+
+
+;;; ## ENDS_WITH
+(datasets/expect-with-all-datasets
+ [[5 "Brite Spot Family Restaurant" 20 34.0778 -118.261 2]
+ [7 "Don Day Korean Restaurant" 44 34.0689 -118.305 2]
+ [17 "Ruen Pair Thai Restaurant" 71 34.1021 -118.306 2]
+ [45 "Tu Lan Restaurant" 4 37.7821 -122.41 1]
+ [55 "Dal Rae Restaurant" 67 33.983 -118.096 4]]
+ (Q return rows
+ aggregate rows of venues
+ filter ends-with name "Restaurant"
+ order id))
+
+
+;;; ## CONTAINS
+(datasets/expect-with-all-datasets
+ [[31 "Bludso's BBQ" 5 33.8894 -118.207 2]
+ [34 "Beachwood BBQ & Brewing" 10 33.7701 -118.191 2]
+ [39 "Baby Blues BBQ" 5 34.0003 -118.465 2]]
+ (Q return rows
+ aggregate rows of venues
+ filter contains name "BBQ"
+ order id))
+
+;;; ## Nested AND / OR
+
+(datasets/expect-with-all-datasets
+ [81]
+ (Q aggregate count of venues
+ filter and != price 3
+ or = price 1
+ or = price 2
+ return first-row))
+
+
+;;; ## = / != with multiple values
+
+(datasets/expect-with-all-datasets
+ [81]
+ (Q return first-row
+ aggregate count of venues
+ filter = price 1 2))
+
+(datasets/expect-with-all-datasets
+ [19]
+ (Q return first-row
+ aggregate count of venues
+ filter != price 1 2))
diff --git a/test/metabase/driver/sync_test.clj b/test/metabase/driver/sync_test.clj
index bdca4176f5f1374483a0eb1007750edbc1b58615..0cd0692c309e6299dfbf0290039ecc5697dd5ac8 100644
--- a/test/metabase/driver/sync_test.clj
+++ b/test/metabase/driver/sync_test.clj
@@ -1,6 +1,6 @@
(ns metabase.driver.sync-test
(:require [expectations :refer :all]
- [korma.core :refer :all]
+ [korma.core :as k]
[metabase.db :refer :all]
[metabase.driver :as driver]
(metabase.driver [h2 :as h2]
@@ -8,10 +8,14 @@
[sync :as sync])
[metabase.driver.generic-sql.util :refer [korma-entity]]
(metabase.models [field :refer [Field]]
+ [field-values :refer [FieldValues]]
[foreign-key :refer [ForeignKey]]
[table :refer [Table]])
(metabase.test [data :refer :all]
- [util :refer [resolve-private-fns]])))
+ [util :refer [resolve-private-fns]])
+ (metabase.test.data [datasets :as datasets]
+ [interface :refer [create-database-definition]])
+ [metabase.util :as u]))
(def users-table
(delay (sel :one Table :name "USERS")))
@@ -23,7 +27,7 @@
(delay (korma-entity @users-table)))
(def users-name-field
- (delay (sel :one Field :id (id :users :name))))
+ (delay (Field (id :users :name))))
;; ## TEST PK SYNCING
@@ -77,16 +81,104 @@
(upd Field field-id :special_type nil)
(get-special-type-and-fk-exists?))
;; Run sync-table and they should be set again
- (let [table (sel :one Table :id (id :checkins))]
+ (let [table (Table (id :checkins))]
(driver/sync-table! table)
(get-special-type-and-fk-exists?))]))
;; ## Tests for DETERMINE-FK-TYPE
;; Since COUNT(category_id) > COUNT(DISTINCT(category_id)) the FK relationship should be Mt1
+(def determine-fk-type (u/runtime-resolved-fn 'metabase.driver.sync 'determine-fk-type))
(expect :Mt1
- (sync/determine-fk-type (sel :one Field :id (id :venues :category_id))))
+ (determine-fk-type (Field (id :venues :category_id))))
;; Since COUNT(id) == COUNT(DISTINCT(id)) the FK relationship should be 1t1
;; (yes, ID isn't really a FK field, but determine-fk-type doesn't need to know that)
(expect :1t1
- (sync/determine-fk-type (sel :one Field :id (id :venues :id))))
+ (determine-fk-type (Field (id :venues :id))))
+
+
+;;; ## FieldValues Syncing
+
+(let [get-field-values (fn [] (sel :one :field [FieldValues :values] :field_id (id :venues :price)))
+ get-field-values-id (fn [] (sel :one :id FieldValues :field_id (id :venues :price)))]
+ ;; Test that when we delete FieldValues syncing the Table again will cause them to be re-created
+ (expect
+ [[1 2 3 4] ; 1
+ nil ; 2
+ [1 2 3 4]] ; 3
+ [ ;; 1. Check that we have expected field values to start with
+ (get-field-values)
+ ;; 2. Delete the Field values, make sure they're gone
+ (do (cascade-delete FieldValues :id (get-field-values-id))
+ (get-field-values))
+ ;; 3. Now re-sync the table and make sure they're back
+ (do (driver/sync-table! @venues-table)
+ (get-field-values))])
+
+ ;; Test that syncing will cause FieldValues to be updated
+ (expect
+ [[1 2 3 4] ; 1
+ [1 2 3] ; 2
+ [1 2 3 4]] ; 3
+ [ ;; 1. Check that we have expected field values to start with
+ (get-field-values)
+ ;; 2. Update the FieldValues, remove one of the values that should be there
+ (do (upd FieldValues (get-field-values-id) :values [1 2 3])
+ (get-field-values))
+ ;; 3. Now re-sync the table and make sure the value is back
+ (do (driver/sync-table! @venues-table)
+ (get-field-values))]))
+
+
+;;; ## mark-json-field!
+
+(resolve-private-fns metabase.driver.sync values-are-valid-json?)
+
+(def ^:const ^:private fake-values-seq-json
+ "A sequence of values that should be marked is valid JSON.")
+
+;; When all the values are valid JSON dicts they're valid JSON
+(expect true
+ (values-are-valid-json? ["{\"this\":\"is\",\"valid\":\"json\"}"
+ "{\"this\":\"is\",\"valid\":\"json\"}"
+ "{\"this\":\"is\",\"valid\":\"json\"}"]))
+
+;; When all the values are valid JSON arrays they're valid JSON
+(expect true
+ (values-are-valid-json? ["[1, 2, 3, 4]"
+ "[1, 2, 3, 4]"
+ "[1, 2, 3, 4]"]))
+
+;; Some combo of both can still be marked as JSON
+(expect true
+ (values-are-valid-json? ["{\"this\":\"is\",\"valid\":\"json\"}"
+ "[1, 2, 3, 4]"
+ "[1, 2, 3, 4]"]))
+
+;; If the values have some valid JSON dicts but is mostly null, it's still valid JSON
+(expect true
+ (values-are-valid-json? ["{\"this\":\"is\",\"valid\":\"json\"}"
+ nil
+ nil]))
+
+;; If every value is nil then the values should not be considered valid JSON
+(expect false
+ (values-are-valid-json? [nil, nil, nil]))
+
+;; Check that things that aren't dictionaries or arrays aren't marked as JSON
+(expect false (values-are-valid-json? ["\"A JSON string should not cause a Field to be marked as JSON\""]))
+(expect false (values-are-valid-json? ["100"]))
+(expect false (values-are-valid-json? ["true"]))
+(expect false (values-are-valid-json? ["false"]))
+
+
+(datasets/expect-with-dataset :postgres
+ :json
+ (with-temp-db
+ [_
+ (dataset-loader)
+ (create-database-definition "Postgres with a JSON Field"
+ ["venues"
+ [{:field-name "address", :base-type {:native "json"}}]
+ [[(k/raw "to_json('{\"street\": \"431 Natoma\", \"city\": \"San Francisco\", \"state\": \"CA\", \"zip\": 94103}'::text)")]]])]
+ (sel :one :field [Field :special_type] :id &venues.address:id)))
diff --git a/test/metabase/email/messages_test.clj b/test/metabase/email/messages_test.clj
index c550331d25c9463b0f2b5a34d89b9094104abad1..72d5862554c00e9f374b12954b347d588f23bc97 100644
--- a/test/metabase/email/messages_test.clj
+++ b/test/metabase/email/messages_test.clj
@@ -36,18 +36,19 @@
(email/email-smtp-password orig-password#))))))
;; new user email
+;; NOTE: we are not validating the content of the email body namely because it's got randomized elements and thus
+;; it would be extremely hard to have a predictable test that we can rely on
(expect
[{:from "notifications@metabase.com",
:to ["test@test.com"],
- :subject "Your new Metabase account is all set up",
- :body [{:type "text/html; charset=utf-8",
- :content (str "<html><body><p>Welcome to Metabase test!</p>"
- "<p>Your account is setup and ready to go, you just need to set a password so you can login. "
- "Follow the link below to reset your account password.</p>"
- "<p><a href=\"http://localhost/some/url\">http://localhost/some/url</a></p></body></html>")}]}]
+ :subject "You're invited to join Metabase Test's Metabase",
+ :body [{:type "text/html; charset=utf-8"}]}]
(with-fake-inbox
- (send-new-user-email "test" "test@test.com" "http://localhost/some/url")
- (@inbox "test@test.com")))
+ (send-new-user-email {:first_name "test" :email "test@test.com"}
+ {:first_name "invitor" :email "invited_by@test.com"}
+ "http://localhost/some/url")
+ (-> (@inbox "test@test.com")
+ (update-in [0 :body 0] dissoc :content))))
;; password reset email
(expect
diff --git a/test/metabase/http_client.clj b/test/metabase/http_client.clj
index e9b827d8208176ff80e9abd306429d11f33ed342..a66fe17ad272a87633b7bf81a834797dc2cdc689 100644
--- a/test/metabase/http_client.clj
+++ b/test/metabase/http_client.clj
@@ -4,8 +4,7 @@
[cheshire.core :as cheshire]
[clj-http.lite.client :as client]
[metabase.config :as config]
- [metabase.util :as u])
- (:import com.metabase.corvus.api.ApiException))
+ [metabase.util :as u]))
(declare authenticate
auto-deserialize-dates
@@ -63,37 +62,36 @@
(or (nil? url-param-kwargs)
(map? url-param-kwargs))]}
- (let [request-map (cond-> {:accept :json
- :headers {"X-METABASE-SESSION" (when credentials (if (map? credentials) (authenticate credentials)
- credentials))}}
- (not (empty? http-body)) (assoc
- :content-type :json
- :body (cheshire/generate-string http-body)))
- request-fn (case method
- :get client/get
- :post client/post
- :put client/put
- :delete client/delete)
- url (build-url url url-param-kwargs)
+ (let [request-map (cond-> {:accept :json
+ :headers {"X-METABASE-SESSION" (when credentials (if (map? credentials) (authenticate credentials)
+ credentials))}}
+ (seq http-body) (assoc
+ :content-type :json
+ :body (cheshire/generate-string http-body)))
+ request-fn (case method
+ :get client/get
+ :post client/post
+ :put client/put
+ :delete client/delete)
+ url (build-url url url-param-kwargs)
method-name (.toUpperCase ^String (name method))
;; Now perform the HTTP request
{:keys [status body]} (try (request-fn url request-map)
(catch clojure.lang.ExceptionInfo e
(log/debug method-name url)
- (-> (.getData ^clojure.lang.ExceptionInfo e)
- :object)))]
+ (:object (.getData ^clojure.lang.ExceptionInfo e))))]
;; -check the status code if EXPECTED-STATUS was passed
(log/debug method-name url status)
(when expected-status
(when-not (= status expected-status)
(let [message (format "%s %s expected a status code of %d, got %d." method-name url expected-status status)
- {stacktrace :stacktrace :as body} (try (-> (cheshire/parse-string body)
- clojure.walk/keywordize-keys)
- (catch Exception _ body))]
- (log/warn (with-out-str (clojure.pprint/pprint body)))
- (throw (ApiException. status message)))))
+ body (try (-> (cheshire/parse-string body)
+ clojure.walk/keywordize-keys)
+ (catch Exception _ body))]
+ (log/error (u/pprint-to-str 'red body))
+ (throw (ex-info message {:status-code status})))))
;; Deserialize the JSON response or return as-is if that fails
(try (-> body
diff --git a/test/metabase/middleware/auth_test.clj b/test/metabase/middleware/auth_test.clj
index 871143d14a425766ed2ab26b17fec3b7b4e5dec7..58ac400655c86014fe3e3009d7c51339cfa6350f 100644
--- a/test/metabase/middleware/auth_test.clj
+++ b/test/metabase/middleware/auth_test.clj
@@ -1,188 +1,172 @@
(ns metabase.middleware.auth-test
(:require [expectations :refer :all]
- [korma.core :as korma]
+ [korma.core :as k]
[ring.mock.request :as mock]
[metabase.api.common :refer [*current-user-id* *current-user*]]
[metabase.middleware.auth :refer :all]
[metabase.models.session :refer [Session]]
[metabase.test.data :refer :all]
[metabase.test.data.users :refer :all]
- [metabase.util :as util]))
+ [metabase.util :as u]))
-;; =========================== TEST wrap-sessionid middleware ===========================
+;; =========================== TEST wrap-session-id middleware ===========================
;; create a simple example of our middleware wrapped around a handler that simply returns the request
;; this works in this case because the only impact our middleware has is on the request
-(def wrapped-handler
- (wrap-sessionid (fn [req] req)))
+(def ^:private wrapped-handler
+ (wrap-session-id identity))
-;; no sessionid in the request
-(expect
- {}
+;; no session-id in the request
+(expect nil
(-> (wrapped-handler (mock/request :get "/anyurl") )
- (select-keys [:metabase-sessionid])))
+ :metabase-session-id))
-;; extract sessionid from header
-(expect
- {:metabase-sessionid "foobar"}
+;; extract session-id from header
+(expect "foobar"
(-> (wrapped-handler (mock/header (mock/request :get "/anyurl") metabase-session-header "foobar"))
- (select-keys [:metabase-sessionid])))
+ :metabase-session-id))
-;; extract sessionid from cookie
-(expect
- {:metabase-sessionid "cookie-session"}
+;; extract session-id from cookie
+(expect "cookie-session"
(-> (wrapped-handler (assoc (mock/request :get "/anyurl") :cookies {metabase-session-cookie {:value "cookie-session"}}))
- (select-keys [:metabase-sessionid])))
+ :metabase-session-id))
-;; if both header and cookie sessionids exist, then we expect the cookie to take precedence
-(expect
- {:metabase-sessionid "cookie-session"}
+;; if both header and cookie session-ids exist, then we expect the cookie to take precedence
+(expect "cookie-session"
(-> (wrapped-handler (-> (mock/header (mock/request :get "/anyurl") metabase-session-header "foobar")
(assoc :cookies {metabase-session-cookie {:value "cookie-session"}})))
- (select-keys [:metabase-sessionid])))
+ :metabase-session-id))
;; =========================== TEST enforce-authentication middleware ===========================
;; create a simple example of our middleware wrapped around a handler that simply returns the request
-(def auth-enforced-handler
- (enforce-authentication (fn [req] req)))
+(def ^:private auth-enforced-handler
+ (wrap-current-user-id (enforce-authentication identity)))
-(defn request-with-sessionid
- "Creates a mock Ring request with the given sessionid applied"
- [sessionid]
+(defn- request-with-session-id
+ "Creates a mock Ring request with the given session-id applied"
+ [session-id]
(-> (mock/request :get "/anyurl")
- (assoc :metabase-sessionid sessionid)))
+ (assoc :metabase-session-id session-id)))
-;; no sessionid in the request
-(expect
- {:status (:status response-unauthentic)
- :body (:body response-unauthentic)}
+;; no session-id in the request
+(expect response-unauthentic
(auth-enforced-handler (mock/request :get "/anyurl")))
+(defn- random-session-id []
+ {:post [(string? %)]}
+ (.toString (java.util.UUID/randomUUID)))
-;; valid sessionid
-(let [sessionid (.toString (java.util.UUID/randomUUID))]
- (assert sessionid)
- ;; validate that we are authenticated
- (expect-let [res (korma/insert Session (korma/values {:id sessionid :user_id (user->id :rasta) :created_at (util/new-sql-timestamp)}))]
- {:metabase-userid (user->id :rasta)}
- (-> (auth-enforced-handler (request-with-sessionid sessionid))
- (select-keys [:metabase-userid]))))
+;; valid session ID
+(expect (user->id :rasta)
+ (let [session-id (random-session-id)]
+ (k/insert Session (k/values {:id session-id, :user_id (user->id :rasta), :created_at (u/new-sql-timestamp)}))
+ (-> (auth-enforced-handler (request-with-session-id session-id))
+ :metabase-user-id)))
-;; expired sessionid
-(let [sessionid (.toString (java.util.UUID/randomUUID))]
- (assert sessionid)
- ;; create a new session (specifically created some time in the past so it's EXPIRED)
- ;; should fail due to session expiration
- (expect-let [res (korma/insert Session (korma/values {:id sessionid :user_id (user->id :rasta) :created_at (java.sql.Timestamp. 0)}))]
- {:status (:status response-unauthentic)
- :body (:body response-unauthentic)}
- (auth-enforced-handler (request-with-sessionid sessionid))))
+;; expired session-id
+;; create a new session (specifically created some time in the past so it's EXPIRED)
+;; should fail due to session expiration
+(expect response-unauthentic
+ (let [session-id (random-session-id)]
+ (k/insert Session (k/values {:id session-id, :user_id (user->id :rasta), :created_at (java.sql.Timestamp. 0)}))
+ (auth-enforced-handler (request-with-session-id session-id))))
-;; inactive user sessionid
-(let [sessionid (.toString (java.util.UUID/randomUUID))]
- (assert sessionid)
- ;; create a new session (specifically created some time in the past so it's EXPIRED)
- ;; should fail due to inactive user
- ;; NOTE that :trashbird is our INACTIVE test user
- (expect-let [res (korma/insert Session (korma/values {:id sessionid :user_id (user->id :trashbird) :created_at (util/new-sql-timestamp)}))]
- {:status (:status response-unauthentic)
- :body (:body response-unauthentic)}
- (auth-enforced-handler (request-with-sessionid sessionid))))
+;; inactive user session-id
+;; create a new session (specifically created some time in the past so it's EXPIRED)
+;; should fail due to inactive user
+;; NOTE that :trashbird is our INACTIVE test user
+(expect response-unauthentic
+ (let [session-id (random-session-id)]
+ (k/insert Session (k/values {:id session-id, :user_id (user->id :trashbird), :created_at (u/new-sql-timestamp)}))
+ (auth-enforced-handler (request-with-session-id session-id))))
;; =========================== TEST bind-current-user middleware ===========================
;; create a simple example of our middleware wrapped around a handler that simply returns our bound variables for users
-(def user-bound-handler
- (bind-current-user (fn [req] {:userid *current-user-id*
- :user (select-keys @*current-user* [:id :email])})))
+(def ^:private user-bound-handler
+ (bind-current-user (fn [_] {:user-id *current-user-id*
+ :user (select-keys @*current-user* [:id :email])})))
-
-(defn request-with-userid
- "Creates a mock Ring request with the given userid applied"
- [userid]
+(defn- request-with-user-id
+ "Creates a mock Ring request with the given user-id applied"
+ [user-id]
(-> (mock/request :get "/anyurl")
- (assoc :metabase-userid userid)))
+ (assoc :metabase-user-id user-id)))
;; with valid user-id
(expect
- {:userid (user->id :rasta)
- :user {:id (user->id :rasta)
- :email (:email (fetch-user :rasta))}}
- (user-bound-handler (request-with-userid (user->id :rasta))))
+ {:user-id (user->id :rasta)
+ :user {:id (user->id :rasta)
+ :email (:email (fetch-user :rasta))}}
+ (user-bound-handler (request-with-user-id (user->id :rasta))))
;; with invalid user-id (not sure how this could ever happen, but lets test it anyways)
(expect
- {:userid 0
- :user {}}
- (user-bound-handler (request-with-userid 0)))
+ {:user-id 0
+ :user {}}
+ (user-bound-handler (request-with-user-id 0)))
-;; =========================== TEST wrap-apikey middleware ===========================
+;; =========================== TEST wrap-api-key middleware ===========================
;; create a simple example of our middleware wrapped around a handler that simply returns the request
;; this works in this case because the only impact our middleware has is on the request
-(def wrapped-apikey-handler
- (wrap-apikey (fn [req] req)))
+(def ^:private wrapped-api-key-handler
+ (wrap-api-key identity))
;; no apikey in the request
-(expect
- {}
- (-> (wrapped-apikey-handler (mock/request :get "/anyurl") )
- (select-keys [:metabase-sessionid])))
+(expect nil
+ (-> (wrapped-api-key-handler (mock/request :get "/anyurl") )
+ :metabase-session-id))
;; extract apikey from header
-(expect
- {:metabase-apikey "foobar"}
- (-> (wrapped-apikey-handler (mock/header (mock/request :get "/anyurl") metabase-apikey-header "foobar"))
- (select-keys [:metabase-apikey])))
+(expect "foobar"
+ (-> (wrapped-api-key-handler (mock/header (mock/request :get "/anyurl") metabase-api-key-header "foobar"))
+ :metabase-api-key))
-;; =========================== TEST enforce-apikey middleware ===========================
+;; =========================== TEST enforce-api-key middleware ===========================
;; create a simple example of our middleware wrapped around a handler that simply returns the request
-(def apikey-enforced-handler
- (enforce-apikey (fn [req] {:success true})))
+(def ^:private api-key-enforced-handler
+ (enforce-api-key (constantly {:success true})))
-(defn request-with-apikey
+(defn- request-with-api-key
"Creates a mock Ring request with the given apikey applied"
- [apikey]
+ [api-key]
(-> (mock/request :get "/anyurl")
- (assoc :metabase-apikey apikey)))
+ (assoc :metabase-api-key api-key)))
;; no apikey in the request, expect 403
-(expect
- {:status (:status response-forbidden)
- :body (:body response-forbidden)}
- (apikey-enforced-handler (mock/request :get "/anyurl")))
+(expect response-forbidden
+ (api-key-enforced-handler (mock/request :get "/anyurl")))
;; valid apikey, expect 200
(expect
- {:success true}
- (apikey-enforced-handler (request-with-apikey "test-api-key")))
+ {:success true}
+ (api-key-enforced-handler (request-with-api-key "test-api-key")))
;; invalid apikey, expect 403
-(expect
- {:status (:status response-forbidden)
- :body (:body response-forbidden)}
- (apikey-enforced-handler (request-with-apikey "foobar")))
+(expect response-forbidden
+ (api-key-enforced-handler (request-with-api-key "foobar")))
diff --git a/test/metabase/models/common_test.clj b/test/metabase/models/common_test.clj
index 2ac473653d073d8fbcfecf79d639211e6d24aa08..261e87a36ba57f7e4ff21f8b50fbffde94ef1ae7 100644
--- a/test/metabase/models/common_test.clj
+++ b/test/metabase/models/common_test.clj
@@ -1,26 +1,19 @@
(ns metabase.models.common-test
(:require [expectations :refer :all]
- [metabase.api.common :refer [*current-user-id*]]
- [metabase.models.common :refer :all]))
-
-;;; tests for PUBLIC-PERMISSIONS
-
-(expect #{}
- (public-permissions {:public_perms 0}))
-
-(expect #{:read}
- (public-permissions {:public_perms 1}))
-
-(expect #{:read :write}
- (public-permissions {:public_perms 2}))
-
-
-;;; tests for USER-PERMISSIONS
-
-;; creator can read + write
-(expect #{:read :write}
- (binding [*current-user-id* 100]
- (user-permissions {:creator_id 100
- :public_perms 0})))
-
-;; TODO - write tests for the rest of the `user-permissions`
+ [metabase.db :refer :all]
+ [metabase.models.common :refer [name->human-readable-name]]
+ [metabase.test.data :refer :all]))
+
+
+;; testing on `(name->human-readable-name)`
+(expect nil (name->human-readable-name nil))
+(expect nil (name->human-readable-name ""))
+(expect "" (name->human-readable-name "_"))
+(expect "" (name->human-readable-name "-"))
+(expect "Id" (name->human-readable-name "_id"))
+(expect "Agent Invite Migration" (name->human-readable-name "_agent_invite_migration"))
+(expect "Agent Invite Migration" (name->human-readable-name "-agent-invite-migration"))
+(expect "Foobar" (name->human-readable-name "fooBar"))
+(expect "Foo Bar" (name->human-readable-name "foo-bar"))
+(expect "Foo Bar" (name->human-readable-name "foo_bar"))
+(expect "Foo Id" (name->human-readable-name "foo_id"))
diff --git a/test/metabase/models/hydrate_test.clj b/test/metabase/models/hydrate_test.clj
index bf98426bc2b7e51c829d403f7186bd8ca7806a83..af9098d703a87208e5a90e0272cd8f94690d9894 100644
--- a/test/metabase/models/hydrate_test.clj
+++ b/test/metabase/models/hydrate_test.clj
@@ -237,11 +237,13 @@
:b d2}
:b))
-;; specifying "nested" hydration with no "nested" keys should still work
-(expect {:a 1 :b 2}
- (hydrate {:a 1
- :b d2}
- [:b]))
+;; specifying "nested" hydration with no "nested" keys should throw an exception and tell you not to do it
+(expect "Assert failed: Replace '[:b]' with ':b'. Vectors are for nested hydration. There's no need to use one when you only have a single key.\n(> (count vect) 1)"
+ (try (hydrate {:a 1
+ :b d2}
+ [:b])
+ (catch Throwable e
+ (.getMessage e))))
;; check that returning an array works correctly
(expect {:c [1 2 3]}
diff --git a/test/metabase/models/revision/diff_test.clj b/test/metabase/models/revision/diff_test.clj
new file mode 100644
index 0000000000000000000000000000000000000000..342c9e2d17e868c0da77f3601d3cc89bab3eb651
--- /dev/null
+++ b/test/metabase/models/revision/diff_test.clj
@@ -0,0 +1,34 @@
+(ns metabase.models.revision.diff-test
+ (:require [metabase.models.revision.diff :refer :all]
+ [expectations :refer :all]))
+
+
+;; Check that pattern matching allows specialization and that string only reflects the keys that have changed
+(expect "Cam Saul renamed this card from \"Tips by State\" to \"Spots by State\"."
+ (diff-str "Cam Saul" "card"
+ {:name "Tips by State", :private false}
+ {:name "Spots by State", :private false}))
+
+(expect "Cam Saul made this card private."
+ (diff-str "Cam Saul" "card"
+ {:name "Spots by State", :private false}
+ {:name "Spots by State", :private true}))
+
+
+;; Check the fallback sentence fragment for key without specialized sentence fragment
+(expect "Cam Saul changed priority from \"Important\" to \"Regular\"."
+ (diff-str "Cam Saul" "card"
+ {:priority "Important"}
+ {:priority "Regular"}))
+
+;; Check that 2 changes are handled nicely
+(expect "Cam Saul made this card private and renamed it from \"Tips by State\" to \"Spots by State\"."
+ (diff-str "Cam Saul" "card"
+ {:name "Tips by State", :private false}
+ {:name "Spots by State", :private true}))
+
+;; Check that several changes are handled nicely
+(expect "Cam Saul changed priority from \"Important\" to \"Regular\", made this card private and renamed it from \"Tips by State\" to \"Spots by State\"."
+ (diff-str "Cam Saul" "card"
+ {:name "Tips by State", :private false, :priority "Important"}
+ {:name "Spots by State", :private true, :priority "Regular"}))
diff --git a/test/metabase/models/revision_test.clj b/test/metabase/models/revision_test.clj
new file mode 100644
index 0000000000000000000000000000000000000000..66321a75b28c2d797321cf3d106123a8192041aa
--- /dev/null
+++ b/test/metabase/models/revision_test.clj
@@ -0,0 +1,154 @@
+(ns metabase.models.revision-test
+ (:require [expectations :refer :all]
+ [korma.core :refer [table]]
+ [medley.core :as m]
+ [metabase.db :as db]
+ (metabase.models [card :refer [Card]]
+ [interface :refer [defentity]]
+ [revision :refer :all])
+ [metabase.test.data.users :refer :all]
+ [metabase.util :as u]))
+
+(defn fake-card [& {:as kwargs}]
+ (m/mapply db/ins Card (merge {:name (str (java.util.UUID/randomUUID))
+ :display :table
+ :public_perms 0
+ :dataset_query {}
+ :visualization_settings 0
+ :creator_id (user->id :rasta)}
+ kwargs)))
+
+(defmacro with-fake-card [[binding & [options]] & body]
+ `(let [card# (fake-card ~@(flatten (seq options)))
+ ~binding card#]
+ (try
+ ~@body
+ (finally
+ (db/cascade-delete Card :id (:id card#))))))
+
+(def ^:private reverted-to
+ (atom nil))
+
+(defentity ^:private FakedCard
+ [(table :report_card)])
+
+(extend-type FakedCardEntity
+ IRevisioned
+ (serialize-instance [_ _ obj]
+ (assoc obj :serialized true))
+ (revert-to-revision [_ _ serialized-instance]
+ (reset! reverted-to (dissoc serialized-instance :serialized)))
+ (describe-diff [_ _ o1 o2]
+ {:before o1
+ :after o2}))
+
+(defn- push-fake-revision [card-id & {:as object}]
+ (push-revision :entity FakedCard, :id card-id, :user-id (user->id :rasta), :object object))
+
+
+;;; # REVISIONS + PUSH-REVISION
+
+;; Test that a newly created Card doesn't have any revisions
+(expect []
+ (with-fake-card [{card-id :id}]
+ (revisions FakedCard card-id)))
+
+;; Test that when we can add a revision
+(expect [{:model "FakedCard"
+ :user_id (user->id :rasta)
+ :object {:name "Tips Created by Day", :serialized true}
+ :is_reversion false}]
+ (with-fake-card [{card-id :id}]
+ (push-fake-revision card-id, :name "Tips Created by Day")
+ (->> (revisions FakedCard card-id)
+ (map (u/rpartial dissoc :timestamp :id :model_id)))))
+
+;; Test that revisions are sorted in reverse chronological order
+(expect [{:model "FakedCard"
+ :user_id (user->id :rasta)
+ :object {:name "Spots Created by Day", :serialized true}
+ :is_reversion false}
+ {:model "FakedCard"
+ :user_id (user->id :rasta)
+ :object {:name "Tips Created by Day", :serialized true}
+ :is_reversion false}]
+ (with-fake-card [{card-id :id}]
+ (push-fake-revision card-id, :name "Tips Created by Day")
+ (push-fake-revision card-id, :name "Spots Created by Day")
+ (->> (revisions FakedCard card-id)
+ (map (u/rpartial dissoc :timestamp :id :model_id)))))
+
+;; Check that old revisions get deleted
+(expect max-revisions
+ (with-fake-card [{card-id :id}]
+ ;; e.g. if max-revisions is 15 then insert 16 revisions
+ (dorun (repeatedly (inc max-revisions) #(push-fake-revision card-id, :name "Tips Created by Day")))
+ (count (revisions FakedCard card-id))))
+
+
+;;; # REVISIONS+DETAILS
+
+;; Check that revisions+details pulls in user info and adds description
+(expect [{:is_reversion false,
+ :user {:id (user->id :rasta), :common_name "Rasta Toucan", :first_name "Rasta", :last_name "Toucan"},
+ :description "First revision."}]
+ (with-fake-card [{card-id :id}]
+ (push-fake-revision card-id, :name "Tips Created by Day")
+ (->> (revisions+details FakedCard card-id)
+ (map (u/rpartial dissoc :timestamp :id :model_id)))))
+
+;; Check that revisions properly defer to describe-diff
+(expect [{:is_reversion false,
+ :user {:id (user->id :rasta), :common_name "Rasta Toucan", :first_name "Rasta", :last_name "Toucan"},
+ :description {:before {:name "Tips Created by Day", :serialized true}
+ :after {:name "Spots Created by Day", :serialized true}}}
+ {:is_reversion false,
+ :user {:id (user->id :rasta), :common_name "Rasta Toucan", :first_name "Rasta", :last_name "Toucan"},
+ :description "First revision."}]
+ (with-fake-card [{card-id :id}]
+ (push-fake-revision card-id, :name "Tips Created by Day")
+ (push-fake-revision card-id, :name "Spots Created by Day")
+ (->> (revisions+details FakedCard card-id)
+ (map (u/rpartial dissoc :timestamp :id :model_id)))))
+
+;;; # REVERT
+
+;; Check that revert defers to revert-to-revision
+(expect {:name "Tips Created by Day"}
+ (with-fake-card [{card-id :id}]
+ (push-fake-revision card-id, :name "Tips Created by Day")
+ (let [[{revision-id :id}] (revisions FakedCard card-id)]
+ (revert :entity FakedCard, :id card-id, :user-id (user->id :rasta), :revision-id revision-id)
+ @reverted-to)))
+
+;; Check default impl of revert-to-revision just does mapply upd
+(expect ["Spots Created By Day"
+ "Tips Created by Day"]
+ (with-fake-card [{card-id :id} {:name "Spots Created By Day"}]
+ (push-revision :entity Card, :id card-id, :user-id (user->id :rasta), :object {:name "Tips Created by Day"})
+ (push-revision :entity Card, :id card-id, :user-id (user->id :rasta), :object {:name "Spots Created by Day"})
+ [(:name (Card card-id))
+ (let [[_ {old-revision-id :id}] (revisions Card card-id)]
+ (revert :entity Card, :id card-id, :user-id (user->id :rasta), :revision-id old-revision-id)
+ (:name (Card card-id)))]))
+
+;; Check that reverting to a previous revision adds an appropriate revision
+(expect [{:model "FakedCard"
+ :user_id (user->id :rasta)
+ :object {:name "Tips Created by Day", :serialized true}
+ :is_reversion true}
+ {:model "FakedCard",
+ :user_id (user->id :rasta)
+ :object {:name "Spots Created by Day", :serialized true}
+ :is_reversion false}
+ {:model "FakedCard",
+ :user_id (user->id :rasta)
+ :object {:name "Tips Created by Day", :serialized true}
+ :is_reversion false}]
+ (with-fake-card [{card-id :id}]
+ (push-fake-revision card-id, :name "Tips Created by Day")
+ (push-fake-revision card-id, :name "Spots Created by Day")
+ (let [[_ {old-revision-id :id}] (revisions FakedCard card-id)]
+ (revert :entity FakedCard, :id card-id, :user-id (user->id :rasta), :revision-id old-revision-id)
+ (->> (revisions FakedCard card-id)
+ (map (u/rpartial dissoc :timestamp :id :model_id))))))
diff --git a/test/metabase/task_test.clj b/test/metabase/task_test.clj
index 5e1b817e39096e7fefbb0a007cfbf13927c8243f..a6e07ddfc41efc46dd2a18752b61960a31cba4bb 100644
--- a/test/metabase/task_test.clj
+++ b/test/metabase/task_test.clj
@@ -67,16 +67,16 @@
:restarted]
[(do
(stop-task-runner!)
- (with-redefs [metabase.task/hourly-task-delay (constantly 100)
+ (with-redefs [metabase.task/hourly-task-delay (constantly 200)
metabase.task/hourly-tasks-hook mock-hourly-tasks-hook]
(add-hook! #'hourly-tasks-hook inc-task-test-atom-counter-by-system-hour)
(reset! task-test-atom-counter 0)
(start-task-runner!)
[@task-test-atom-counter ; should be 0, since not enough time has elaspsed for the hook to be executed
- (do (Thread/sleep 150)
- @task-test-atom-counter) ; should have been called once (~50ms ago)
- (do (Thread/sleep 200)
+ (do (Thread/sleep 300)
+ @task-test-atom-counter) ; should have been called once (~100ms ago)
+ (do (Thread/sleep 400)
@task-test-atom-counter) ; should have been called two more times
(do (stop-task-runner!)
:stopped)]))
diff --git a/test/metabase/test/data.clj b/test/metabase/test/data.clj
index f1c56f2b4e0a07a9714170d439cc9967147d2c4f..41292fe2af2e3deb495e8f9cb437c3702342ae59 100644
--- a/test/metabase/test/data.clj
+++ b/test/metabase/test/data.clj
@@ -13,7 +13,8 @@
(metabase.test.data [data :as data]
[datasets :as datasets :refer [*dataset*]]
[h2 :as h2]
- [interface :refer :all]))
+ [interface :refer :all])
+ [metabase.util :as u])
(:import clojure.lang.Keyword
(metabase.test.data.interface DatabaseDefinition
FieldDefinition
@@ -67,6 +68,9 @@
(defn id-field-type []
(datasets/id-field-type *dataset*))
+(defn sum-field-type []
+ (datasets/sum-field-type *dataset*))
+
(defn timestamp-field-type []
(datasets/timestamp-field-type *dataset*))
@@ -87,29 +91,22 @@
(or (metabase-instance database-definition engine)
(do
;; Create the database
- (log/info (color/blue (format "Creating %s database %s..." (name engine) database-name)))
(create-physical-db! dataset-loader database-definition)
;; Load data
- (log/info (color/blue "Loading data..."))
(doseq [^TableDefinition table-definition (:table-definitions database-definition)]
- (log/info (color/blue (format "Loading data for table '%s'..." (:table-name table-definition))))
- (load-table-data! dataset-loader database-definition table-definition)
- (log/info (color/blue (format "Inserted %d rows." (count (:rows table-definition))))))
+ (load-table-data! dataset-loader database-definition table-definition))
;; Add DB object to Metabase DB
- (log/info (color/blue "Adding DB to Metabase..."))
(let [db (ins Database
:name database-name
:engine (name engine)
:details (database->connection-details dataset-loader database-definition))]
;; Sync the database
- (log/info (color/blue "Syncing DB..."))
(driver/sync-database! db)
;; Add extra metadata like Field field-type, base-type, etc.
- (log/info (color/blue "Adding schema metadata..."))
(doseq [^TableDefinition table-definition (:table-definitions database-definition)]
(let [table-name (:table-name table-definition)
table (delay (let [table (metabase-instance table-definition db)]
@@ -120,13 +117,11 @@
(assert field)
field))]
(when field-type
- (log/info (format "SET FIELD TYPE %s.%s -> %s" table-name field-name field-type))
+ (log/debug (format "SET FIELD TYPE %s.%s -> %s" table-name field-name field-type))
(upd Field (:id @field) :field_type (name field-type)))
(when special-type
- (log/info (format "SET SPECIAL TYPE %s.%s -> %s" table-name field-name special-type))
+ (log/debug (format "SET SPECIAL TYPE %s.%s -> %s" table-name field-name special-type))
(upd Field (:id @field) :special_type (name special-type)))))))
-
- (log/info (color/blue "Finished."))
db))))))
(defn remove-database!
@@ -151,17 +146,21 @@
(defn- table-id->field-name->field
"Return a map of lowercased `Field` names -> fields for `Table` with TABLE-ID."
[table-id]
- (->> (sel :many :field->obj [Field :name] :table_id table-id)
- (m/map-keys s/lower-case)))
+ {:pre [(integer? table-id)]}
+ (->> (binding [*sel-disable-logging* true]
+ (sel :many :field->obj [Field :name], :table_id table-id, :parent_id nil))
+ (m/map-keys s/lower-case)
+ (m/map-keys (u/rpartial s/replace #"^_id$" "id")))) ; rename Mongo _id fields to ID so we can use the same name for any driver
(defn- db-id->table-name->table
"Return a map of lowercased `Table` names -> Tables for `Database` with DATABASE-ID.
Add a delay `:field-name->field` to each Table that calls `table-id->field-name->field` for that Table."
[database-id]
- (->> (sel :many :field->obj [Table :name] :db_id database-id)
+ {:pre [(integer? database-id)]}
+ (->> (binding [*sel-disable-logging* true]
+ (sel :many :field->obj [Table :name] :db_id database-id))
(m/map-keys s/lower-case)
- (m/map-vals (fn [table]
- (assoc table :field-name->field (delay (table-id->field-name->field (:id table))))))))
+ (m/map-vals #(assoc % :field-name->field (delay (table-id->field-name->field (:id %)))))))
(defn -temp-db-add-getter-delay
"Add a delay `:table-name->table` to DB that calls `db-id->table-name->table`."
@@ -174,33 +173,72 @@
With three args, fetch `Field` with FIELD-NAME by recursively fetching `Table` and using its `:field-name->field` delay."
([temp-db table-name]
{:pre [(map? temp-db)
- (string? table-name)]}
+ (string? table-name)]
+ :post [(or (map? %) (assert nil (format "Couldn't find table '%s'.\nValid choices are: %s" table-name
+ (vec (keys @(:table-name->table temp-db))))))]}
(@(:table-name->table temp-db) table-name))
+
([temp-db table-name field-name]
- {:pre [(string? field-name)]}
- (@(:field-name->field (-temp-get temp-db table-name)) field-name)))
+ {:pre [(string? field-name)]
+ :post [(or (map? %) (assert nil (format "Couldn't find field '%s.%s'.\nValid choices are: %s" table-name field-name
+ (vec (keys @(:field-name->field (-temp-get temp-db table-name)))))))]}
+ (@(:field-name->field (-temp-get temp-db table-name)) field-name))
+
+ ([temp-db table-name parent-field-name & nested-field-names]
+ {:pre [(every? string? nested-field-names)]
+ :post [(or (map? %) (assert nil (format "Couldn't find nested field '%s.%s.%s'.\nValid choices are: %s" table-name parent-field-name
+ (apply str (interpose "." nested-field-names))
+ (vec (map :name @(:children (apply -temp-get temp-db table-name parent-field-name (butlast nested-field-names))))))))]}
+ (binding [*sel-disable-logging* true]
+ (let [parent (apply -temp-get temp-db table-name parent-field-name (butlast nested-field-names))
+ children @(:children parent)
+ child-name->child (zipmap (map :name children) children)]
+ (child-name->child (last nested-field-names))))))
(defn- walk-expand-&
- "Walk BODY looking for symbols like `&table` or `&table.field` and expand them to appropriate `-temp-get` forms."
+ "Walk BODY looking for symbols like `&table` or `&table.field` and expand them to appropriate `-temp-get` forms.
+ If symbol ends in a `:field` form, wrap the call to `-temp-get` in call in a keyword getter for that field.
+
+ &sightings -> (-temp-get db \"sightings\")
+ &cities.name -> (-temp-get db \"cities\" \"name\")
+ &cities.name:id -> (:id (-temp-get db \"cities\" \"name\"))"
[db-binding body]
(walk/prewalk
(fn [form]
(or (when (symbol? form)
- (when-let [symbol-name (re-matches #"^&.+$" (name form))]
- `(-temp-get ~db-binding ~@(-> symbol-name
- (s/replace #"&" "")
- (s/split #"\.")))))
+ (when-let [[_ table-name field-name prop-name] (re-matches #"^&([^.:]+)(?:\.([^.:]+))?(?::([^.:]+))?$" (name form))]
+ (let [temp-get `(-temp-get ~db-binding ~table-name ~@(when field-name [field-name]))]
+ (if prop-name `(~(keyword prop-name) ~temp-get)
+ temp-get))))
form))
body))
+(defn -with-temp-db [loader ^DatabaseDefinition dbdef f]
+ (let [dbdef (map->DatabaseDefinition (assoc dbdef :short-lived? true))]
+ (try
+ (binding [*sel-disable-logging* true]
+ (remove-database! loader dbdef)
+ (let [db (-> (get-or-create-database! loader dbdef)
+ -temp-db-add-getter-delay)]
+ (assert db)
+ (assert (exists? Database :id (:id db)))
+ (binding [*sel-disable-logging* false]
+ (f db))))
+ (finally
+ (binding [*sel-disable-logging* true]
+ (remove-database! loader dbdef))))))
+
(defmacro with-temp-db
"Load and sync DATABASE-DEFINITION with DATASET-LOADER and execute BODY with
the newly created `Database` bound to DB-BINDING.
Remove `Database` and destroy data afterward.
Within BODY, symbols like `&table` and `&table.field` will be expanded into function calls to
- fetch corresponding `Tables` and `Fields`. These are accessed via lazily-created maps of
- Table/Field names to the objects themselves. To facilitate mutli-driver tests, these names are lowercased.
+ fetch corresponding `Tables` and `Fields`. Symbols like `&table:id` wrap a getter around the resulting
+ forms (see `walk-expand-&` for details).
+
+ These are accessed via lazily-created maps of Table/Field names to the objects themselves.
+ To facilitate mutli-driver tests, these names are lowercased.
(with-temp-db [db (h2/dataset-loader) us-history-1607-to-1774]
(driver/process-quiery {:database (:id db)
@@ -209,13 +247,6 @@
:aggregation [\"count\"]
:filter [\"<\" (:id &events.timestamp) \"1765-01-01\"]}}))"
[[db-binding dataset-loader ^DatabaseDefinition database-definition] & body]
- `(let [loader# ~dataset-loader
- ;; Add :short-lived? to the database definition so dataset loaders can use different connection options if desired
- dbdef# (map->DatabaseDefinition (assoc ~database-definition :short-lived? true))]
- (try
- (remove-database! loader# dbdef#) ; Remove DB if it already exists for some weird reason
- (let [~db-binding (-> (get-or-create-database! loader# dbdef#)
- -temp-db-add-getter-delay)] ; Add the :table-name->table delay used by -temp-get
- ~@(walk-expand-& db-binding body)) ; expand $table and $table.field forms into -temp-get calls
- (finally
- (remove-database! loader# dbdef#)))))
+ `(-with-temp-db ~dataset-loader ~database-definition
+ (fn [~db-binding]
+ ~@(walk-expand-& db-binding body))))
diff --git a/test/metabase/test/data/dataset_definitions.clj b/test/metabase/test/data/dataset_definitions.clj
index b4f2d5a5c17c77bd5c140d67f88b40fdcf8942e1..c6a2c859d01459c679993b2f81a2a0c14be767c5 100644
--- a/test/metabase/test/data/dataset_definitions.clj
+++ b/test/metabase/test/data/dataset_definitions.clj
@@ -30,7 +30,15 @@
;; TODO - make rows be lazily loadable for DB definitions from a file
(defmacro ^:private def-database-definition-edn [dbname]
`(def-database-definition ~dbname
- (edn/read-string (slurp ~(str edn-definitions-dir (name dbname) ".edn")))))
+ ~@(edn/read-string (slurp (str edn-definitions-dir (name dbname) ".edn")))))
;; Times when the Toucan cried
(def-database-definition-edn sad-toucan-incidents)
+
+;; Places, times, and circumstances where Tupac was sighted
+(def-database-definition-edn tupac-sightings)
+
+(def-database-definition-edn geographical-tips)
+
+;; A very tiny dataset with a list of places and a booleans
+(def-database-definition-edn places-cam-likes)
diff --git a/test/metabase/test/data/dataset_definitions/geographical-tips.edn b/test/metabase/test/data/dataset_definitions/geographical-tips.edn
new file mode 100644
index 0000000000000000000000000000000000000000..271eafce334efe38559688479a75d214b8dd4eff
--- /dev/null
+++ b/test/metabase/test/data/dataset_definitions/geographical-tips.edn
@@ -0,0 +1,3008 @@
+[["tips" [{:field-name "text"
+ :base-type :CharField}
+ {:field-name "url"
+ :base-type :UnknownField}
+ {:field-name "venue"
+ :base-type :UnknownField}
+ {:field-name "source"
+ :base-type :UnknownField}]
+ [["Lucky's Gluten-Free Café is a atmospheric and delicious place to have a drink during winter."
+ {:small "http://cloudfront.net/50576ac9-2211-4198-8915-265d32a6ba82/small.jpg",
+ :medium "http://cloudfront.net/50576ac9-2211-4198-8915-265d32a6ba82/med.jpg",
+ :large "http://cloudfront.net/50576ac9-2211-4198-8915-265d32a6ba82/large.jpg"}
+ {:name "Lucky's Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-740-2328", :id "379af987-ad40-4a93-88a6-0233e1c14649"}
+ {:service "facebook", :facebook-photo-id "e46749c3-c532-4dc7-bdc3-da274de3c3ab", :url "http://facebook.com/photos/e46749c3-c532-4dc7-bdc3-da274de3c3ab"}]
+ ["Joe's Homestyle Eatery is a exclusive and historical place to have breakfast on public holidays."
+ {:small "http://cloudfront.net/b90e3288-c02c-4744-823a-d4110ca2d71b/small.jpg",
+ :medium "http://cloudfront.net/b90e3288-c02c-4744-823a-d4110ca2d71b/med.jpg",
+ :large "http://cloudfront.net/b90e3288-c02c-4744-823a-d4110ca2d71b/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "flare", :username "mandy"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a underground and fantastic place to catch a bite to eat on Saturday night."
+ {:small "http://cloudfront.net/2122308c-e15a-460e-98a0-a3b604db3cd1/small.jpg",
+ :medium "http://cloudfront.net/2122308c-e15a-460e-98a0-a3b604db3cd1/med.jpg",
+ :large "http://cloudfront.net/2122308c-e15a-460e-98a0-a3b604db3cd1/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "flare", :username "mandy"}]
+ ["Oakland European Liquor Store is a swell and wonderful place to take a date in July."
+ {:small "http://cloudfront.net/2fb9d1ae-a3d1-4b27-966e-260983f01813/small.jpg",
+ :medium "http://cloudfront.net/2fb9d1ae-a3d1-4b27-966e-260983f01813/med.jpg",
+ :large "http://cloudfront.net/2fb9d1ae-a3d1-4b27-966e-260983f01813/large.jpg"}
+ {:name "Oakland European Liquor Store", :categories ["European" "Liquor Store"], :phone "415-559-1516", :id "e342e7b7-e82d-475d-a822-b2df9c84850d"}
+ {:service "facebook", :facebook-photo-id "a9855e18-8612-4a97-b86a-aafe0d747bb4", :url "http://facebook.com/photos/a9855e18-8612-4a97-b86a-aafe0d747bb4"}]
+ ["Tenderloin Gormet Restaurant is a world-famous and popular place to have a drink during winter."
+ {:small "http://cloudfront.net/30ef9979-b1a9-40a9-82a4-32565401bab5/small.jpg",
+ :medium "http://cloudfront.net/30ef9979-b1a9-40a9-82a4-32565401bab5/med.jpg",
+ :large "http://cloudfront.net/30ef9979-b1a9-40a9-82a4-32565401bab5/large.jpg"}
+ {:name "Tenderloin Gormet Restaurant", :categories ["Gormet" "Restaurant"], :phone "415-127-4197", :id "54a9eac8-d80d-4af8-b6d7-34651a60e59c"}
+ {:service "twitter", :mentions ["@tenderloin_gormet_restaurant"], :tags ["#gormet" "#restaurant"], :username "tupac"}]
+ ["Marina Modern Sushi is a fantastic and underappreciated place to have a birthday party weekday afternoons."
+ {:small "http://cloudfront.net/bc7bac7f-5e92-4023-9b35-fd80f106274a/small.jpg",
+ :medium "http://cloudfront.net/bc7bac7f-5e92-4023-9b35-fd80f106274a/med.jpg",
+ :large "http://cloudfront.net/bc7bac7f-5e92-4023-9b35-fd80f106274a/large.jpg"}
+ {:name "Marina Modern Sushi", :categories ["Modern" "Sushi"], :phone "415-393-7672", :id "21807c63-ca4c-4468-9844-d0c2620fbdfc"}
+ {:service "facebook", :facebook-photo-id "58084e61-6381-4313-83be-6e35c8424600", :url "http://facebook.com/photos/58084e61-6381-4313-83be-6e35c8424600"}]
+ ["Sunset Homestyle Grill is a world-famous and well-decorated place to conduct a business meeting Friday nights."
+ {:small "http://cloudfront.net/3fc720ca-07d7-48b7-bcab-550d951f58b9/small.jpg",
+ :medium "http://cloudfront.net/3fc720ca-07d7-48b7-bcab-550d951f58b9/med.jpg",
+ :large "http://cloudfront.net/3fc720ca-07d7-48b7-bcab-550d951f58b9/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "yelp", :yelp-photo-id "976fdffd-70ca-4b57-b214-80f0eb80f619", :categories ["Homestyle" "Grill"]}]
+ ["Kyle's Low-Carb Grill is a delicious and underappreciated place to have a after-work cocktail after baseball games."
+ {:small "http://cloudfront.net/49b48260-5c56-4873-956e-c13423f4feed/small.jpg",
+ :medium "http://cloudfront.net/49b48260-5c56-4873-956e-c13423f4feed/med.jpg",
+ :large "http://cloudfront.net/49b48260-5c56-4873-956e-c13423f4feed/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "yelp", :yelp-photo-id "058b7d4e-b92b-4408-ba67-659f5b640e4b", :categories ["Low-Carb" "Grill"]}]
+ ["Mission Homestyle Churros is a groovy and wonderful place to catch a bite to eat weekday afternoons."
+ {:small "http://cloudfront.net/2110742e-7e30-4a0d-8df4-1d20d2503f42/small.jpg",
+ :medium "http://cloudfront.net/2110742e-7e30-4a0d-8df4-1d20d2503f42/med.jpg",
+ :large "http://cloudfront.net/2110742e-7e30-4a0d-8df4-1d20d2503f42/large.jpg"}
+ {:name "Mission Homestyle Churros", :categories ["Homestyle" "Churros"], :phone "415-343-4489", :id "21d903d3-8bdb-4b7d-b288-6063ad48af44"}
+ {:service "facebook", :facebook-photo-id "b2a4862c-c5b7-4cfb-8ff6-fb564c28f4c8", :url "http://facebook.com/photos/b2a4862c-c5b7-4cfb-8ff6-fb564c28f4c8"}]
+ ["Sameer's Pizza Liquor Store is a overrated and decent place to sip a glass of expensive wine during summer."
+ {:small "http://cloudfront.net/df8c679d-93d5-4008-a129-b33711892cba/small.jpg",
+ :medium "http://cloudfront.net/df8c679d-93d5-4008-a129-b33711892cba/med.jpg",
+ :large "http://cloudfront.net/df8c679d-93d5-4008-a129-b33711892cba/large.jpg"}
+ {:name "Sameer's Pizza Liquor Store", :categories ["Pizza" "Liquor Store"], :phone "415-969-7474", :id "7b9c7dc3-d8f1-498d-843a-e62360449892"}
+ {:service "twitter", :mentions ["@sameers_pizza_liquor_store"], :tags ["#pizza" "#liquor" "#store"], :username "cam_saul"}]
+ ["Market St. European Ice Cream Truck is a overrated and overrated place to watch the Giants game on Saturday night."
+ {:small "http://cloudfront.net/25be5a46-88b0-4ac7-965d-196d4dbab4b8/small.jpg",
+ :medium "http://cloudfront.net/25be5a46-88b0-4ac7-965d-196d4dbab4b8/med.jpg",
+ :large "http://cloudfront.net/25be5a46-88b0-4ac7-965d-196d4dbab4b8/large.jpg"}
+ {:name "Market St. European Ice Cream Truck", :categories ["European" "Ice Cream Truck"], :phone "415-555-4197", :id "4ed53fe4-4bd9-4fa3-8f61-374ea75129ca"}
+ {:service "facebook", :facebook-photo-id "d3717643-c5c3-4e36-8721-99c2fd65972f", :url "http://facebook.com/photos/d3717643-c5c3-4e36-8721-99c2fd65972f"}]
+ ["Haight Mexican Restaurant is a fantastic and overrated place to sip a glass of expensive wine with your pet toucan."
+ {:small "http://cloudfront.net/d01af223-d655-4b62-83a9-63a03118b288/small.jpg",
+ :medium "http://cloudfront.net/d01af223-d655-4b62-83a9-63a03118b288/med.jpg",
+ :large "http://cloudfront.net/d01af223-d655-4b62-83a9-63a03118b288/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "foursquare", :foursquare-photo-id "5eac8186-24ef-4369-9b46-3bbec215a9c3", :mayor "cam_saul"}]
+ ["Rasta's Mexican Sushi is a overrated and well-decorated place to watch the Warriors game with your pet toucan."
+ {:small "http://cloudfront.net/c807068e-1def-4902-987a-75e4e06636f9/small.jpg",
+ :medium "http://cloudfront.net/c807068e-1def-4902-987a-75e4e06636f9/med.jpg",
+ :large "http://cloudfront.net/c807068e-1def-4902-987a-75e4e06636f9/large.jpg"}
+ {:name "Rasta's Mexican Sushi", :categories ["Mexican" "Sushi"], :phone "415-387-1284", :id "e4912a22-e6ac-4806-8377-6497bf533a21"}
+ {:service "flare", :username "amy"}]
+ ["Market St. European Ice Cream Truck is a amazing and groovy place to have a drink on Saturday night."
+ {:small "http://cloudfront.net/1b91096b-206b-4823-8ef9-13f0bf9ac76e/small.jpg",
+ :medium "http://cloudfront.net/1b91096b-206b-4823-8ef9-13f0bf9ac76e/med.jpg",
+ :large "http://cloudfront.net/1b91096b-206b-4823-8ef9-13f0bf9ac76e/large.jpg"}
+ {:name "Market St. European Ice Cream Truck", :categories ["European" "Ice Cream Truck"], :phone "415-555-4197", :id "4ed53fe4-4bd9-4fa3-8f61-374ea75129ca"}
+ {:service "facebook", :facebook-photo-id "d7ab7046-43cd-472e-a48d-1b11cd3f7b55", :url "http://facebook.com/photos/d7ab7046-43cd-472e-a48d-1b11cd3f7b55"}]
+ ["Tenderloin Paleo Hotel & Restaurant is a underappreciated and fantastic place to take visiting friends and relatives after baseball games."
+ {:small "http://cloudfront.net/5ad20c96-0a12-43ff-97e9-8b8b7e373b6c/small.jpg",
+ :medium "http://cloudfront.net/5ad20c96-0a12-43ff-97e9-8b8b7e373b6c/med.jpg",
+ :large "http://cloudfront.net/5ad20c96-0a12-43ff-97e9-8b8b7e373b6c/large.jpg"}
+ {:name "Tenderloin Paleo Hotel & Restaurant", :categories ["Paleo" "Hotel & Restaurant"], :phone "415-402-1652", :id "4dea27b4-6d89-4b86-80a8-5631e171da8d"}
+ {:service "flare", :username "lucky_pigeon"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a well-decorated and amazing place to watch the Warriors game when hungover."
+ {:small "http://cloudfront.net/5809d5db-cfc0-4f54-8760-228bdb3e1697/small.jpg",
+ :medium "http://cloudfront.net/5809d5db-cfc0-4f54-8760-228bdb3e1697/med.jpg",
+ :large "http://cloudfront.net/5809d5db-cfc0-4f54-8760-228bdb3e1697/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "foursquare", :foursquare-photo-id "b8ef27c8-8dc4-45ff-9485-c130889eaea1", :mayor "joe"}]
+ ["Polk St. Mexican Coffee House is a world-famous and modern place to pitch an investor in the spring."
+ {:small "http://cloudfront.net/a351a826-49e8-43d5-b983-7b4f013e872e/small.jpg",
+ :medium "http://cloudfront.net/a351a826-49e8-43d5-b983-7b4f013e872e/med.jpg",
+ :large "http://cloudfront.net/a351a826-49e8-43d5-b983-7b4f013e872e/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "facebook", :facebook-photo-id "3c80ed1f-409b-4cfa-bf78-9bbc8cd8f9f5", :url "http://facebook.com/photos/3c80ed1f-409b-4cfa-bf78-9bbc8cd8f9f5"}]
+ ["Sunset Homestyle Grill is a amazing and world-famous place to drink a craft beer when hungover."
+ {:small "http://cloudfront.net/d6ff64d9-1779-4cbf-bbbf-6f666a67691e/small.jpg",
+ :medium "http://cloudfront.net/d6ff64d9-1779-4cbf-bbbf-6f666a67691e/med.jpg",
+ :large "http://cloudfront.net/d6ff64d9-1779-4cbf-bbbf-6f666a67691e/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "yelp", :yelp-photo-id "4ab42195-c3df-49e2-b8e9-20e4f5fae63b", :categories ["Homestyle" "Grill"]}]
+ ["Marina Modern Bar & Grill is a atmospheric and great place to have breakfast during winter."
+ {:small "http://cloudfront.net/95842ec7-663b-48db-b667-d6b70d0c194d/small.jpg",
+ :medium "http://cloudfront.net/95842ec7-663b-48db-b667-d6b70d0c194d/med.jpg",
+ :large "http://cloudfront.net/95842ec7-663b-48db-b667-d6b70d0c194d/large.jpg"}
+ {:name "Marina Modern Bar & Grill", :categories ["Modern" "Bar & Grill"], :phone "415-203-8530", :id "806144f1-bb7a-4271-8fcb-fc6550f51676"}
+ {:service "facebook", :facebook-photo-id "0a3e4b0e-ecd7-4c55-8d5f-2265ad57b02a", :url "http://facebook.com/photos/0a3e4b0e-ecd7-4c55-8d5f-2265ad57b02a"}]
+ ["Polk St. Mexican Coffee House is a swell and wonderful place to have a after-work cocktail in June."
+ {:small "http://cloudfront.net/4b773ee9-a6db-4e6a-8314-24530a35cdf5/small.jpg",
+ :medium "http://cloudfront.net/4b773ee9-a6db-4e6a-8314-24530a35cdf5/med.jpg",
+ :large "http://cloudfront.net/4b773ee9-a6db-4e6a-8314-24530a35cdf5/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "twitter", :mentions ["@polk_st._mexican_coffee_house"], :tags ["#mexican" "#coffee" "#house"], :username "amy"}]
+ ["Nob Hill Korean Taqueria is a decent and modern place to catch a bite to eat on Taco Tuesday."
+ {:small "http://cloudfront.net/e87adb96-9303-4728-a2e2-ce4d2c1edb74/small.jpg",
+ :medium "http://cloudfront.net/e87adb96-9303-4728-a2e2-ce4d2c1edb74/med.jpg",
+ :large "http://cloudfront.net/e87adb96-9303-4728-a2e2-ce4d2c1edb74/large.jpg"}
+ {:name "Nob Hill Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-107-7332", :id "a43c184c-90f5-488c-bb3b-00ea2666d90e"}
+ {:service "yelp", :yelp-photo-id "b0b7027e-5884-48fb-93d4-d11f44c564df", :categories ["Korean" "Taqueria"]}]
+ ["SF Deep-Dish Eatery is a world-famous and historical place to catch a bite to eat on a Tuesday afternoon."
+ {:small "http://cloudfront.net/bda4e656-d27d-44f2-a0ca-8aa8856a4eb5/small.jpg",
+ :medium "http://cloudfront.net/bda4e656-d27d-44f2-a0ca-8aa8856a4eb5/med.jpg",
+ :large "http://cloudfront.net/bda4e656-d27d-44f2-a0ca-8aa8856a4eb5/large.jpg"}
+ {:name "SF Deep-Dish Eatery", :categories ["Deep-Dish" "Eatery"], :phone "415-476-9257", :id "ad41d3f6-c20c-46a7-9e5d-db602fff7d0d"}
+ {:service "foursquare", :foursquare-photo-id "217e84df-2032-4e13-b32d-20745fc36be0", :mayor "amy"}]
+ ["Sunset Deep-Dish Hotel & Restaurant is a popular and groovy place to have a drink weekend mornings."
+ {:small "http://cloudfront.net/6f15c573-5718-4e17-a64b-5b5ac3a4be00/small.jpg",
+ :medium "http://cloudfront.net/6f15c573-5718-4e17-a64b-5b5ac3a4be00/med.jpg",
+ :large "http://cloudfront.net/6f15c573-5718-4e17-a64b-5b5ac3a4be00/large.jpg"}
+ {:name "Sunset Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-332-0978", :id "a80745c7-af74-4579-8932-70dd488269e6"}
+ {:service "twitter", :mentions ["@sunset_deep_dish_hotel_&_restaurant"], :tags ["#deep-dish" "#hotel" "#&" "#restaurant"], :username "lucky_pigeon"}]
+ ["Polk St. Japanese Liquor Store is a fantastic and delicious place to catch a bite to eat with your pet dog."
+ {:small "http://cloudfront.net/5af61fa2-9031-4be5-86c8-210e9612a184/small.jpg",
+ :medium "http://cloudfront.net/5af61fa2-9031-4be5-86c8-210e9612a184/med.jpg",
+ :large "http://cloudfront.net/5af61fa2-9031-4be5-86c8-210e9612a184/large.jpg"}
+ {:name "Polk St. Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-726-7986", :id "b57ceac5-328d-4b65-9909-a1f9abc93015"}
+ {:service "foursquare", :foursquare-photo-id "0928a8d9-8198-4004-ae00-58025bc98a4b", :mayor "mandy"}]
+ ["Chinatown Paleo Food Truck is a modern and underappreciated place to nurse a hangover weekend mornings."
+ {:small "http://cloudfront.net/55ab1c20-acae-491b-afa2-455e35c924bd/small.jpg",
+ :medium "http://cloudfront.net/55ab1c20-acae-491b-afa2-455e35c924bd/med.jpg",
+ :large "http://cloudfront.net/55ab1c20-acae-491b-afa2-455e35c924bd/large.jpg"}
+ {:name "Chinatown Paleo Food Truck", :categories ["Paleo" "Food Truck"], :phone "415-583-4380", :id "aa9b5ce9-db74-470e-8573-f2faca24d546"}
+ {:service "facebook", :facebook-photo-id "533e16df-df5c-4368-81fe-ca4c53797f4c", :url "http://facebook.com/photos/533e16df-df5c-4368-81fe-ca4c53797f4c"}]
+ ["Rasta's Paleo Churros is a well-decorated and underground place to sip a glass of expensive wine in the fall."
+ {:small "http://cloudfront.net/45c98735-bbc7-4d81-bac6-d45527446f71/small.jpg",
+ :medium "http://cloudfront.net/45c98735-bbc7-4d81-bac6-d45527446f71/med.jpg",
+ :large "http://cloudfront.net/45c98735-bbc7-4d81-bac6-d45527446f71/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "facebook", :facebook-photo-id "71b1c7b4-cf56-4cb1-985a-d97edb8bda7c", :url "http://facebook.com/photos/71b1c7b4-cf56-4cb1-985a-d97edb8bda7c"}]
+ ["Market St. Gluten-Free Café is a classic and exclusive place to drink a craft beer with friends."
+ {:small "http://cloudfront.net/569435ff-07e5-4369-bf69-075ee03b3f74/small.jpg",
+ :medium "http://cloudfront.net/569435ff-07e5-4369-bf69-075ee03b3f74/med.jpg",
+ :large "http://cloudfront.net/569435ff-07e5-4369-bf69-075ee03b3f74/large.jpg"}
+ {:name "Market St. Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-697-9776", :id "ce4947d0-071a-4491-b5ac-f8b0241bd54c"}
+ {:service "facebook", :facebook-photo-id "250305eb-9827-43b8-a190-401a7170eb1e", :url "http://facebook.com/photos/250305eb-9827-43b8-a190-401a7170eb1e"}]
+ ["Lucky's Old-Fashioned Eatery is a underground and delicious place to watch the Warriors game during summer."
+ {:small "http://cloudfront.net/188511ac-9217-42ca-8d1e-973072669935/small.jpg",
+ :medium "http://cloudfront.net/188511ac-9217-42ca-8d1e-973072669935/med.jpg",
+ :large "http://cloudfront.net/188511ac-9217-42ca-8d1e-973072669935/large.jpg"}
+ {:name "Lucky's Old-Fashioned Eatery", :categories ["Old-Fashioned" "Eatery"], :phone "415-362-2338", :id "71dc221c-6e82-4d06-8709-93293121b1da"}
+ {:service "foursquare", :foursquare-photo-id "c1759648-8365-48ca-8068-f3ba5fbb32a4", :mayor "mandy"}]
+ ["Polk St. Japanese Liquor Store is a underappreciated and modern place to catch a bite to eat weekend mornings."
+ {:small "http://cloudfront.net/f143dd2d-b46d-4444-ac48-f5253fa0fdae/small.jpg",
+ :medium "http://cloudfront.net/f143dd2d-b46d-4444-ac48-f5253fa0fdae/med.jpg",
+ :large "http://cloudfront.net/f143dd2d-b46d-4444-ac48-f5253fa0fdae/large.jpg"}
+ {:name "Polk St. Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-726-7986", :id "b57ceac5-328d-4b65-9909-a1f9abc93015"}
+ {:service "facebook", :facebook-photo-id "3f7b182d-22b8-401c-939d-bd08cde5a9ac", :url "http://facebook.com/photos/3f7b182d-22b8-401c-939d-bd08cde5a9ac"}]
+ ["Cam's Mexican Gastro Pub is a great and world-famous place to catch a bite to eat when hungover."
+ {:small "http://cloudfront.net/dc69ae89-81f7-49d3-aa4d-ce48621f7497/small.jpg",
+ :medium "http://cloudfront.net/dc69ae89-81f7-49d3-aa4d-ce48621f7497/med.jpg",
+ :large "http://cloudfront.net/dc69ae89-81f7-49d3-aa4d-ce48621f7497/large.jpg"}
+ {:name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :phone "415-320-9123", :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}
+ {:service "foursquare", :foursquare-photo-id "6a0d547d-2053-4c14-b35f-f658cfc21f84", :mayor "sameer"}]
+ ["Lucky's Gluten-Free Gastro Pub is a wonderful and horrible place to have a birthday party with friends."
+ {:small "http://cloudfront.net/5c9aedc4-916f-4552-b520-084495bf5cce/small.jpg",
+ :medium "http://cloudfront.net/5c9aedc4-916f-4552-b520-084495bf5cce/med.jpg",
+ :large "http://cloudfront.net/5c9aedc4-916f-4552-b520-084495bf5cce/large.jpg"}
+ {:name "Lucky's Gluten-Free Gastro Pub", :categories ["Gluten-Free" "Gastro Pub"], :phone "415-391-6443", :id "7ccf8bbb-74b4-48f7-aa7c-43872f63cb1b"}
+ {:service "facebook", :facebook-photo-id "c5fff3c3-8ea4-42d2-b3dd-29d83c6a9ed2", :url "http://facebook.com/photos/c5fff3c3-8ea4-42d2-b3dd-29d83c6a9ed2"}]
+ ["Kyle's Chinese Restaurant is a classic and decent place to catch a bite to eat the first Sunday of the month."
+ {:small "http://cloudfront.net/460f06c2-3fd1-4356-a2ed-cddfef334a76/small.jpg",
+ :medium "http://cloudfront.net/460f06c2-3fd1-4356-a2ed-cddfef334a76/med.jpg",
+ :large "http://cloudfront.net/460f06c2-3fd1-4356-a2ed-cddfef334a76/large.jpg"}
+ {:name "Kyle's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-298-9499", :id "de08b3c7-9929-40d8-8c20-dd9317613c17"}
+ {:service "foursquare", :foursquare-photo-id "eff5660c-a3bf-42e5-9406-a9181f3abf41", :mayor "lucky_pigeon"}]
+ ["Nob Hill Gluten-Free Coffee House is a wonderful and overrated place to meet new friends the second Saturday of the month."
+ {:small "http://cloudfront.net/3e975ead-6942-48d4-98a4-01147baf0e9c/small.jpg",
+ :medium "http://cloudfront.net/3e975ead-6942-48d4-98a4-01147baf0e9c/med.jpg",
+ :large "http://cloudfront.net/3e975ead-6942-48d4-98a4-01147baf0e9c/large.jpg"}
+ {:name "Nob Hill Gluten-Free Coffee House", :categories ["Gluten-Free" "Coffee House"], :phone "415-605-9554", :id "df57ff6d-1b5f-46da-b292-32321c6b1a7e"}
+ {:service "foursquare", :foursquare-photo-id "901ae47c-e6f2-4511-a20b-b89e2b600239", :mayor "cam_saul"}]
+ ["Sunset American Churros is a amazing and exclusive place to have a birthday party the second Saturday of the month."
+ {:small "http://cloudfront.net/7db04c5a-49bd-4606-b3c6-af074075db64/small.jpg",
+ :medium "http://cloudfront.net/7db04c5a-49bd-4606-b3c6-af074075db64/med.jpg",
+ :large "http://cloudfront.net/7db04c5a-49bd-4606-b3c6-af074075db64/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "facebook", :facebook-photo-id "b4f4f18b-fb73-42a5-9628-607f6526a8ca", :url "http://facebook.com/photos/b4f4f18b-fb73-42a5-9628-607f6526a8ca"}]
+ ["SoMa British Bakery is a atmospheric and underground place to sip Champagne in July."
+ {:small "http://cloudfront.net/e3da9d78-f911-451c-a64c-929ecbfb477d/small.jpg",
+ :medium "http://cloudfront.net/e3da9d78-f911-451c-a64c-929ecbfb477d/med.jpg",
+ :large "http://cloudfront.net/e3da9d78-f911-451c-a64c-929ecbfb477d/large.jpg"}
+ {:name "SoMa British Bakery", :categories ["British" "Bakery"], :phone "415-909-5728", :id "662cb0d0-8ee6-4db7-aaf1-89eb2530feda"}
+ {:service "flare", :username "jessica"}]
+ ["Tenderloin Cage-Free Sushi is a swell and historical place to people-watch on Thursdays."
+ {:small "http://cloudfront.net/7ea17999-9e65-414a-a86c-891cb0ee41bc/small.jpg",
+ :medium "http://cloudfront.net/7ea17999-9e65-414a-a86c-891cb0ee41bc/med.jpg",
+ :large "http://cloudfront.net/7ea17999-9e65-414a-a86c-891cb0ee41bc/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "twitter", :mentions ["@tenderloin_cage_free_sushi"], :tags ["#cage-free" "#sushi"], :username "joe"}]
+ ["Sunset American Churros is a great and atmospheric place to conduct a business meeting with friends."
+ {:small "http://cloudfront.net/e41c5cf4-8ccd-410e-bbad-feed53827baf/small.jpg",
+ :medium "http://cloudfront.net/e41c5cf4-8ccd-410e-bbad-feed53827baf/med.jpg",
+ :large "http://cloudfront.net/e41c5cf4-8ccd-410e-bbad-feed53827baf/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "yelp", :yelp-photo-id "6e4d9aff-63d3-4b00-9134-a4a3727b9d8d", :categories ["American" "Churros"]}]
+ ["Rasta's British Food Truck is a fantastic and underground place to sip a glass of expensive wine in June."
+ {:small "http://cloudfront.net/6670e042-020e-4919-90da-020cf93fab95/small.jpg",
+ :medium "http://cloudfront.net/6670e042-020e-4919-90da-020cf93fab95/med.jpg",
+ :large "http://cloudfront.net/6670e042-020e-4919-90da-020cf93fab95/large.jpg"}
+ {:name "Rasta's British Food Truck", :categories ["British" "Food Truck"], :phone "415-958-9031", :id "b6616c97-01d0-488f-a855-bcd6efe2b899"}
+ {:service "facebook", :facebook-photo-id "ff353525-8a3c-4510-85ec-c22d5fe5b831", :url "http://facebook.com/photos/ff353525-8a3c-4510-85ec-c22d5fe5b831"}]
+ ["Haight Gormet Pizzeria is a swell and modern place to have a after-work cocktail weekday afternoons."
+ {:small "http://cloudfront.net/0d491f2a-db93-4226-bbee-8e3647a6d3fa/small.jpg",
+ :medium "http://cloudfront.net/0d491f2a-db93-4226-bbee-8e3647a6d3fa/med.jpg",
+ :large "http://cloudfront.net/0d491f2a-db93-4226-bbee-8e3647a6d3fa/large.jpg"}
+ {:name "Haight Gormet Pizzeria", :categories ["Gormet" "Pizzeria"], :phone "415-869-2197", :id "0425bdd0-3f57-4108-80e3-78335327355a"}
+ {:service "facebook", :facebook-photo-id "6387d17f-d000-488b-b9f4-5f808e517f28", :url "http://facebook.com/photos/6387d17f-d000-488b-b9f4-5f808e517f28"}]
+ ["Haight Chinese Gastro Pub is a modern and great place to meet new friends the second Saturday of the month."
+ {:small "http://cloudfront.net/562d5a4b-6d03-43b4-89f6-68270448c8cc/small.jpg",
+ :medium "http://cloudfront.net/562d5a4b-6d03-43b4-89f6-68270448c8cc/med.jpg",
+ :large "http://cloudfront.net/562d5a4b-6d03-43b4-89f6-68270448c8cc/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "facebook", :facebook-photo-id "8c4a5b4b-f72b-41bc-8242-3d31df7f175a", :url "http://facebook.com/photos/8c4a5b4b-f72b-41bc-8242-3d31df7f175a"}]
+ ["Cam's Old-Fashioned Coffee House is a fantastic and overrated place to have brunch in the spring."
+ {:small "http://cloudfront.net/06e5458e-25da-45b6-bb26-7662ac033edc/small.jpg",
+ :medium "http://cloudfront.net/06e5458e-25da-45b6-bb26-7662ac033edc/med.jpg",
+ :large "http://cloudfront.net/06e5458e-25da-45b6-bb26-7662ac033edc/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-871-9473", :id "5d1f918e-ef00-40de-b6e4-3f9f34ee8cd4"}
+ {:service "yelp", :yelp-photo-id "0562bf77-bb42-464e-951f-6e18206de08b", :categories ["Old-Fashioned" "Coffee House"]}]
+ ["SoMa Old-Fashioned Pizzeria is a underappreciated and wonderful place to have a after-work cocktail on a Tuesday afternoon."
+ {:small "http://cloudfront.net/c727c895-8572-453b-b8bf-921298fb9240/small.jpg",
+ :medium "http://cloudfront.net/c727c895-8572-453b-b8bf-921298fb9240/med.jpg",
+ :large "http://cloudfront.net/c727c895-8572-453b-b8bf-921298fb9240/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "foursquare", :foursquare-photo-id "506df972-9899-40d8-be2d-052a0d32730b", :mayor "joe"}]
+ ["Sameer's Pizza Liquor Store is a classic and decent place to have a birthday party with your pet dog."
+ {:small "http://cloudfront.net/4c023049-681d-4c45-a1ed-b7859bb9b8aa/small.jpg",
+ :medium "http://cloudfront.net/4c023049-681d-4c45-a1ed-b7859bb9b8aa/med.jpg",
+ :large "http://cloudfront.net/4c023049-681d-4c45-a1ed-b7859bb9b8aa/large.jpg"}
+ {:name "Sameer's Pizza Liquor Store", :categories ["Pizza" "Liquor Store"], :phone "415-969-7474", :id "7b9c7dc3-d8f1-498d-843a-e62360449892"}
+ {:service "twitter", :mentions ["@sameers_pizza_liquor_store"], :tags ["#pizza" "#liquor" "#store"], :username "sameer"}]
+ ["Oakland Afgan Coffee House is a wonderful and historical place to watch the Warriors game Friday nights."
+ {:small "http://cloudfront.net/8f18bcd6-66de-414a-a087-5d57f042b26b/small.jpg",
+ :medium "http://cloudfront.net/8f18bcd6-66de-414a-a087-5d57f042b26b/med.jpg",
+ :large "http://cloudfront.net/8f18bcd6-66de-414a-a087-5d57f042b26b/large.jpg"}
+ {:name "Oakland Afgan Coffee House", :categories ["Afgan" "Coffee House"], :phone "415-674-0208", :id "dcc9efd9-f34c-4ca1-9a41-386f1130f411"}
+ {:service "facebook", :facebook-photo-id "d4b18407-5358-43a0-8bee-c53606ceb4b4", :url "http://facebook.com/photos/d4b18407-5358-43a0-8bee-c53606ceb4b4"}]
+ ["Mission Homestyle Churros is a swell and well-decorated place to sip Champagne with your pet dog."
+ {:small "http://cloudfront.net/58de8593-50a8-494f-9aa9-99f64db4339b/small.jpg",
+ :medium "http://cloudfront.net/58de8593-50a8-494f-9aa9-99f64db4339b/med.jpg",
+ :large "http://cloudfront.net/58de8593-50a8-494f-9aa9-99f64db4339b/large.jpg"}
+ {:name "Mission Homestyle Churros", :categories ["Homestyle" "Churros"], :phone "415-343-4489", :id "21d903d3-8bdb-4b7d-b288-6063ad48af44"}
+ {:service "yelp", :yelp-photo-id "9d710fa3-1505-43a4-8f41-ea8c188ee172", :categories ["Homestyle" "Churros"]}]
+ ["Haight Soul Food Hotel & Restaurant is a swell and swell place to have a drink in the spring."
+ {:small "http://cloudfront.net/f188d9d9-211f-4b66-87bd-6271f05fbcc6/small.jpg",
+ :medium "http://cloudfront.net/f188d9d9-211f-4b66-87bd-6271f05fbcc6/med.jpg",
+ :large "http://cloudfront.net/f188d9d9-211f-4b66-87bd-6271f05fbcc6/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "facebook", :facebook-photo-id "81f9c252-5b76-45f1-baf9-a2d919ee7695", :url "http://facebook.com/photos/81f9c252-5b76-45f1-baf9-a2d919ee7695"}]
+ ["Marina Japanese Liquor Store is a historical and horrible place to drink a craft beer the second Saturday of the month."
+ {:small "http://cloudfront.net/4a27d895-0832-47c1-8e30-5b41c7f2d8aa/small.jpg",
+ :medium "http://cloudfront.net/4a27d895-0832-47c1-8e30-5b41c7f2d8aa/med.jpg",
+ :large "http://cloudfront.net/4a27d895-0832-47c1-8e30-5b41c7f2d8aa/large.jpg"}
+ {:name "Marina Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-587-9819", :id "08fd0138-35dd-41b0-836d-1c652e95ffcd"}
+ {:service "flare", :username "kyle"}]
+ ["SF British Pop-Up Food Stand is a groovy and popular place to meet new friends weekend evenings."
+ {:small "http://cloudfront.net/b1397f37-124b-435d-ab72-ac9002e56f7b/small.jpg",
+ :medium "http://cloudfront.net/b1397f37-124b-435d-ab72-ac9002e56f7b/med.jpg",
+ :large "http://cloudfront.net/b1397f37-124b-435d-ab72-ac9002e56f7b/large.jpg"}
+ {:name "SF British Pop-Up Food Stand", :categories ["British" "Pop-Up Food Stand"], :phone "415-441-3725", :id "19eac087-7b1c-4668-a26c-d7c02cbcd3f6"}
+ {:service "facebook", :facebook-photo-id "adf58b74-9ac3-4c27-a4a7-b951736b79ae", :url "http://facebook.com/photos/adf58b74-9ac3-4c27-a4a7-b951736b79ae"}]
+ ["Sameer's GMO-Free Restaurant is a delicious and fantastic place to have breakfast in the spring."
+ {:small "http://cloudfront.net/e4251131-92d3-4097-82f5-782405eb0ae5/small.jpg",
+ :medium "http://cloudfront.net/e4251131-92d3-4097-82f5-782405eb0ae5/med.jpg",
+ :large "http://cloudfront.net/e4251131-92d3-4097-82f5-782405eb0ae5/large.jpg"}
+ {:name "Sameer's GMO-Free Restaurant", :categories ["GMO-Free" "Restaurant"], :phone "415-128-9430", :id "7ac8a7dd-c07f-45a6-92ba-bdb1b1280af2"}
+ {:service "twitter", :mentions ["@sameers_gmo_free_restaurant"], :tags ["#gmo-free" "#restaurant"], :username "cam_saul"}]
+ ["Rasta's Paleo Churros is a underappreciated and atmospheric place to catch a bite to eat when hungover."
+ {:small "http://cloudfront.net/1729a6bc-19f5-4084-b4fe-e91eafbe07cb/small.jpg",
+ :medium "http://cloudfront.net/1729a6bc-19f5-4084-b4fe-e91eafbe07cb/med.jpg",
+ :large "http://cloudfront.net/1729a6bc-19f5-4084-b4fe-e91eafbe07cb/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "flare", :username "tupac"}]
+ ["SoMa Old-Fashioned Pizzeria is a underground and fantastic place to drink a craft beer when hungover."
+ {:small "http://cloudfront.net/7905ee6d-f63b-4f36-bc51-c8006b4c39f4/small.jpg",
+ :medium "http://cloudfront.net/7905ee6d-f63b-4f36-bc51-c8006b4c39f4/med.jpg",
+ :large "http://cloudfront.net/7905ee6d-f63b-4f36-bc51-c8006b4c39f4/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "facebook", :facebook-photo-id "98c776ab-0c90-4fa4-a4c6-6f0e19ad6b9e", :url "http://facebook.com/photos/98c776ab-0c90-4fa4-a4c6-6f0e19ad6b9e"}]
+ ["SoMa Old-Fashioned Pizzeria is a exclusive and underappreciated place to pitch an investor the first Sunday of the month."
+ {:small "http://cloudfront.net/f46c53c3-8987-4dee-88ba-6693f884f53a/small.jpg",
+ :medium "http://cloudfront.net/f46c53c3-8987-4dee-88ba-6693f884f53a/med.jpg",
+ :large "http://cloudfront.net/f46c53c3-8987-4dee-88ba-6693f884f53a/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "twitter", :mentions ["@soma_old_fashioned_pizzeria"], :tags ["#old-fashioned" "#pizzeria"], :username "bob"}]
+ ["Oakland American Grill is a groovy and modern place to sip a glass of expensive wine weekend mornings."
+ {:small "http://cloudfront.net/700e2004-8a15-4cd6-9341-413c09249098/small.jpg",
+ :medium "http://cloudfront.net/700e2004-8a15-4cd6-9341-413c09249098/med.jpg",
+ :large "http://cloudfront.net/700e2004-8a15-4cd6-9341-413c09249098/large.jpg"}
+ {:name "Oakland American Grill", :categories ["American" "Grill"], :phone "415-660-0889", :id "856f907d-b669-4b9c-8337-bf9c88883746"}
+ {:service "twitter", :mentions ["@oakland_american_grill"], :tags ["#american" "#grill"], :username "cam_saul"}]
+ ["Polk St. Deep-Dish Hotel & Restaurant is a atmospheric and horrible place to sip a glass of expensive wine weekday afternoons."
+ {:small "http://cloudfront.net/d60aea9e-0e15-4bf5-90a8-68fcbb7f1f06/small.jpg",
+ :medium "http://cloudfront.net/d60aea9e-0e15-4bf5-90a8-68fcbb7f1f06/med.jpg",
+ :large "http://cloudfront.net/d60aea9e-0e15-4bf5-90a8-68fcbb7f1f06/large.jpg"}
+ {:name "Polk St. Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-666-8681", :id "47f1698e-ae11-46f5-818b-85a59d0affba"}
+ {:service "twitter", :mentions ["@polk_st._deep_dish_hotel_&_restaurant"], :tags ["#deep-dish" "#hotel" "#&" "#restaurant"], :username "mandy"}]
+ ["Haight Chinese Gastro Pub is a world-famous and amazing place to sip Champagne when hungover."
+ {:small "http://cloudfront.net/cae5889b-70e1-4f7e-b097-709ae2db369e/small.jpg",
+ :medium "http://cloudfront.net/cae5889b-70e1-4f7e-b097-709ae2db369e/med.jpg",
+ :large "http://cloudfront.net/cae5889b-70e1-4f7e-b097-709ae2db369e/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "twitter", :mentions ["@haight_chinese_gastro_pub"], :tags ["#chinese" "#gastro" "#pub"], :username "cam_saul"}]
+ ["Lucky's Gluten-Free Gastro Pub is a popular and overrated place to watch the Giants game the second Saturday of the month."
+ {:small "http://cloudfront.net/1f98a61a-b644-4adf-bb2a-24207ed563f8/small.jpg",
+ :medium "http://cloudfront.net/1f98a61a-b644-4adf-bb2a-24207ed563f8/med.jpg",
+ :large "http://cloudfront.net/1f98a61a-b644-4adf-bb2a-24207ed563f8/large.jpg"}
+ {:name "Lucky's Gluten-Free Gastro Pub", :categories ["Gluten-Free" "Gastro Pub"], :phone "415-391-6443", :id "7ccf8bbb-74b4-48f7-aa7c-43872f63cb1b"}
+ {:service "foursquare", :foursquare-photo-id "9543ebb3-8d33-468f-8ba1-980fe43aa09b", :mayor "amy"}]
+ ["Lucky's Deep-Dish Gastro Pub is a great and family-friendly place to meet new friends on Saturday night."
+ {:small "http://cloudfront.net/58db9f8b-70b5-4f9e-9b3e-9eab40907b1e/small.jpg",
+ :medium "http://cloudfront.net/58db9f8b-70b5-4f9e-9b3e-9eab40907b1e/med.jpg",
+ :large "http://cloudfront.net/58db9f8b-70b5-4f9e-9b3e-9eab40907b1e/large.jpg"}
+ {:name "Lucky's Deep-Dish Gastro Pub", :categories ["Deep-Dish" "Gastro Pub"], :phone "415-487-4085", :id "0136c454-0968-41cd-a237-ceec5724cab8"}
+ {:service "twitter", :mentions ["@luckys_deep_dish_gastro_pub"], :tags ["#deep-dish" "#gastro" "#pub"], :username "biggie"}]
+ ["Alcatraz Pizza Churros is a delicious and classic place to have breakfast on Taco Tuesday."
+ {:small "http://cloudfront.net/d3e4995f-57ad-4b71-8321-6d71082cb24c/small.jpg",
+ :medium "http://cloudfront.net/d3e4995f-57ad-4b71-8321-6d71082cb24c/med.jpg",
+ :large "http://cloudfront.net/d3e4995f-57ad-4b71-8321-6d71082cb24c/large.jpg"}
+ {:name "Alcatraz Pizza Churros", :categories ["Pizza" "Churros"], :phone "415-754-7867", :id "df95e4f1-8719-42af-a15d-3ee00de6e04f"}
+ {:service "flare", :username "mandy"}]
+ ["SoMa Old-Fashioned Pizzeria is a popular and amazing place to take visiting friends and relatives during summer."
+ {:small "http://cloudfront.net/d516bb79-8683-4e5a-a2e0-937144346293/small.jpg",
+ :medium "http://cloudfront.net/d516bb79-8683-4e5a-a2e0-937144346293/med.jpg",
+ :large "http://cloudfront.net/d516bb79-8683-4e5a-a2e0-937144346293/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "flare", :username "jane"}]
+ ["SoMa Old-Fashioned Pizzeria is a underappreciated and underappreciated place to people-watch weekend evenings."
+ {:small "http://cloudfront.net/0c331686-89ff-451e-8283-d08742746c3b/small.jpg",
+ :medium "http://cloudfront.net/0c331686-89ff-451e-8283-d08742746c3b/med.jpg",
+ :large "http://cloudfront.net/0c331686-89ff-451e-8283-d08742746c3b/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "yelp", :yelp-photo-id "cf77c28d-03a5-44d4-9882-4fe4bef60a02", :categories ["Old-Fashioned" "Pizzeria"]}]
+ ["Tenderloin Cage-Free Sushi is a overrated and historical place to catch a bite to eat the first Sunday of the month."
+ {:small "http://cloudfront.net/1b419482-e80c-4783-8b7f-d21b04e35a4b/small.jpg",
+ :medium "http://cloudfront.net/1b419482-e80c-4783-8b7f-d21b04e35a4b/med.jpg",
+ :large "http://cloudfront.net/1b419482-e80c-4783-8b7f-d21b04e35a4b/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "twitter", :mentions ["@tenderloin_cage_free_sushi"], :tags ["#cage-free" "#sushi"], :username "mandy"}]
+ ["Polk St. Red White & Blue Café is a historical and swell place to have a birthday party in the fall."
+ {:small "http://cloudfront.net/8b0d7fc8-2b5c-4bfb-a947-3fd4753b118c/small.jpg",
+ :medium "http://cloudfront.net/8b0d7fc8-2b5c-4bfb-a947-3fd4753b118c/med.jpg",
+ :large "http://cloudfront.net/8b0d7fc8-2b5c-4bfb-a947-3fd4753b118c/large.jpg"}
+ {:name "Polk St. Red White & Blue Café", :categories ["Red White & Blue" "Café"], :phone "415-986-0661", :id "6eb9d2db-5015-49f0-bd18-f4c4938b7e5a"}
+ {:service "yelp", :yelp-photo-id "d84760ec-d55c-486d-9b53-e43a20e0395c", :categories ["Red White & Blue" "Café"]}]
+ ["Market St. Homestyle Pop-Up Food Stand is a classic and underground place to take a date during winter."
+ {:small "http://cloudfront.net/96e29fb5-834c-437c-9747-b2f33a3f096c/small.jpg",
+ :medium "http://cloudfront.net/96e29fb5-834c-437c-9747-b2f33a3f096c/med.jpg",
+ :large "http://cloudfront.net/96e29fb5-834c-437c-9747-b2f33a3f096c/large.jpg"}
+ {:name "Market St. Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-213-3030", :id "2d873280-e43d-449e-9940-af96ae7df718"}
+ {:service "foursquare", :foursquare-photo-id "64feb4b2-a403-4be7-aa96-5c5e5595eba5", :mayor "joe"}]
+ ["Marina Low-Carb Food Truck is a classic and groovy place to nurse a hangover weekend evenings."
+ {:small "http://cloudfront.net/08213fe2-157e-46f7-a71d-82588347d023/small.jpg",
+ :medium "http://cloudfront.net/08213fe2-157e-46f7-a71d-82588347d023/med.jpg",
+ :large "http://cloudfront.net/08213fe2-157e-46f7-a71d-82588347d023/large.jpg"}
+ {:name "Marina Low-Carb Food Truck", :categories ["Low-Carb" "Food Truck"], :phone "415-748-3513", :id "a13a5beb-19de-40ca-a334-02df3bdf5285"}
+ {:service "twitter", :mentions ["@marina_low_carb_food_truck"], :tags ["#low-carb" "#food" "#truck"], :username "cam_saul"}]
+ ["Marina Modern Bar & Grill is a modern and well-decorated place to watch the Giants game on public holidays."
+ {:small "http://cloudfront.net/00be0fe9-6765-4c76-98ee-f7e2e7e0b7b9/small.jpg",
+ :medium "http://cloudfront.net/00be0fe9-6765-4c76-98ee-f7e2e7e0b7b9/med.jpg",
+ :large "http://cloudfront.net/00be0fe9-6765-4c76-98ee-f7e2e7e0b7b9/large.jpg"}
+ {:name "Marina Modern Bar & Grill", :categories ["Modern" "Bar & Grill"], :phone "415-203-8530", :id "806144f1-bb7a-4271-8fcb-fc6550f51676"}
+ {:service "foursquare", :foursquare-photo-id "b53c2c6c-b767-4816-b881-52613ecb438d", :mayor "rasta_toucan"}]
+ ["Alcatraz Cage-Free Restaurant is a swell and underappreciated place to have a after-work cocktail in the fall."
+ {:small "http://cloudfront.net/3e6adc7d-41cc-426d-8221-e1d75e60c6c9/small.jpg",
+ :medium "http://cloudfront.net/3e6adc7d-41cc-426d-8221-e1d75e60c6c9/med.jpg",
+ :large "http://cloudfront.net/3e6adc7d-41cc-426d-8221-e1d75e60c6c9/large.jpg"}
+ {:name "Alcatraz Cage-Free Restaurant", :categories ["Cage-Free" "Restaurant"], :phone "415-568-0312", :id "fe0c7f8e-4937-4a76-bda4-44ad89c5231c"}
+ {:service "foursquare", :foursquare-photo-id "a40cb559-779a-45cb-82d4-82361f7ac9c1", :mayor "jane"}]
+ ["Kyle's Low-Carb Grill is a exclusive and fantastic place to have a birthday party on Saturday night."
+ {:small "http://cloudfront.net/ec5fd5d5-4e24-4a8e-99a8-1c06c9b6ad83/small.jpg",
+ :medium "http://cloudfront.net/ec5fd5d5-4e24-4a8e-99a8-1c06c9b6ad83/med.jpg",
+ :large "http://cloudfront.net/ec5fd5d5-4e24-4a8e-99a8-1c06c9b6ad83/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "flare", :username "amy"}]
+ ["Marina Modern Sushi is a exclusive and fantastic place to conduct a business meeting in the fall."
+ {:small "http://cloudfront.net/a44ff874-27fd-480a-b723-79516d9a0f5a/small.jpg",
+ :medium "http://cloudfront.net/a44ff874-27fd-480a-b723-79516d9a0f5a/med.jpg",
+ :large "http://cloudfront.net/a44ff874-27fd-480a-b723-79516d9a0f5a/large.jpg"}
+ {:name "Marina Modern Sushi", :categories ["Modern" "Sushi"], :phone "415-393-7672", :id "21807c63-ca4c-4468-9844-d0c2620fbdfc"}
+ {:service "foursquare", :foursquare-photo-id "4f9300e3-8787-4429-9837-52a8949a920e", :mayor "bob"}]
+ ["Haight Soul Food Hotel & Restaurant is a world-famous and popular place to nurse a hangover Friday nights."
+ {:small "http://cloudfront.net/c9d748f5-245c-4a0f-9308-76e56ae5666c/small.jpg",
+ :medium "http://cloudfront.net/c9d748f5-245c-4a0f-9308-76e56ae5666c/med.jpg",
+ :large "http://cloudfront.net/c9d748f5-245c-4a0f-9308-76e56ae5666c/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "flare", :username "kyle"}]
+ ["Sunset American Churros is a decent and fantastic place to have a drink weekend mornings."
+ {:small "http://cloudfront.net/7a5085d9-5fe6-49c1-9556-9f196f0938ae/small.jpg",
+ :medium "http://cloudfront.net/7a5085d9-5fe6-49c1-9556-9f196f0938ae/med.jpg",
+ :large "http://cloudfront.net/7a5085d9-5fe6-49c1-9556-9f196f0938ae/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "facebook", :facebook-photo-id "0bbffb73-91f1-4a27-97df-5e0dbae6532b", :url "http://facebook.com/photos/0bbffb73-91f1-4a27-97df-5e0dbae6532b"}]
+ ["Cam's Mexican Gastro Pub is a family-friendly and acceptable place to people-watch weekend evenings."
+ {:small "http://cloudfront.net/a6bddb27-880a-46da-b824-4449b2389a73/small.jpg",
+ :medium "http://cloudfront.net/a6bddb27-880a-46da-b824-4449b2389a73/med.jpg",
+ :large "http://cloudfront.net/a6bddb27-880a-46da-b824-4449b2389a73/large.jpg"}
+ {:name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :phone "415-320-9123", :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}
+ {:service "yelp", :yelp-photo-id "fd35ac16-71ef-48f8-8512-2078bda1db30", :categories ["Mexican" "Gastro Pub"]}]
+ ["Nob Hill Gluten-Free Coffee House is a fantastic and historical place to have a after-work cocktail with your pet toucan."
+ {:small "http://cloudfront.net/c3c254d4-4a06-472a-8373-c96d1cf13ca1/small.jpg",
+ :medium "http://cloudfront.net/c3c254d4-4a06-472a-8373-c96d1cf13ca1/med.jpg",
+ :large "http://cloudfront.net/c3c254d4-4a06-472a-8373-c96d1cf13ca1/large.jpg"}
+ {:name "Nob Hill Gluten-Free Coffee House", :categories ["Gluten-Free" "Coffee House"], :phone "415-605-9554", :id "df57ff6d-1b5f-46da-b292-32321c6b1a7e"}
+ {:service "facebook", :facebook-photo-id "f9afa193-7158-49d9-9f8c-42542c1e47dd", :url "http://facebook.com/photos/f9afa193-7158-49d9-9f8c-42542c1e47dd"}]
+ ["Rasta's British Food Truck is a fantastic and underappreciated place to sip a glass of expensive wine when hungover."
+ {:small "http://cloudfront.net/1f6bfab8-196f-41cb-9abb-55fcf5ce501b/small.jpg",
+ :medium "http://cloudfront.net/1f6bfab8-196f-41cb-9abb-55fcf5ce501b/med.jpg",
+ :large "http://cloudfront.net/1f6bfab8-196f-41cb-9abb-55fcf5ce501b/large.jpg"}
+ {:name "Rasta's British Food Truck", :categories ["British" "Food Truck"], :phone "415-958-9031", :id "b6616c97-01d0-488f-a855-bcd6efe2b899"}
+ {:service "yelp", :yelp-photo-id "4f557d5b-b69d-48d1-814a-d4cac246e72c", :categories ["British" "Food Truck"]}]
+ ["Pacific Heights Pizza Bakery is a delicious and amazing place to watch the Giants game weekday afternoons."
+ {:small "http://cloudfront.net/44645780-38d0-4de9-9d8e-468b9f237a5f/small.jpg",
+ :medium "http://cloudfront.net/44645780-38d0-4de9-9d8e-468b9f237a5f/med.jpg",
+ :large "http://cloudfront.net/44645780-38d0-4de9-9d8e-468b9f237a5f/large.jpg"}
+ {:name "Pacific Heights Pizza Bakery", :categories ["Pizza" "Bakery"], :phone "415-006-0149", :id "7fda37a5-810f-4902-b571-54afe583f0dd"}
+ {:service "facebook", :facebook-photo-id "0927d96d-e419-49a9-bd61-cb6bb7f46a33", :url "http://facebook.com/photos/0927d96d-e419-49a9-bd61-cb6bb7f46a33"}]
+ ["Marina No-MSG Sushi is a atmospheric and historical place to sip Champagne on public holidays."
+ {:small "http://cloudfront.net/679db911-40ba-4250-9b11-46cc3d1a135f/small.jpg",
+ :medium "http://cloudfront.net/679db911-40ba-4250-9b11-46cc3d1a135f/med.jpg",
+ :large "http://cloudfront.net/679db911-40ba-4250-9b11-46cc3d1a135f/large.jpg"}
+ {:name "Marina No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-856-5937", :id "d51013a3-8547-4705-a5f0-cb11d8206481"}
+ {:service "facebook", :facebook-photo-id "61efe486-455b-4327-995f-235de7d75f5a", :url "http://facebook.com/photos/61efe486-455b-4327-995f-235de7d75f5a"}]
+ ["Marina Cage-Free Liquor Store is a well-decorated and delicious place to nurse a hangover on a Tuesday afternoon."
+ {:small "http://cloudfront.net/bbbe5406-2b10-4af1-a63d-6c98fe101d90/small.jpg",
+ :medium "http://cloudfront.net/bbbe5406-2b10-4af1-a63d-6c98fe101d90/med.jpg",
+ :large "http://cloudfront.net/bbbe5406-2b10-4af1-a63d-6c98fe101d90/large.jpg"}
+ {:name "Marina Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-571-0783", :id "ad68f549-3000-407e-ab98-7f314cfa4653"}
+ {:service "facebook", :facebook-photo-id "f13a16b2-3177-4827-bc81-3abccba5506b", :url "http://facebook.com/photos/f13a16b2-3177-4827-bc81-3abccba5506b"}]
+ ["Lower Pac Heights Deep-Dish Liquor Store is a horrible and exclusive place to have brunch weekend mornings."
+ {:small "http://cloudfront.net/30f58fc0-8e79-4c25-bffa-5cf022b984a9/small.jpg",
+ :medium "http://cloudfront.net/30f58fc0-8e79-4c25-bffa-5cf022b984a9/med.jpg",
+ :large "http://cloudfront.net/30f58fc0-8e79-4c25-bffa-5cf022b984a9/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Liquor Store", :categories ["Deep-Dish" "Liquor Store"], :phone "415-497-3039", :id "4d4eabfc-ff1f-4bc6-88b0-2f55489ff666"}
+ {:service "facebook", :facebook-photo-id "2b761a56-e66d-4cad-9117-ef6b0b633720", :url "http://facebook.com/photos/2b761a56-e66d-4cad-9117-ef6b0b633720"}]
+ ["Mission British Café is a world-famous and groovy place to pitch an investor on public holidays."
+ {:small "http://cloudfront.net/a75b8799-e41c-4a50-b19c-b3cb21ef8ae6/small.jpg",
+ :medium "http://cloudfront.net/a75b8799-e41c-4a50-b19c-b3cb21ef8ae6/med.jpg",
+ :large "http://cloudfront.net/a75b8799-e41c-4a50-b19c-b3cb21ef8ae6/large.jpg"}
+ {:name "Mission British Café", :categories ["British" "Café"], :phone "415-715-7004", :id "c99899e3-439c-4444-9dc4-5598632aec8d"}
+ {:service "facebook", :facebook-photo-id "9b584eeb-9715-4874-8e56-8a69838e6ddf", :url "http://facebook.com/photos/9b584eeb-9715-4874-8e56-8a69838e6ddf"}]
+ ["Oakland American Grill is a fantastic and well-decorated place to have a birthday party weekday afternoons."
+ {:small "http://cloudfront.net/e255e8ea-3015-46bd-94db-198385ae5f7c/small.jpg",
+ :medium "http://cloudfront.net/e255e8ea-3015-46bd-94db-198385ae5f7c/med.jpg",
+ :large "http://cloudfront.net/e255e8ea-3015-46bd-94db-198385ae5f7c/large.jpg"}
+ {:name "Oakland American Grill", :categories ["American" "Grill"], :phone "415-660-0889", :id "856f907d-b669-4b9c-8337-bf9c88883746"}
+ {:service "flare", :username "sameer"}]
+ ["Kyle's Low-Carb Grill is a overrated and fantastic place to have breakfast with your pet dog."
+ {:small "http://cloudfront.net/629404a1-ed36-4288-95e0-e57f6142990f/small.jpg",
+ :medium "http://cloudfront.net/629404a1-ed36-4288-95e0-e57f6142990f/med.jpg",
+ :large "http://cloudfront.net/629404a1-ed36-4288-95e0-e57f6142990f/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "foursquare", :foursquare-photo-id "35681dab-4f25-420d-9a65-915d233817f0", :mayor "sameer"}]
+ ["Nob Hill Gluten-Free Coffee House is a underappreciated and family-friendly place to take a date after baseball games."
+ {:small "http://cloudfront.net/5d8da40a-6415-4dcc-8f51-f8e3ef99f332/small.jpg",
+ :medium "http://cloudfront.net/5d8da40a-6415-4dcc-8f51-f8e3ef99f332/med.jpg",
+ :large "http://cloudfront.net/5d8da40a-6415-4dcc-8f51-f8e3ef99f332/large.jpg"}
+ {:name "Nob Hill Gluten-Free Coffee House", :categories ["Gluten-Free" "Coffee House"], :phone "415-605-9554", :id "df57ff6d-1b5f-46da-b292-32321c6b1a7e"}
+ {:service "foursquare", :foursquare-photo-id "1714302b-8629-4b18-ab25-2368ad1e4568", :mayor "biggie"}]
+ ["Alcatraz Cage-Free Restaurant is a underappreciated and groovy place to have a drink when hungover."
+ {:small "http://cloudfront.net/92e9ca72-bdf1-4e8a-8f21-709644a8a848/small.jpg",
+ :medium "http://cloudfront.net/92e9ca72-bdf1-4e8a-8f21-709644a8a848/med.jpg",
+ :large "http://cloudfront.net/92e9ca72-bdf1-4e8a-8f21-709644a8a848/large.jpg"}
+ {:name "Alcatraz Cage-Free Restaurant", :categories ["Cage-Free" "Restaurant"], :phone "415-568-0312", :id "fe0c7f8e-4937-4a76-bda4-44ad89c5231c"}
+ {:service "foursquare", :foursquare-photo-id "c1e232ec-e10f-4ad6-b932-84cd854ee3c2", :mayor "amy"}]
+ ["Kyle's Low-Carb Grill is a decent and well-decorated place to sip a glass of expensive wine in July."
+ {:small "http://cloudfront.net/2e81de9d-a366-4756-ab0f-c88b1eeb15cc/small.jpg",
+ :medium "http://cloudfront.net/2e81de9d-a366-4756-ab0f-c88b1eeb15cc/med.jpg",
+ :large "http://cloudfront.net/2e81de9d-a366-4756-ab0f-c88b1eeb15cc/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "yelp", :yelp-photo-id "23e11b87-eb0d-48a8-9eb4-0e7b0453f4d7", :categories ["Low-Carb" "Grill"]}]
+ ["Lower Pac Heights Deep-Dish Liquor Store is a modern and well-decorated place to pitch an investor after baseball games."
+ {:small "http://cloudfront.net/28f821ba-fc0c-43d5-90aa-014997910ff4/small.jpg",
+ :medium "http://cloudfront.net/28f821ba-fc0c-43d5-90aa-014997910ff4/med.jpg",
+ :large "http://cloudfront.net/28f821ba-fc0c-43d5-90aa-014997910ff4/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Liquor Store", :categories ["Deep-Dish" "Liquor Store"], :phone "415-497-3039", :id "4d4eabfc-ff1f-4bc6-88b0-2f55489ff666"}
+ {:service "twitter", :mentions ["@lower_pac_heights_deep_dish_liquor_store"], :tags ["#deep-dish" "#liquor" "#store"], :username "sameer"}]
+ ["Kyle's Chinese Restaurant is a decent and world-famous place to drink a craft beer in the fall."
+ {:small "http://cloudfront.net/0a8ca876-81d1-43de-928c-6dfaaa99a4d9/small.jpg",
+ :medium "http://cloudfront.net/0a8ca876-81d1-43de-928c-6dfaaa99a4d9/med.jpg",
+ :large "http://cloudfront.net/0a8ca876-81d1-43de-928c-6dfaaa99a4d9/large.jpg"}
+ {:name "Kyle's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-298-9499", :id "de08b3c7-9929-40d8-8c20-dd9317613c17"}
+ {:service "twitter", :mentions ["@kyles_chinese_restaurant"], :tags ["#chinese" "#restaurant"], :username "tupac"}]
+ ["Lucky's Japanese Bar & Grill is a atmospheric and decent place to watch the Warriors game in the spring."
+ {:small "http://cloudfront.net/81d4c210-2aad-44be-a5a5-554d0c68a1b3/small.jpg",
+ :medium "http://cloudfront.net/81d4c210-2aad-44be-a5a5-554d0c68a1b3/med.jpg",
+ :large "http://cloudfront.net/81d4c210-2aad-44be-a5a5-554d0c68a1b3/large.jpg"}
+ {:name "Lucky's Japanese Bar & Grill", :categories ["Japanese" "Bar & Grill"], :phone "415-816-1300", :id "602d574a-6fd3-44df-9bac-e71ce1ab5eb4"}
+ {:service "facebook", :facebook-photo-id "f132a200-55f9-4ae8-b61e-4e932287c502", :url "http://facebook.com/photos/f132a200-55f9-4ae8-b61e-4e932287c502"}]
+ ["Marina Japanese Liquor Store is a fantastic and modern place to have a birthday party on a Tuesday afternoon."
+ {:small "http://cloudfront.net/e7db8648-76ac-4f59-aa43-f8e980e929fe/small.jpg",
+ :medium "http://cloudfront.net/e7db8648-76ac-4f59-aa43-f8e980e929fe/med.jpg",
+ :large "http://cloudfront.net/e7db8648-76ac-4f59-aa43-f8e980e929fe/large.jpg"}
+ {:name "Marina Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-587-9819", :id "08fd0138-35dd-41b0-836d-1c652e95ffcd"}
+ {:service "facebook", :facebook-photo-id "3f37d940-c75b-41f2-b13f-e5b0828843af", :url "http://facebook.com/photos/3f37d940-c75b-41f2-b13f-e5b0828843af"}]
+ ["Kyle's Chinese Restaurant is a great and delicious place to conduct a business meeting on public holidays."
+ {:small "http://cloudfront.net/1620fe7b-8e84-46d4-8807-fa47f52be5bb/small.jpg",
+ :medium "http://cloudfront.net/1620fe7b-8e84-46d4-8807-fa47f52be5bb/med.jpg",
+ :large "http://cloudfront.net/1620fe7b-8e84-46d4-8807-fa47f52be5bb/large.jpg"}
+ {:name "Kyle's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-298-9499", :id "de08b3c7-9929-40d8-8c20-dd9317613c17"}
+ {:service "facebook", :facebook-photo-id "27189121-e22e-4dd6-85da-8880be9c513c", :url "http://facebook.com/photos/27189121-e22e-4dd6-85da-8880be9c513c"}]
+ ["Haight Soul Food Hotel & Restaurant is a world-famous and atmospheric place to sip a glass of expensive wine Friday nights."
+ {:small "http://cloudfront.net/8b7f40e0-1ab0-4f11-8313-04fb6dc3c1a9/small.jpg",
+ :medium "http://cloudfront.net/8b7f40e0-1ab0-4f11-8313-04fb6dc3c1a9/med.jpg",
+ :large "http://cloudfront.net/8b7f40e0-1ab0-4f11-8313-04fb6dc3c1a9/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "twitter", :mentions ["@haight_soul_food_hotel_&_restaurant"], :tags ["#soul" "#food" "#hotel" "#&" "#restaurant"], :username "cam_saul"}]
+ ["Haight Soul Food Café is a wonderful and underground place to watch the Warriors game on a Tuesday afternoon."
+ {:small "http://cloudfront.net/68e3313a-d8cf-4de6-9d85-393b5e881259/small.jpg",
+ :medium "http://cloudfront.net/68e3313a-d8cf-4de6-9d85-393b5e881259/med.jpg",
+ :large "http://cloudfront.net/68e3313a-d8cf-4de6-9d85-393b5e881259/large.jpg"}
+ {:name "Haight Soul Food Café", :categories ["Soul Food" "Café"], :phone "415-257-1769", :id "a1796c4b-da2b-474f-9fd6-4fa96c1eac70"}
+ {:service "foursquare", :foursquare-photo-id "3bbd4357-aba9-4a8e-837c-c57e42dee4e3", :mayor "biggie"}]
+ ["Sunset Homestyle Grill is a atmospheric and great place to have brunch weekend mornings."
+ {:small "http://cloudfront.net/14743cfe-f2e7-4532-bd72-3ef14a277fa6/small.jpg",
+ :medium "http://cloudfront.net/14743cfe-f2e7-4532-bd72-3ef14a277fa6/med.jpg",
+ :large "http://cloudfront.net/14743cfe-f2e7-4532-bd72-3ef14a277fa6/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "facebook", :facebook-photo-id "39e3b7a2-6fcf-4e90-b038-fafcc1e528f6", :url "http://facebook.com/photos/39e3b7a2-6fcf-4e90-b038-fafcc1e528f6"}]
+ ["Sameer's GMO-Free Pop-Up Food Stand is a wonderful and fantastic place to have breakfast the first Sunday of the month."
+ {:small "http://cloudfront.net/a9e803dd-7cdf-47ac-8314-3f12eee7fdfc/small.jpg",
+ :medium "http://cloudfront.net/a9e803dd-7cdf-47ac-8314-3f12eee7fdfc/med.jpg",
+ :large "http://cloudfront.net/a9e803dd-7cdf-47ac-8314-3f12eee7fdfc/large.jpg"}
+ {:name "Sameer's GMO-Free Pop-Up Food Stand", :categories ["GMO-Free" "Pop-Up Food Stand"], :phone "415-217-7891", :id "a829efc7-7e03-4e73-b072-83d10d1e3953"}
+ {:service "yelp", :yelp-photo-id "5bfe141b-4680-45de-be48-4eb8cdb8b791", :categories ["GMO-Free" "Pop-Up Food Stand"]}]
+ ["Cam's Old-Fashioned Coffee House is a modern and family-friendly place to take visiting friends and relatives Friday nights."
+ {:small "http://cloudfront.net/490f4943-6aaa-422c-8a7a-5996d806b67f/small.jpg",
+ :medium "http://cloudfront.net/490f4943-6aaa-422c-8a7a-5996d806b67f/med.jpg",
+ :large "http://cloudfront.net/490f4943-6aaa-422c-8a7a-5996d806b67f/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-871-9473", :id "5d1f918e-ef00-40de-b6e4-3f9f34ee8cd4"}
+ {:service "flare", :username "tupac"}]
+ ["Tenderloin Cage-Free Sushi is a overrated and overrated place to watch the Warriors game weekend mornings."
+ {:small "http://cloudfront.net/6cf1e5bd-3fd0-4ee4-a35a-fbc60cc2d8be/small.jpg",
+ :medium "http://cloudfront.net/6cf1e5bd-3fd0-4ee4-a35a-fbc60cc2d8be/med.jpg",
+ :large "http://cloudfront.net/6cf1e5bd-3fd0-4ee4-a35a-fbc60cc2d8be/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "flare", :username "mandy"}]
+ ["Tenderloin Red White & Blue Pizzeria is a atmospheric and wonderful place to conduct a business meeting Friday nights."
+ {:small "http://cloudfront.net/2b9bbbcb-b715-4429-b139-2855600d721e/small.jpg",
+ :medium "http://cloudfront.net/2b9bbbcb-b715-4429-b139-2855600d721e/med.jpg",
+ :large "http://cloudfront.net/2b9bbbcb-b715-4429-b139-2855600d721e/large.jpg"}
+ {:name "Tenderloin Red White & Blue Pizzeria", :categories ["Red White & Blue" "Pizzeria"], :phone "415-719-8143", :id "eba3dbcd-100a-4f38-a701-e0dec157f437"}
+ {:service "facebook", :facebook-photo-id "331f4c85-0b7b-4106-94be-df6628e6fb09", :url "http://facebook.com/photos/331f4c85-0b7b-4106-94be-df6628e6fb09"}]
+ ["Haight Soul Food Pop-Up Food Stand is a overrated and amazing place to catch a bite to eat weekday afternoons."
+ {:small "http://cloudfront.net/da6fff65-7f9d-403a-b905-d21cd0306f69/small.jpg",
+ :medium "http://cloudfront.net/da6fff65-7f9d-403a-b905-d21cd0306f69/med.jpg",
+ :large "http://cloudfront.net/da6fff65-7f9d-403a-b905-d21cd0306f69/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "foursquare", :foursquare-photo-id "3dcc3e91-1555-476a-9b3b-7834c2f8f1ba", :mayor "biggie"}]
+ ["Lucky's Old-Fashioned Eatery is a delicious and family-friendly place to drink a craft beer the first Sunday of the month."
+ {:small "http://cloudfront.net/4437ee2a-9520-4357-a9d5-c321055a249f/small.jpg",
+ :medium "http://cloudfront.net/4437ee2a-9520-4357-a9d5-c321055a249f/med.jpg",
+ :large "http://cloudfront.net/4437ee2a-9520-4357-a9d5-c321055a249f/large.jpg"}
+ {:name "Lucky's Old-Fashioned Eatery", :categories ["Old-Fashioned" "Eatery"], :phone "415-362-2338", :id "71dc221c-6e82-4d06-8709-93293121b1da"}
+ {:service "twitter", :mentions ["@luckys_old_fashioned_eatery"], :tags ["#old-fashioned" "#eatery"], :username "lucky_pigeon"}]
+ ["Tenderloin Japanese Ice Cream Truck is a well-decorated and decent place to have breakfast with friends."
+ {:small "http://cloudfront.net/04f74c1f-c835-46f4-8c7f-823042f2a091/small.jpg",
+ :medium "http://cloudfront.net/04f74c1f-c835-46f4-8c7f-823042f2a091/med.jpg",
+ :large "http://cloudfront.net/04f74c1f-c835-46f4-8c7f-823042f2a091/large.jpg"}
+ {:name "Tenderloin Japanese Ice Cream Truck", :categories ["Japanese" "Ice Cream Truck"], :phone "415-856-0371", :id "5ce47baa-bbef-4bc7-adf6-57842913ea8a"}
+ {:service "twitter", :mentions ["@tenderloin_japanese_ice_cream_truck"], :tags ["#japanese" "#ice" "#cream" "#truck"], :username "amy"}]
+ ["Oakland American Grill is a wonderful and underappreciated place to watch the Giants game with friends."
+ {:small "http://cloudfront.net/11b1c0e3-005a-414a-bd5a-e05880d277d5/small.jpg",
+ :medium "http://cloudfront.net/11b1c0e3-005a-414a-bd5a-e05880d277d5/med.jpg",
+ :large "http://cloudfront.net/11b1c0e3-005a-414a-bd5a-e05880d277d5/large.jpg"}
+ {:name "Oakland American Grill", :categories ["American" "Grill"], :phone "415-660-0889", :id "856f907d-b669-4b9c-8337-bf9c88883746"}
+ {:service "facebook", :facebook-photo-id "b5874d46-0247-4515-bd96-e8cc562c256d", :url "http://facebook.com/photos/b5874d46-0247-4515-bd96-e8cc562c256d"}]
+ ["Tenderloin Paleo Hotel & Restaurant is a classic and decent place to sip Champagne the first Sunday of the month."
+ {:small "http://cloudfront.net/ed01632a-a03e-4f9a-8949-0b06c690abd5/small.jpg",
+ :medium "http://cloudfront.net/ed01632a-a03e-4f9a-8949-0b06c690abd5/med.jpg",
+ :large "http://cloudfront.net/ed01632a-a03e-4f9a-8949-0b06c690abd5/large.jpg"}
+ {:name "Tenderloin Paleo Hotel & Restaurant", :categories ["Paleo" "Hotel & Restaurant"], :phone "415-402-1652", :id "4dea27b4-6d89-4b86-80a8-5631e171da8d"}
+ {:service "facebook", :facebook-photo-id "dafa1931-d938-44cf-bd12-4321d5c22407", :url "http://facebook.com/photos/dafa1931-d938-44cf-bd12-4321d5c22407"}]
+ ["Rasta's Paleo Café is a well-decorated and exclusive place to sip a glass of expensive wine on a Tuesday afternoon."
+ {:small "http://cloudfront.net/42b88fc6-e651-4ca3-9d53-e750df273b71/small.jpg",
+ :medium "http://cloudfront.net/42b88fc6-e651-4ca3-9d53-e750df273b71/med.jpg",
+ :large "http://cloudfront.net/42b88fc6-e651-4ca3-9d53-e750df273b71/large.jpg"}
+ {:name "Rasta's Paleo Café", :categories ["Paleo" "Café"], :phone "415-392-6341", :id "4f9e69be-f06c-46a0-bb8b-f3ddd8218ca1"}
+ {:service "twitter", :mentions ["@rastas_paleo_café"], :tags ["#paleo" "#café"], :username "jessica"}]
+ ["Lower Pac Heights Deep-Dish Ice Cream Truck is a family-friendly and atmospheric place to nurse a hangover on Taco Tuesday."
+ {:small "http://cloudfront.net/6ff7a334-5c10-4be7-8cdf-320f10f12f6e/small.jpg",
+ :medium "http://cloudfront.net/6ff7a334-5c10-4be7-8cdf-320f10f12f6e/med.jpg",
+ :large "http://cloudfront.net/6ff7a334-5c10-4be7-8cdf-320f10f12f6e/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Ice Cream Truck", :categories ["Deep-Dish" "Ice Cream Truck"], :phone "415-495-1414", :id "d5efa2f2-496d-41b2-8b85-3d002a22a2bc"}
+ {:service "foursquare", :foursquare-photo-id "1a06dc7a-c6a4-47e6-a93d-131e99c481da", :mayor "lucky_pigeon"}]
+ ["Joe's Homestyle Eatery is a popular and atmospheric place to conduct a business meeting on a Tuesday afternoon."
+ {:small "http://cloudfront.net/42fa4469-19ba-41a2-816f-eeedf65664e5/small.jpg",
+ :medium "http://cloudfront.net/42fa4469-19ba-41a2-816f-eeedf65664e5/med.jpg",
+ :large "http://cloudfront.net/42fa4469-19ba-41a2-816f-eeedf65664e5/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "foursquare", :foursquare-photo-id "416a5da5-6d01-4a16-956d-dcb85ce88bd5", :mayor "joe"}]
+ ["Lucky's Low-Carb Coffee House is a exclusive and overrated place to pitch an investor on a Tuesday afternoon."
+ {:small "http://cloudfront.net/30379e31-47c0-4ba6-be2f-9a1cbd4baa63/small.jpg",
+ :medium "http://cloudfront.net/30379e31-47c0-4ba6-be2f-9a1cbd4baa63/med.jpg",
+ :large "http://cloudfront.net/30379e31-47c0-4ba6-be2f-9a1cbd4baa63/large.jpg"}
+ {:name "Lucky's Low-Carb Coffee House", :categories ["Low-Carb" "Coffee House"], :phone "415-145-7107", :id "81b0f944-f0ce-45e5-b84e-a924c441064a"}
+ {:service "foursquare", :foursquare-photo-id "3b06925f-553a-4117-9864-b3e35d81d9e0", :mayor "tupac"}]
+ ["Lower Pac Heights Deep-Dish Ice Cream Truck is a delicious and great place to have a drink on Saturday night."
+ {:small "http://cloudfront.net/9766eef8-6548-4a83-ab8d-ce023b2681c9/small.jpg",
+ :medium "http://cloudfront.net/9766eef8-6548-4a83-ab8d-ce023b2681c9/med.jpg",
+ :large "http://cloudfront.net/9766eef8-6548-4a83-ab8d-ce023b2681c9/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Ice Cream Truck", :categories ["Deep-Dish" "Ice Cream Truck"], :phone "415-495-1414", :id "d5efa2f2-496d-41b2-8b85-3d002a22a2bc"}
+ {:service "foursquare", :foursquare-photo-id "06e30d03-9b56-4820-adb4-c0b7ddde578b", :mayor "jane"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a horrible and swell place to people-watch the first Sunday of the month."
+ {:small "http://cloudfront.net/0bf95c7a-44aa-4a9d-8580-c3b8f79147d2/small.jpg",
+ :medium "http://cloudfront.net/0bf95c7a-44aa-4a9d-8580-c3b8f79147d2/med.jpg",
+ :large "http://cloudfront.net/0bf95c7a-44aa-4a9d-8580-c3b8f79147d2/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "twitter", :mentions ["@lower_pac_heights_cage_free_coffee_house"], :tags ["#cage-free" "#coffee" "#house"], :username "biggie"}]
+ ["Marina Cage-Free Liquor Store is a wonderful and acceptable place to watch the Warriors game during winter."
+ {:small "http://cloudfront.net/cb4a1c99-85d3-401c-b015-48839206ebfe/small.jpg",
+ :medium "http://cloudfront.net/cb4a1c99-85d3-401c-b015-48839206ebfe/med.jpg",
+ :large "http://cloudfront.net/cb4a1c99-85d3-401c-b015-48839206ebfe/large.jpg"}
+ {:name "Marina Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-571-0783", :id "ad68f549-3000-407e-ab98-7f314cfa4653"}
+ {:service "facebook", :facebook-photo-id "16a05fd8-120e-4f96-9857-4f340611e5f9", :url "http://facebook.com/photos/16a05fd8-120e-4f96-9857-4f340611e5f9"}]
+ ["SoMa Japanese Churros is a fantastic and swell place to drink a craft beer in the spring."
+ {:small "http://cloudfront.net/20a5ff27-ccd3-4c02-8cf5-7bc11e03b47d/small.jpg",
+ :medium "http://cloudfront.net/20a5ff27-ccd3-4c02-8cf5-7bc11e03b47d/med.jpg",
+ :large "http://cloudfront.net/20a5ff27-ccd3-4c02-8cf5-7bc11e03b47d/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "facebook", :facebook-photo-id "4022dab6-225b-4677-be1d-7c201233bdee", :url "http://facebook.com/photos/4022dab6-225b-4677-be1d-7c201233bdee"}]
+ ["Nob Hill Free-Range Ice Cream Truck is a groovy and fantastic place to have brunch on a Tuesday afternoon."
+ {:small "http://cloudfront.net/2e8ef910-73c2-45d1-8b15-fb2f4913d094/small.jpg",
+ :medium "http://cloudfront.net/2e8ef910-73c2-45d1-8b15-fb2f4913d094/med.jpg",
+ :large "http://cloudfront.net/2e8ef910-73c2-45d1-8b15-fb2f4913d094/large.jpg"}
+ {:name "Nob Hill Free-Range Ice Cream Truck", :categories ["Free-Range" "Ice Cream Truck"], :phone "415-787-4049", :id "08d1e93c-105f-4abf-a9ec-b2e3cd30747e"}
+ {:service "facebook", :facebook-photo-id "7e9a5a67-48ab-4a54-821c-1a6f59a3ea92", :url "http://facebook.com/photos/7e9a5a67-48ab-4a54-821c-1a6f59a3ea92"}]
+ ["SoMa Old-Fashioned Pizzeria is a horrible and horrible place to conduct a business meeting on Taco Tuesday."
+ {:small "http://cloudfront.net/8fd7a773-2103-4d2a-8337-f965ad7bb41e/small.jpg",
+ :medium "http://cloudfront.net/8fd7a773-2103-4d2a-8337-f965ad7bb41e/med.jpg",
+ :large "http://cloudfront.net/8fd7a773-2103-4d2a-8337-f965ad7bb41e/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "facebook", :facebook-photo-id "a868cdab-32c0-4939-a024-463412457bca", :url "http://facebook.com/photos/a868cdab-32c0-4939-a024-463412457bca"}]
+ ["Haight Soul Food Pop-Up Food Stand is a fantastic and family-friendly place to take a date with your pet dog."
+ {:small "http://cloudfront.net/252aa589-8ab3-48d8-861a-bfefd422b257/small.jpg",
+ :medium "http://cloudfront.net/252aa589-8ab3-48d8-861a-bfefd422b257/med.jpg",
+ :large "http://cloudfront.net/252aa589-8ab3-48d8-861a-bfefd422b257/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "twitter", :mentions ["@haight_soul_food_pop_up_food_stand"], :tags ["#soul" "#food" "#pop-up" "#food" "#stand"], :username "amy"}]
+ ["Pacific Heights Free-Range Eatery is a atmospheric and modern place to nurse a hangover on Saturday night."
+ {:small "http://cloudfront.net/860991ab-b4ca-4a5b-93fb-7a6cd7a6d208/small.jpg",
+ :medium "http://cloudfront.net/860991ab-b4ca-4a5b-93fb-7a6cd7a6d208/med.jpg",
+ :large "http://cloudfront.net/860991ab-b4ca-4a5b-93fb-7a6cd7a6d208/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "foursquare", :foursquare-photo-id "a3ad3c09-99fc-45e3-b786-0b293eaa525d", :mayor "jane"}]
+ ["Sameer's GMO-Free Restaurant is a underground and swell place to watch the Warriors game on Thursdays."
+ {:small "http://cloudfront.net/51846ade-98ab-4b6a-b783-2714d9c751d0/small.jpg",
+ :medium "http://cloudfront.net/51846ade-98ab-4b6a-b783-2714d9c751d0/med.jpg",
+ :large "http://cloudfront.net/51846ade-98ab-4b6a-b783-2714d9c751d0/large.jpg"}
+ {:name "Sameer's GMO-Free Restaurant", :categories ["GMO-Free" "Restaurant"], :phone "415-128-9430", :id "7ac8a7dd-c07f-45a6-92ba-bdb1b1280af2"}
+ {:service "facebook", :facebook-photo-id "f8d9a1ea-707f-4e4d-9a1b-fbc953f50361", :url "http://facebook.com/photos/f8d9a1ea-707f-4e4d-9a1b-fbc953f50361"}]
+ ["Rasta's European Taqueria is a acceptable and groovy place to have a birthday party Friday nights."
+ {:small "http://cloudfront.net/ae49f9bb-7498-44ea-bfaf-e9d4c2f7b7f3/small.jpg",
+ :medium "http://cloudfront.net/ae49f9bb-7498-44ea-bfaf-e9d4c2f7b7f3/med.jpg",
+ :large "http://cloudfront.net/ae49f9bb-7498-44ea-bfaf-e9d4c2f7b7f3/large.jpg"}
+ {:name "Rasta's European Taqueria", :categories ["European" "Taqueria"], :phone "415-631-1599", :id "cb472880-ee6e-46e3-bd58-22cf33109aba"}
+ {:service "facebook", :facebook-photo-id "50e226aa-7b65-450e-9248-040c24bf3577", :url "http://facebook.com/photos/50e226aa-7b65-450e-9248-040c24bf3577"}]
+ ["Cam's Old-Fashioned Coffee House is a groovy and classic place to take a date weekend evenings."
+ {:small "http://cloudfront.net/ba2b9659-02d5-4df5-849d-b24d342176e6/small.jpg",
+ :medium "http://cloudfront.net/ba2b9659-02d5-4df5-849d-b24d342176e6/med.jpg",
+ :large "http://cloudfront.net/ba2b9659-02d5-4df5-849d-b24d342176e6/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-871-9473", :id "5d1f918e-ef00-40de-b6e4-3f9f34ee8cd4"}
+ {:service "yelp", :yelp-photo-id "e6266710-a32b-4da5-8d9d-6b0440596c10", :categories ["Old-Fashioned" "Coffee House"]}]
+ ["Polk St. Mexican Coffee House is a exclusive and well-decorated place to people-watch weekend evenings."
+ {:small "http://cloudfront.net/2cfd3695-50fd-46fe-b141-07491a10ac99/small.jpg",
+ :medium "http://cloudfront.net/2cfd3695-50fd-46fe-b141-07491a10ac99/med.jpg",
+ :large "http://cloudfront.net/2cfd3695-50fd-46fe-b141-07491a10ac99/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "twitter", :mentions ["@polk_st._mexican_coffee_house"], :tags ["#mexican" "#coffee" "#house"], :username "sameer"}]
+ ["Tenderloin Gluten-Free Bar & Grill is a swell and exclusive place to have brunch weekend evenings."
+ {:small "http://cloudfront.net/cfb304d9-bb56-4b72-b9e7-df983f1fb9e1/small.jpg",
+ :medium "http://cloudfront.net/cfb304d9-bb56-4b72-b9e7-df983f1fb9e1/med.jpg",
+ :large "http://cloudfront.net/cfb304d9-bb56-4b72-b9e7-df983f1fb9e1/large.jpg"}
+ {:name "Tenderloin Gluten-Free Bar & Grill", :categories ["Gluten-Free" "Bar & Grill"], :phone "415-904-0956", :id "0d7e235a-eea8-45b3-aaa7-23b4ea2b50f2"}
+ {:service "foursquare", :foursquare-photo-id "02362879-deac-452e-b656-976edb806e8b", :mayor "rasta_toucan"}]
+ ["Sunset Homestyle Grill is a world-famous and fantastic place to meet new friends on public holidays."
+ {:small "http://cloudfront.net/a1ccd1c5-5144-475a-a151-450c3cc66742/small.jpg",
+ :medium "http://cloudfront.net/a1ccd1c5-5144-475a-a151-450c3cc66742/med.jpg",
+ :large "http://cloudfront.net/a1ccd1c5-5144-475a-a151-450c3cc66742/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "facebook", :facebook-photo-id "fc57f41a-9684-4b88-bb8b-9c223eeb47ef", :url "http://facebook.com/photos/fc57f41a-9684-4b88-bb8b-9c223eeb47ef"}]
+ ["Haight Chinese Gastro Pub is a exclusive and underappreciated place to drink a craft beer the second Saturday of the month."
+ {:small "http://cloudfront.net/1ac6a807-49a0-4c57-90c7-4ded792903fe/small.jpg",
+ :medium "http://cloudfront.net/1ac6a807-49a0-4c57-90c7-4ded792903fe/med.jpg",
+ :large "http://cloudfront.net/1ac6a807-49a0-4c57-90c7-4ded792903fe/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "twitter", :mentions ["@haight_chinese_gastro_pub"], :tags ["#chinese" "#gastro" "#pub"], :username "bob"}]
+ ["Haight Soul Food Café is a great and popular place to pitch an investor during winter."
+ {:small "http://cloudfront.net/9e69fff5-926e-4fdd-a160-1dc607ab06a0/small.jpg",
+ :medium "http://cloudfront.net/9e69fff5-926e-4fdd-a160-1dc607ab06a0/med.jpg",
+ :large "http://cloudfront.net/9e69fff5-926e-4fdd-a160-1dc607ab06a0/large.jpg"}
+ {:name "Haight Soul Food Café", :categories ["Soul Food" "Café"], :phone "415-257-1769", :id "a1796c4b-da2b-474f-9fd6-4fa96c1eac70"}
+ {:service "foursquare", :foursquare-photo-id "dc0709af-da58-4c33-9919-0c3e42e4e0d7", :mayor "rasta_toucan"}]
+ ["SF Deep-Dish Eatery is a horrible and great place to drink a craft beer on Taco Tuesday."
+ {:small "http://cloudfront.net/b76358fa-f3cc-470a-9f9f-91be479e7c77/small.jpg",
+ :medium "http://cloudfront.net/b76358fa-f3cc-470a-9f9f-91be479e7c77/med.jpg",
+ :large "http://cloudfront.net/b76358fa-f3cc-470a-9f9f-91be479e7c77/large.jpg"}
+ {:name "SF Deep-Dish Eatery", :categories ["Deep-Dish" "Eatery"], :phone "415-476-9257", :id "ad41d3f6-c20c-46a7-9e5d-db602fff7d0d"}
+ {:service "foursquare", :foursquare-photo-id "e415f4d4-08f0-4ee0-abab-d2df0bf41fa1", :mayor "cam_saul"}]
+ ["Pacific Heights Free-Range Eatery is a groovy and historical place to have a birthday party in the spring."
+ {:small "http://cloudfront.net/b3499888-ccc2-456c-875b-c1b16e6a9fab/small.jpg",
+ :medium "http://cloudfront.net/b3499888-ccc2-456c-875b-c1b16e6a9fab/med.jpg",
+ :large "http://cloudfront.net/b3499888-ccc2-456c-875b-c1b16e6a9fab/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "flare", :username "jane"}]
+ ["Haight Chinese Gastro Pub is a world-famous and popular place to take visiting friends and relatives the second Saturday of the month."
+ {:small "http://cloudfront.net/98170d41-1145-4c3c-8e4e-ecf65ac1ff26/small.jpg",
+ :medium "http://cloudfront.net/98170d41-1145-4c3c-8e4e-ecf65ac1ff26/med.jpg",
+ :large "http://cloudfront.net/98170d41-1145-4c3c-8e4e-ecf65ac1ff26/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "foursquare", :foursquare-photo-id "a3de9324-b821-47ec-a07d-36c9c0702400", :mayor "lucky_pigeon"}]
+ ["Haight Soul Food Pop-Up Food Stand is a great and wonderful place to catch a bite to eat weekend evenings."
+ {:small "http://cloudfront.net/3187fbfa-fa2c-4109-af80-77b4e0afe5bd/small.jpg",
+ :medium "http://cloudfront.net/3187fbfa-fa2c-4109-af80-77b4e0afe5bd/med.jpg",
+ :large "http://cloudfront.net/3187fbfa-fa2c-4109-af80-77b4e0afe5bd/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "yelp", :yelp-photo-id "6747488f-9287-40f4-b676-0116b0973bec", :categories ["Soul Food" "Pop-Up Food Stand"]}]
+ ["Pacific Heights Red White & Blue Bar & Grill is a horrible and decent place to watch the Giants game in July."
+ {:small "http://cloudfront.net/919615dc-461e-4f34-ac5f-97253d515021/small.jpg",
+ :medium "http://cloudfront.net/919615dc-461e-4f34-ac5f-97253d515021/med.jpg",
+ :large "http://cloudfront.net/919615dc-461e-4f34-ac5f-97253d515021/large.jpg"}
+ {:name "Pacific Heights Red White & Blue Bar & Grill", :categories ["Red White & Blue" "Bar & Grill"], :phone "415-208-2550", :id "c7547aa1-94c1-44bd-bf5a-8655e4698ed8"}
+ {:service "yelp", :yelp-photo-id "2e35c934-2f4c-417f-a6ab-56a8bda58b16", :categories ["Red White & Blue" "Bar & Grill"]}]
+ ["Rasta's Old-Fashioned Pop-Up Food Stand is a exclusive and family-friendly place to conduct a business meeting on public holidays."
+ {:small "http://cloudfront.net/0e16f689-a170-4fe0-9e15-8fd838abdf09/small.jpg",
+ :medium "http://cloudfront.net/0e16f689-a170-4fe0-9e15-8fd838abdf09/med.jpg",
+ :large "http://cloudfront.net/0e16f689-a170-4fe0-9e15-8fd838abdf09/large.jpg"}
+ {:name "Rasta's Old-Fashioned Pop-Up Food Stand", :categories ["Old-Fashioned" "Pop-Up Food Stand"], :phone "415-942-1875", :id "9fd8b920-a877-4888-86bf-578b2724ac4e"}
+ {:service "flare", :username "tupac"}]
+ ["Mission Free-Range Liquor Store is a groovy and delicious place to conduct a business meeting in June."
+ {:small "http://cloudfront.net/d72b00cf-fc40-493a-9f27-aab6ab438e38/small.jpg",
+ :medium "http://cloudfront.net/d72b00cf-fc40-493a-9f27-aab6ab438e38/med.jpg",
+ :large "http://cloudfront.net/d72b00cf-fc40-493a-9f27-aab6ab438e38/large.jpg"}
+ {:name "Mission Free-Range Liquor Store", :categories ["Free-Range" "Liquor Store"], :phone "415-041-3816", :id "6e665924-8e2c-42ab-af58-23a27f017e37"}
+ {:service "foursquare", :foursquare-photo-id "9f9fdd2d-a3d1-4bc1-b706-7e94d8ea2042", :mayor "rasta_toucan"}]
+ ["Kyle's European Churros is a underappreciated and family-friendly place to watch the Giants game during summer."
+ {:small "http://cloudfront.net/046e8027-3830-4251-a7a9-b3039b4300f9/small.jpg",
+ :medium "http://cloudfront.net/046e8027-3830-4251-a7a9-b3039b4300f9/med.jpg",
+ :large "http://cloudfront.net/046e8027-3830-4251-a7a9-b3039b4300f9/large.jpg"}
+ {:name "Kyle's European Churros", :categories ["European" "Churros"], :phone "415-233-8392", :id "5270240c-6e6e-4512-9344-3dc497d6ea49"}
+ {:service "twitter", :mentions ["@kyles_european_churros"], :tags ["#european" "#churros"], :username "jane"}]
+ ["Haight Soul Food Hotel & Restaurant is a classic and decent place to people-watch on Taco Tuesday."
+ {:small "http://cloudfront.net/e23afb15-0deb-4060-a5ff-ec8497816adf/small.jpg",
+ :medium "http://cloudfront.net/e23afb15-0deb-4060-a5ff-ec8497816adf/med.jpg",
+ :large "http://cloudfront.net/e23afb15-0deb-4060-a5ff-ec8497816adf/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["SoMa Old-Fashioned Pizzeria is a world-famous and classic place to catch a bite to eat in June."
+ {:small "http://cloudfront.net/926c9016-ec2e-4ef3-b40f-fd404e573d94/small.jpg",
+ :medium "http://cloudfront.net/926c9016-ec2e-4ef3-b40f-fd404e573d94/med.jpg",
+ :large "http://cloudfront.net/926c9016-ec2e-4ef3-b40f-fd404e573d94/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "yelp", :yelp-photo-id "22e2d196-931a-4251-8fce-a5492c304185", :categories ["Old-Fashioned" "Pizzeria"]}]
+ ["Haight Chinese Gastro Pub is a modern and underground place to watch the Warriors game weekday afternoons."
+ {:small "http://cloudfront.net/b6c37f33-b6c7-4684-b96e-54b5ee77cac2/small.jpg",
+ :medium "http://cloudfront.net/b6c37f33-b6c7-4684-b96e-54b5ee77cac2/med.jpg",
+ :large "http://cloudfront.net/b6c37f33-b6c7-4684-b96e-54b5ee77cac2/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "foursquare", :foursquare-photo-id "0211f4dc-c9db-4505-8b9d-fd5abf151ada", :mayor "rasta_toucan"}]
+ ["Cam's Old-Fashioned Coffee House is a decent and modern place to conduct a business meeting Friday nights."
+ {:small "http://cloudfront.net/34c40a62-a21f-4110-a3a9-d633e2bad9da/small.jpg",
+ :medium "http://cloudfront.net/34c40a62-a21f-4110-a3a9-d633e2bad9da/med.jpg",
+ :large "http://cloudfront.net/34c40a62-a21f-4110-a3a9-d633e2bad9da/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-871-9473", :id "5d1f918e-ef00-40de-b6e4-3f9f34ee8cd4"}
+ {:service "foursquare", :foursquare-photo-id "dc22d4ab-1f2a-4ad2-babf-9b5b96cc65d7", :mayor "joe"}]
+ ["Market St. Gluten-Free Café is a classic and wonderful place to watch the Warriors game in June."
+ {:small "http://cloudfront.net/b8408489-88ec-4ff0-9c18-1dc647aa70aa/small.jpg",
+ :medium "http://cloudfront.net/b8408489-88ec-4ff0-9c18-1dc647aa70aa/med.jpg",
+ :large "http://cloudfront.net/b8408489-88ec-4ff0-9c18-1dc647aa70aa/large.jpg"}
+ {:name "Market St. Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-697-9776", :id "ce4947d0-071a-4491-b5ac-f8b0241bd54c"}
+ {:service "foursquare", :foursquare-photo-id "a033581b-09b2-487f-b78d-18af543bc0b6", :mayor "rasta_toucan"}]
+ ["Tenderloin Paleo Hotel & Restaurant is a world-famous and swell place to sip a glass of expensive wine weekend mornings."
+ {:small "http://cloudfront.net/00a4a70a-3f26-46a7-b952-a08e9ae1281f/small.jpg",
+ :medium "http://cloudfront.net/00a4a70a-3f26-46a7-b952-a08e9ae1281f/med.jpg",
+ :large "http://cloudfront.net/00a4a70a-3f26-46a7-b952-a08e9ae1281f/large.jpg"}
+ {:name "Tenderloin Paleo Hotel & Restaurant", :categories ["Paleo" "Hotel & Restaurant"], :phone "415-402-1652", :id "4dea27b4-6d89-4b86-80a8-5631e171da8d"}
+ {:service "foursquare", :foursquare-photo-id "44854a6b-c709-4f0f-ab52-f4b5982ec2ee", :mayor "amy"}]
+ ["Haight Soul Food Sushi is a swell and acceptable place to nurse a hangover on Saturday night."
+ {:small "http://cloudfront.net/d14c0a83-f0a8-4bee-b760-4c91bbd44c21/small.jpg",
+ :medium "http://cloudfront.net/d14c0a83-f0a8-4bee-b760-4c91bbd44c21/med.jpg",
+ :large "http://cloudfront.net/d14c0a83-f0a8-4bee-b760-4c91bbd44c21/large.jpg"}
+ {:name "Haight Soul Food Sushi", :categories ["Soul Food" "Sushi"], :phone "415-371-8026", :id "b4df5eb7-d8cd-431d-9d43-381984ec81ae"}
+ {:service "foursquare", :foursquare-photo-id "73b07d4f-8de1-4c30-be6e-65e891d60dcd", :mayor "sameer"}]
+ ["SoMa Japanese Churros is a world-famous and modern place to drink a craft beer when hungover."
+ {:small "http://cloudfront.net/d058c540-7cba-4cdd-82a1-1c19bb6e0926/small.jpg",
+ :medium "http://cloudfront.net/d058c540-7cba-4cdd-82a1-1c19bb6e0926/med.jpg",
+ :large "http://cloudfront.net/d058c540-7cba-4cdd-82a1-1c19bb6e0926/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "flare", :username "bob"}]
+ ["Marina Low-Carb Food Truck is a fantastic and decent place to watch the Giants game in the spring."
+ {:small "http://cloudfront.net/7984c64f-8b50-49fe-bb19-d96b88d692eb/small.jpg",
+ :medium "http://cloudfront.net/7984c64f-8b50-49fe-bb19-d96b88d692eb/med.jpg",
+ :large "http://cloudfront.net/7984c64f-8b50-49fe-bb19-d96b88d692eb/large.jpg"}
+ {:name "Marina Low-Carb Food Truck", :categories ["Low-Carb" "Food Truck"], :phone "415-748-3513", :id "a13a5beb-19de-40ca-a334-02df3bdf5285"}
+ {:service "facebook", :facebook-photo-id "7888806a-6bcb-43e4-89a6-ee06096d8f6f", :url "http://facebook.com/photos/7888806a-6bcb-43e4-89a6-ee06096d8f6f"}]
+ ["Rasta's Paleo Churros is a historical and acceptable place to catch a bite to eat on public holidays."
+ {:small "http://cloudfront.net/d04563bd-9802-4fd9-bcb3-132544b06612/small.jpg",
+ :medium "http://cloudfront.net/d04563bd-9802-4fd9-bcb3-132544b06612/med.jpg",
+ :large "http://cloudfront.net/d04563bd-9802-4fd9-bcb3-132544b06612/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "yelp", :yelp-photo-id "e63bccf1-3d28-46c5-a3ca-7b8b8063a785", :categories ["Paleo" "Churros"]}]
+ ["Sameer's GMO-Free Pop-Up Food Stand is a wonderful and horrible place to drink a craft beer on Thursdays."
+ {:small "http://cloudfront.net/4a743cdf-ef0f-4b8c-839f-c7691449fe9e/small.jpg",
+ :medium "http://cloudfront.net/4a743cdf-ef0f-4b8c-839f-c7691449fe9e/med.jpg",
+ :large "http://cloudfront.net/4a743cdf-ef0f-4b8c-839f-c7691449fe9e/large.jpg"}
+ {:name "Sameer's GMO-Free Pop-Up Food Stand", :categories ["GMO-Free" "Pop-Up Food Stand"], :phone "415-217-7891", :id "a829efc7-7e03-4e73-b072-83d10d1e3953"}
+ {:service "foursquare", :foursquare-photo-id "2ae13e5f-bfef-46cb-8bfb-f568f5fa383d", :mayor "amy"}]
+ ["Marina Cage-Free Liquor Store is a delicious and acceptable place to pitch an investor on Taco Tuesday."
+ {:small "http://cloudfront.net/aa31e351-b952-4757-80ce-5563659b677e/small.jpg",
+ :medium "http://cloudfront.net/aa31e351-b952-4757-80ce-5563659b677e/med.jpg",
+ :large "http://cloudfront.net/aa31e351-b952-4757-80ce-5563659b677e/large.jpg"}
+ {:name "Marina Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-571-0783", :id "ad68f549-3000-407e-ab98-7f314cfa4653"}
+ {:service "yelp", :yelp-photo-id "03bfbbbc-ca84-459a-a81e-3a2e08986052", :categories ["Cage-Free" "Liquor Store"]}]
+ ["Mission British Café is a decent and decent place to nurse a hangover after baseball games."
+ {:small "http://cloudfront.net/dd60f1e4-5954-4bb3-b826-684715614901/small.jpg",
+ :medium "http://cloudfront.net/dd60f1e4-5954-4bb3-b826-684715614901/med.jpg",
+ :large "http://cloudfront.net/dd60f1e4-5954-4bb3-b826-684715614901/large.jpg"}
+ {:name "Mission British Café", :categories ["British" "Café"], :phone "415-715-7004", :id "c99899e3-439c-4444-9dc4-5598632aec8d"}
+ {:service "yelp", :yelp-photo-id "4b790ee2-1c3f-4ee6-bd5d-9debea0377e1", :categories ["British" "Café"]}]
+ ["Sameer's Pizza Liquor Store is a great and popular place to nurse a hangover during summer."
+ {:small "http://cloudfront.net/b579ac79-99e9-4be9-861a-36e540f0d335/small.jpg",
+ :medium "http://cloudfront.net/b579ac79-99e9-4be9-861a-36e540f0d335/med.jpg",
+ :large "http://cloudfront.net/b579ac79-99e9-4be9-861a-36e540f0d335/large.jpg"}
+ {:name "Sameer's Pizza Liquor Store", :categories ["Pizza" "Liquor Store"], :phone "415-969-7474", :id "7b9c7dc3-d8f1-498d-843a-e62360449892"}
+ {:service "foursquare", :foursquare-photo-id "a8cc052d-7c49-4c06-b81d-81d5208ed90c", :mayor "jessica"}]
+ ["Pacific Heights Irish Grill is a overrated and underground place to people-watch in June."
+ {:small "http://cloudfront.net/11e72119-4d0a-4136-b84f-46ce0d184767/small.jpg",
+ :medium "http://cloudfront.net/11e72119-4d0a-4136-b84f-46ce0d184767/med.jpg",
+ :large "http://cloudfront.net/11e72119-4d0a-4136-b84f-46ce0d184767/large.jpg"}
+ {:name "Pacific Heights Irish Grill", :categories ["Irish" "Grill"], :phone "415-491-2202", :id "d6b92dfc-56e9-4f65-b1d0-595f120043d9"}
+ {:service "foursquare", :foursquare-photo-id "5d6e0806-1f8c-43c7-84c4-2209c132d438", :mayor "mandy"}]
+ ["SoMa Old-Fashioned Pizzeria is a exclusive and acceptable place to watch the Giants game in June."
+ {:small "http://cloudfront.net/a17fc0ad-3eb8-4b64-877e-4320b87f1ec5/small.jpg",
+ :medium "http://cloudfront.net/a17fc0ad-3eb8-4b64-877e-4320b87f1ec5/med.jpg",
+ :large "http://cloudfront.net/a17fc0ad-3eb8-4b64-877e-4320b87f1ec5/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "foursquare", :foursquare-photo-id "5b08d58b-61b1-464a-8380-0bf9d846a9be", :mayor "sameer"}]
+ ["Mission Chinese Liquor Store is a swell and well-decorated place to catch a bite to eat during summer."
+ {:small "http://cloudfront.net/1cb214d4-0140-4aa5-aa4c-259f6d980fea/small.jpg",
+ :medium "http://cloudfront.net/1cb214d4-0140-4aa5-aa4c-259f6d980fea/med.jpg",
+ :large "http://cloudfront.net/1cb214d4-0140-4aa5-aa4c-259f6d980fea/large.jpg"}
+ {:name "Mission Chinese Liquor Store", :categories ["Chinese" "Liquor Store"], :phone "415-906-6919", :id "00132b5b-31fc-46f0-a288-f547f23477ee"}
+ {:service "twitter", :mentions ["@mission_chinese_liquor_store"], :tags ["#chinese" "#liquor" "#store"], :username "lucky_pigeon"}]
+ ["Haight Soul Food Sushi is a swell and underappreciated place to watch the Giants game in the spring."
+ {:small "http://cloudfront.net/88e6aee5-89e4-4b52-ac93-d721652a8d36/small.jpg",
+ :medium "http://cloudfront.net/88e6aee5-89e4-4b52-ac93-d721652a8d36/med.jpg",
+ :large "http://cloudfront.net/88e6aee5-89e4-4b52-ac93-d721652a8d36/large.jpg"}
+ {:name "Haight Soul Food Sushi", :categories ["Soul Food" "Sushi"], :phone "415-371-8026", :id "b4df5eb7-d8cd-431d-9d43-381984ec81ae"}
+ {:service "yelp", :yelp-photo-id "4043626c-1296-45f8-ba01-eca54642defa", :categories ["Soul Food" "Sushi"]}]
+ ["Market St. Homestyle Pop-Up Food Stand is a amazing and classic place to sip Champagne Friday nights."
+ {:small "http://cloudfront.net/d4d40457-4efa-414e-8741-a10843fea0fd/small.jpg",
+ :medium "http://cloudfront.net/d4d40457-4efa-414e-8741-a10843fea0fd/med.jpg",
+ :large "http://cloudfront.net/d4d40457-4efa-414e-8741-a10843fea0fd/large.jpg"}
+ {:name "Market St. Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-213-3030", :id "2d873280-e43d-449e-9940-af96ae7df718"}
+ {:service "yelp", :yelp-photo-id "9b425a8e-9bcb-40ce-98df-52e8c6e47978", :categories ["Homestyle" "Pop-Up Food Stand"]}]
+ ["Polk St. Deep-Dish Hotel & Restaurant is a well-decorated and fantastic place to take a date in June."
+ {:small "http://cloudfront.net/0f7bdbd7-40e6-4b97-81c0-daae0875c3b7/small.jpg",
+ :medium "http://cloudfront.net/0f7bdbd7-40e6-4b97-81c0-daae0875c3b7/med.jpg",
+ :large "http://cloudfront.net/0f7bdbd7-40e6-4b97-81c0-daae0875c3b7/large.jpg"}
+ {:name "Polk St. Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-666-8681", :id "47f1698e-ae11-46f5-818b-85a59d0affba"}
+ {:service "facebook", :facebook-photo-id "cd159f6b-6c5d-400e-90e9-c667d40cea43", :url "http://facebook.com/photos/cd159f6b-6c5d-400e-90e9-c667d40cea43"}]
+ ["Pacific Heights Red White & Blue Bar & Grill is a decent and family-friendly place to have a drink on Saturday night."
+ {:small "http://cloudfront.net/e7211862-740e-4100-919a-4fd221276ef1/small.jpg",
+ :medium "http://cloudfront.net/e7211862-740e-4100-919a-4fd221276ef1/med.jpg",
+ :large "http://cloudfront.net/e7211862-740e-4100-919a-4fd221276ef1/large.jpg"}
+ {:name "Pacific Heights Red White & Blue Bar & Grill", :categories ["Red White & Blue" "Bar & Grill"], :phone "415-208-2550", :id "c7547aa1-94c1-44bd-bf5a-8655e4698ed8"}
+ {:service "twitter", :mentions ["@pacific_heights_red_white_&_blue_bar_&_grill"], :tags ["#red" "#white" "#&" "#blue" "#bar" "#&" "#grill"], :username "cam_saul"}]
+ ["Haight European Grill is a wonderful and horrible place to sip Champagne with your pet dog."
+ {:small "http://cloudfront.net/f08661e3-3f7d-4e05-b3b7-25643b1478f1/small.jpg",
+ :medium "http://cloudfront.net/f08661e3-3f7d-4e05-b3b7-25643b1478f1/med.jpg",
+ :large "http://cloudfront.net/f08661e3-3f7d-4e05-b3b7-25643b1478f1/large.jpg"}
+ {:name "Haight European Grill", :categories ["European" "Grill"], :phone "415-191-2778", :id "7e6281f7-5b17-4056-ada0-85453247bc8f"}
+ {:service "foursquare", :foursquare-photo-id "bad6706f-9387-4946-a65f-872b5055638b", :mayor "tupac"}]
+ ["Cam's Old-Fashioned Coffee House is a underappreciated and family-friendly place to have a drink with friends."
+ {:small "http://cloudfront.net/83f2915e-edff-49bf-bb42-2236c634f0da/small.jpg",
+ :medium "http://cloudfront.net/83f2915e-edff-49bf-bb42-2236c634f0da/med.jpg",
+ :large "http://cloudfront.net/83f2915e-edff-49bf-bb42-2236c634f0da/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-871-9473", :id "5d1f918e-ef00-40de-b6e4-3f9f34ee8cd4"}
+ {:service "twitter", :mentions ["@cams_old_fashioned_coffee_house"], :tags ["#old-fashioned" "#coffee" "#house"], :username "rasta_toucan"}]
+ ["Cam's Old-Fashioned Coffee House is a exclusive and fantastic place to have a birthday party weekend evenings."
+ {:small "http://cloudfront.net/2f4200f6-8a0e-4a51-a80d-2783be070731/small.jpg",
+ :medium "http://cloudfront.net/2f4200f6-8a0e-4a51-a80d-2783be070731/med.jpg",
+ :large "http://cloudfront.net/2f4200f6-8a0e-4a51-a80d-2783be070731/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-871-9473", :id "5d1f918e-ef00-40de-b6e4-3f9f34ee8cd4"}
+ {:service "yelp", :yelp-photo-id "dcc28cfa-c4aa-4c03-8985-48b72c682e06", :categories ["Old-Fashioned" "Coffee House"]}]
+ ["Mission Homestyle Churros is a well-decorated and exclusive place to have a after-work cocktail the first Sunday of the month."
+ {:small "http://cloudfront.net/2c0d54dc-414f-45c0-9844-643b05dda78d/small.jpg",
+ :medium "http://cloudfront.net/2c0d54dc-414f-45c0-9844-643b05dda78d/med.jpg",
+ :large "http://cloudfront.net/2c0d54dc-414f-45c0-9844-643b05dda78d/large.jpg"}
+ {:name "Mission Homestyle Churros", :categories ["Homestyle" "Churros"], :phone "415-343-4489", :id "21d903d3-8bdb-4b7d-b288-6063ad48af44"}
+ {:service "flare", :username "cam_saul"}]
+ ["Alcatraz Pizza Churros is a groovy and underappreciated place to take visiting friends and relatives on Taco Tuesday."
+ {:small "http://cloudfront.net/e566abbe-39c9-47a6-be61-1654ca23d783/small.jpg",
+ :medium "http://cloudfront.net/e566abbe-39c9-47a6-be61-1654ca23d783/med.jpg",
+ :large "http://cloudfront.net/e566abbe-39c9-47a6-be61-1654ca23d783/large.jpg"}
+ {:name "Alcatraz Pizza Churros", :categories ["Pizza" "Churros"], :phone "415-754-7867", :id "df95e4f1-8719-42af-a15d-3ee00de6e04f"}
+ {:service "yelp", :yelp-photo-id "161da098-e1d5-43d2-9ca9-f10ca0b48008", :categories ["Pizza" "Churros"]}]
+ ["Polk St. Deep-Dish Hotel & Restaurant is a modern and swell place to have a birthday party on Saturday night."
+ {:small "http://cloudfront.net/3511bf6b-6066-4139-bde0-ce2a4ffee9bd/small.jpg",
+ :medium "http://cloudfront.net/3511bf6b-6066-4139-bde0-ce2a4ffee9bd/med.jpg",
+ :large "http://cloudfront.net/3511bf6b-6066-4139-bde0-ce2a4ffee9bd/large.jpg"}
+ {:name "Polk St. Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-666-8681", :id "47f1698e-ae11-46f5-818b-85a59d0affba"}
+ {:service "foursquare", :foursquare-photo-id "a8cf3fba-ecc4-46b5-97de-35f953def90e", :mayor "bob"}]
+ ["Rasta's Mexican Sushi is a swell and horrible place to conduct a business meeting in June."
+ {:small "http://cloudfront.net/5ec77779-ac5d-4c0e-8d7c-a83cb883db1b/small.jpg",
+ :medium "http://cloudfront.net/5ec77779-ac5d-4c0e-8d7c-a83cb883db1b/med.jpg",
+ :large "http://cloudfront.net/5ec77779-ac5d-4c0e-8d7c-a83cb883db1b/large.jpg"}
+ {:name "Rasta's Mexican Sushi", :categories ["Mexican" "Sushi"], :phone "415-387-1284", :id "e4912a22-e6ac-4806-8377-6497bf533a21"}
+ {:service "yelp", :yelp-photo-id "7679858d-2f30-4af5-b620-e406eb0b2f73", :categories ["Mexican" "Sushi"]}]
+ ["Haight Chinese Gastro Pub is a underappreciated and overrated place to take a date weekend evenings."
+ {:small "http://cloudfront.net/10d9c169-e448-4c5a-bc35-d6c316f0ebf6/small.jpg",
+ :medium "http://cloudfront.net/10d9c169-e448-4c5a-bc35-d6c316f0ebf6/med.jpg",
+ :large "http://cloudfront.net/10d9c169-e448-4c5a-bc35-d6c316f0ebf6/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "twitter", :mentions ["@haight_chinese_gastro_pub"], :tags ["#chinese" "#gastro" "#pub"], :username "tupac"}]
+ ["Alcatraz Modern Eatery is a underground and underground place to meet new friends on a Tuesday afternoon."
+ {:small "http://cloudfront.net/ea1f1ae6-f34f-429d-b3ae-f31d4eec1560/small.jpg",
+ :medium "http://cloudfront.net/ea1f1ae6-f34f-429d-b3ae-f31d4eec1560/med.jpg",
+ :large "http://cloudfront.net/ea1f1ae6-f34f-429d-b3ae-f31d4eec1560/large.jpg"}
+ {:name "Alcatraz Modern Eatery", :categories ["Modern" "Eatery"], :phone "415-899-2965", :id "bbfafaac-e825-4c4f-8655-f5e697148d9c"}
+ {:service "facebook", :facebook-photo-id "ab85f630-7d6d-445f-9848-48461b588909", :url "http://facebook.com/photos/ab85f630-7d6d-445f-9848-48461b588909"}]
+ ["Haight Soul Food Café is a amazing and fantastic place to drink a craft beer with your pet dog."
+ {:small "http://cloudfront.net/0acfc578-9f98-4e18-aa00-b9f4913d5aa8/small.jpg",
+ :medium "http://cloudfront.net/0acfc578-9f98-4e18-aa00-b9f4913d5aa8/med.jpg",
+ :large "http://cloudfront.net/0acfc578-9f98-4e18-aa00-b9f4913d5aa8/large.jpg"}
+ {:name "Haight Soul Food Café", :categories ["Soul Food" "Café"], :phone "415-257-1769", :id "a1796c4b-da2b-474f-9fd6-4fa96c1eac70"}
+ {:service "facebook", :facebook-photo-id "050b4f87-87f7-45c2-aeb7-d02cae41b076", :url "http://facebook.com/photos/050b4f87-87f7-45c2-aeb7-d02cae41b076"}]
+ ["Lucky's Gluten-Free Café is a swell and horrible place to watch the Giants game with your pet dog."
+ {:small "http://cloudfront.net/f2ce5a16-6524-49f1-aa01-c231e73d8e0e/small.jpg",
+ :medium "http://cloudfront.net/f2ce5a16-6524-49f1-aa01-c231e73d8e0e/med.jpg",
+ :large "http://cloudfront.net/f2ce5a16-6524-49f1-aa01-c231e73d8e0e/large.jpg"}
+ {:name "Lucky's Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-740-2328", :id "379af987-ad40-4a93-88a6-0233e1c14649"}
+ {:service "foursquare", :foursquare-photo-id "f63d629b-0e13-4c23-8cc8-6b08ca2e8213", :mayor "tupac"}]
+ ["Joe's Modern Coffee House is a exclusive and exclusive place to sip Champagne with your pet dog."
+ {:small "http://cloudfront.net/1388c27c-c987-4d8d-8f26-60094f8057e8/small.jpg",
+ :medium "http://cloudfront.net/1388c27c-c987-4d8d-8f26-60094f8057e8/med.jpg",
+ :large "http://cloudfront.net/1388c27c-c987-4d8d-8f26-60094f8057e8/large.jpg"}
+ {:name "Joe's Modern Coffee House", :categories ["Modern" "Coffee House"], :phone "415-331-5269", :id "cd9e3610-9ead-4f0b-ad93-cd53611d49fe"}
+ {:service "yelp", :yelp-photo-id "ff896124-cf74-44f8-ab68-631810f8bbff", :categories ["Modern" "Coffee House"]}]
+ ["Oakland Low-Carb Bakery is a classic and groovy place to have breakfast on Taco Tuesday."
+ {:small "http://cloudfront.net/1fde679f-4f4d-4cd9-b4ba-33417d84f2bb/small.jpg",
+ :medium "http://cloudfront.net/1fde679f-4f4d-4cd9-b4ba-33417d84f2bb/med.jpg",
+ :large "http://cloudfront.net/1fde679f-4f4d-4cd9-b4ba-33417d84f2bb/large.jpg"}
+ {:name "Oakland Low-Carb Bakery", :categories ["Low-Carb" "Bakery"], :phone "415-546-0101", :id "da7dd72d-60fb-495b-a2c0-1e2ae73a1a86"}
+ {:service "foursquare", :foursquare-photo-id "8608a711-9a31-4f23-a2b5-01de2b554df0", :mayor "lucky_pigeon"}]
+ ["Mission Homestyle Churros is a exclusive and popular place to have a birthday party Friday nights."
+ {:small "http://cloudfront.net/d50c5351-db5f-409d-a3db-b17509974e6c/small.jpg",
+ :medium "http://cloudfront.net/d50c5351-db5f-409d-a3db-b17509974e6c/med.jpg",
+ :large "http://cloudfront.net/d50c5351-db5f-409d-a3db-b17509974e6c/large.jpg"}
+ {:name "Mission Homestyle Churros", :categories ["Homestyle" "Churros"], :phone "415-343-4489", :id "21d903d3-8bdb-4b7d-b288-6063ad48af44"}
+ {:service "foursquare", :foursquare-photo-id "b9f30495-8334-43b1-bcbd-e3b9e8cab52a", :mayor "cam_saul"}]
+ ["Haight Mexican Restaurant is a swell and exclusive place to meet new friends with your pet dog."
+ {:small "http://cloudfront.net/86e0d356-dd46-477f-9dae-338c30ea5a2b/small.jpg",
+ :medium "http://cloudfront.net/86e0d356-dd46-477f-9dae-338c30ea5a2b/med.jpg",
+ :large "http://cloudfront.net/86e0d356-dd46-477f-9dae-338c30ea5a2b/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "twitter", :mentions ["@haight_mexican_restaurant"], :tags ["#mexican" "#restaurant"], :username "rasta_toucan"}]
+ ["Sameer's GMO-Free Pop-Up Food Stand is a great and decent place to have breakfast in June."
+ {:small "http://cloudfront.net/5c8a43de-d9a0-49a9-8cc6-eb9dea7800fb/small.jpg",
+ :medium "http://cloudfront.net/5c8a43de-d9a0-49a9-8cc6-eb9dea7800fb/med.jpg",
+ :large "http://cloudfront.net/5c8a43de-d9a0-49a9-8cc6-eb9dea7800fb/large.jpg"}
+ {:name "Sameer's GMO-Free Pop-Up Food Stand", :categories ["GMO-Free" "Pop-Up Food Stand"], :phone "415-217-7891", :id "a829efc7-7e03-4e73-b072-83d10d1e3953"}
+ {:service "twitter", :mentions ["@sameers_gmo_free_pop_up_food_stand"], :tags ["#gmo-free" "#pop-up" "#food" "#stand"], :username "bob"}]
+ ["Cam's Old-Fashioned Coffee House is a delicious and modern place to people-watch on Taco Tuesday."
+ {:small "http://cloudfront.net/9a3e6c72-3ab0-4105-bde4-0c08ee753d40/small.jpg",
+ :medium "http://cloudfront.net/9a3e6c72-3ab0-4105-bde4-0c08ee753d40/med.jpg",
+ :large "http://cloudfront.net/9a3e6c72-3ab0-4105-bde4-0c08ee753d40/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-868-2973", :id "27592c2b-e682-44bb-be28-8e9a622becca"}
+ {:service "foursquare", :foursquare-photo-id "4549eb5a-9e17-4b08-bfb3-44acfcc9d494", :mayor "tupac"}]
+ ["Cam's Mexican Gastro Pub is a great and swell place to drink a craft beer in June."
+ {:small "http://cloudfront.net/036ac2ce-65b1-4a03-aef3-6919a7789f00/small.jpg",
+ :medium "http://cloudfront.net/036ac2ce-65b1-4a03-aef3-6919a7789f00/med.jpg",
+ :large "http://cloudfront.net/036ac2ce-65b1-4a03-aef3-6919a7789f00/large.jpg"}
+ {:name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :phone "415-320-9123", :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}
+ {:service "flare", :username "jane"}]
+ ["Sunset Homestyle Grill is a overrated and underappreciated place to nurse a hangover in the fall."
+ {:small "http://cloudfront.net/7b59a37b-1f2c-4cf1-a6dd-14bbf2111904/small.jpg",
+ :medium "http://cloudfront.net/7b59a37b-1f2c-4cf1-a6dd-14bbf2111904/med.jpg",
+ :large "http://cloudfront.net/7b59a37b-1f2c-4cf1-a6dd-14bbf2111904/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "twitter", :mentions ["@sunset_homestyle_grill"], :tags ["#homestyle" "#grill"], :username "amy"}]
+ ["Polk St. Red White & Blue Café is a delicious and swell place to conduct a business meeting on Thursdays."
+ {:small "http://cloudfront.net/9aefced2-f658-485c-a1c5-ee5cbdbb42d7/small.jpg",
+ :medium "http://cloudfront.net/9aefced2-f658-485c-a1c5-ee5cbdbb42d7/med.jpg",
+ :large "http://cloudfront.net/9aefced2-f658-485c-a1c5-ee5cbdbb42d7/large.jpg"}
+ {:name "Polk St. Red White & Blue Café", :categories ["Red White & Blue" "Café"], :phone "415-986-0661", :id "6eb9d2db-5015-49f0-bd18-f4c4938b7e5a"}
+ {:service "facebook", :facebook-photo-id "01ba3c6f-4360-406a-b1d3-5e6ca8d28a5a", :url "http://facebook.com/photos/01ba3c6f-4360-406a-b1d3-5e6ca8d28a5a"}]
+ ["Haight European Grill is a swell and overrated place to watch the Giants game with your pet dog."
+ {:small "http://cloudfront.net/b0c4fee2-d9cd-4183-8695-8466dd15c08d/small.jpg",
+ :medium "http://cloudfront.net/b0c4fee2-d9cd-4183-8695-8466dd15c08d/med.jpg",
+ :large "http://cloudfront.net/b0c4fee2-d9cd-4183-8695-8466dd15c08d/large.jpg"}
+ {:name "Haight European Grill", :categories ["European" "Grill"], :phone "415-191-2778", :id "7e6281f7-5b17-4056-ada0-85453247bc8f"}
+ {:service "facebook", :facebook-photo-id "42762b62-7cff-4a54-a0f7-f16c1f42d81c", :url "http://facebook.com/photos/42762b62-7cff-4a54-a0f7-f16c1f42d81c"}]
+ ["Haight Soul Food Pop-Up Food Stand is a amazing and world-famous place to sip a glass of expensive wine weekend evenings."
+ {:small "http://cloudfront.net/1285fa6f-a990-46c0-ad26-443d959f183c/small.jpg",
+ :medium "http://cloudfront.net/1285fa6f-a990-46c0-ad26-443d959f183c/med.jpg",
+ :large "http://cloudfront.net/1285fa6f-a990-46c0-ad26-443d959f183c/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "twitter", :mentions ["@haight_soul_food_pop_up_food_stand"], :tags ["#soul" "#food" "#pop-up" "#food" "#stand"], :username "sameer"}]
+ ["Tenderloin Red White & Blue Pizzeria is a decent and underappreciated place to have a drink on Taco Tuesday."
+ {:small "http://cloudfront.net/0229bb84-6bc0-4ed4-b3da-dc743a49c8c8/small.jpg",
+ :medium "http://cloudfront.net/0229bb84-6bc0-4ed4-b3da-dc743a49c8c8/med.jpg",
+ :large "http://cloudfront.net/0229bb84-6bc0-4ed4-b3da-dc743a49c8c8/large.jpg"}
+ {:name "Tenderloin Red White & Blue Pizzeria", :categories ["Red White & Blue" "Pizzeria"], :phone "415-719-8143", :id "eba3dbcd-100a-4f38-a701-e0dec157f437"}
+ {:service "twitter", :mentions ["@tenderloin_red_white_&_blue_pizzeria"], :tags ["#red" "#white" "#&" "#blue" "#pizzeria"], :username "jessica"}]
+ ["Sunset Homestyle Grill is a amazing and wonderful place to have brunch on a Tuesday afternoon."
+ {:small "http://cloudfront.net/4203f53b-6a89-4f14-a597-305c3b2a27a1/small.jpg",
+ :medium "http://cloudfront.net/4203f53b-6a89-4f14-a597-305c3b2a27a1/med.jpg",
+ :large "http://cloudfront.net/4203f53b-6a89-4f14-a597-305c3b2a27a1/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "twitter", :mentions ["@sunset_homestyle_grill"], :tags ["#homestyle" "#grill"], :username "jane"}]
+ ["Lucky's Old-Fashioned Eatery is a decent and acceptable place to have a birthday party on public holidays."
+ {:small "http://cloudfront.net/9ea7bca8-891b-4b8e-be13-6374a91604a9/small.jpg",
+ :medium "http://cloudfront.net/9ea7bca8-891b-4b8e-be13-6374a91604a9/med.jpg",
+ :large "http://cloudfront.net/9ea7bca8-891b-4b8e-be13-6374a91604a9/large.jpg"}
+ {:name "Lucky's Old-Fashioned Eatery", :categories ["Old-Fashioned" "Eatery"], :phone "415-362-2338", :id "71dc221c-6e82-4d06-8709-93293121b1da"}
+ {:service "foursquare", :foursquare-photo-id "b555bae0-96f0-492f-807d-484460d33f62", :mayor "sameer"}]
+ ["Pacific Heights Free-Range Eatery is a swell and swell place to have a birthday party the first Sunday of the month."
+ {:small "http://cloudfront.net/52083005-7074-4b91-b2e7-aa3cbd81bb21/small.jpg",
+ :medium "http://cloudfront.net/52083005-7074-4b91-b2e7-aa3cbd81bb21/med.jpg",
+ :large "http://cloudfront.net/52083005-7074-4b91-b2e7-aa3cbd81bb21/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "foursquare", :foursquare-photo-id "bb3679fc-46fa-4b28-b0d2-291b301c67c1", :mayor "rasta_toucan"}]
+ ["Mission Homestyle Churros is a swell and great place to have a birthday party weekend evenings."
+ {:small "http://cloudfront.net/bd9023b0-0eda-41d6-823c-9cf526e5f5f3/small.jpg",
+ :medium "http://cloudfront.net/bd9023b0-0eda-41d6-823c-9cf526e5f5f3/med.jpg",
+ :large "http://cloudfront.net/bd9023b0-0eda-41d6-823c-9cf526e5f5f3/large.jpg"}
+ {:name "Mission Homestyle Churros", :categories ["Homestyle" "Churros"], :phone "415-343-4489", :id "21d903d3-8bdb-4b7d-b288-6063ad48af44"}
+ {:service "foursquare", :foursquare-photo-id "76baeb06-f79c-43c4-ae15-108b69983aa3", :mayor "mandy"}]
+ ["Mission Japanese Coffee House is a classic and wonderful place to watch the Warriors game in the spring."
+ {:small "http://cloudfront.net/8bff3709-0af5-4e6f-9963-575cb5044b37/small.jpg",
+ :medium "http://cloudfront.net/8bff3709-0af5-4e6f-9963-575cb5044b37/med.jpg",
+ :large "http://cloudfront.net/8bff3709-0af5-4e6f-9963-575cb5044b37/large.jpg"}
+ {:name "Mission Japanese Coffee House", :categories ["Japanese" "Coffee House"], :phone "415-561-0506", :id "60dd274e-0cbf-4521-946d-8a4e0f151150"}
+ {:service "yelp", :yelp-photo-id "35f2e21d-b05f-4e7c-adfe-e8d70ecd478e", :categories ["Japanese" "Coffee House"]}]
+ ["Kyle's Free-Range Taqueria is a popular and modern place to have a birthday party in June."
+ {:small "http://cloudfront.net/00ba782a-b50a-4246-88eb-c965f39a27b2/small.jpg",
+ :medium "http://cloudfront.net/00ba782a-b50a-4246-88eb-c965f39a27b2/med.jpg",
+ :large "http://cloudfront.net/00ba782a-b50a-4246-88eb-c965f39a27b2/large.jpg"}
+ {:name "Kyle's Free-Range Taqueria", :categories ["Free-Range" "Taqueria"], :phone "415-201-7832", :id "7aeb9416-4fe6-45f9-8849-6b8ba6d3f3b9"}
+ {:service "yelp", :yelp-photo-id "f1bc8db8-9cd5-4664-b6d9-440618790ffc", :categories ["Free-Range" "Taqueria"]}]
+ ["Haight Soul Food Hotel & Restaurant is a wonderful and amazing place to meet new friends with friends."
+ {:small "http://cloudfront.net/84c1175b-e3aa-47cd-83b8-abf1122496bf/small.jpg",
+ :medium "http://cloudfront.net/84c1175b-e3aa-47cd-83b8-abf1122496bf/med.jpg",
+ :large "http://cloudfront.net/84c1175b-e3aa-47cd-83b8-abf1122496bf/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "flare", :username "mandy"}]
+ ["SoMa Japanese Churros is a fantastic and world-famous place to watch the Warriors game when hungover."
+ {:small "http://cloudfront.net/60f59426-c2db-4bb5-885b-af2641a8f7b5/small.jpg",
+ :medium "http://cloudfront.net/60f59426-c2db-4bb5-885b-af2641a8f7b5/med.jpg",
+ :large "http://cloudfront.net/60f59426-c2db-4bb5-885b-af2641a8f7b5/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "twitter", :mentions ["@soma_japanese_churros"], :tags ["#japanese" "#churros"], :username "tupac"}]
+ ["Pacific Heights Pizza Bakery is a overrated and exclusive place to take visiting friends and relatives on public holidays."
+ {:small "http://cloudfront.net/721c2488-5e3b-4f25-9da4-463c5cbecf21/small.jpg",
+ :medium "http://cloudfront.net/721c2488-5e3b-4f25-9da4-463c5cbecf21/med.jpg",
+ :large "http://cloudfront.net/721c2488-5e3b-4f25-9da4-463c5cbecf21/large.jpg"}
+ {:name "Pacific Heights Pizza Bakery", :categories ["Pizza" "Bakery"], :phone "415-006-0149", :id "7fda37a5-810f-4902-b571-54afe583f0dd"}
+ {:service "yelp", :yelp-photo-id "da8703eb-dd7c-4559-b39c-e2a6fff91b92", :categories ["Pizza" "Bakery"]}]
+ ["Mission British Café is a decent and swell place to drink a craft beer in June."
+ {:small "http://cloudfront.net/75976ced-01ca-4762-93aa-3e9b255a8dc7/small.jpg",
+ :medium "http://cloudfront.net/75976ced-01ca-4762-93aa-3e9b255a8dc7/med.jpg",
+ :large "http://cloudfront.net/75976ced-01ca-4762-93aa-3e9b255a8dc7/large.jpg"}
+ {:name "Mission British Café", :categories ["British" "Café"], :phone "415-715-7004", :id "c99899e3-439c-4444-9dc4-5598632aec8d"}
+ {:service "twitter", :mentions ["@mission_british_café"], :tags ["#british" "#café"], :username "lucky_pigeon"}]
+ ["Oakland American Grill is a amazing and underground place to have brunch on Saturday night."
+ {:small "http://cloudfront.net/a848ecf7-8d6a-4bb4-bd15-674fac1b7f79/small.jpg",
+ :medium "http://cloudfront.net/a848ecf7-8d6a-4bb4-bd15-674fac1b7f79/med.jpg",
+ :large "http://cloudfront.net/a848ecf7-8d6a-4bb4-bd15-674fac1b7f79/large.jpg"}
+ {:name "Oakland American Grill", :categories ["American" "Grill"], :phone "415-660-0889", :id "856f907d-b669-4b9c-8337-bf9c88883746"}
+ {:service "flare", :username "mandy"}]
+ ["Pacific Heights Free-Range Eatery is a great and modern place to take visiting friends and relatives on a Tuesday afternoon."
+ {:small "http://cloudfront.net/b12a9c02-b78a-43de-a4e4-838be542a7b7/small.jpg",
+ :medium "http://cloudfront.net/b12a9c02-b78a-43de-a4e4-838be542a7b7/med.jpg",
+ :large "http://cloudfront.net/b12a9c02-b78a-43de-a4e4-838be542a7b7/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "twitter", :mentions ["@pacific_heights_free_range_eatery"], :tags ["#free-range" "#eatery"], :username "biggie"}]
+ ["SoMa Old-Fashioned Pizzeria is a groovy and delicious place to nurse a hangover when hungover."
+ {:small "http://cloudfront.net/1182d679-c0cb-4250-b219-d6da0fefaa2e/small.jpg",
+ :medium "http://cloudfront.net/1182d679-c0cb-4250-b219-d6da0fefaa2e/med.jpg",
+ :large "http://cloudfront.net/1182d679-c0cb-4250-b219-d6da0fefaa2e/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "flare", :username "joe"}]
+ ["Haight Mexican Restaurant is a historical and horrible place to sip Champagne weekday afternoons."
+ {:small "http://cloudfront.net/18129bb1-88f0-45c2-ba6b-bb86b8004a18/small.jpg",
+ :medium "http://cloudfront.net/18129bb1-88f0-45c2-ba6b-bb86b8004a18/med.jpg",
+ :large "http://cloudfront.net/18129bb1-88f0-45c2-ba6b-bb86b8004a18/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "twitter", :mentions ["@haight_mexican_restaurant"], :tags ["#mexican" "#restaurant"], :username "amy"}]
+ ["Nob Hill Korean Taqueria is a overrated and classic place to pitch an investor weekend mornings."
+ {:small "http://cloudfront.net/c466065c-7be8-46d0-8920-f0a98d4d94ef/small.jpg",
+ :medium "http://cloudfront.net/c466065c-7be8-46d0-8920-f0a98d4d94ef/med.jpg",
+ :large "http://cloudfront.net/c466065c-7be8-46d0-8920-f0a98d4d94ef/large.jpg"}
+ {:name "Nob Hill Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-107-7332", :id "a43c184c-90f5-488c-bb3b-00ea2666d90e"}
+ {:service "twitter", :mentions ["@nob_hill_korean_taqueria"], :tags ["#korean" "#taqueria"], :username "jessica"}]
+ ["Joe's Modern Coffee House is a acceptable and fantastic place to watch the Giants game in the spring."
+ {:small "http://cloudfront.net/ec13291b-2bee-4993-8198-0c1f799f9a3b/small.jpg",
+ :medium "http://cloudfront.net/ec13291b-2bee-4993-8198-0c1f799f9a3b/med.jpg",
+ :large "http://cloudfront.net/ec13291b-2bee-4993-8198-0c1f799f9a3b/large.jpg"}
+ {:name "Joe's Modern Coffee House", :categories ["Modern" "Coffee House"], :phone "415-331-5269", :id "cd9e3610-9ead-4f0b-ad93-cd53611d49fe"}
+ {:service "foursquare", :foursquare-photo-id "e00287d6-3633-42a1-a096-7756abdc25fa", :mayor "joe"}]
+ ["Kyle's Chinese Restaurant is a exclusive and great place to have a after-work cocktail on Saturday night."
+ {:small "http://cloudfront.net/bc41c4ff-50e6-4971-9de8-14cd0ed203ee/small.jpg",
+ :medium "http://cloudfront.net/bc41c4ff-50e6-4971-9de8-14cd0ed203ee/med.jpg",
+ :large "http://cloudfront.net/bc41c4ff-50e6-4971-9de8-14cd0ed203ee/large.jpg"}
+ {:name "Kyle's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-298-9499", :id "de08b3c7-9929-40d8-8c20-dd9317613c17"}
+ {:service "twitter", :mentions ["@kyles_chinese_restaurant"], :tags ["#chinese" "#restaurant"], :username "jessica"}]
+ ["Pacific Heights Soul Food Coffee House is a fantastic and great place to catch a bite to eat in June."
+ {:small "http://cloudfront.net/b00518e6-988c-4175-a17a-e49b5924a014/small.jpg",
+ :medium "http://cloudfront.net/b00518e6-988c-4175-a17a-e49b5924a014/med.jpg",
+ :large "http://cloudfront.net/b00518e6-988c-4175-a17a-e49b5924a014/large.jpg"}
+ {:name "Pacific Heights Soul Food Coffee House", :categories ["Soul Food" "Coffee House"], :phone "415-838-3464", :id "6aed1816-4c64-4f76-8e2a-619528e5b48d"}
+ {:service "facebook", :facebook-photo-id "a909c6c2-faee-4994-9f99-a922f40d64ea", :url "http://facebook.com/photos/a909c6c2-faee-4994-9f99-a922f40d64ea"}]
+ ["Chinatown Paleo Food Truck is a underground and well-decorated place to drink a craft beer weekend evenings."
+ {:small "http://cloudfront.net/ffa9dc6d-5d1c-4475-923c-72934f3e8762/small.jpg",
+ :medium "http://cloudfront.net/ffa9dc6d-5d1c-4475-923c-72934f3e8762/med.jpg",
+ :large "http://cloudfront.net/ffa9dc6d-5d1c-4475-923c-72934f3e8762/large.jpg"}
+ {:name "Chinatown Paleo Food Truck", :categories ["Paleo" "Food Truck"], :phone "415-583-4380", :id "aa9b5ce9-db74-470e-8573-f2faca24d546"}
+ {:service "twitter", :mentions ["@chinatown_paleo_food_truck"], :tags ["#paleo" "#food" "#truck"], :username "joe"}]
+ ["Lucky's Low-Carb Coffee House is a delicious and atmospheric place to take a date during winter."
+ {:small "http://cloudfront.net/256793eb-de7f-45c6-9143-9fde81134caf/small.jpg",
+ :medium "http://cloudfront.net/256793eb-de7f-45c6-9143-9fde81134caf/med.jpg",
+ :large "http://cloudfront.net/256793eb-de7f-45c6-9143-9fde81134caf/large.jpg"}
+ {:name "Lucky's Low-Carb Coffee House", :categories ["Low-Carb" "Coffee House"], :phone "415-145-7107", :id "81b0f944-f0ce-45e5-b84e-a924c441064a"}
+ {:service "flare", :username "tupac"}]
+ ["Sunset American Churros is a underground and acceptable place to have a drink in the spring."
+ {:small "http://cloudfront.net/d138162c-e3bc-4d50-b3bd-55bc9b599e9a/small.jpg",
+ :medium "http://cloudfront.net/d138162c-e3bc-4d50-b3bd-55bc9b599e9a/med.jpg",
+ :large "http://cloudfront.net/d138162c-e3bc-4d50-b3bd-55bc9b599e9a/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "facebook", :facebook-photo-id "33e0c40f-43b2-4f59-8539-9ff952ce06c3", :url "http://facebook.com/photos/33e0c40f-43b2-4f59-8539-9ff952ce06c3"}]
+ ["Kyle's Chinese Restaurant is a historical and atmospheric place to watch the Warriors game in June."
+ {:small "http://cloudfront.net/267696df-7262-4dab-9c71-0346861f9a9c/small.jpg",
+ :medium "http://cloudfront.net/267696df-7262-4dab-9c71-0346861f9a9c/med.jpg",
+ :large "http://cloudfront.net/267696df-7262-4dab-9c71-0346861f9a9c/large.jpg"}
+ {:name "Kyle's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-298-9499", :id "de08b3c7-9929-40d8-8c20-dd9317613c17"}
+ {:service "facebook", :facebook-photo-id "36ecd1a2-0282-422c-995a-664668a4cb80", :url "http://facebook.com/photos/36ecd1a2-0282-422c-995a-664668a4cb80"}]
+ ["Polk St. Korean Taqueria is a overrated and popular place to watch the Warriors game with your pet dog."
+ {:small "http://cloudfront.net/a4d216fa-08b5-4f73-a236-eabf0b3e38e7/small.jpg",
+ :medium "http://cloudfront.net/a4d216fa-08b5-4f73-a236-eabf0b3e38e7/med.jpg",
+ :large "http://cloudfront.net/a4d216fa-08b5-4f73-a236-eabf0b3e38e7/large.jpg"}
+ {:name "Polk St. Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-511-5531", :id "ddb09b32-6f0b-4e54-98c7-14398f16ca4e"}
+ {:service "flare", :username "amy"}]
+ ["Marina Japanese Liquor Store is a underappreciated and fantastic place to conduct a business meeting in June."
+ {:small "http://cloudfront.net/cd9e419f-75ef-404b-8637-7120d469b743/small.jpg",
+ :medium "http://cloudfront.net/cd9e419f-75ef-404b-8637-7120d469b743/med.jpg",
+ :large "http://cloudfront.net/cd9e419f-75ef-404b-8637-7120d469b743/large.jpg"}
+ {:name "Marina Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-587-9819", :id "08fd0138-35dd-41b0-836d-1c652e95ffcd"}
+ {:service "twitter", :mentions ["@marina_japanese_liquor_store"], :tags ["#japanese" "#liquor" "#store"], :username "jane"}]
+ ["Polk St. Red White & Blue Café is a underground and horrible place to nurse a hangover on Taco Tuesday."
+ {:small "http://cloudfront.net/9629743a-e19f-4443-966e-b3cede3cce45/small.jpg",
+ :medium "http://cloudfront.net/9629743a-e19f-4443-966e-b3cede3cce45/med.jpg",
+ :large "http://cloudfront.net/9629743a-e19f-4443-966e-b3cede3cce45/large.jpg"}
+ {:name "Polk St. Red White & Blue Café", :categories ["Red White & Blue" "Café"], :phone "415-986-0661", :id "6eb9d2db-5015-49f0-bd18-f4c4938b7e5a"}
+ {:service "facebook", :facebook-photo-id "54f31306-b4ce-46f6-b30e-37dc2f10fc18", :url "http://facebook.com/photos/54f31306-b4ce-46f6-b30e-37dc2f10fc18"}]
+ ["SoMa Old-Fashioned Pizzeria is a groovy and amazing place to have brunch with your pet toucan."
+ {:small "http://cloudfront.net/a29570eb-e53f-4ddd-ab61-747cf6709515/small.jpg",
+ :medium "http://cloudfront.net/a29570eb-e53f-4ddd-ab61-747cf6709515/med.jpg",
+ :large "http://cloudfront.net/a29570eb-e53f-4ddd-ab61-747cf6709515/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "yelp", :yelp-photo-id "c8f35c36-0f19-4318-a0e4-88d96b5b72eb", :categories ["Old-Fashioned" "Pizzeria"]}]
+ ["Haight Soul Food Hotel & Restaurant is a popular and modern place to take visiting friends and relatives weekday afternoons."
+ {:small "http://cloudfront.net/a0842810-2d69-48c3-ba37-941479473250/small.jpg",
+ :medium "http://cloudfront.net/a0842810-2d69-48c3-ba37-941479473250/med.jpg",
+ :large "http://cloudfront.net/a0842810-2d69-48c3-ba37-941479473250/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "yelp", :yelp-photo-id "d753f0de-f1db-4cf0-9260-ad3eeee4aa9c", :categories ["Soul Food" "Hotel & Restaurant"]}]
+ ["Marina Low-Carb Food Truck is a underappreciated and modern place to take a date with friends."
+ {:small "http://cloudfront.net/576cf625-4a9e-443a-b0df-ffb279f418f8/small.jpg",
+ :medium "http://cloudfront.net/576cf625-4a9e-443a-b0df-ffb279f418f8/med.jpg",
+ :large "http://cloudfront.net/576cf625-4a9e-443a-b0df-ffb279f418f8/large.jpg"}
+ {:name "Marina Low-Carb Food Truck", :categories ["Low-Carb" "Food Truck"], :phone "415-748-3513", :id "a13a5beb-19de-40ca-a334-02df3bdf5285"}
+ {:service "foursquare", :foursquare-photo-id "a5c87b6a-a1e6-4abe-932f-90dde0e8125b", :mayor "tupac"}]
+ ["Mission Soul Food Pizzeria is a amazing and world-famous place to have a after-work cocktail in the spring."
+ {:small "http://cloudfront.net/171695dd-4ad1-4c50-9056-27d6d80d524a/small.jpg",
+ :medium "http://cloudfront.net/171695dd-4ad1-4c50-9056-27d6d80d524a/med.jpg",
+ :large "http://cloudfront.net/171695dd-4ad1-4c50-9056-27d6d80d524a/large.jpg"}
+ {:name "Mission Soul Food Pizzeria", :categories ["Soul Food" "Pizzeria"], :phone "415-437-3479", :id "9905fe61-44cb-4626-843b-5d725c7949bb"}
+ {:service "yelp", :yelp-photo-id "728c253f-8576-4e91-a0f7-8f4409ef3ea3", :categories ["Soul Food" "Pizzeria"]}]
+ ["Cam's Old-Fashioned Coffee House is a delicious and overrated place to have a birthday party weekend mornings."
+ {:small "http://cloudfront.net/8270c1f4-e118-4d40-a5f1-f2257c99b3ab/small.jpg",
+ :medium "http://cloudfront.net/8270c1f4-e118-4d40-a5f1-f2257c99b3ab/med.jpg",
+ :large "http://cloudfront.net/8270c1f4-e118-4d40-a5f1-f2257c99b3ab/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-871-9473", :id "5d1f918e-ef00-40de-b6e4-3f9f34ee8cd4"}
+ {:service "twitter", :mentions ["@cams_old_fashioned_coffee_house"], :tags ["#old-fashioned" "#coffee" "#house"], :username "tupac"}]
+ ["Haight European Grill is a family-friendly and wonderful place to sip Champagne on Saturday night."
+ {:small "http://cloudfront.net/1b7745d8-0082-495f-a767-589bfd31dc04/small.jpg",
+ :medium "http://cloudfront.net/1b7745d8-0082-495f-a767-589bfd31dc04/med.jpg",
+ :large "http://cloudfront.net/1b7745d8-0082-495f-a767-589bfd31dc04/large.jpg"}
+ {:name "Haight European Grill", :categories ["European" "Grill"], :phone "415-191-2778", :id "7e6281f7-5b17-4056-ada0-85453247bc8f"}
+ {:service "twitter", :mentions ["@haight_european_grill"], :tags ["#european" "#grill"], :username "lucky_pigeon"}]
+ ["Polk St. Deep-Dish Hotel & Restaurant is a world-famous and popular place to sip Champagne with your pet dog."
+ {:small "http://cloudfront.net/d81ae9d6-676c-45c5-add1-f0c007db6de5/small.jpg",
+ :medium "http://cloudfront.net/d81ae9d6-676c-45c5-add1-f0c007db6de5/med.jpg",
+ :large "http://cloudfront.net/d81ae9d6-676c-45c5-add1-f0c007db6de5/large.jpg"}
+ {:name "Polk St. Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-666-8681", :id "47f1698e-ae11-46f5-818b-85a59d0affba"}
+ {:service "flare", :username "mandy"}]
+ ["SF Afgan Restaurant is a horrible and delicious place to sip a glass of expensive wine the first Sunday of the month."
+ {:small "http://cloudfront.net/77737d07-f201-4898-90b9-72b7d4c73de9/small.jpg",
+ :medium "http://cloudfront.net/77737d07-f201-4898-90b9-72b7d4c73de9/med.jpg",
+ :large "http://cloudfront.net/77737d07-f201-4898-90b9-72b7d4c73de9/large.jpg"}
+ {:name "SF Afgan Restaurant", :categories ["Afgan" "Restaurant"], :phone "415-451-4697", :id "66ccc68a-db9a-470c-a17b-7764d23daced"}
+ {:service "twitter", :mentions ["@sf_afgan_restaurant"], :tags ["#afgan" "#restaurant"], :username "rasta_toucan"}]
+ ["Tenderloin Gluten-Free Bar & Grill is a exclusive and wonderful place to meet new friends on Thursdays."
+ {:small "http://cloudfront.net/48526d8c-934d-4f24-b31e-ce1bc15bc734/small.jpg",
+ :medium "http://cloudfront.net/48526d8c-934d-4f24-b31e-ce1bc15bc734/med.jpg",
+ :large "http://cloudfront.net/48526d8c-934d-4f24-b31e-ce1bc15bc734/large.jpg"}
+ {:name "Tenderloin Gluten-Free Bar & Grill", :categories ["Gluten-Free" "Bar & Grill"], :phone "415-904-0956", :id "0d7e235a-eea8-45b3-aaa7-23b4ea2b50f2"}
+ {:service "facebook", :facebook-photo-id "f073cb47-002c-4db7-b80a-c5ed327d0ac9", :url "http://facebook.com/photos/f073cb47-002c-4db7-b80a-c5ed327d0ac9"}]
+ ["Pacific Heights Irish Grill is a overrated and popular place to catch a bite to eat during winter."
+ {:small "http://cloudfront.net/c01dad01-edba-4413-b723-52d87a587f2d/small.jpg",
+ :medium "http://cloudfront.net/c01dad01-edba-4413-b723-52d87a587f2d/med.jpg",
+ :large "http://cloudfront.net/c01dad01-edba-4413-b723-52d87a587f2d/large.jpg"}
+ {:name "Pacific Heights Irish Grill", :categories ["Irish" "Grill"], :phone "415-491-2202", :id "d6b92dfc-56e9-4f65-b1d0-595f120043d9"}
+ {:service "flare", :username "lucky_pigeon"}]
+ ["Haight Soul Food Café is a horrible and underground place to take visiting friends and relatives on Thursdays."
+ {:small "http://cloudfront.net/f3bd2564-9a67-4712-86e7-5c1abe816bd0/small.jpg",
+ :medium "http://cloudfront.net/f3bd2564-9a67-4712-86e7-5c1abe816bd0/med.jpg",
+ :large "http://cloudfront.net/f3bd2564-9a67-4712-86e7-5c1abe816bd0/large.jpg"}
+ {:name "Haight Soul Food Café", :categories ["Soul Food" "Café"], :phone "415-257-1769", :id "a1796c4b-da2b-474f-9fd6-4fa96c1eac70"}
+ {:service "flare", :username "jane"}]
+ ["Marina Cage-Free Liquor Store is a delicious and family-friendly place to watch the Warriors game after baseball games."
+ {:small "http://cloudfront.net/ea520d10-a490-416c-a603-058a212a3e0c/small.jpg",
+ :medium "http://cloudfront.net/ea520d10-a490-416c-a603-058a212a3e0c/med.jpg",
+ :large "http://cloudfront.net/ea520d10-a490-416c-a603-058a212a3e0c/large.jpg"}
+ {:name "Marina Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-571-0783", :id "ad68f549-3000-407e-ab98-7f314cfa4653"}
+ {:service "twitter", :mentions ["@marina_cage_free_liquor_store"], :tags ["#cage-free" "#liquor" "#store"], :username "bob"}]
+ ["Lower Pac Heights Deep-Dish Ice Cream Truck is a classic and underground place to take a date with friends."
+ {:small "http://cloudfront.net/6a960d66-43a5-4053-b5d6-b03ab59a263b/small.jpg",
+ :medium "http://cloudfront.net/6a960d66-43a5-4053-b5d6-b03ab59a263b/med.jpg",
+ :large "http://cloudfront.net/6a960d66-43a5-4053-b5d6-b03ab59a263b/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Ice Cream Truck", :categories ["Deep-Dish" "Ice Cream Truck"], :phone "415-495-1414", :id "d5efa2f2-496d-41b2-8b85-3d002a22a2bc"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["SoMa Old-Fashioned Pizzeria is a swell and acceptable place to sip a glass of expensive wine on a Tuesday afternoon."
+ {:small "http://cloudfront.net/a04b6844-2caf-4303-9921-e750208f79ee/small.jpg",
+ :medium "http://cloudfront.net/a04b6844-2caf-4303-9921-e750208f79ee/med.jpg",
+ :large "http://cloudfront.net/a04b6844-2caf-4303-9921-e750208f79ee/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "twitter", :mentions ["@soma_old_fashioned_pizzeria"], :tags ["#old-fashioned" "#pizzeria"], :username "biggie"}]
+ ["SF British Pop-Up Food Stand is a swell and popular place to people-watch on Thursdays."
+ {:small "http://cloudfront.net/fc488143-5e29-44be-9dc4-2b7a3653c3b3/small.jpg",
+ :medium "http://cloudfront.net/fc488143-5e29-44be-9dc4-2b7a3653c3b3/med.jpg",
+ :large "http://cloudfront.net/fc488143-5e29-44be-9dc4-2b7a3653c3b3/large.jpg"}
+ {:name "SF British Pop-Up Food Stand", :categories ["British" "Pop-Up Food Stand"], :phone "415-441-3725", :id "19eac087-7b1c-4668-a26c-d7c02cbcd3f6"}
+ {:service "facebook", :facebook-photo-id "98c2e661-c20e-41df-967a-b65635e34031", :url "http://facebook.com/photos/98c2e661-c20e-41df-967a-b65635e34031"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a classic and fantastic place to take visiting friends and relatives with your pet dog."
+ {:small "http://cloudfront.net/9b7e4812-949c-4b68-8ff5-312e6bf143fb/small.jpg",
+ :medium "http://cloudfront.net/9b7e4812-949c-4b68-8ff5-312e6bf143fb/med.jpg",
+ :large "http://cloudfront.net/9b7e4812-949c-4b68-8ff5-312e6bf143fb/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["Haight Mexican Restaurant is a amazing and underappreciated place to nurse a hangover weekday afternoons."
+ {:small "http://cloudfront.net/df889bbe-152e-483f-9599-a6e12ae821a7/small.jpg",
+ :medium "http://cloudfront.net/df889bbe-152e-483f-9599-a6e12ae821a7/med.jpg",
+ :large "http://cloudfront.net/df889bbe-152e-483f-9599-a6e12ae821a7/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "twitter", :mentions ["@haight_mexican_restaurant"], :tags ["#mexican" "#restaurant"], :username "rasta_toucan"}]
+ ["Cam's Old-Fashioned Coffee House is a delicious and great place to pitch an investor when hungover."
+ {:small "http://cloudfront.net/80c44503-734b-4aac-8659-1d90ddd579ab/small.jpg",
+ :medium "http://cloudfront.net/80c44503-734b-4aac-8659-1d90ddd579ab/med.jpg",
+ :large "http://cloudfront.net/80c44503-734b-4aac-8659-1d90ddd579ab/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-868-2973", :id "27592c2b-e682-44bb-be28-8e9a622becca"}
+ {:service "facebook", :facebook-photo-id "81a3711b-d0c6-4100-b3f7-b18f67613a09", :url "http://facebook.com/photos/81a3711b-d0c6-4100-b3f7-b18f67613a09"}]
+ ["Tenderloin Gormet Restaurant is a modern and decent place to have a after-work cocktail during winter."
+ {:small "http://cloudfront.net/cf1833eb-476c-45fc-8eb5-68fd009f0871/small.jpg",
+ :medium "http://cloudfront.net/cf1833eb-476c-45fc-8eb5-68fd009f0871/med.jpg",
+ :large "http://cloudfront.net/cf1833eb-476c-45fc-8eb5-68fd009f0871/large.jpg"}
+ {:name "Tenderloin Gormet Restaurant", :categories ["Gormet" "Restaurant"], :phone "415-127-4197", :id "54a9eac8-d80d-4af8-b6d7-34651a60e59c"}
+ {:service "flare", :username "joe"}]
+ ["Chinatown Paleo Food Truck is a classic and underground place to watch the Giants game in the fall."
+ {:small "http://cloudfront.net/9432fe46-24be-40e9-a0b5-8824149712fd/small.jpg",
+ :medium "http://cloudfront.net/9432fe46-24be-40e9-a0b5-8824149712fd/med.jpg",
+ :large "http://cloudfront.net/9432fe46-24be-40e9-a0b5-8824149712fd/large.jpg"}
+ {:name "Chinatown Paleo Food Truck", :categories ["Paleo" "Food Truck"], :phone "415-583-4380", :id "aa9b5ce9-db74-470e-8573-f2faca24d546"}
+ {:service "twitter", :mentions ["@chinatown_paleo_food_truck"], :tags ["#paleo" "#food" "#truck"], :username "joe"}]
+ ["Haight Soul Food Hotel & Restaurant is a family-friendly and amazing place to watch the Warriors game in June."
+ {:small "http://cloudfront.net/2fff12e5-6582-4c35-8fed-4bae3f61acc1/small.jpg",
+ :medium "http://cloudfront.net/2fff12e5-6582-4c35-8fed-4bae3f61acc1/med.jpg",
+ :large "http://cloudfront.net/2fff12e5-6582-4c35-8fed-4bae3f61acc1/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "twitter", :mentions ["@haight_soul_food_hotel_&_restaurant"], :tags ["#soul" "#food" "#hotel" "#&" "#restaurant"], :username "bob"}]
+ ["Haight Soul Food Pop-Up Food Stand is a decent and underground place to conduct a business meeting in the spring."
+ {:small "http://cloudfront.net/6509339f-e90f-4961-9041-25984c0068e1/small.jpg",
+ :medium "http://cloudfront.net/6509339f-e90f-4961-9041-25984c0068e1/med.jpg",
+ :large "http://cloudfront.net/6509339f-e90f-4961-9041-25984c0068e1/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "flare", :username "kyle"}]
+ ["Joe's Modern Coffee House is a underappreciated and delicious place to take a date in July."
+ {:small "http://cloudfront.net/1402d2a6-e94f-43dc-b66c-22621bfc0709/small.jpg",
+ :medium "http://cloudfront.net/1402d2a6-e94f-43dc-b66c-22621bfc0709/med.jpg",
+ :large "http://cloudfront.net/1402d2a6-e94f-43dc-b66c-22621bfc0709/large.jpg"}
+ {:name "Joe's Modern Coffee House", :categories ["Modern" "Coffee House"], :phone "415-331-5269", :id "cd9e3610-9ead-4f0b-ad93-cd53611d49fe"}
+ {:service "foursquare", :foursquare-photo-id "7d0faa6d-0d94-4920-894a-8da7537839a7", :mayor "bob"}]
+ ["Polk St. Mexican Coffee House is a popular and historical place to catch a bite to eat with your pet toucan."
+ {:small "http://cloudfront.net/a8c99e30-dc02-456c-b752-91702acb84c5/small.jpg",
+ :medium "http://cloudfront.net/a8c99e30-dc02-456c-b752-91702acb84c5/med.jpg",
+ :large "http://cloudfront.net/a8c99e30-dc02-456c-b752-91702acb84c5/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "flare", :username "biggie"}]
+ ["Marina No-MSG Sushi is a overrated and overrated place to pitch an investor Friday nights."
+ {:small "http://cloudfront.net/c14d1b58-b607-4a3b-86c0-331e6b965534/small.jpg",
+ :medium "http://cloudfront.net/c14d1b58-b607-4a3b-86c0-331e6b965534/med.jpg",
+ :large "http://cloudfront.net/c14d1b58-b607-4a3b-86c0-331e6b965534/large.jpg"}
+ {:name "Marina No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-856-5937", :id "d51013a3-8547-4705-a5f0-cb11d8206481"}
+ {:service "twitter", :mentions ["@marina_no_msg_sushi"], :tags ["#no-msg" "#sushi"], :username "rasta_toucan"}]
+ ["Sunset Deep-Dish Hotel & Restaurant is a horrible and world-famous place to catch a bite to eat Friday nights."
+ {:small "http://cloudfront.net/038a5a74-18a8-48f2-a771-6a32c9c57d98/small.jpg",
+ :medium "http://cloudfront.net/038a5a74-18a8-48f2-a771-6a32c9c57d98/med.jpg",
+ :large "http://cloudfront.net/038a5a74-18a8-48f2-a771-6a32c9c57d98/large.jpg"}
+ {:name "Sunset Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-332-0978", :id "a80745c7-af74-4579-8932-70dd488269e6"}
+ {:service "twitter", :mentions ["@sunset_deep_dish_hotel_&_restaurant"], :tags ["#deep-dish" "#hotel" "#&" "#restaurant"], :username "rasta_toucan"}]
+ ["Pacific Heights Free-Range Eatery is a wonderful and modern place to take visiting friends and relatives Friday nights."
+ {:small "http://cloudfront.net/cedd4221-dbdb-46c3-95a9-935cce6b3fe5/small.jpg",
+ :medium "http://cloudfront.net/cedd4221-dbdb-46c3-95a9-935cce6b3fe5/med.jpg",
+ :large "http://cloudfront.net/cedd4221-dbdb-46c3-95a9-935cce6b3fe5/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "twitter", :mentions ["@pacific_heights_free_range_eatery"], :tags ["#free-range" "#eatery"], :username "kyle"}]
+ ["Lucky's Deep-Dish Gastro Pub is a decent and delicious place to watch the Giants game on Taco Tuesday."
+ {:small "http://cloudfront.net/a9b4f7f8-637b-4b83-9881-78d3b7f417dc/small.jpg",
+ :medium "http://cloudfront.net/a9b4f7f8-637b-4b83-9881-78d3b7f417dc/med.jpg",
+ :large "http://cloudfront.net/a9b4f7f8-637b-4b83-9881-78d3b7f417dc/large.jpg"}
+ {:name "Lucky's Deep-Dish Gastro Pub", :categories ["Deep-Dish" "Gastro Pub"], :phone "415-487-4085", :id "0136c454-0968-41cd-a237-ceec5724cab8"}
+ {:service "facebook", :facebook-photo-id "dfad685c-f2a7-4ab4-ba45-a9d94919d8f6", :url "http://facebook.com/photos/dfad685c-f2a7-4ab4-ba45-a9d94919d8f6"}]
+ ["Polk St. Mexican Coffee House is a world-famous and horrible place to pitch an investor the second Saturday of the month."
+ {:small "http://cloudfront.net/cf7ce0ef-0ce6-4138-9f33-a13de2a6c752/small.jpg",
+ :medium "http://cloudfront.net/cf7ce0ef-0ce6-4138-9f33-a13de2a6c752/med.jpg",
+ :large "http://cloudfront.net/cf7ce0ef-0ce6-4138-9f33-a13de2a6c752/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "twitter", :mentions ["@polk_st._mexican_coffee_house"], :tags ["#mexican" "#coffee" "#house"], :username "bob"}]
+ ["Pacific Heights Pizza Bakery is a acceptable and fantastic place to have a after-work cocktail after baseball games."
+ {:small "http://cloudfront.net/71ec461a-21c1-4c41-9fe5-31e69dfd95f4/small.jpg",
+ :medium "http://cloudfront.net/71ec461a-21c1-4c41-9fe5-31e69dfd95f4/med.jpg",
+ :large "http://cloudfront.net/71ec461a-21c1-4c41-9fe5-31e69dfd95f4/large.jpg"}
+ {:name "Pacific Heights Pizza Bakery", :categories ["Pizza" "Bakery"], :phone "415-006-0149", :id "7fda37a5-810f-4902-b571-54afe583f0dd"}
+ {:service "yelp", :yelp-photo-id "a7da25d3-cf05-444f-9a1c-11541fdbdb78", :categories ["Pizza" "Bakery"]}]
+ ["SoMa Old-Fashioned Pizzeria is a underappreciated and groovy place to take a date with your pet dog."
+ {:small "http://cloudfront.net/03e3ec21-9842-4b57-a311-3c1ecf5716c3/small.jpg",
+ :medium "http://cloudfront.net/03e3ec21-9842-4b57-a311-3c1ecf5716c3/med.jpg",
+ :large "http://cloudfront.net/03e3ec21-9842-4b57-a311-3c1ecf5716c3/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "flare", :username "lucky_pigeon"}]
+ ["Marina Homestyle Pop-Up Food Stand is a amazing and acceptable place to take visiting friends and relatives during winter."
+ {:small "http://cloudfront.net/2da70d7a-afe8-4708-84a4-8023b813194d/small.jpg",
+ :medium "http://cloudfront.net/2da70d7a-afe8-4708-84a4-8023b813194d/med.jpg",
+ :large "http://cloudfront.net/2da70d7a-afe8-4708-84a4-8023b813194d/large.jpg"}
+ {:name "Marina Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-094-4567", :id "88a7ae3c-8b36-4901-a0c5-b82342cba6cd"}
+ {:service "yelp", :yelp-photo-id "a031364b-8035-45ba-8948-3e3d42cd0bb1", :categories ["Homestyle" "Pop-Up Food Stand"]}]
+ ["Haight European Grill is a horrible and amazing place to have a birthday party during winter."
+ {:small "http://cloudfront.net/1dcef7de-a1c4-405b-a9e1-69c92d686ef1/small.jpg",
+ :medium "http://cloudfront.net/1dcef7de-a1c4-405b-a9e1-69c92d686ef1/med.jpg",
+ :large "http://cloudfront.net/1dcef7de-a1c4-405b-a9e1-69c92d686ef1/large.jpg"}
+ {:name "Haight European Grill", :categories ["European" "Grill"], :phone "415-191-2778", :id "7e6281f7-5b17-4056-ada0-85453247bc8f"}
+ {:service "twitter", :mentions ["@haight_european_grill"], :tags ["#european" "#grill"], :username "kyle"}]
+ ["SoMa Japanese Churros is a horrible and overrated place to people-watch during winter."
+ {:small "http://cloudfront.net/f49ffbdc-9f8b-4191-ad5c-a6d32a709fec/small.jpg",
+ :medium "http://cloudfront.net/f49ffbdc-9f8b-4191-ad5c-a6d32a709fec/med.jpg",
+ :large "http://cloudfront.net/f49ffbdc-9f8b-4191-ad5c-a6d32a709fec/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "facebook", :facebook-photo-id "d9c67f4f-f651-4e29-91bf-fe8a13c51a42", :url "http://facebook.com/photos/d9c67f4f-f651-4e29-91bf-fe8a13c51a42"}]
+ ["Marina Japanese Liquor Store is a wonderful and historical place to people-watch in July."
+ {:small "http://cloudfront.net/b6595a58-aa5a-4653-a582-321a0499af2c/small.jpg",
+ :medium "http://cloudfront.net/b6595a58-aa5a-4653-a582-321a0499af2c/med.jpg",
+ :large "http://cloudfront.net/b6595a58-aa5a-4653-a582-321a0499af2c/large.jpg"}
+ {:name "Marina Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-587-9819", :id "08fd0138-35dd-41b0-836d-1c652e95ffcd"}
+ {:service "yelp", :yelp-photo-id "a09b2b6a-2cc4-4c75-ad94-bc4b255f2609", :categories ["Japanese" "Liquor Store"]}]
+ ["Nob Hill Gluten-Free Coffee House is a popular and historical place to take visiting friends and relatives weekend mornings."
+ {:small "http://cloudfront.net/f42279fb-7c4d-4dc6-8788-04be94c68b67/small.jpg",
+ :medium "http://cloudfront.net/f42279fb-7c4d-4dc6-8788-04be94c68b67/med.jpg",
+ :large "http://cloudfront.net/f42279fb-7c4d-4dc6-8788-04be94c68b67/large.jpg"}
+ {:name "Nob Hill Gluten-Free Coffee House", :categories ["Gluten-Free" "Coffee House"], :phone "415-605-9554", :id "df57ff6d-1b5f-46da-b292-32321c6b1a7e"}
+ {:service "foursquare", :foursquare-photo-id "e11de3d3-8166-424c-91a4-857d3abb8487", :mayor "kyle"}]
+ ["Polk St. Deep-Dish Hotel & Restaurant is a family-friendly and amazing place to take visiting friends and relatives in the spring."
+ {:small "http://cloudfront.net/a938a596-27ad-4d83-bc32-d5113d44bc56/small.jpg",
+ :medium "http://cloudfront.net/a938a596-27ad-4d83-bc32-d5113d44bc56/med.jpg",
+ :large "http://cloudfront.net/a938a596-27ad-4d83-bc32-d5113d44bc56/large.jpg"}
+ {:name "Polk St. Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-666-8681", :id "47f1698e-ae11-46f5-818b-85a59d0affba"}
+ {:service "yelp", :yelp-photo-id "101ea39b-5bc5-4bb7-905e-017f1a8271c8", :categories ["Deep-Dish" "Hotel & Restaurant"]}]
+ ["Joe's No-MSG Sushi is a underappreciated and family-friendly place to people-watch weekend evenings."
+ {:small "http://cloudfront.net/5469697b-2b07-46ab-b9ef-3bfa449e7db5/small.jpg",
+ :medium "http://cloudfront.net/5469697b-2b07-46ab-b9ef-3bfa449e7db5/med.jpg",
+ :large "http://cloudfront.net/5469697b-2b07-46ab-b9ef-3bfa449e7db5/large.jpg"}
+ {:name "Joe's No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-739-8157", :id "9ff21570-cd5b-415e-933a-52144f551b86"}
+ {:service "flare", :username "sameer"}]
+ ["Mission Soul Food Pizzeria is a acceptable and historical place to pitch an investor during winter."
+ {:small "http://cloudfront.net/38325411-8a54-4a10-930f-0c1a439d0f78/small.jpg",
+ :medium "http://cloudfront.net/38325411-8a54-4a10-930f-0c1a439d0f78/med.jpg",
+ :large "http://cloudfront.net/38325411-8a54-4a10-930f-0c1a439d0f78/large.jpg"}
+ {:name "Mission Soul Food Pizzeria", :categories ["Soul Food" "Pizzeria"], :phone "415-437-3479", :id "9905fe61-44cb-4626-843b-5d725c7949bb"}
+ {:service "yelp", :yelp-photo-id "22c576f1-d64a-44c1-a510-85ed03cd8a9c", :categories ["Soul Food" "Pizzeria"]}]
+ ["Joe's Homestyle Eatery is a popular and underappreciated place to drink a craft beer with your pet toucan."
+ {:small "http://cloudfront.net/9d0c77a6-ac3a-4221-8125-c670c48a963a/small.jpg",
+ :medium "http://cloudfront.net/9d0c77a6-ac3a-4221-8125-c670c48a963a/med.jpg",
+ :large "http://cloudfront.net/9d0c77a6-ac3a-4221-8125-c670c48a963a/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "facebook", :facebook-photo-id "3e5b3749-a758-4acf-b87e-aadca225127c", :url "http://facebook.com/photos/3e5b3749-a758-4acf-b87e-aadca225127c"}]
+ ["Market St. Gluten-Free Café is a family-friendly and family-friendly place to have a after-work cocktail when hungover."
+ {:small "http://cloudfront.net/f1891933-8d88-4e80-92c3-76b0a10c6b45/small.jpg",
+ :medium "http://cloudfront.net/f1891933-8d88-4e80-92c3-76b0a10c6b45/med.jpg",
+ :large "http://cloudfront.net/f1891933-8d88-4e80-92c3-76b0a10c6b45/large.jpg"}
+ {:name "Market St. Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-697-9776", :id "ce4947d0-071a-4491-b5ac-f8b0241bd54c"}
+ {:service "flare", :username "amy"}]
+ ["Tenderloin Cage-Free Sushi is a swell and classic place to nurse a hangover with your pet toucan."
+ {:small "http://cloudfront.net/325091a5-4a50-45bd-9566-654940a8932c/small.jpg",
+ :medium "http://cloudfront.net/325091a5-4a50-45bd-9566-654940a8932c/med.jpg",
+ :large "http://cloudfront.net/325091a5-4a50-45bd-9566-654940a8932c/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "twitter", :mentions ["@tenderloin_cage_free_sushi"], :tags ["#cage-free" "#sushi"], :username "joe"}]
+ ["Mission Chinese Liquor Store is a family-friendly and great place to take visiting friends and relatives weekday afternoons."
+ {:small "http://cloudfront.net/1b313721-9de8-4f91-afe2-659873693387/small.jpg",
+ :medium "http://cloudfront.net/1b313721-9de8-4f91-afe2-659873693387/med.jpg",
+ :large "http://cloudfront.net/1b313721-9de8-4f91-afe2-659873693387/large.jpg"}
+ {:name "Mission Chinese Liquor Store", :categories ["Chinese" "Liquor Store"], :phone "415-906-6919", :id "00132b5b-31fc-46f0-a288-f547f23477ee"}
+ {:service "twitter", :mentions ["@mission_chinese_liquor_store"], :tags ["#chinese" "#liquor" "#store"], :username "jane"}]
+ ["Lucky's Low-Carb Coffee House is a great and decent place to conduct a business meeting when hungover."
+ {:small "http://cloudfront.net/e9e3efe7-1b9a-48c7-85d6-92a1322960b8/small.jpg",
+ :medium "http://cloudfront.net/e9e3efe7-1b9a-48c7-85d6-92a1322960b8/med.jpg",
+ :large "http://cloudfront.net/e9e3efe7-1b9a-48c7-85d6-92a1322960b8/large.jpg"}
+ {:name "Lucky's Low-Carb Coffee House", :categories ["Low-Carb" "Coffee House"], :phone "415-145-7107", :id "81b0f944-f0ce-45e5-b84e-a924c441064a"}
+ {:service "foursquare", :foursquare-photo-id "f7b66a97-8c94-4754-8938-6b4e3244b08e", :mayor "jane"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a exclusive and fantastic place to take visiting friends and relatives with your pet dog."
+ {:small "http://cloudfront.net/b3321e36-0ffa-40be-bba4-f8ada008c0f0/small.jpg",
+ :medium "http://cloudfront.net/b3321e36-0ffa-40be-bba4-f8ada008c0f0/med.jpg",
+ :large "http://cloudfront.net/b3321e36-0ffa-40be-bba4-f8ada008c0f0/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "flare", :username "jane"}]
+ ["SoMa TaquerÃa Diner is a overrated and amazing place to have breakfast in June."
+ {:small "http://cloudfront.net/36b82a08-66c3-4c94-a76d-0026653fadf0/small.jpg",
+ :medium "http://cloudfront.net/36b82a08-66c3-4c94-a76d-0026653fadf0/med.jpg",
+ :large "http://cloudfront.net/36b82a08-66c3-4c94-a76d-0026653fadf0/large.jpg"}
+ {:name "SoMa TaquerÃa Diner", :categories ["TaquerÃa" "Diner"], :phone "415-947-9521", :id "f97ede4a-074f-4e24-babc-5c44f2be9c36"}
+ {:service "yelp", :yelp-photo-id "cf483e10-dd11-4611-90e0-bc0238b41b59", :categories ["TaquerÃa" "Diner"]}]
+ ["Cam's Mexican Gastro Pub is a swell and world-famous place to take visiting friends and relatives Friday nights."
+ {:small "http://cloudfront.net/c4414384-985d-4539-b6e5-1758bd4ec73a/small.jpg",
+ :medium "http://cloudfront.net/c4414384-985d-4539-b6e5-1758bd4ec73a/med.jpg",
+ :large "http://cloudfront.net/c4414384-985d-4539-b6e5-1758bd4ec73a/large.jpg"}
+ {:name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :phone "415-320-9123", :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}
+ {:service "yelp", :yelp-photo-id "33a70c42-6c5a-4a29-af94-b7856cbc6cbb", :categories ["Mexican" "Gastro Pub"]}]
+ ["Alcatraz Pizza Churros is a horrible and underground place to sip a glass of expensive wine during winter."
+ {:small "http://cloudfront.net/a0d56ff5-9a10-4b98-bdcf-152d45019943/small.jpg",
+ :medium "http://cloudfront.net/a0d56ff5-9a10-4b98-bdcf-152d45019943/med.jpg",
+ :large "http://cloudfront.net/a0d56ff5-9a10-4b98-bdcf-152d45019943/large.jpg"}
+ {:name "Alcatraz Pizza Churros", :categories ["Pizza" "Churros"], :phone "415-754-7867", :id "df95e4f1-8719-42af-a15d-3ee00de6e04f"}
+ {:service "yelp", :yelp-photo-id "e6a2e47f-07b6-4ec9-a491-371fb1959975", :categories ["Pizza" "Churros"]}]
+ ["Marina Low-Carb Food Truck is a groovy and delicious place to watch the Giants game on Thursdays."
+ {:small "http://cloudfront.net/91c8de79-39fa-41b8-8022-fdfef267bb71/small.jpg",
+ :medium "http://cloudfront.net/91c8de79-39fa-41b8-8022-fdfef267bb71/med.jpg",
+ :large "http://cloudfront.net/91c8de79-39fa-41b8-8022-fdfef267bb71/large.jpg"}
+ {:name "Marina Low-Carb Food Truck", :categories ["Low-Carb" "Food Truck"], :phone "415-748-3513", :id "a13a5beb-19de-40ca-a334-02df3bdf5285"}
+ {:service "flare", :username "tupac"}]
+ ["Rasta's Paleo Churros is a acceptable and family-friendly place to have brunch weekday afternoons."
+ {:small "http://cloudfront.net/b3866479-4dfb-48e8-97fa-058d125e36e7/small.jpg",
+ :medium "http://cloudfront.net/b3866479-4dfb-48e8-97fa-058d125e36e7/med.jpg",
+ :large "http://cloudfront.net/b3866479-4dfb-48e8-97fa-058d125e36e7/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "facebook", :facebook-photo-id "0b3c791c-935c-4d01-84f8-9708c699eb1b", :url "http://facebook.com/photos/0b3c791c-935c-4d01-84f8-9708c699eb1b"}]
+ ["Tenderloin Red White & Blue Pizzeria is a swell and historical place to nurse a hangover Friday nights."
+ {:small "http://cloudfront.net/99dce602-9ba9-4a3c-b9c3-c86ef6f9bcfa/small.jpg",
+ :medium "http://cloudfront.net/99dce602-9ba9-4a3c-b9c3-c86ef6f9bcfa/med.jpg",
+ :large "http://cloudfront.net/99dce602-9ba9-4a3c-b9c3-c86ef6f9bcfa/large.jpg"}
+ {:name "Tenderloin Red White & Blue Pizzeria", :categories ["Red White & Blue" "Pizzeria"], :phone "415-719-8143", :id "eba3dbcd-100a-4f38-a701-e0dec157f437"}
+ {:service "yelp", :yelp-photo-id "c6aa321a-e8f7-484b-9fd1-ab8f6a1c5906", :categories ["Red White & Blue" "Pizzeria"]}]
+ ["Kyle's Free-Range Taqueria is a amazing and wonderful place to have breakfast in the fall."
+ {:small "http://cloudfront.net/613f6695-adee-4175-ad07-1af6b7753fa7/small.jpg",
+ :medium "http://cloudfront.net/613f6695-adee-4175-ad07-1af6b7753fa7/med.jpg",
+ :large "http://cloudfront.net/613f6695-adee-4175-ad07-1af6b7753fa7/large.jpg"}
+ {:name "Kyle's Free-Range Taqueria", :categories ["Free-Range" "Taqueria"], :phone "415-201-7832", :id "7aeb9416-4fe6-45f9-8849-6b8ba6d3f3b9"}
+ {:service "flare", :username "amy"}]
+ ["Lucky's Cage-Free Liquor Store is a delicious and acceptable place to drink a craft beer on public holidays."
+ {:small "http://cloudfront.net/9311a1df-401c-4c89-b4ee-d399635fd558/small.jpg",
+ :medium "http://cloudfront.net/9311a1df-401c-4c89-b4ee-d399635fd558/med.jpg",
+ :large "http://cloudfront.net/9311a1df-401c-4c89-b4ee-d399635fd558/large.jpg"}
+ {:name "Lucky's Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-341-3219", :id "968eac8d-1fd0-443d-a7ff-b48810ab0f69"}
+ {:service "foursquare", :foursquare-photo-id "ef083c69-08d6-45be-8cfb-c71654b0a8fc", :mayor "cam_saul"}]
+ ["Lucky's Gluten-Free Café is a groovy and wonderful place to have a drink with friends."
+ {:small "http://cloudfront.net/85d2ae70-0381-4c67-9d5f-97f8068e64df/small.jpg",
+ :medium "http://cloudfront.net/85d2ae70-0381-4c67-9d5f-97f8068e64df/med.jpg",
+ :large "http://cloudfront.net/85d2ae70-0381-4c67-9d5f-97f8068e64df/large.jpg"}
+ {:name "Lucky's Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-740-2328", :id "379af987-ad40-4a93-88a6-0233e1c14649"}
+ {:service "twitter", :mentions ["@luckys_gluten_free_café"], :tags ["#gluten-free" "#café"], :username "biggie"}]
+ ["Marina Modern Sushi is a wonderful and exclusive place to watch the Warriors game the second Saturday of the month."
+ {:small "http://cloudfront.net/ad6ceaf6-a43a-4c35-8f6c-ecef429c7408/small.jpg",
+ :medium "http://cloudfront.net/ad6ceaf6-a43a-4c35-8f6c-ecef429c7408/med.jpg",
+ :large "http://cloudfront.net/ad6ceaf6-a43a-4c35-8f6c-ecef429c7408/large.jpg"}
+ {:name "Marina Modern Sushi", :categories ["Modern" "Sushi"], :phone "415-393-7672", :id "21807c63-ca4c-4468-9844-d0c2620fbdfc"}
+ {:service "flare", :username "kyle"}]
+ ["Pacific Heights Red White & Blue Bar & Grill is a decent and delicious place to watch the Giants game when hungover."
+ {:small "http://cloudfront.net/7ae8b782-4cf9-4efd-af2f-12f3d921e44a/small.jpg",
+ :medium "http://cloudfront.net/7ae8b782-4cf9-4efd-af2f-12f3d921e44a/med.jpg",
+ :large "http://cloudfront.net/7ae8b782-4cf9-4efd-af2f-12f3d921e44a/large.jpg"}
+ {:name "Pacific Heights Red White & Blue Bar & Grill", :categories ["Red White & Blue" "Bar & Grill"], :phone "415-208-2550", :id "c7547aa1-94c1-44bd-bf5a-8655e4698ed8"}
+ {:service "foursquare", :foursquare-photo-id "55c948c7-8d08-46e1-98e6-a03ca330795c", :mayor "mandy"}]
+ ["Joe's Modern Coffee House is a acceptable and exclusive place to catch a bite to eat during summer."
+ {:small "http://cloudfront.net/9f063ae2-9db6-490e-8098-bac5a030b5d4/small.jpg",
+ :medium "http://cloudfront.net/9f063ae2-9db6-490e-8098-bac5a030b5d4/med.jpg",
+ :large "http://cloudfront.net/9f063ae2-9db6-490e-8098-bac5a030b5d4/large.jpg"}
+ {:name "Joe's Modern Coffee House", :categories ["Modern" "Coffee House"], :phone "415-331-5269", :id "cd9e3610-9ead-4f0b-ad93-cd53611d49fe"}
+ {:service "flare", :username "kyle"}]
+ ["Haight Gormet Pizzeria is a historical and modern place to pitch an investor Friday nights."
+ {:small "http://cloudfront.net/1484e4b7-fe56-4bed-8598-c6558202adeb/small.jpg",
+ :medium "http://cloudfront.net/1484e4b7-fe56-4bed-8598-c6558202adeb/med.jpg",
+ :large "http://cloudfront.net/1484e4b7-fe56-4bed-8598-c6558202adeb/large.jpg"}
+ {:name "Haight Gormet Pizzeria", :categories ["Gormet" "Pizzeria"], :phone "415-869-2197", :id "0425bdd0-3f57-4108-80e3-78335327355a"}
+ {:service "flare", :username "cam_saul"}]
+ ["Cam's Mexican Gastro Pub is a world-famous and fantastic place to take a date in July."
+ {:small "http://cloudfront.net/7663dd1e-d8d3-4add-9cdd-e6b7322e622c/small.jpg",
+ :medium "http://cloudfront.net/7663dd1e-d8d3-4add-9cdd-e6b7322e622c/med.jpg",
+ :large "http://cloudfront.net/7663dd1e-d8d3-4add-9cdd-e6b7322e622c/large.jpg"}
+ {:name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :phone "415-320-9123", :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}
+ {:service "yelp", :yelp-photo-id "c76eeafe-a161-492d-8a84-f0d3eb729d2b", :categories ["Mexican" "Gastro Pub"]}]
+ ["Haight European Grill is a acceptable and underground place to have breakfast on a Tuesday afternoon."
+ {:small "http://cloudfront.net/833021dd-cdcf-419f-8891-cf680f8d124e/small.jpg",
+ :medium "http://cloudfront.net/833021dd-cdcf-419f-8891-cf680f8d124e/med.jpg",
+ :large "http://cloudfront.net/833021dd-cdcf-419f-8891-cf680f8d124e/large.jpg"}
+ {:name "Haight European Grill", :categories ["European" "Grill"], :phone "415-191-2778", :id "7e6281f7-5b17-4056-ada0-85453247bc8f"}
+ {:service "flare", :username "joe"}]
+ ["Tenderloin Cage-Free Sushi is a modern and atmospheric place to sip Champagne weekday afternoons."
+ {:small "http://cloudfront.net/4e14334f-fa3d-4c90-af94-7aa9c37a5dbd/small.jpg",
+ :medium "http://cloudfront.net/4e14334f-fa3d-4c90-af94-7aa9c37a5dbd/med.jpg",
+ :large "http://cloudfront.net/4e14334f-fa3d-4c90-af94-7aa9c37a5dbd/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "facebook", :facebook-photo-id "fd4144e1-bddb-4f4d-8985-de94a554a730", :url "http://facebook.com/photos/fd4144e1-bddb-4f4d-8985-de94a554a730"}]
+ ["Lower Pac Heights Deep-Dish Liquor Store is a horrible and decent place to pitch an investor on Taco Tuesday."
+ {:small "http://cloudfront.net/3d883dfb-23a7-4097-aed9-d69c4cbb67ef/small.jpg",
+ :medium "http://cloudfront.net/3d883dfb-23a7-4097-aed9-d69c4cbb67ef/med.jpg",
+ :large "http://cloudfront.net/3d883dfb-23a7-4097-aed9-d69c4cbb67ef/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Liquor Store", :categories ["Deep-Dish" "Liquor Store"], :phone "415-497-3039", :id "4d4eabfc-ff1f-4bc6-88b0-2f55489ff666"}
+ {:service "yelp", :yelp-photo-id "50bdc257-fcc9-44d1-b121-87f5c3e45058", :categories ["Deep-Dish" "Liquor Store"]}]
+ ["Mission Free-Range Liquor Store is a popular and fantastic place to watch the Giants game on Taco Tuesday."
+ {:small "http://cloudfront.net/57374d95-ff55-4a20-b98e-191dfc08ce75/small.jpg",
+ :medium "http://cloudfront.net/57374d95-ff55-4a20-b98e-191dfc08ce75/med.jpg",
+ :large "http://cloudfront.net/57374d95-ff55-4a20-b98e-191dfc08ce75/large.jpg"}
+ {:name "Mission Free-Range Liquor Store", :categories ["Free-Range" "Liquor Store"], :phone "415-041-3816", :id "6e665924-8e2c-42ab-af58-23a27f017e37"}
+ {:service "foursquare", :foursquare-photo-id "90c4812a-a426-4776-aeb1-81e4770c7887", :mayor "sameer"}]
+ ["SoMa British Bakery is a wonderful and historical place to have a drink during winter."
+ {:small "http://cloudfront.net/7ee329cb-d9c3-48cf-8486-639e39df7329/small.jpg",
+ :medium "http://cloudfront.net/7ee329cb-d9c3-48cf-8486-639e39df7329/med.jpg",
+ :large "http://cloudfront.net/7ee329cb-d9c3-48cf-8486-639e39df7329/large.jpg"}
+ {:name "SoMa British Bakery", :categories ["British" "Bakery"], :phone "415-909-5728", :id "662cb0d0-8ee6-4db7-aaf1-89eb2530feda"}
+ {:service "yelp", :yelp-photo-id "d2643a6d-6669-48e5-890e-080aaff6d1e7", :categories ["British" "Bakery"]}]
+ ["Market St. Gluten-Free Café is a great and modern place to sip a glass of expensive wine Friday nights."
+ {:small "http://cloudfront.net/723c33fc-4901-4403-9f13-f451f98be98b/small.jpg",
+ :medium "http://cloudfront.net/723c33fc-4901-4403-9f13-f451f98be98b/med.jpg",
+ :large "http://cloudfront.net/723c33fc-4901-4403-9f13-f451f98be98b/large.jpg"}
+ {:name "Market St. Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-697-9776", :id "ce4947d0-071a-4491-b5ac-f8b0241bd54c"}
+ {:service "foursquare", :foursquare-photo-id "7ae76e90-44db-483e-a5bc-2cb8ec65fa61", :mayor "jessica"}]
+ ["Marina No-MSG Sushi is a fantastic and classic place to have brunch with your pet dog."
+ {:small "http://cloudfront.net/c338a1ea-38e3-4409-9c0e-5099609318aa/small.jpg",
+ :medium "http://cloudfront.net/c338a1ea-38e3-4409-9c0e-5099609318aa/med.jpg",
+ :large "http://cloudfront.net/c338a1ea-38e3-4409-9c0e-5099609318aa/large.jpg"}
+ {:name "Marina No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-856-5937", :id "d51013a3-8547-4705-a5f0-cb11d8206481"}
+ {:service "twitter", :mentions ["@marina_no_msg_sushi"], :tags ["#no-msg" "#sushi"], :username "jane"}]
+ ["Sunset American Churros is a underappreciated and world-famous place to have brunch with friends."
+ {:small "http://cloudfront.net/56669abd-119c-4a02-abfc-d9acdd1e84fc/small.jpg",
+ :medium "http://cloudfront.net/56669abd-119c-4a02-abfc-d9acdd1e84fc/med.jpg",
+ :large "http://cloudfront.net/56669abd-119c-4a02-abfc-d9acdd1e84fc/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "foursquare", :foursquare-photo-id "1b34eb04-290c-409e-b63c-ee82fff83878", :mayor "mandy"}]
+ ["Sameer's Pizza Liquor Store is a decent and underground place to meet new friends the second Saturday of the month."
+ {:small "http://cloudfront.net/010b1a6c-8ddf-4ea8-9c30-ab990356a5eb/small.jpg",
+ :medium "http://cloudfront.net/010b1a6c-8ddf-4ea8-9c30-ab990356a5eb/med.jpg",
+ :large "http://cloudfront.net/010b1a6c-8ddf-4ea8-9c30-ab990356a5eb/large.jpg"}
+ {:name "Sameer's Pizza Liquor Store", :categories ["Pizza" "Liquor Store"], :phone "415-969-7474", :id "7b9c7dc3-d8f1-498d-843a-e62360449892"}
+ {:service "flare", :username "biggie"}]
+ ["SF Deep-Dish Eatery is a delicious and modern place to watch the Warriors game on Saturday night."
+ {:small "http://cloudfront.net/29b0f569-4023-455e-bfbf-4e2e799c6f6e/small.jpg",
+ :medium "http://cloudfront.net/29b0f569-4023-455e-bfbf-4e2e799c6f6e/med.jpg",
+ :large "http://cloudfront.net/29b0f569-4023-455e-bfbf-4e2e799c6f6e/large.jpg"}
+ {:name "SF Deep-Dish Eatery", :categories ["Deep-Dish" "Eatery"], :phone "415-476-9257", :id "ad41d3f6-c20c-46a7-9e5d-db602fff7d0d"}
+ {:service "yelp", :yelp-photo-id "79616795-0585-478a-9998-8c9b0169005e", :categories ["Deep-Dish" "Eatery"]}]
+ ["SF Afgan Restaurant is a fantastic and exclusive place to nurse a hangover in June."
+ {:small "http://cloudfront.net/9af6de8f-b24f-4f36-8991-0888e7dbad4e/small.jpg",
+ :medium "http://cloudfront.net/9af6de8f-b24f-4f36-8991-0888e7dbad4e/med.jpg",
+ :large "http://cloudfront.net/9af6de8f-b24f-4f36-8991-0888e7dbad4e/large.jpg"}
+ {:name "SF Afgan Restaurant", :categories ["Afgan" "Restaurant"], :phone "415-451-4697", :id "66ccc68a-db9a-470c-a17b-7764d23daced"}
+ {:service "foursquare", :foursquare-photo-id "c00e6384-fc26-4056-86fc-95df69092552", :mayor "kyle"}]
+ ["Pacific Heights Red White & Blue Bar & Grill is a swell and atmospheric place to conduct a business meeting the second Saturday of the month."
+ {:small "http://cloudfront.net/1c465d71-1c46-492f-883a-a069df6048ce/small.jpg",
+ :medium "http://cloudfront.net/1c465d71-1c46-492f-883a-a069df6048ce/med.jpg",
+ :large "http://cloudfront.net/1c465d71-1c46-492f-883a-a069df6048ce/large.jpg"}
+ {:name "Pacific Heights Red White & Blue Bar & Grill", :categories ["Red White & Blue" "Bar & Grill"], :phone "415-208-2550", :id "c7547aa1-94c1-44bd-bf5a-8655e4698ed8"}
+ {:service "facebook", :facebook-photo-id "d4c43b07-932f-42d3-b70f-29306c9f0746", :url "http://facebook.com/photos/d4c43b07-932f-42d3-b70f-29306c9f0746"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a acceptable and family-friendly place to nurse a hangover during winter."
+ {:small "http://cloudfront.net/7cb07300-7f55-4634-b998-4999aa1b4fb8/small.jpg",
+ :medium "http://cloudfront.net/7cb07300-7f55-4634-b998-4999aa1b4fb8/med.jpg",
+ :large "http://cloudfront.net/7cb07300-7f55-4634-b998-4999aa1b4fb8/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["Oakland American Grill is a amazing and swell place to catch a bite to eat the first Sunday of the month."
+ {:small "http://cloudfront.net/dd1aaaba-124f-4722-8a46-33f2bcb826a4/small.jpg",
+ :medium "http://cloudfront.net/dd1aaaba-124f-4722-8a46-33f2bcb826a4/med.jpg",
+ :large "http://cloudfront.net/dd1aaaba-124f-4722-8a46-33f2bcb826a4/large.jpg"}
+ {:name "Oakland American Grill", :categories ["American" "Grill"], :phone "415-660-0889", :id "856f907d-b669-4b9c-8337-bf9c88883746"}
+ {:service "yelp", :yelp-photo-id "38bc4d27-d28f-434b-b89d-5b88384a1c9b", :categories ["American" "Grill"]}]
+ ["Joe's No-MSG Sushi is a well-decorated and delicious place to catch a bite to eat on Thursdays."
+ {:small "http://cloudfront.net/27579436-073b-45b3-91c8-49f361fecefd/small.jpg",
+ :medium "http://cloudfront.net/27579436-073b-45b3-91c8-49f361fecefd/med.jpg",
+ :large "http://cloudfront.net/27579436-073b-45b3-91c8-49f361fecefd/large.jpg"}
+ {:name "Joe's No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-739-8157", :id "9ff21570-cd5b-415e-933a-52144f551b86"}
+ {:service "twitter", :mentions ["@joes_no_msg_sushi"], :tags ["#no-msg" "#sushi"], :username "joe"}]
+ ["Rasta's British Food Truck is a historical and well-decorated place to take visiting friends and relatives on a Tuesday afternoon."
+ {:small "http://cloudfront.net/6274a518-20f4-4db9-bcad-473c4f452841/small.jpg",
+ :medium "http://cloudfront.net/6274a518-20f4-4db9-bcad-473c4f452841/med.jpg",
+ :large "http://cloudfront.net/6274a518-20f4-4db9-bcad-473c4f452841/large.jpg"}
+ {:name "Rasta's British Food Truck", :categories ["British" "Food Truck"], :phone "415-958-9031", :id "b6616c97-01d0-488f-a855-bcd6efe2b899"}
+ {:service "flare", :username "jessica"}]
+ ["Polk St. Deep-Dish Hotel & Restaurant is a groovy and horrible place to take visiting friends and relatives with your pet toucan."
+ {:small "http://cloudfront.net/c28e51fc-ac77-43ab-90d3-d660143a78fe/small.jpg",
+ :medium "http://cloudfront.net/c28e51fc-ac77-43ab-90d3-d660143a78fe/med.jpg",
+ :large "http://cloudfront.net/c28e51fc-ac77-43ab-90d3-d660143a78fe/large.jpg"}
+ {:name "Polk St. Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-666-8681", :id "47f1698e-ae11-46f5-818b-85a59d0affba"}
+ {:service "flare", :username "tupac"}]
+ ["Market St. Gluten-Free Café is a delicious and delicious place to catch a bite to eat on a Tuesday afternoon."
+ {:small "http://cloudfront.net/cd5d0bf5-1341-4340-877d-b4f22ae989c9/small.jpg",
+ :medium "http://cloudfront.net/cd5d0bf5-1341-4340-877d-b4f22ae989c9/med.jpg",
+ :large "http://cloudfront.net/cd5d0bf5-1341-4340-877d-b4f22ae989c9/large.jpg"}
+ {:name "Market St. Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-697-9776", :id "ce4947d0-071a-4491-b5ac-f8b0241bd54c"}
+ {:service "flare", :username "mandy"}]
+ ["Marina Modern Sushi is a underground and family-friendly place to sip Champagne Friday nights."
+ {:small "http://cloudfront.net/1c3be2ad-9aa2-4bea-8153-6130512cd9e8/small.jpg",
+ :medium "http://cloudfront.net/1c3be2ad-9aa2-4bea-8153-6130512cd9e8/med.jpg",
+ :large "http://cloudfront.net/1c3be2ad-9aa2-4bea-8153-6130512cd9e8/large.jpg"}
+ {:name "Marina Modern Sushi", :categories ["Modern" "Sushi"], :phone "415-393-7672", :id "21807c63-ca4c-4468-9844-d0c2620fbdfc"}
+ {:service "flare", :username "joe"}]
+ ["Pacific Heights Pizza Bakery is a underappreciated and popular place to sip a glass of expensive wine the first Sunday of the month."
+ {:small "http://cloudfront.net/ac8b7804-3e6b-4c2d-b78e-aa20530c9a35/small.jpg",
+ :medium "http://cloudfront.net/ac8b7804-3e6b-4c2d-b78e-aa20530c9a35/med.jpg",
+ :large "http://cloudfront.net/ac8b7804-3e6b-4c2d-b78e-aa20530c9a35/large.jpg"}
+ {:name "Pacific Heights Pizza Bakery", :categories ["Pizza" "Bakery"], :phone "415-006-0149", :id "7fda37a5-810f-4902-b571-54afe583f0dd"}
+ {:service "yelp", :yelp-photo-id "8e817a6f-5d3d-4fff-9c80-b5ed3e225095", :categories ["Pizza" "Bakery"]}]
+ ["Kyle's Japanese Hotel & Restaurant is a amazing and family-friendly place to have breakfast in June."
+ {:small "http://cloudfront.net/9967c7f3-3da3-4891-b00e-8296898bbeb6/small.jpg",
+ :medium "http://cloudfront.net/9967c7f3-3da3-4891-b00e-8296898bbeb6/med.jpg",
+ :large "http://cloudfront.net/9967c7f3-3da3-4891-b00e-8296898bbeb6/large.jpg"}
+ {:name "Kyle's Japanese Hotel & Restaurant", :categories ["Japanese" "Hotel & Restaurant"], :phone "415-337-5387", :id "eced4f41-b627-4553-a297-888871038b69"}
+ {:service "flare", :username "mandy"}]
+ ["Pacific Heights No-MSG Sushi is a groovy and groovy place to drink a craft beer when hungover."
+ {:small "http://cloudfront.net/6d5d0c28-8b65-4392-9fe9-3b85427a1cdb/small.jpg",
+ :medium "http://cloudfront.net/6d5d0c28-8b65-4392-9fe9-3b85427a1cdb/med.jpg",
+ :large "http://cloudfront.net/6d5d0c28-8b65-4392-9fe9-3b85427a1cdb/large.jpg"}
+ {:name "Pacific Heights No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-354-9547", :id "b15b66a8-f3da-4b65-8156-80f5518fdd5a"}
+ {:service "facebook", :facebook-photo-id "265681c6-d000-4618-87fc-f8e35eef9ee3", :url "http://facebook.com/photos/265681c6-d000-4618-87fc-f8e35eef9ee3"}]
+ ["Joe's Homestyle Eatery is a decent and fantastic place to conduct a business meeting on public holidays."
+ {:small "http://cloudfront.net/0ad76a39-e0df-4212-a365-b5afb27bf7b6/small.jpg",
+ :medium "http://cloudfront.net/0ad76a39-e0df-4212-a365-b5afb27bf7b6/med.jpg",
+ :large "http://cloudfront.net/0ad76a39-e0df-4212-a365-b5afb27bf7b6/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "yelp", :yelp-photo-id "69b17ca8-3a3e-4df2-a46b-a18d4d82283d", :categories ["Homestyle" "Eatery"]}]
+ ["Pacific Heights Irish Grill is a world-famous and delicious place to conduct a business meeting with friends."
+ {:small "http://cloudfront.net/4e773c36-2173-4583-967c-9d31f56b086d/small.jpg",
+ :medium "http://cloudfront.net/4e773c36-2173-4583-967c-9d31f56b086d/med.jpg",
+ :large "http://cloudfront.net/4e773c36-2173-4583-967c-9d31f56b086d/large.jpg"}
+ {:name "Pacific Heights Irish Grill", :categories ["Irish" "Grill"], :phone "415-491-2202", :id "d6b92dfc-56e9-4f65-b1d0-595f120043d9"}
+ {:service "flare", :username "jane"}]
+ ["Marina Japanese Liquor Store is a classic and groovy place to watch the Giants game Friday nights."
+ {:small "http://cloudfront.net/a3abdf98-ee64-4a7d-96a4-0983e7c6a616/small.jpg",
+ :medium "http://cloudfront.net/a3abdf98-ee64-4a7d-96a4-0983e7c6a616/med.jpg",
+ :large "http://cloudfront.net/a3abdf98-ee64-4a7d-96a4-0983e7c6a616/large.jpg"}
+ {:name "Marina Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-587-9819", :id "08fd0138-35dd-41b0-836d-1c652e95ffcd"}
+ {:service "twitter", :mentions ["@marina_japanese_liquor_store"], :tags ["#japanese" "#liquor" "#store"], :username "bob"}]
+ ["Pacific Heights Soul Food Coffee House is a wonderful and underappreciated place to watch the Warriors game in July."
+ {:small "http://cloudfront.net/08e81253-a561-45d2-8715-e2e8a6d990a0/small.jpg",
+ :medium "http://cloudfront.net/08e81253-a561-45d2-8715-e2e8a6d990a0/med.jpg",
+ :large "http://cloudfront.net/08e81253-a561-45d2-8715-e2e8a6d990a0/large.jpg"}
+ {:name "Pacific Heights Soul Food Coffee House", :categories ["Soul Food" "Coffee House"], :phone "415-838-3464", :id "6aed1816-4c64-4f76-8e2a-619528e5b48d"}
+ {:service "flare", :username "amy"}]
+ ["Polk St. Korean Taqueria is a amazing and historical place to people-watch on Saturday night."
+ {:small "http://cloudfront.net/a9ad1e78-ebe9-4248-b265-048c12945997/small.jpg",
+ :medium "http://cloudfront.net/a9ad1e78-ebe9-4248-b265-048c12945997/med.jpg",
+ :large "http://cloudfront.net/a9ad1e78-ebe9-4248-b265-048c12945997/large.jpg"}
+ {:name "Polk St. Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-511-5531", :id "ddb09b32-6f0b-4e54-98c7-14398f16ca4e"}
+ {:service "twitter", :mentions ["@polk_st._korean_taqueria"], :tags ["#korean" "#taqueria"], :username "bob"}]
+ ["Lucky's Cage-Free Liquor Store is a delicious and amazing place to catch a bite to eat on a Tuesday afternoon."
+ {:small "http://cloudfront.net/9e74ec8b-ecd9-4987-b2d8-63a84938d699/small.jpg",
+ :medium "http://cloudfront.net/9e74ec8b-ecd9-4987-b2d8-63a84938d699/med.jpg",
+ :large "http://cloudfront.net/9e74ec8b-ecd9-4987-b2d8-63a84938d699/large.jpg"}
+ {:name "Lucky's Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-341-3219", :id "968eac8d-1fd0-443d-a7ff-b48810ab0f69"}
+ {:service "facebook", :facebook-photo-id "8ce61a42-cb9c-4304-bada-3a8fb245bb64", :url "http://facebook.com/photos/8ce61a42-cb9c-4304-bada-3a8fb245bb64"}]
+ ["SoMa Japanese Churros is a wonderful and modern place to conduct a business meeting during winter."
+ {:small "http://cloudfront.net/41114760-4e0c-4555-a67c-9018ec34ef73/small.jpg",
+ :medium "http://cloudfront.net/41114760-4e0c-4555-a67c-9018ec34ef73/med.jpg",
+ :large "http://cloudfront.net/41114760-4e0c-4555-a67c-9018ec34ef73/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "facebook", :facebook-photo-id "4e3d4ad7-54ba-4f55-baf7-4ad223bcfaf6", :url "http://facebook.com/photos/4e3d4ad7-54ba-4f55-baf7-4ad223bcfaf6"}]
+ ["SoMa Old-Fashioned Pizzeria is a well-decorated and horrible place to meet new friends in the fall."
+ {:small "http://cloudfront.net/dd0eb180-3e40-4ac6-becb-653a32f2d43d/small.jpg",
+ :medium "http://cloudfront.net/dd0eb180-3e40-4ac6-becb-653a32f2d43d/med.jpg",
+ :large "http://cloudfront.net/dd0eb180-3e40-4ac6-becb-653a32f2d43d/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "facebook", :facebook-photo-id "91e06ea0-df70-48e2-bb43-6acfe787d203", :url "http://facebook.com/photos/91e06ea0-df70-48e2-bb43-6acfe787d203"}]
+ ["Oakland European Liquor Store is a popular and historical place to sip Champagne with your pet toucan."
+ {:small "http://cloudfront.net/9c28ae3e-e583-4ec2-9646-a58af7de6e5a/small.jpg",
+ :medium "http://cloudfront.net/9c28ae3e-e583-4ec2-9646-a58af7de6e5a/med.jpg",
+ :large "http://cloudfront.net/9c28ae3e-e583-4ec2-9646-a58af7de6e5a/large.jpg"}
+ {:name "Oakland European Liquor Store", :categories ["European" "Liquor Store"], :phone "415-559-1516", :id "e342e7b7-e82d-475d-a822-b2df9c84850d"}
+ {:service "flare", :username "cam_saul"}]
+ ["Pacific Heights Pizza Bakery is a classic and classic place to have a birthday party on public holidays."
+ {:small "http://cloudfront.net/114749c9-8bf7-4a65-9757-ac8e42be72bb/small.jpg",
+ :medium "http://cloudfront.net/114749c9-8bf7-4a65-9757-ac8e42be72bb/med.jpg",
+ :large "http://cloudfront.net/114749c9-8bf7-4a65-9757-ac8e42be72bb/large.jpg"}
+ {:name "Pacific Heights Pizza Bakery", :categories ["Pizza" "Bakery"], :phone "415-006-0149", :id "7fda37a5-810f-4902-b571-54afe583f0dd"}
+ {:service "twitter", :mentions ["@pacific_heights_pizza_bakery"], :tags ["#pizza" "#bakery"], :username "mandy"}]
+ ["Sameer's GMO-Free Restaurant is a decent and family-friendly place to take visiting friends and relatives during winter."
+ {:small "http://cloudfront.net/ce7cc9e2-9948-4ca3-9803-87d565168cbb/small.jpg",
+ :medium "http://cloudfront.net/ce7cc9e2-9948-4ca3-9803-87d565168cbb/med.jpg",
+ :large "http://cloudfront.net/ce7cc9e2-9948-4ca3-9803-87d565168cbb/large.jpg"}
+ {:name "Sameer's GMO-Free Restaurant", :categories ["GMO-Free" "Restaurant"], :phone "415-128-9430", :id "7ac8a7dd-c07f-45a6-92ba-bdb1b1280af2"}
+ {:service "flare", :username "tupac"}]
+ ["Pacific Heights Pizza Bakery is a great and swell place to take a date on Thursdays."
+ {:small "http://cloudfront.net/76d68d0c-7118-41eb-9c5b-b45c1096b791/small.jpg",
+ :medium "http://cloudfront.net/76d68d0c-7118-41eb-9c5b-b45c1096b791/med.jpg",
+ :large "http://cloudfront.net/76d68d0c-7118-41eb-9c5b-b45c1096b791/large.jpg"}
+ {:name "Pacific Heights Pizza Bakery", :categories ["Pizza" "Bakery"], :phone "415-006-0149", :id "7fda37a5-810f-4902-b571-54afe583f0dd"}
+ {:service "facebook", :facebook-photo-id "f420e2a8-13ce-4753-b30e-493d6e59f7ce", :url "http://facebook.com/photos/f420e2a8-13ce-4753-b30e-493d6e59f7ce"}]
+ ["Lucky's Gluten-Free Gastro Pub is a exclusive and overrated place to nurse a hangover in June."
+ {:small "http://cloudfront.net/8651fa50-125f-47bf-99ec-2e950facd1fd/small.jpg",
+ :medium "http://cloudfront.net/8651fa50-125f-47bf-99ec-2e950facd1fd/med.jpg",
+ :large "http://cloudfront.net/8651fa50-125f-47bf-99ec-2e950facd1fd/large.jpg"}
+ {:name "Lucky's Gluten-Free Gastro Pub", :categories ["Gluten-Free" "Gastro Pub"], :phone "415-391-6443", :id "7ccf8bbb-74b4-48f7-aa7c-43872f63cb1b"}
+ {:service "yelp", :yelp-photo-id "22fac240-8066-4a4d-a3a4-08c268bca17d", :categories ["Gluten-Free" "Gastro Pub"]}]
+ ["Oakland Low-Carb Bakery is a classic and modern place to have brunch weekday afternoons."
+ {:small "http://cloudfront.net/ecb14fc2-cbc6-4f8f-b879-c6884bec5fb0/small.jpg",
+ :medium "http://cloudfront.net/ecb14fc2-cbc6-4f8f-b879-c6884bec5fb0/med.jpg",
+ :large "http://cloudfront.net/ecb14fc2-cbc6-4f8f-b879-c6884bec5fb0/large.jpg"}
+ {:name "Oakland Low-Carb Bakery", :categories ["Low-Carb" "Bakery"], :phone "415-546-0101", :id "da7dd72d-60fb-495b-a2c0-1e2ae73a1a86"}
+ {:service "flare", :username "jane"}]
+ ["Tenderloin Gormet Restaurant is a underground and classic place to have breakfast weekend mornings."
+ {:small "http://cloudfront.net/d40b4507-d30a-4c0c-a1da-bf78e510607d/small.jpg",
+ :medium "http://cloudfront.net/d40b4507-d30a-4c0c-a1da-bf78e510607d/med.jpg",
+ :large "http://cloudfront.net/d40b4507-d30a-4c0c-a1da-bf78e510607d/large.jpg"}
+ {:name "Tenderloin Gormet Restaurant", :categories ["Gormet" "Restaurant"], :phone "415-127-4197", :id "54a9eac8-d80d-4af8-b6d7-34651a60e59c"}
+ {:service "flare", :username "joe"}]
+ ["SoMa TaquerÃa Diner is a historical and world-famous place to watch the Warriors game on Saturday night."
+ {:small "http://cloudfront.net/1e4cb1bb-ec7a-45b4-bcd8-230a32350a51/small.jpg",
+ :medium "http://cloudfront.net/1e4cb1bb-ec7a-45b4-bcd8-230a32350a51/med.jpg",
+ :large "http://cloudfront.net/1e4cb1bb-ec7a-45b4-bcd8-230a32350a51/large.jpg"}
+ {:name "SoMa TaquerÃa Diner", :categories ["TaquerÃa" "Diner"], :phone "415-947-9521", :id "f97ede4a-074f-4e24-babc-5c44f2be9c36"}
+ {:service "flare", :username "lucky_pigeon"}]
+ ["Kyle's Low-Carb Grill is a world-famous and amazing place to nurse a hangover on Thursdays."
+ {:small "http://cloudfront.net/7cf33495-cc12-499d-b243-53100bd76df6/small.jpg",
+ :medium "http://cloudfront.net/7cf33495-cc12-499d-b243-53100bd76df6/med.jpg",
+ :large "http://cloudfront.net/7cf33495-cc12-499d-b243-53100bd76df6/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "facebook", :facebook-photo-id "9edda8de-49c1-41f7-8c22-06c0fc7cfc10", :url "http://facebook.com/photos/9edda8de-49c1-41f7-8c22-06c0fc7cfc10"}]
+ ["Haight Soul Food Pop-Up Food Stand is a modern and acceptable place to watch the Warriors game in the spring."
+ {:small "http://cloudfront.net/be0f6011-ee1b-47ae-9d71-d7e8561e25a1/small.jpg",
+ :medium "http://cloudfront.net/be0f6011-ee1b-47ae-9d71-d7e8561e25a1/med.jpg",
+ :large "http://cloudfront.net/be0f6011-ee1b-47ae-9d71-d7e8561e25a1/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "facebook", :facebook-photo-id "234f4d52-f5b6-4214-9fbc-13ae88e25cdb", :url "http://facebook.com/photos/234f4d52-f5b6-4214-9fbc-13ae88e25cdb"}]
+ ["Rasta's Paleo Churros is a fantastic and classic place to nurse a hangover during summer."
+ {:small "http://cloudfront.net/51726cf2-f9af-476c-9eea-e8ef16a03cc4/small.jpg",
+ :medium "http://cloudfront.net/51726cf2-f9af-476c-9eea-e8ef16a03cc4/med.jpg",
+ :large "http://cloudfront.net/51726cf2-f9af-476c-9eea-e8ef16a03cc4/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "foursquare", :foursquare-photo-id "ced4f00d-21ed-4b10-90f6-8d5db5cc24e7", :mayor "bob"}]
+ ["Rasta's Paleo Churros is a fantastic and delicious place to take a date when hungover."
+ {:small "http://cloudfront.net/3ebb84e2-a51e-4e2d-913b-3e20974f0ed5/small.jpg",
+ :medium "http://cloudfront.net/3ebb84e2-a51e-4e2d-913b-3e20974f0ed5/med.jpg",
+ :large "http://cloudfront.net/3ebb84e2-a51e-4e2d-913b-3e20974f0ed5/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "flare", :username "mandy"}]
+ ["SF Afgan Restaurant is a groovy and family-friendly place to have a after-work cocktail weekend mornings."
+ {:small "http://cloudfront.net/6ad9e353-e342-4aa3-beca-dff8a2c80506/small.jpg",
+ :medium "http://cloudfront.net/6ad9e353-e342-4aa3-beca-dff8a2c80506/med.jpg",
+ :large "http://cloudfront.net/6ad9e353-e342-4aa3-beca-dff8a2c80506/large.jpg"}
+ {:name "SF Afgan Restaurant", :categories ["Afgan" "Restaurant"], :phone "415-451-4697", :id "66ccc68a-db9a-470c-a17b-7764d23daced"}
+ {:service "flare", :username "biggie"}]
+ ["Mission Homestyle Churros is a historical and well-decorated place to catch a bite to eat weekend evenings."
+ {:small "http://cloudfront.net/f00dd865-2e18-4924-aa16-fb50cc0829de/small.jpg",
+ :medium "http://cloudfront.net/f00dd865-2e18-4924-aa16-fb50cc0829de/med.jpg",
+ :large "http://cloudfront.net/f00dd865-2e18-4924-aa16-fb50cc0829de/large.jpg"}
+ {:name "Mission Homestyle Churros", :categories ["Homestyle" "Churros"], :phone "415-343-4489", :id "21d903d3-8bdb-4b7d-b288-6063ad48af44"}
+ {:service "twitter", :mentions ["@mission_homestyle_churros"], :tags ["#homestyle" "#churros"], :username "biggie"}]
+ ["Pacific Heights Free-Range Eatery is a groovy and overrated place to sip a glass of expensive wine in the spring."
+ {:small "http://cloudfront.net/7ca05f25-488c-47ec-b308-9ac9aa506f3a/small.jpg",
+ :medium "http://cloudfront.net/7ca05f25-488c-47ec-b308-9ac9aa506f3a/med.jpg",
+ :large "http://cloudfront.net/7ca05f25-488c-47ec-b308-9ac9aa506f3a/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "yelp", :yelp-photo-id "8ebf793a-f6e8-4113-8d3b-769d6eb1a0bf", :categories ["Free-Range" "Eatery"]}]
+ ["Marina Cage-Free Liquor Store is a delicious and fantastic place to nurse a hangover during summer."
+ {:small "http://cloudfront.net/39c91431-8787-4240-b706-911793d6826c/small.jpg",
+ :medium "http://cloudfront.net/39c91431-8787-4240-b706-911793d6826c/med.jpg",
+ :large "http://cloudfront.net/39c91431-8787-4240-b706-911793d6826c/large.jpg"}
+ {:name "Marina Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-571-0783", :id "ad68f549-3000-407e-ab98-7f314cfa4653"}
+ {:service "foursquare", :foursquare-photo-id "1a1168ce-aa45-485f-a427-309eeb536510", :mayor "cam_saul"}]
+ ["Tenderloin Red White & Blue Pizzeria is a atmospheric and atmospheric place to nurse a hangover during winter."
+ {:small "http://cloudfront.net/fcf38a30-edfb-4dd0-b2e1-91ddfae20425/small.jpg",
+ :medium "http://cloudfront.net/fcf38a30-edfb-4dd0-b2e1-91ddfae20425/med.jpg",
+ :large "http://cloudfront.net/fcf38a30-edfb-4dd0-b2e1-91ddfae20425/large.jpg"}
+ {:name "Tenderloin Red White & Blue Pizzeria", :categories ["Red White & Blue" "Pizzeria"], :phone "415-719-8143", :id "eba3dbcd-100a-4f38-a701-e0dec157f437"}
+ {:service "yelp", :yelp-photo-id "989113fd-f95f-4e62-ac21-a428e2b72334", :categories ["Red White & Blue" "Pizzeria"]}]
+ ["Polk St. Mexican Coffee House is a classic and swell place to watch the Giants game weekend mornings."
+ {:small "http://cloudfront.net/ffe98db7-7824-4685-99ec-eaebf63d9248/small.jpg",
+ :medium "http://cloudfront.net/ffe98db7-7824-4685-99ec-eaebf63d9248/med.jpg",
+ :large "http://cloudfront.net/ffe98db7-7824-4685-99ec-eaebf63d9248/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "facebook", :facebook-photo-id "4384296d-a41c-44c8-bff9-a5d64bb01f44", :url "http://facebook.com/photos/4384296d-a41c-44c8-bff9-a5d64bb01f44"}]
+ ["Mission Chinese Liquor Store is a horrible and atmospheric place to have a birthday party when hungover."
+ {:small "http://cloudfront.net/9c3f49c7-3924-4213-b09d-aaa9db7993f3/small.jpg",
+ :medium "http://cloudfront.net/9c3f49c7-3924-4213-b09d-aaa9db7993f3/med.jpg",
+ :large "http://cloudfront.net/9c3f49c7-3924-4213-b09d-aaa9db7993f3/large.jpg"}
+ {:name "Mission Chinese Liquor Store", :categories ["Chinese" "Liquor Store"], :phone "415-906-6919", :id "00132b5b-31fc-46f0-a288-f547f23477ee"}
+ {:service "yelp", :yelp-photo-id "4623b716-fb61-4349-8f79-cef3706d6b0d", :categories ["Chinese" "Liquor Store"]}]
+ ["Tenderloin Gormet Restaurant is a overrated and swell place to nurse a hangover in June."
+ {:small "http://cloudfront.net/817b3f0f-3cee-48ac-bfec-9b5ad18d8350/small.jpg",
+ :medium "http://cloudfront.net/817b3f0f-3cee-48ac-bfec-9b5ad18d8350/med.jpg",
+ :large "http://cloudfront.net/817b3f0f-3cee-48ac-bfec-9b5ad18d8350/large.jpg"}
+ {:name "Tenderloin Gormet Restaurant", :categories ["Gormet" "Restaurant"], :phone "415-127-4197", :id "54a9eac8-d80d-4af8-b6d7-34651a60e59c"}
+ {:service "yelp", :yelp-photo-id "a4e6c1c8-afaf-48ed-b18d-755f9c6dd4b6", :categories ["Gormet" "Restaurant"]}]
+ ["Tenderloin Paleo Hotel & Restaurant is a modern and groovy place to pitch an investor the second Saturday of the month."
+ {:small "http://cloudfront.net/8357d4c5-a502-4b71-ab70-25a5090ac16c/small.jpg",
+ :medium "http://cloudfront.net/8357d4c5-a502-4b71-ab70-25a5090ac16c/med.jpg",
+ :large "http://cloudfront.net/8357d4c5-a502-4b71-ab70-25a5090ac16c/large.jpg"}
+ {:name "Tenderloin Paleo Hotel & Restaurant", :categories ["Paleo" "Hotel & Restaurant"], :phone "415-402-1652", :id "4dea27b4-6d89-4b86-80a8-5631e171da8d"}
+ {:service "flare", :username "biggie"}]
+ ["Pacific Heights Free-Range Eatery is a underground and family-friendly place to have a after-work cocktail with friends."
+ {:small "http://cloudfront.net/7a4260f9-efef-4e28-8c78-4b2d2f36d30d/small.jpg",
+ :medium "http://cloudfront.net/7a4260f9-efef-4e28-8c78-4b2d2f36d30d/med.jpg",
+ :large "http://cloudfront.net/7a4260f9-efef-4e28-8c78-4b2d2f36d30d/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "yelp", :yelp-photo-id "cc9465c4-b3af-45f1-aa0d-8b38c5a6a366", :categories ["Free-Range" "Eatery"]}]
+ ["Lower Pac Heights Deep-Dish Ice Cream Truck is a classic and atmospheric place to meet new friends weekend mornings."
+ {:small "http://cloudfront.net/e7bf1145-72d9-4229-b464-d33209e3549a/small.jpg",
+ :medium "http://cloudfront.net/e7bf1145-72d9-4229-b464-d33209e3549a/med.jpg",
+ :large "http://cloudfront.net/e7bf1145-72d9-4229-b464-d33209e3549a/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Ice Cream Truck", :categories ["Deep-Dish" "Ice Cream Truck"], :phone "415-495-1414", :id "d5efa2f2-496d-41b2-8b85-3d002a22a2bc"}
+ {:service "yelp", :yelp-photo-id "6b5975f9-77f6-4375-be86-5fd047a5493a", :categories ["Deep-Dish" "Ice Cream Truck"]}]
+ ["Mission BBQ Churros is a family-friendly and delicious place to people-watch on Saturday night."
+ {:small "http://cloudfront.net/24d757ff-5f11-4864-8395-744c78e36ade/small.jpg",
+ :medium "http://cloudfront.net/24d757ff-5f11-4864-8395-744c78e36ade/med.jpg",
+ :large "http://cloudfront.net/24d757ff-5f11-4864-8395-744c78e36ade/large.jpg"}
+ {:name "Mission BBQ Churros", :categories ["BBQ" "Churros"], :phone "415-406-5374", :id "429ea81a-02c5-449f-bfa7-03a11b227f1f"}
+ {:service "yelp", :yelp-photo-id "dd02f753-593e-4bc5-b370-08a6fe46de96", :categories ["BBQ" "Churros"]}]
+ ["Pacific Heights Soul Food Coffee House is a family-friendly and wonderful place to pitch an investor weekday afternoons."
+ {:small "http://cloudfront.net/24928248-5bf6-4a49-a2aa-2331d9d83990/small.jpg",
+ :medium "http://cloudfront.net/24928248-5bf6-4a49-a2aa-2331d9d83990/med.jpg",
+ :large "http://cloudfront.net/24928248-5bf6-4a49-a2aa-2331d9d83990/large.jpg"}
+ {:name "Pacific Heights Soul Food Coffee House", :categories ["Soul Food" "Coffee House"], :phone "415-838-3464", :id "6aed1816-4c64-4f76-8e2a-619528e5b48d"}
+ {:service "twitter", :mentions ["@pacific_heights_soul_food_coffee_house"], :tags ["#soul" "#food" "#coffee" "#house"], :username "mandy"}]
+ ["Mission Soul Food Pizzeria is a groovy and underground place to take visiting friends and relatives in July."
+ {:small "http://cloudfront.net/c60e9321-eae7-43a9-aa60-654d6be34177/small.jpg",
+ :medium "http://cloudfront.net/c60e9321-eae7-43a9-aa60-654d6be34177/med.jpg",
+ :large "http://cloudfront.net/c60e9321-eae7-43a9-aa60-654d6be34177/large.jpg"}
+ {:name "Mission Soul Food Pizzeria", :categories ["Soul Food" "Pizzeria"], :phone "415-437-3479", :id "9905fe61-44cb-4626-843b-5d725c7949bb"}
+ {:service "yelp", :yelp-photo-id "bf759d74-af3f-4a57-addb-1349f2b2f8c9", :categories ["Soul Food" "Pizzeria"]}]
+ ["Chinatown American Bakery is a decent and great place to have brunch during winter."
+ {:small "http://cloudfront.net/301b02c7-4539-4713-9d5f-3f478ca2b2c3/small.jpg",
+ :medium "http://cloudfront.net/301b02c7-4539-4713-9d5f-3f478ca2b2c3/med.jpg",
+ :large "http://cloudfront.net/301b02c7-4539-4713-9d5f-3f478ca2b2c3/large.jpg"}
+ {:name "Chinatown American Bakery", :categories ["American" "Bakery"], :phone "415-658-7393", :id "cf55cdbd-c614-4be1-8496-0e11b195d16f"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["Cam's Old-Fashioned Coffee House is a groovy and popular place to have a birthday party in the fall."
+ {:small "http://cloudfront.net/1aed40ef-77a4-4207-9bc5-c657fad18f61/small.jpg",
+ :medium "http://cloudfront.net/1aed40ef-77a4-4207-9bc5-c657fad18f61/med.jpg",
+ :large "http://cloudfront.net/1aed40ef-77a4-4207-9bc5-c657fad18f61/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-868-2973", :id "27592c2b-e682-44bb-be28-8e9a622becca"}
+ {:service "twitter", :mentions ["@cams_old_fashioned_coffee_house"], :tags ["#old-fashioned" "#coffee" "#house"], :username "lucky_pigeon"}]
+ ["Pacific Heights No-MSG Sushi is a well-decorated and amazing place to conduct a business meeting in the fall."
+ {:small "http://cloudfront.net/4e1edf59-97fa-456b-94ff-bc82c7282d86/small.jpg",
+ :medium "http://cloudfront.net/4e1edf59-97fa-456b-94ff-bc82c7282d86/med.jpg",
+ :large "http://cloudfront.net/4e1edf59-97fa-456b-94ff-bc82c7282d86/large.jpg"}
+ {:name "Pacific Heights No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-354-9547", :id "b15b66a8-f3da-4b65-8156-80f5518fdd5a"}
+ {:service "facebook", :facebook-photo-id "251a7bf8-73d3-44b8-9f55-2ee0048158d1", :url "http://facebook.com/photos/251a7bf8-73d3-44b8-9f55-2ee0048158d1"}]
+ ["Mission Chinese Liquor Store is a underappreciated and acceptable place to have breakfast with friends."
+ {:small "http://cloudfront.net/4276a5e5-3821-4fba-bf48-32c8d9fb2ba1/small.jpg",
+ :medium "http://cloudfront.net/4276a5e5-3821-4fba-bf48-32c8d9fb2ba1/med.jpg",
+ :large "http://cloudfront.net/4276a5e5-3821-4fba-bf48-32c8d9fb2ba1/large.jpg"}
+ {:name "Mission Chinese Liquor Store", :categories ["Chinese" "Liquor Store"], :phone "415-906-6919", :id "00132b5b-31fc-46f0-a288-f547f23477ee"}
+ {:service "facebook", :facebook-photo-id "b2fa77dd-6e6d-440e-8f12-caa3ea7c120c", :url "http://facebook.com/photos/b2fa77dd-6e6d-440e-8f12-caa3ea7c120c"}]
+ ["Kyle's Old-Fashioned Pop-Up Food Stand is a underappreciated and groovy place to catch a bite to eat on a Tuesday afternoon."
+ {:small "http://cloudfront.net/36d9d88d-a911-4e0e-911a-16645a2d939e/small.jpg",
+ :medium "http://cloudfront.net/36d9d88d-a911-4e0e-911a-16645a2d939e/med.jpg",
+ :large "http://cloudfront.net/36d9d88d-a911-4e0e-911a-16645a2d939e/large.jpg"}
+ {:name "Kyle's Old-Fashioned Pop-Up Food Stand", :categories ["Old-Fashioned" "Pop-Up Food Stand"], :phone "415-638-8972", :id "7da187e8-bd01-48ca-ad93-7a02a442d9eb"}
+ {:service "flare", :username "sameer"}]
+ ["Sameer's GMO-Free Restaurant is a groovy and modern place to people-watch after baseball games."
+ {:small "http://cloudfront.net/74209bf9-650b-4130-8095-95ce2caf22bf/small.jpg",
+ :medium "http://cloudfront.net/74209bf9-650b-4130-8095-95ce2caf22bf/med.jpg",
+ :large "http://cloudfront.net/74209bf9-650b-4130-8095-95ce2caf22bf/large.jpg"}
+ {:name "Sameer's GMO-Free Restaurant", :categories ["GMO-Free" "Restaurant"], :phone "415-128-9430", :id "7ac8a7dd-c07f-45a6-92ba-bdb1b1280af2"}
+ {:service "twitter", :mentions ["@sameers_gmo_free_restaurant"], :tags ["#gmo-free" "#restaurant"], :username "tupac"}]
+ ["Haight Soul Food Pop-Up Food Stand is a underground and modern place to have breakfast on a Tuesday afternoon."
+ {:small "http://cloudfront.net/8f613909-550f-4d79-96f6-dc498ff65d1b/small.jpg",
+ :medium "http://cloudfront.net/8f613909-550f-4d79-96f6-dc498ff65d1b/med.jpg",
+ :large "http://cloudfront.net/8f613909-550f-4d79-96f6-dc498ff65d1b/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "twitter", :mentions ["@haight_soul_food_pop_up_food_stand"], :tags ["#soul" "#food" "#pop-up" "#food" "#stand"], :username "kyle"}]
+ ["Pacific Heights Irish Grill is a acceptable and world-famous place to have a after-work cocktail on Saturday night."
+ {:small "http://cloudfront.net/a7c43f41-345f-43ce-8bb9-48b4717d1cfd/small.jpg",
+ :medium "http://cloudfront.net/a7c43f41-345f-43ce-8bb9-48b4717d1cfd/med.jpg",
+ :large "http://cloudfront.net/a7c43f41-345f-43ce-8bb9-48b4717d1cfd/large.jpg"}
+ {:name "Pacific Heights Irish Grill", :categories ["Irish" "Grill"], :phone "415-491-2202", :id "d6b92dfc-56e9-4f65-b1d0-595f120043d9"}
+ {:service "flare", :username "mandy"}]
+ ["Mission Homestyle Churros is a decent and horrible place to pitch an investor on Taco Tuesday."
+ {:small "http://cloudfront.net/da92cb40-5920-49cf-b065-4cb558f201df/small.jpg",
+ :medium "http://cloudfront.net/da92cb40-5920-49cf-b065-4cb558f201df/med.jpg",
+ :large "http://cloudfront.net/da92cb40-5920-49cf-b065-4cb558f201df/large.jpg"}
+ {:name "Mission Homestyle Churros", :categories ["Homestyle" "Churros"], :phone "415-343-4489", :id "21d903d3-8bdb-4b7d-b288-6063ad48af44"}
+ {:service "flare", :username "sameer"}]
+ ["Haight Soul Food Sushi is a well-decorated and wonderful place to drink a craft beer with friends."
+ {:small "http://cloudfront.net/918a829c-61a2-439f-8607-b5c42f39345c/small.jpg",
+ :medium "http://cloudfront.net/918a829c-61a2-439f-8607-b5c42f39345c/med.jpg",
+ :large "http://cloudfront.net/918a829c-61a2-439f-8607-b5c42f39345c/large.jpg"}
+ {:name "Haight Soul Food Sushi", :categories ["Soul Food" "Sushi"], :phone "415-371-8026", :id "b4df5eb7-d8cd-431d-9d43-381984ec81ae"}
+ {:service "foursquare", :foursquare-photo-id "95609cc6-1197-4713-bc72-7e3e799dbb6c", :mayor "jessica"}]
+ ["Market St. Homestyle Pop-Up Food Stand is a historical and great place to nurse a hangover weekday afternoons."
+ {:small "http://cloudfront.net/8f9473e3-1128-4383-8f9d-3a2009b97f56/small.jpg",
+ :medium "http://cloudfront.net/8f9473e3-1128-4383-8f9d-3a2009b97f56/med.jpg",
+ :large "http://cloudfront.net/8f9473e3-1128-4383-8f9d-3a2009b97f56/large.jpg"}
+ {:name "Market St. Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-213-3030", :id "2d873280-e43d-449e-9940-af96ae7df718"}
+ {:service "foursquare", :foursquare-photo-id "002d03c2-9c91-4160-a9e8-4603ae977245", :mayor "sameer"}]
+ ["Sameer's European Sushi is a atmospheric and horrible place to take a date on Taco Tuesday."
+ {:small "http://cloudfront.net/e0767b0f-2938-4e84-be6f-9c7e6ba8ff82/small.jpg",
+ :medium "http://cloudfront.net/e0767b0f-2938-4e84-be6f-9c7e6ba8ff82/med.jpg",
+ :large "http://cloudfront.net/e0767b0f-2938-4e84-be6f-9c7e6ba8ff82/large.jpg"}
+ {:name "Sameer's European Sushi", :categories ["European" "Sushi"], :phone "415-035-2474", :id "7de6b3ef-7b53-4831-bf76-43123874f8ce"}
+ {:service "yelp", :yelp-photo-id "6ccfda4c-84d2-4108-8cb1-699d28cd1574", :categories ["European" "Sushi"]}]
+ ["Polk St. Korean Taqueria is a family-friendly and horrible place to take a date in the spring."
+ {:small "http://cloudfront.net/53a88ef8-505f-4923-9a13-eb686c6e7f25/small.jpg",
+ :medium "http://cloudfront.net/53a88ef8-505f-4923-9a13-eb686c6e7f25/med.jpg",
+ :large "http://cloudfront.net/53a88ef8-505f-4923-9a13-eb686c6e7f25/large.jpg"}
+ {:name "Polk St. Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-511-5531", :id "ddb09b32-6f0b-4e54-98c7-14398f16ca4e"}
+ {:service "flare", :username "bob"}]
+ ["Polk St. Red White & Blue Café is a popular and swell place to have a birthday party in June."
+ {:small "http://cloudfront.net/eed1df2e-ed28-4a7c-a9b4-9b6511837414/small.jpg",
+ :medium "http://cloudfront.net/eed1df2e-ed28-4a7c-a9b4-9b6511837414/med.jpg",
+ :large "http://cloudfront.net/eed1df2e-ed28-4a7c-a9b4-9b6511837414/large.jpg"}
+ {:name "Polk St. Red White & Blue Café", :categories ["Red White & Blue" "Café"], :phone "415-986-0661", :id "6eb9d2db-5015-49f0-bd18-f4c4938b7e5a"}
+ {:service "facebook", :facebook-photo-id "276865a5-e7d3-40f6-a2b2-62172caf3024", :url "http://facebook.com/photos/276865a5-e7d3-40f6-a2b2-62172caf3024"}]
+ ["Lucky's Gluten-Free Gastro Pub is a underappreciated and historical place to watch the Warriors game with friends."
+ {:small "http://cloudfront.net/4020585b-9a66-4cb1-b5f2-2e7e3a1d26c2/small.jpg",
+ :medium "http://cloudfront.net/4020585b-9a66-4cb1-b5f2-2e7e3a1d26c2/med.jpg",
+ :large "http://cloudfront.net/4020585b-9a66-4cb1-b5f2-2e7e3a1d26c2/large.jpg"}
+ {:name "Lucky's Gluten-Free Gastro Pub", :categories ["Gluten-Free" "Gastro Pub"], :phone "415-391-6443", :id "7ccf8bbb-74b4-48f7-aa7c-43872f63cb1b"}
+ {:service "flare", :username "kyle"}]
+ ["Rasta's Paleo Café is a decent and swell place to have a drink weekend evenings."
+ {:small "http://cloudfront.net/7bdece4f-bc76-46a3-bbf6-c8a9c2012e79/small.jpg",
+ :medium "http://cloudfront.net/7bdece4f-bc76-46a3-bbf6-c8a9c2012e79/med.jpg",
+ :large "http://cloudfront.net/7bdece4f-bc76-46a3-bbf6-c8a9c2012e79/large.jpg"}
+ {:name "Rasta's Paleo Café", :categories ["Paleo" "Café"], :phone "415-392-6341", :id "4f9e69be-f06c-46a0-bb8b-f3ddd8218ca1"}
+ {:service "facebook", :facebook-photo-id "26cff009-fce9-4439-a263-39df23a3b143", :url "http://facebook.com/photos/26cff009-fce9-4439-a263-39df23a3b143"}]
+ ["Polk St. Mexican Coffee House is a modern and historical place to have brunch when hungover."
+ {:small "http://cloudfront.net/34084c76-3ff7-4bf0-a0f9-bcf9a3767f03/small.jpg",
+ :medium "http://cloudfront.net/34084c76-3ff7-4bf0-a0f9-bcf9a3767f03/med.jpg",
+ :large "http://cloudfront.net/34084c76-3ff7-4bf0-a0f9-bcf9a3767f03/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "yelp", :yelp-photo-id "b82466db-dddb-451c-ba09-47d520df8730", :categories ["Mexican" "Coffee House"]}]
+ ["Polk St. Korean Taqueria is a amazing and classic place to take visiting friends and relatives weekend evenings."
+ {:small "http://cloudfront.net/95f2673c-fa99-4429-918d-45095a699691/small.jpg",
+ :medium "http://cloudfront.net/95f2673c-fa99-4429-918d-45095a699691/med.jpg",
+ :large "http://cloudfront.net/95f2673c-fa99-4429-918d-45095a699691/large.jpg"}
+ {:name "Polk St. Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-511-5531", :id "ddb09b32-6f0b-4e54-98c7-14398f16ca4e"}
+ {:service "foursquare", :foursquare-photo-id "686a4c8a-51ca-4f6b-b216-d4b53dc11944", :mayor "rasta_toucan"}]
+ ["Pacific Heights Free-Range Eatery is a groovy and swell place to sip a glass of expensive wine during summer."
+ {:small "http://cloudfront.net/10f63b40-459d-446a-9bc9-a7a6a078d77a/small.jpg",
+ :medium "http://cloudfront.net/10f63b40-459d-446a-9bc9-a7a6a078d77a/med.jpg",
+ :large "http://cloudfront.net/10f63b40-459d-446a-9bc9-a7a6a078d77a/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "flare", :username "sameer"}]
+ ["Market St. Low-Carb Taqueria is a delicious and groovy place to watch the Warriors game with friends."
+ {:small "http://cloudfront.net/1d458234-44b2-47f7-9038-1110a9a0dc0d/small.jpg",
+ :medium "http://cloudfront.net/1d458234-44b2-47f7-9038-1110a9a0dc0d/med.jpg",
+ :large "http://cloudfront.net/1d458234-44b2-47f7-9038-1110a9a0dc0d/large.jpg"}
+ {:name "Market St. Low-Carb Taqueria", :categories ["Low-Carb" "Taqueria"], :phone "415-751-6525", :id "f30eb85b-f048-4d8c-8008-3c2876125061"}
+ {:service "facebook", :facebook-photo-id "b136f58c-6b1f-433b-bce8-c803040ff9bd", :url "http://facebook.com/photos/b136f58c-6b1f-433b-bce8-c803040ff9bd"}]
+ ["Pacific Heights Pizza Bakery is a classic and historical place to meet new friends during winter."
+ {:small "http://cloudfront.net/903495d4-56b9-4ac6-a141-fd30ad37f00c/small.jpg",
+ :medium "http://cloudfront.net/903495d4-56b9-4ac6-a141-fd30ad37f00c/med.jpg",
+ :large "http://cloudfront.net/903495d4-56b9-4ac6-a141-fd30ad37f00c/large.jpg"}
+ {:name "Pacific Heights Pizza Bakery", :categories ["Pizza" "Bakery"], :phone "415-006-0149", :id "7fda37a5-810f-4902-b571-54afe583f0dd"}
+ {:service "facebook", :facebook-photo-id "024c7142-3009-4fcc-9094-f7975b939e80", :url "http://facebook.com/photos/024c7142-3009-4fcc-9094-f7975b939e80"}]
+ ["Polk St. Mexican Coffee House is a horrible and underground place to have brunch with friends."
+ {:small "http://cloudfront.net/4c06d251-8f13-4195-b5d6-68857091b26f/small.jpg",
+ :medium "http://cloudfront.net/4c06d251-8f13-4195-b5d6-68857091b26f/med.jpg",
+ :large "http://cloudfront.net/4c06d251-8f13-4195-b5d6-68857091b26f/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "flare", :username "lucky_pigeon"}]
+ ["Marina Low-Carb Food Truck is a swell and world-famous place to watch the Warriors game with friends."
+ {:small "http://cloudfront.net/95b4c506-0290-4042-ba97-de6d46d23cbe/small.jpg",
+ :medium "http://cloudfront.net/95b4c506-0290-4042-ba97-de6d46d23cbe/med.jpg",
+ :large "http://cloudfront.net/95b4c506-0290-4042-ba97-de6d46d23cbe/large.jpg"}
+ {:name "Marina Low-Carb Food Truck", :categories ["Low-Carb" "Food Truck"], :phone "415-748-3513", :id "a13a5beb-19de-40ca-a334-02df3bdf5285"}
+ {:service "facebook", :facebook-photo-id "10073113-dee8-47d0-a994-eb84a3099ad4", :url "http://facebook.com/photos/10073113-dee8-47d0-a994-eb84a3099ad4"}]
+ ["Haight Soul Food Pop-Up Food Stand is a exclusive and amazing place to nurse a hangover during summer."
+ {:small "http://cloudfront.net/fd764dce-022d-45ca-80ac-6603f807de11/small.jpg",
+ :medium "http://cloudfront.net/fd764dce-022d-45ca-80ac-6603f807de11/med.jpg",
+ :large "http://cloudfront.net/fd764dce-022d-45ca-80ac-6603f807de11/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "yelp", :yelp-photo-id "59df02f3-5581-43bb-8875-ce689355302d", :categories ["Soul Food" "Pop-Up Food Stand"]}]
+ ["Polk St. Red White & Blue Café is a family-friendly and wonderful place to have brunch weekday afternoons."
+ {:small "http://cloudfront.net/0e61715d-c180-4fd0-942a-1917392c5b18/small.jpg",
+ :medium "http://cloudfront.net/0e61715d-c180-4fd0-942a-1917392c5b18/med.jpg",
+ :large "http://cloudfront.net/0e61715d-c180-4fd0-942a-1917392c5b18/large.jpg"}
+ {:name "Polk St. Red White & Blue Café", :categories ["Red White & Blue" "Café"], :phone "415-986-0661", :id "6eb9d2db-5015-49f0-bd18-f4c4938b7e5a"}
+ {:service "facebook", :facebook-photo-id "061a7423-a561-4ed6-9b75-20053659738c", :url "http://facebook.com/photos/061a7423-a561-4ed6-9b75-20053659738c"}]
+ ["Rasta's Paleo Churros is a classic and overrated place to catch a bite to eat in June."
+ {:small "http://cloudfront.net/6298f645-2abd-4b53-821a-6d3d1dd5eab7/small.jpg",
+ :medium "http://cloudfront.net/6298f645-2abd-4b53-821a-6d3d1dd5eab7/med.jpg",
+ :large "http://cloudfront.net/6298f645-2abd-4b53-821a-6d3d1dd5eab7/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "yelp", :yelp-photo-id "3326a855-2959-486f-a0f3-21c21211361f", :categories ["Paleo" "Churros"]}]
+ ["Nob Hill Korean Taqueria is a great and popular place to take a date when hungover."
+ {:small "http://cloudfront.net/0717cf07-cc25-4938-82ad-582fbb27753c/small.jpg",
+ :medium "http://cloudfront.net/0717cf07-cc25-4938-82ad-582fbb27753c/med.jpg",
+ :large "http://cloudfront.net/0717cf07-cc25-4938-82ad-582fbb27753c/large.jpg"}
+ {:name "Nob Hill Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-107-7332", :id "a43c184c-90f5-488c-bb3b-00ea2666d90e"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["Tenderloin Japanese Ice Cream Truck is a swell and acceptable place to nurse a hangover on Thursdays."
+ {:small "http://cloudfront.net/aa6e3b77-7eba-4817-8510-e1e19e96ae2a/small.jpg",
+ :medium "http://cloudfront.net/aa6e3b77-7eba-4817-8510-e1e19e96ae2a/med.jpg",
+ :large "http://cloudfront.net/aa6e3b77-7eba-4817-8510-e1e19e96ae2a/large.jpg"}
+ {:name "Tenderloin Japanese Ice Cream Truck", :categories ["Japanese" "Ice Cream Truck"], :phone "415-856-0371", :id "5ce47baa-bbef-4bc7-adf6-57842913ea8a"}
+ {:service "yelp", :yelp-photo-id "cc977fda-1fb0-4e78-8699-1558c5f42e69", :categories ["Japanese" "Ice Cream Truck"]}]
+ ["Haight Soul Food Sushi is a decent and swell place to conduct a business meeting in the spring."
+ {:small "http://cloudfront.net/677835f0-ba4f-40b1-bd8b-993760fa3117/small.jpg",
+ :medium "http://cloudfront.net/677835f0-ba4f-40b1-bd8b-993760fa3117/med.jpg",
+ :large "http://cloudfront.net/677835f0-ba4f-40b1-bd8b-993760fa3117/large.jpg"}
+ {:name "Haight Soul Food Sushi", :categories ["Soul Food" "Sushi"], :phone "415-371-8026", :id "b4df5eb7-d8cd-431d-9d43-381984ec81ae"}
+ {:service "yelp", :yelp-photo-id "40052a53-f10e-4d38-806f-d88d2e77faf2", :categories ["Soul Food" "Sushi"]}]
+ ["Kyle's Low-Carb Grill is a classic and wonderful place to have a drink when hungover."
+ {:small "http://cloudfront.net/7f021f2d-479e-4115-a0ad-18115f906184/small.jpg",
+ :medium "http://cloudfront.net/7f021f2d-479e-4115-a0ad-18115f906184/med.jpg",
+ :large "http://cloudfront.net/7f021f2d-479e-4115-a0ad-18115f906184/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "flare", :username "mandy"}]
+ ["Rasta's Paleo Churros is a modern and horrible place to watch the Giants game on Taco Tuesday."
+ {:small "http://cloudfront.net/cb993d22-054e-4848-ac71-ad7071d1df7f/small.jpg",
+ :medium "http://cloudfront.net/cb993d22-054e-4848-ac71-ad7071d1df7f/med.jpg",
+ :large "http://cloudfront.net/cb993d22-054e-4848-ac71-ad7071d1df7f/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "foursquare", :foursquare-photo-id "ed2871fe-d033-4d81-87b1-86550a879d9c", :mayor "rasta_toucan"}]
+ ["Kyle's Chinese Restaurant is a delicious and well-decorated place to pitch an investor the first Sunday of the month."
+ {:small "http://cloudfront.net/750fb652-b5a7-4107-8c46-8e28bc3e86f6/small.jpg",
+ :medium "http://cloudfront.net/750fb652-b5a7-4107-8c46-8e28bc3e86f6/med.jpg",
+ :large "http://cloudfront.net/750fb652-b5a7-4107-8c46-8e28bc3e86f6/large.jpg"}
+ {:name "Kyle's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-298-9499", :id "de08b3c7-9929-40d8-8c20-dd9317613c17"}
+ {:service "yelp", :yelp-photo-id "964cf5f3-9d68-4fa5-8fff-93d09fe23f13", :categories ["Chinese" "Restaurant"]}]
+ ["Rasta's Paleo Café is a exclusive and popular place to sip Champagne on Saturday night."
+ {:small "http://cloudfront.net/5faf0fda-041a-446d-aba4-54b7a6ceaa18/small.jpg",
+ :medium "http://cloudfront.net/5faf0fda-041a-446d-aba4-54b7a6ceaa18/med.jpg",
+ :large "http://cloudfront.net/5faf0fda-041a-446d-aba4-54b7a6ceaa18/large.jpg"}
+ {:name "Rasta's Paleo Café", :categories ["Paleo" "Café"], :phone "415-392-6341", :id "4f9e69be-f06c-46a0-bb8b-f3ddd8218ca1"}
+ {:service "facebook", :facebook-photo-id "0fc82427-48c6-468d-8813-9dca3289e519", :url "http://facebook.com/photos/0fc82427-48c6-468d-8813-9dca3289e519"}]
+ ["Kyle's Free-Range Taqueria is a horrible and exclusive place to sip a glass of expensive wine with your pet toucan."
+ {:small "http://cloudfront.net/865964d4-35c0-40e2-9029-584fc6f393ce/small.jpg",
+ :medium "http://cloudfront.net/865964d4-35c0-40e2-9029-584fc6f393ce/med.jpg",
+ :large "http://cloudfront.net/865964d4-35c0-40e2-9029-584fc6f393ce/large.jpg"}
+ {:name "Kyle's Free-Range Taqueria", :categories ["Free-Range" "Taqueria"], :phone "415-201-7832", :id "7aeb9416-4fe6-45f9-8849-6b8ba6d3f3b9"}
+ {:service "foursquare", :foursquare-photo-id "6c35de08-10de-4ca4-acb8-a659d005f73c", :mayor "bob"}]
+ ["Sunset Deep-Dish Hotel & Restaurant is a modern and acceptable place to take visiting friends and relatives the second Saturday of the month."
+ {:small "http://cloudfront.net/896eef7b-8a70-4706-a70f-f8fbf75acffc/small.jpg",
+ :medium "http://cloudfront.net/896eef7b-8a70-4706-a70f-f8fbf75acffc/med.jpg",
+ :large "http://cloudfront.net/896eef7b-8a70-4706-a70f-f8fbf75acffc/large.jpg"}
+ {:name "Sunset Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-332-0978", :id "a80745c7-af74-4579-8932-70dd488269e6"}
+ {:service "foursquare", :foursquare-photo-id "6b2657cc-f404-4507-99d0-89df941c8c19", :mayor "jessica"}]
+ ["Rasta's European Taqueria is a fantastic and great place to watch the Warriors game weekend mornings."
+ {:small "http://cloudfront.net/11b7f47b-1a68-43a9-b3be-0228fa19c70c/small.jpg",
+ :medium "http://cloudfront.net/11b7f47b-1a68-43a9-b3be-0228fa19c70c/med.jpg",
+ :large "http://cloudfront.net/11b7f47b-1a68-43a9-b3be-0228fa19c70c/large.jpg"}
+ {:name "Rasta's European Taqueria", :categories ["European" "Taqueria"], :phone "415-631-1599", :id "cb472880-ee6e-46e3-bd58-22cf33109aba"}
+ {:service "yelp", :yelp-photo-id "d2f7fc44-73f5-4c46-b6ac-b4407bb0df0e", :categories ["European" "Taqueria"]}]
+ ["Joe's Homestyle Eatery is a amazing and delicious place to have a drink when hungover."
+ {:small "http://cloudfront.net/90957931-5a61-49dd-ab52-bdcf648e370f/small.jpg",
+ :medium "http://cloudfront.net/90957931-5a61-49dd-ab52-bdcf648e370f/med.jpg",
+ :large "http://cloudfront.net/90957931-5a61-49dd-ab52-bdcf648e370f/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "yelp", :yelp-photo-id "e5070b25-6933-44e9-a96b-bc7273c13616", :categories ["Homestyle" "Eatery"]}]
+ ["SoMa Japanese Churros is a acceptable and horrible place to have a birthday party with your pet dog."
+ {:small "http://cloudfront.net/91e5dd78-7a6d-4384-8252-943b8a860a2d/small.jpg",
+ :medium "http://cloudfront.net/91e5dd78-7a6d-4384-8252-943b8a860a2d/med.jpg",
+ :large "http://cloudfront.net/91e5dd78-7a6d-4384-8252-943b8a860a2d/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "flare", :username "tupac"}]
+ ["Haight Soul Food Pop-Up Food Stand is a groovy and swell place to have breakfast when hungover."
+ {:small "http://cloudfront.net/4337bc10-99dc-4f86-a9c2-a64e9d1804da/small.jpg",
+ :medium "http://cloudfront.net/4337bc10-99dc-4f86-a9c2-a64e9d1804da/med.jpg",
+ :large "http://cloudfront.net/4337bc10-99dc-4f86-a9c2-a64e9d1804da/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "flare", :username "amy"}]
+ ["Mission Free-Range Liquor Store is a exclusive and horrible place to have a birthday party Friday nights."
+ {:small "http://cloudfront.net/ba5c2732-f133-41c7-b3aa-4b627710733b/small.jpg",
+ :medium "http://cloudfront.net/ba5c2732-f133-41c7-b3aa-4b627710733b/med.jpg",
+ :large "http://cloudfront.net/ba5c2732-f133-41c7-b3aa-4b627710733b/large.jpg"}
+ {:name "Mission Free-Range Liquor Store", :categories ["Free-Range" "Liquor Store"], :phone "415-041-3816", :id "6e665924-8e2c-42ab-af58-23a27f017e37"}
+ {:service "foursquare", :foursquare-photo-id "532267f2-2b66-4adc-8c51-b8ee4509e548", :mayor "kyle"}]
+ ["Rasta's Paleo Café is a delicious and delicious place to drink a craft beer in June."
+ {:small "http://cloudfront.net/c8302d26-6053-438a-9ac4-979699496d0f/small.jpg",
+ :medium "http://cloudfront.net/c8302d26-6053-438a-9ac4-979699496d0f/med.jpg",
+ :large "http://cloudfront.net/c8302d26-6053-438a-9ac4-979699496d0f/large.jpg"}
+ {:name "Rasta's Paleo Café", :categories ["Paleo" "Café"], :phone "415-392-6341", :id "4f9e69be-f06c-46a0-bb8b-f3ddd8218ca1"}
+ {:service "facebook", :facebook-photo-id "7b6c29d2-078d-4feb-af95-88f10dc8937b", :url "http://facebook.com/photos/7b6c29d2-078d-4feb-af95-88f10dc8937b"}]
+ ["Mission Soul Food Pizzeria is a family-friendly and acceptable place to sip Champagne in June."
+ {:small "http://cloudfront.net/1ec9c182-6624-4444-8a7f-71c2058c0b0d/small.jpg",
+ :medium "http://cloudfront.net/1ec9c182-6624-4444-8a7f-71c2058c0b0d/med.jpg",
+ :large "http://cloudfront.net/1ec9c182-6624-4444-8a7f-71c2058c0b0d/large.jpg"}
+ {:name "Mission Soul Food Pizzeria", :categories ["Soul Food" "Pizzeria"], :phone "415-437-3479", :id "9905fe61-44cb-4626-843b-5d725c7949bb"}
+ {:service "twitter", :mentions ["@mission_soul_food_pizzeria"], :tags ["#soul" "#food" "#pizzeria"], :username "cam_saul"}]
+ ["Tenderloin Japanese Ice Cream Truck is a horrible and decent place to pitch an investor on Saturday night."
+ {:small "http://cloudfront.net/f818171e-344f-45e2-b0b7-d1ef9fc75866/small.jpg",
+ :medium "http://cloudfront.net/f818171e-344f-45e2-b0b7-d1ef9fc75866/med.jpg",
+ :large "http://cloudfront.net/f818171e-344f-45e2-b0b7-d1ef9fc75866/large.jpg"}
+ {:name "Tenderloin Japanese Ice Cream Truck", :categories ["Japanese" "Ice Cream Truck"], :phone "415-856-0371", :id "5ce47baa-bbef-4bc7-adf6-57842913ea8a"}
+ {:service "flare", :username "bob"}]
+ ["Tenderloin Paleo Hotel & Restaurant is a decent and great place to drink a craft beer on Thursdays."
+ {:small "http://cloudfront.net/33738a8e-ee82-45da-919d-e8739f7600e8/small.jpg",
+ :medium "http://cloudfront.net/33738a8e-ee82-45da-919d-e8739f7600e8/med.jpg",
+ :large "http://cloudfront.net/33738a8e-ee82-45da-919d-e8739f7600e8/large.jpg"}
+ {:name "Tenderloin Paleo Hotel & Restaurant", :categories ["Paleo" "Hotel & Restaurant"], :phone "415-402-1652", :id "4dea27b4-6d89-4b86-80a8-5631e171da8d"}
+ {:service "flare", :username "amy"}]
+ ["Lucky's Low-Carb Coffee House is a horrible and historical place to take a date on a Tuesday afternoon."
+ {:small "http://cloudfront.net/e81790b7-b61d-4c97-a11d-d29414d5f3f6/small.jpg",
+ :medium "http://cloudfront.net/e81790b7-b61d-4c97-a11d-d29414d5f3f6/med.jpg",
+ :large "http://cloudfront.net/e81790b7-b61d-4c97-a11d-d29414d5f3f6/large.jpg"}
+ {:name "Lucky's Low-Carb Coffee House", :categories ["Low-Carb" "Coffee House"], :phone "415-145-7107", :id "81b0f944-f0ce-45e5-b84e-a924c441064a"}
+ {:service "flare", :username "kyle"}]
+ ["Nob Hill Korean Taqueria is a atmospheric and horrible place to sip Champagne on Saturday night."
+ {:small "http://cloudfront.net/6444cc6c-ec22-4e3c-acfe-d1cf028d85b4/small.jpg",
+ :medium "http://cloudfront.net/6444cc6c-ec22-4e3c-acfe-d1cf028d85b4/med.jpg",
+ :large "http://cloudfront.net/6444cc6c-ec22-4e3c-acfe-d1cf028d85b4/large.jpg"}
+ {:name "Nob Hill Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-107-7332", :id "a43c184c-90f5-488c-bb3b-00ea2666d90e"}
+ {:service "flare", :username "bob"}]
+ ["Rasta's Mexican Sushi is a popular and amazing place to nurse a hangover on a Tuesday afternoon."
+ {:small "http://cloudfront.net/586597a8-4d55-4d75-9146-55988033886c/small.jpg",
+ :medium "http://cloudfront.net/586597a8-4d55-4d75-9146-55988033886c/med.jpg",
+ :large "http://cloudfront.net/586597a8-4d55-4d75-9146-55988033886c/large.jpg"}
+ {:name "Rasta's Mexican Sushi", :categories ["Mexican" "Sushi"], :phone "415-387-1284", :id "e4912a22-e6ac-4806-8377-6497bf533a21"}
+ {:service "foursquare", :foursquare-photo-id "0bb00482-d502-4381-9efb-975487a53dc8", :mayor "cam_saul"}]
+ ["Haight Mexican Restaurant is a popular and underground place to drink a craft beer with your pet dog."
+ {:small "http://cloudfront.net/62670450-c60f-4292-b667-4aed5e1ea266/small.jpg",
+ :medium "http://cloudfront.net/62670450-c60f-4292-b667-4aed5e1ea266/med.jpg",
+ :large "http://cloudfront.net/62670450-c60f-4292-b667-4aed5e1ea266/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "foursquare", :foursquare-photo-id "9c94e761-e464-419e-8696-4670f1d9672c", :mayor "amy"}]
+ ["SoMa British Bakery is a swell and fantastic place to take visiting friends and relatives on Saturday night."
+ {:small "http://cloudfront.net/4dc5fa04-8931-456e-b05c-3056fb4b4678/small.jpg",
+ :medium "http://cloudfront.net/4dc5fa04-8931-456e-b05c-3056fb4b4678/med.jpg",
+ :large "http://cloudfront.net/4dc5fa04-8931-456e-b05c-3056fb4b4678/large.jpg"}
+ {:name "SoMa British Bakery", :categories ["British" "Bakery"], :phone "415-909-5728", :id "662cb0d0-8ee6-4db7-aaf1-89eb2530feda"}
+ {:service "flare", :username "jessica"}]
+ ["Market St. Gluten-Free Café is a historical and acceptable place to meet new friends during winter."
+ {:small "http://cloudfront.net/69b12faf-ddb6-491a-986b-a432c44ec881/small.jpg",
+ :medium "http://cloudfront.net/69b12faf-ddb6-491a-986b-a432c44ec881/med.jpg",
+ :large "http://cloudfront.net/69b12faf-ddb6-491a-986b-a432c44ec881/large.jpg"}
+ {:name "Market St. Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-697-9776", :id "ce4947d0-071a-4491-b5ac-f8b0241bd54c"}
+ {:service "twitter", :mentions ["@market_st._gluten_free_café"], :tags ["#gluten-free" "#café"], :username "mandy"}]
+ ["Haight Soul Food Hotel & Restaurant is a amazing and underground place to watch the Warriors game in the spring."
+ {:small "http://cloudfront.net/8ed4e7fd-b105-4b49-8785-01fb01b56408/small.jpg",
+ :medium "http://cloudfront.net/8ed4e7fd-b105-4b49-8785-01fb01b56408/med.jpg",
+ :large "http://cloudfront.net/8ed4e7fd-b105-4b49-8785-01fb01b56408/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "twitter", :mentions ["@haight_soul_food_hotel_&_restaurant"], :tags ["#soul" "#food" "#hotel" "#&" "#restaurant"], :username "joe"}]
+ ["Haight Chinese Gastro Pub is a world-famous and popular place to conduct a business meeting in July."
+ {:small "http://cloudfront.net/65330afd-5c4c-4647-87c6-ac687ea7b542/small.jpg",
+ :medium "http://cloudfront.net/65330afd-5c4c-4647-87c6-ac687ea7b542/med.jpg",
+ :large "http://cloudfront.net/65330afd-5c4c-4647-87c6-ac687ea7b542/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "yelp", :yelp-photo-id "d6adf74a-ac43-4a0d-8895-8a026f4577d6", :categories ["Chinese" "Gastro Pub"]}]
+ ["Polk St. Red White & Blue Café is a groovy and world-famous place to nurse a hangover on Taco Tuesday."
+ {:small "http://cloudfront.net/74df80a0-ead8-4389-a23c-b7126f5898fe/small.jpg",
+ :medium "http://cloudfront.net/74df80a0-ead8-4389-a23c-b7126f5898fe/med.jpg",
+ :large "http://cloudfront.net/74df80a0-ead8-4389-a23c-b7126f5898fe/large.jpg"}
+ {:name "Polk St. Red White & Blue Café", :categories ["Red White & Blue" "Café"], :phone "415-986-0661", :id "6eb9d2db-5015-49f0-bd18-f4c4938b7e5a"}
+ {:service "yelp", :yelp-photo-id "c4683200-8e6c-4e0f-801b-8b5c69263c82", :categories ["Red White & Blue" "Café"]}]
+ ["Rasta's Old-Fashioned Pop-Up Food Stand is a modern and great place to have a after-work cocktail after baseball games."
+ {:small "http://cloudfront.net/104a8586-58c9-4591-a46e-0b37a6a22078/small.jpg",
+ :medium "http://cloudfront.net/104a8586-58c9-4591-a46e-0b37a6a22078/med.jpg",
+ :large "http://cloudfront.net/104a8586-58c9-4591-a46e-0b37a6a22078/large.jpg"}
+ {:name "Rasta's Old-Fashioned Pop-Up Food Stand", :categories ["Old-Fashioned" "Pop-Up Food Stand"], :phone "415-942-1875", :id "9fd8b920-a877-4888-86bf-578b2724ac4e"}
+ {:service "facebook", :facebook-photo-id "0a9c5d13-ab77-4b81-9404-78519055f74f", :url "http://facebook.com/photos/0a9c5d13-ab77-4b81-9404-78519055f74f"}]
+ ["Rasta's European Taqueria is a acceptable and overrated place to have brunch during winter."
+ {:small "http://cloudfront.net/62cbd734-78f4-4309-afbd-4399f6c19325/small.jpg",
+ :medium "http://cloudfront.net/62cbd734-78f4-4309-afbd-4399f6c19325/med.jpg",
+ :large "http://cloudfront.net/62cbd734-78f4-4309-afbd-4399f6c19325/large.jpg"}
+ {:name "Rasta's European Taqueria", :categories ["European" "Taqueria"], :phone "415-631-1599", :id "cb472880-ee6e-46e3-bd58-22cf33109aba"}
+ {:service "flare", :username "lucky_pigeon"}]
+ ["Haight Soul Food Café is a overrated and historical place to watch the Warriors game when hungover."
+ {:small "http://cloudfront.net/85edb88a-a7b8-4c77-aa67-cb937406f07e/small.jpg",
+ :medium "http://cloudfront.net/85edb88a-a7b8-4c77-aa67-cb937406f07e/med.jpg",
+ :large "http://cloudfront.net/85edb88a-a7b8-4c77-aa67-cb937406f07e/large.jpg"}
+ {:name "Haight Soul Food Café", :categories ["Soul Food" "Café"], :phone "415-257-1769", :id "a1796c4b-da2b-474f-9fd6-4fa96c1eac70"}
+ {:service "facebook", :facebook-photo-id "38bdb459-90a7-45d2-815b-ac50f4b945b2", :url "http://facebook.com/photos/38bdb459-90a7-45d2-815b-ac50f4b945b2"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a exclusive and amazing place to pitch an investor with your pet dog."
+ {:small "http://cloudfront.net/2d605283-ac21-4fbb-8fcc-b0c237d95998/small.jpg",
+ :medium "http://cloudfront.net/2d605283-ac21-4fbb-8fcc-b0c237d95998/med.jpg",
+ :large "http://cloudfront.net/2d605283-ac21-4fbb-8fcc-b0c237d95998/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "yelp", :yelp-photo-id "28eec82b-1a47-4e75-970f-ae118d14fcc0", :categories ["Cage-Free" "Coffee House"]}]
+ ["Haight Gormet Pizzeria is a overrated and popular place to have a after-work cocktail with your pet dog."
+ {:small "http://cloudfront.net/36ea3dc3-e9f5-4306-8b38-267eb0080754/small.jpg",
+ :medium "http://cloudfront.net/36ea3dc3-e9f5-4306-8b38-267eb0080754/med.jpg",
+ :large "http://cloudfront.net/36ea3dc3-e9f5-4306-8b38-267eb0080754/large.jpg"}
+ {:name "Haight Gormet Pizzeria", :categories ["Gormet" "Pizzeria"], :phone "415-869-2197", :id "0425bdd0-3f57-4108-80e3-78335327355a"}
+ {:service "foursquare", :foursquare-photo-id "7ad05d8f-924b-4e77-8222-54704df41a83", :mayor "amy"}]
+ ["SF Deep-Dish Eatery is a exclusive and classic place to have a after-work cocktail the first Sunday of the month."
+ {:small "http://cloudfront.net/ade9dbce-8bef-4aa4-836c-3dc0ef024976/small.jpg",
+ :medium "http://cloudfront.net/ade9dbce-8bef-4aa4-836c-3dc0ef024976/med.jpg",
+ :large "http://cloudfront.net/ade9dbce-8bef-4aa4-836c-3dc0ef024976/large.jpg"}
+ {:name "SF Deep-Dish Eatery", :categories ["Deep-Dish" "Eatery"], :phone "415-476-9257", :id "ad41d3f6-c20c-46a7-9e5d-db602fff7d0d"}
+ {:service "facebook", :facebook-photo-id "e149be3f-de3b-4f90-a3d5-fa5a51362a45", :url "http://facebook.com/photos/e149be3f-de3b-4f90-a3d5-fa5a51362a45"}]
+ ["Cam's Soul Food Ice Cream Truck is a overrated and underground place to sip a glass of expensive wine on public holidays."
+ {:small "http://cloudfront.net/30c66e10-c0dc-4439-9d3a-485ebec2b984/small.jpg",
+ :medium "http://cloudfront.net/30c66e10-c0dc-4439-9d3a-485ebec2b984/med.jpg",
+ :large "http://cloudfront.net/30c66e10-c0dc-4439-9d3a-485ebec2b984/large.jpg"}
+ {:name "Cam's Soul Food Ice Cream Truck", :categories ["Soul Food" "Ice Cream Truck"], :phone "415-270-8888", :id "f474e587-1801-43ea-93d5-4c4fd96460b8"}
+ {:service "yelp", :yelp-photo-id "75345d37-3a17-48ac-926c-707fdd1ed073", :categories ["Soul Food" "Ice Cream Truck"]}]
+ ["Haight Soul Food Hotel & Restaurant is a horrible and underappreciated place to have brunch during summer."
+ {:small "http://cloudfront.net/80b32b4f-9d75-4494-bec3-0e4d1c77e592/small.jpg",
+ :medium "http://cloudfront.net/80b32b4f-9d75-4494-bec3-0e4d1c77e592/med.jpg",
+ :large "http://cloudfront.net/80b32b4f-9d75-4494-bec3-0e4d1c77e592/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "twitter", :mentions ["@haight_soul_food_hotel_&_restaurant"], :tags ["#soul" "#food" "#hotel" "#&" "#restaurant"], :username "jane"}]
+ ["Kyle's Japanese Hotel & Restaurant is a well-decorated and underappreciated place to drink a craft beer weekday afternoons."
+ {:small "http://cloudfront.net/375174fb-6d46-4034-aa46-e69d8501c16f/small.jpg",
+ :medium "http://cloudfront.net/375174fb-6d46-4034-aa46-e69d8501c16f/med.jpg",
+ :large "http://cloudfront.net/375174fb-6d46-4034-aa46-e69d8501c16f/large.jpg"}
+ {:name "Kyle's Japanese Hotel & Restaurant", :categories ["Japanese" "Hotel & Restaurant"], :phone "415-337-5387", :id "eced4f41-b627-4553-a297-888871038b69"}
+ {:service "facebook", :facebook-photo-id "7c8ab6a5-f832-4d16-9f5a-e5bb64991845", :url "http://facebook.com/photos/7c8ab6a5-f832-4d16-9f5a-e5bb64991845"}]
+ ["Sameer's GMO-Free Restaurant is a underappreciated and well-decorated place to take a date Friday nights."
+ {:small "http://cloudfront.net/f513fc07-1819-4e27-8459-621ee8daa89b/small.jpg",
+ :medium "http://cloudfront.net/f513fc07-1819-4e27-8459-621ee8daa89b/med.jpg",
+ :large "http://cloudfront.net/f513fc07-1819-4e27-8459-621ee8daa89b/large.jpg"}
+ {:name "Sameer's GMO-Free Restaurant", :categories ["GMO-Free" "Restaurant"], :phone "415-128-9430", :id "7ac8a7dd-c07f-45a6-92ba-bdb1b1280af2"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["Kyle's Free-Range Taqueria is a groovy and classic place to pitch an investor the second Saturday of the month."
+ {:small "http://cloudfront.net/3496607d-7f71-4f4d-a3fb-38a93cb7dc9f/small.jpg",
+ :medium "http://cloudfront.net/3496607d-7f71-4f4d-a3fb-38a93cb7dc9f/med.jpg",
+ :large "http://cloudfront.net/3496607d-7f71-4f4d-a3fb-38a93cb7dc9f/large.jpg"}
+ {:name "Kyle's Free-Range Taqueria", :categories ["Free-Range" "Taqueria"], :phone "415-201-7832", :id "7aeb9416-4fe6-45f9-8849-6b8ba6d3f3b9"}
+ {:service "flare", :username "cam_saul"}]
+ ["Lucky's Gluten-Free Gastro Pub is a atmospheric and wonderful place to drink a craft beer on Thursdays."
+ {:small "http://cloudfront.net/5e5e3ec3-45af-41e3-90fe-aa4923bfff0c/small.jpg",
+ :medium "http://cloudfront.net/5e5e3ec3-45af-41e3-90fe-aa4923bfff0c/med.jpg",
+ :large "http://cloudfront.net/5e5e3ec3-45af-41e3-90fe-aa4923bfff0c/large.jpg"}
+ {:name "Lucky's Gluten-Free Gastro Pub", :categories ["Gluten-Free" "Gastro Pub"], :phone "415-391-6443", :id "7ccf8bbb-74b4-48f7-aa7c-43872f63cb1b"}
+ {:service "yelp", :yelp-photo-id "94ee2c9f-bfcc-462e-9893-6a740cd89edf", :categories ["Gluten-Free" "Gastro Pub"]}]
+ ["Cam's Mexican Gastro Pub is a fantastic and great place to nurse a hangover the second Saturday of the month."
+ {:small "http://cloudfront.net/1682e808-cd81-455c-a146-310951ee9a48/small.jpg",
+ :medium "http://cloudfront.net/1682e808-cd81-455c-a146-310951ee9a48/med.jpg",
+ :large "http://cloudfront.net/1682e808-cd81-455c-a146-310951ee9a48/large.jpg"}
+ {:name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :phone "415-320-9123", :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}
+ {:service "twitter", :mentions ["@cams_mexican_gastro_pub"], :tags ["#mexican" "#gastro" "#pub"], :username "cam_saul"}]
+ ["Marina Cage-Free Liquor Store is a classic and family-friendly place to watch the Giants game weekend evenings."
+ {:small "http://cloudfront.net/4ad99b2b-e8c3-4ee0-b689-4bf4e5f6afc4/small.jpg",
+ :medium "http://cloudfront.net/4ad99b2b-e8c3-4ee0-b689-4bf4e5f6afc4/med.jpg",
+ :large "http://cloudfront.net/4ad99b2b-e8c3-4ee0-b689-4bf4e5f6afc4/large.jpg"}
+ {:name "Marina Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-571-0783", :id "ad68f549-3000-407e-ab98-7f314cfa4653"}
+ {:service "yelp", :yelp-photo-id "3bd9b0c5-4bb3-492f-9f79-b95540dce0a5", :categories ["Cage-Free" "Liquor Store"]}]
+ ["Lucky's Cage-Free Liquor Store is a exclusive and classic place to catch a bite to eat with your pet dog."
+ {:small "http://cloudfront.net/ea6196c8-f2da-4765-9705-24e9d74314a0/small.jpg",
+ :medium "http://cloudfront.net/ea6196c8-f2da-4765-9705-24e9d74314a0/med.jpg",
+ :large "http://cloudfront.net/ea6196c8-f2da-4765-9705-24e9d74314a0/large.jpg"}
+ {:name "Lucky's Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-341-3219", :id "968eac8d-1fd0-443d-a7ff-b48810ab0f69"}
+ {:service "facebook", :facebook-photo-id "ed8f13c6-cb45-4dd5-ab2b-9e5261fe3e7b", :url "http://facebook.com/photos/ed8f13c6-cb45-4dd5-ab2b-9e5261fe3e7b"}]
+ ["Tenderloin Cage-Free Sushi is a well-decorated and popular place to have brunch on Saturday night."
+ {:small "http://cloudfront.net/4e19c71c-f413-4e9e-a802-df85a3ea1ca8/small.jpg",
+ :medium "http://cloudfront.net/4e19c71c-f413-4e9e-a802-df85a3ea1ca8/med.jpg",
+ :large "http://cloudfront.net/4e19c71c-f413-4e9e-a802-df85a3ea1ca8/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "flare", :username "amy"}]
+ ["SoMa Old-Fashioned Pizzeria is a decent and well-decorated place to have a birthday party after baseball games."
+ {:small "http://cloudfront.net/2e81d020-d65b-43ac-abad-32c74d5890b8/small.jpg",
+ :medium "http://cloudfront.net/2e81d020-d65b-43ac-abad-32c74d5890b8/med.jpg",
+ :large "http://cloudfront.net/2e81d020-d65b-43ac-abad-32c74d5890b8/large.jpg"}
+ {:name "SoMa Old-Fashioned Pizzeria", :categories ["Old-Fashioned" "Pizzeria"], :phone "415-966-8856", :id "deb8997b-734d-402b-a181-bd888214bc86"}
+ {:service "twitter", :mentions ["@soma_old_fashioned_pizzeria"], :tags ["#old-fashioned" "#pizzeria"], :username "bob"}]
+ ["Marina Homestyle Pop-Up Food Stand is a groovy and great place to conduct a business meeting with your pet toucan."
+ {:small "http://cloudfront.net/2cf13084-184a-4a3b-9c64-9732b00b2410/small.jpg",
+ :medium "http://cloudfront.net/2cf13084-184a-4a3b-9c64-9732b00b2410/med.jpg",
+ :large "http://cloudfront.net/2cf13084-184a-4a3b-9c64-9732b00b2410/large.jpg"}
+ {:name "Marina Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-094-4567", :id "88a7ae3c-8b36-4901-a0c5-b82342cba6cd"}
+ {:service "flare", :username "sameer"}]
+ ["Sameer's Pizza Liquor Store is a world-famous and underappreciated place to have breakfast the first Sunday of the month."
+ {:small "http://cloudfront.net/2805f64d-9ee0-41e7-b07e-cffe37193efb/small.jpg",
+ :medium "http://cloudfront.net/2805f64d-9ee0-41e7-b07e-cffe37193efb/med.jpg",
+ :large "http://cloudfront.net/2805f64d-9ee0-41e7-b07e-cffe37193efb/large.jpg"}
+ {:name "Sameer's Pizza Liquor Store", :categories ["Pizza" "Liquor Store"], :phone "415-969-7474", :id "7b9c7dc3-d8f1-498d-843a-e62360449892"}
+ {:service "foursquare", :foursquare-photo-id "a06600a6-ab71-4c47-bf7d-9334f0de14a6", :mayor "jessica"}]
+ ["Mission BBQ Churros is a underground and overrated place to have breakfast Friday nights."
+ {:small "http://cloudfront.net/e2e3cd36-f1f4-4a23-b1db-166d87e4bba2/small.jpg",
+ :medium "http://cloudfront.net/e2e3cd36-f1f4-4a23-b1db-166d87e4bba2/med.jpg",
+ :large "http://cloudfront.net/e2e3cd36-f1f4-4a23-b1db-166d87e4bba2/large.jpg"}
+ {:name "Mission BBQ Churros", :categories ["BBQ" "Churros"], :phone "415-406-5374", :id "429ea81a-02c5-449f-bfa7-03a11b227f1f"}
+ {:service "yelp", :yelp-photo-id "500335c8-a480-4d0a-b2e5-fd44f240c668", :categories ["BBQ" "Churros"]}]
+ ["Kyle's Old-Fashioned Pop-Up Food Stand is a amazing and underappreciated place to catch a bite to eat with friends."
+ {:small "http://cloudfront.net/ee0eca87-45da-43e0-b8ad-15e80d4fd00a/small.jpg",
+ :medium "http://cloudfront.net/ee0eca87-45da-43e0-b8ad-15e80d4fd00a/med.jpg",
+ :large "http://cloudfront.net/ee0eca87-45da-43e0-b8ad-15e80d4fd00a/large.jpg"}
+ {:name "Kyle's Old-Fashioned Pop-Up Food Stand", :categories ["Old-Fashioned" "Pop-Up Food Stand"], :phone "415-638-8972", :id "7da187e8-bd01-48ca-ad93-7a02a442d9eb"}
+ {:service "foursquare", :foursquare-photo-id "dab0b46c-7062-4a40-8098-290e126c47df", :mayor "lucky_pigeon"}]
+ ["Nob Hill Free-Range Ice Cream Truck is a decent and classic place to meet new friends during winter."
+ {:small "http://cloudfront.net/98aa0ae9-fc5c-4dad-a643-8d3415b7a95d/small.jpg",
+ :medium "http://cloudfront.net/98aa0ae9-fc5c-4dad-a643-8d3415b7a95d/med.jpg",
+ :large "http://cloudfront.net/98aa0ae9-fc5c-4dad-a643-8d3415b7a95d/large.jpg"}
+ {:name "Nob Hill Free-Range Ice Cream Truck", :categories ["Free-Range" "Ice Cream Truck"], :phone "415-787-4049", :id "08d1e93c-105f-4abf-a9ec-b2e3cd30747e"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["Haight Chinese Gastro Pub is a world-famous and acceptable place to have a birthday party with your pet dog."
+ {:small "http://cloudfront.net/faeeb454-e78f-4f14-84db-4b7acaafe5bb/small.jpg",
+ :medium "http://cloudfront.net/faeeb454-e78f-4f14-84db-4b7acaafe5bb/med.jpg",
+ :large "http://cloudfront.net/faeeb454-e78f-4f14-84db-4b7acaafe5bb/large.jpg"}
+ {:name "Haight Chinese Gastro Pub", :categories ["Chinese" "Gastro Pub"], :phone "415-521-5825", :id "12a8dc6e-1b2c-47e2-9c18-3ae220e4806f"}
+ {:service "foursquare", :foursquare-photo-id "a061d2b6-8c85-4bf4-bc25-9450136340ca", :mayor "rasta_toucan"}]
+ ["Sameer's Pizza Liquor Store is a world-famous and historical place to catch a bite to eat after baseball games."
+ {:small "http://cloudfront.net/ff6df82c-49f2-4061-9369-51ff3d043f61/small.jpg",
+ :medium "http://cloudfront.net/ff6df82c-49f2-4061-9369-51ff3d043f61/med.jpg",
+ :large "http://cloudfront.net/ff6df82c-49f2-4061-9369-51ff3d043f61/large.jpg"}
+ {:name "Sameer's Pizza Liquor Store", :categories ["Pizza" "Liquor Store"], :phone "415-969-7474", :id "7b9c7dc3-d8f1-498d-843a-e62360449892"}
+ {:service "foursquare", :foursquare-photo-id "a45a7d9f-e866-4edf-9594-4229dc893000", :mayor "biggie"}]
+ ["Market St. Low-Carb Taqueria is a well-decorated and modern place to have breakfast weekday afternoons."
+ {:small "http://cloudfront.net/86ecd1d3-5d67-4ff2-9839-4c5858ac1013/small.jpg",
+ :medium "http://cloudfront.net/86ecd1d3-5d67-4ff2-9839-4c5858ac1013/med.jpg",
+ :large "http://cloudfront.net/86ecd1d3-5d67-4ff2-9839-4c5858ac1013/large.jpg"}
+ {:name "Market St. Low-Carb Taqueria", :categories ["Low-Carb" "Taqueria"], :phone "415-751-6525", :id "f30eb85b-f048-4d8c-8008-3c2876125061"}
+ {:service "facebook", :facebook-photo-id "b02f088b-0b6e-4543-bb64-fc46173488c6", :url "http://facebook.com/photos/b02f088b-0b6e-4543-bb64-fc46173488c6"}]
+ ["Joe's Homestyle Eatery is a horrible and historical place to sip a glass of expensive wine Friday nights."
+ {:small "http://cloudfront.net/1f29c79b-7119-4f34-aec1-bc3863b6f392/small.jpg",
+ :medium "http://cloudfront.net/1f29c79b-7119-4f34-aec1-bc3863b6f392/med.jpg",
+ :large "http://cloudfront.net/1f29c79b-7119-4f34-aec1-bc3863b6f392/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "twitter", :mentions ["@joes_homestyle_eatery"], :tags ["#homestyle" "#eatery"], :username "jane"}]
+ ["Market St. Homestyle Pop-Up Food Stand is a popular and delicious place to conduct a business meeting weekday afternoons."
+ {:small "http://cloudfront.net/6caf3094-8900-4461-8b3a-f6c43b3cea3d/small.jpg",
+ :medium "http://cloudfront.net/6caf3094-8900-4461-8b3a-f6c43b3cea3d/med.jpg",
+ :large "http://cloudfront.net/6caf3094-8900-4461-8b3a-f6c43b3cea3d/large.jpg"}
+ {:name "Market St. Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-213-3030", :id "2d873280-e43d-449e-9940-af96ae7df718"}
+ {:service "flare", :username "cam_saul"}]
+ ["Lucky's Afgan Sushi is a historical and fantastic place to catch a bite to eat in the spring."
+ {:small "http://cloudfront.net/f3fb00c6-96fe-4b76-ba66-118e26328fd6/small.jpg",
+ :medium "http://cloudfront.net/f3fb00c6-96fe-4b76-ba66-118e26328fd6/med.jpg",
+ :large "http://cloudfront.net/f3fb00c6-96fe-4b76-ba66-118e26328fd6/large.jpg"}
+ {:name "Lucky's Afgan Sushi", :categories ["Afgan" "Sushi"], :phone "415-188-3506", :id "4a47d0d2-0123-4bb9-b941-38702f0697e9"}
+ {:service "facebook", :facebook-photo-id "97487fd1-61b3-4492-9d4f-45ceba863252", :url "http://facebook.com/photos/97487fd1-61b3-4492-9d4f-45ceba863252"}]
+ ["Market St. Homestyle Pop-Up Food Stand is a overrated and wonderful place to drink a craft beer with your pet toucan."
+ {:small "http://cloudfront.net/af633118-4ae8-450f-b48b-d02d86913e22/small.jpg",
+ :medium "http://cloudfront.net/af633118-4ae8-450f-b48b-d02d86913e22/med.jpg",
+ :large "http://cloudfront.net/af633118-4ae8-450f-b48b-d02d86913e22/large.jpg"}
+ {:name "Market St. Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-213-3030", :id "2d873280-e43d-449e-9940-af96ae7df718"}
+ {:service "flare", :username "tupac"}]
+ ["Sunset Homestyle Grill is a acceptable and classic place to meet new friends in July."
+ {:small "http://cloudfront.net/e495076c-d822-460c-8e1e-eb76d9378433/small.jpg",
+ :medium "http://cloudfront.net/e495076c-d822-460c-8e1e-eb76d9378433/med.jpg",
+ :large "http://cloudfront.net/e495076c-d822-460c-8e1e-eb76d9378433/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "twitter", :mentions ["@sunset_homestyle_grill"], :tags ["#homestyle" "#grill"], :username "mandy"}]
+ ["Polk St. Mexican Coffee House is a overrated and great place to meet new friends on Thursdays."
+ {:small "http://cloudfront.net/7f2cad4a-5bae-4860-af42-59af2b94c90f/small.jpg",
+ :medium "http://cloudfront.net/7f2cad4a-5bae-4860-af42-59af2b94c90f/med.jpg",
+ :large "http://cloudfront.net/7f2cad4a-5bae-4860-af42-59af2b94c90f/large.jpg"}
+ {:name "Polk St. Mexican Coffee House", :categories ["Mexican" "Coffee House"], :phone "415-144-7901", :id "396d36d7-13ad-41fd-86b5-8b70b6ecdabf"}
+ {:service "twitter", :mentions ["@polk_st._mexican_coffee_house"], :tags ["#mexican" "#coffee" "#house"], :username "rasta_toucan"}]
+ ["Marina Low-Carb Food Truck is a exclusive and acceptable place to have breakfast on a Tuesday afternoon."
+ {:small "http://cloudfront.net/b4147277-a95e-4c14-b8de-cdd330292af2/small.jpg",
+ :medium "http://cloudfront.net/b4147277-a95e-4c14-b8de-cdd330292af2/med.jpg",
+ :large "http://cloudfront.net/b4147277-a95e-4c14-b8de-cdd330292af2/large.jpg"}
+ {:name "Marina Low-Carb Food Truck", :categories ["Low-Carb" "Food Truck"], :phone "415-748-3513", :id "a13a5beb-19de-40ca-a334-02df3bdf5285"}
+ {:service "facebook", :facebook-photo-id "83ad3825-1e95-4078-9a3e-902802396114", :url "http://facebook.com/photos/83ad3825-1e95-4078-9a3e-902802396114"}]
+ ["Polk St. Korean Taqueria is a family-friendly and amazing place to conduct a business meeting the second Saturday of the month."
+ {:small "http://cloudfront.net/9eb15f11-015b-497c-86ee-ad3680ab00a8/small.jpg",
+ :medium "http://cloudfront.net/9eb15f11-015b-497c-86ee-ad3680ab00a8/med.jpg",
+ :large "http://cloudfront.net/9eb15f11-015b-497c-86ee-ad3680ab00a8/large.jpg"}
+ {:name "Polk St. Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-511-5531", :id "ddb09b32-6f0b-4e54-98c7-14398f16ca4e"}
+ {:service "foursquare", :foursquare-photo-id "ade689fc-821b-4c22-8e66-cc48a2e4d7b9", :mayor "sameer"}]
+ ["Kyle's Japanese Hotel & Restaurant is a world-famous and world-famous place to have a drink Friday nights."
+ {:small "http://cloudfront.net/8a2fc34f-49ce-4705-85f7-94d0f5847656/small.jpg",
+ :medium "http://cloudfront.net/8a2fc34f-49ce-4705-85f7-94d0f5847656/med.jpg",
+ :large "http://cloudfront.net/8a2fc34f-49ce-4705-85f7-94d0f5847656/large.jpg"}
+ {:name "Kyle's Japanese Hotel & Restaurant", :categories ["Japanese" "Hotel & Restaurant"], :phone "415-337-5387", :id "eced4f41-b627-4553-a297-888871038b69"}
+ {:service "facebook", :facebook-photo-id "e6a59e30-0ffd-4a6f-b4bc-f45ba8c214cf", :url "http://facebook.com/photos/e6a59e30-0ffd-4a6f-b4bc-f45ba8c214cf"}]
+ ["Mission Soul Food Pizzeria is a swell and swell place to pitch an investor with your pet toucan."
+ {:small "http://cloudfront.net/108c11d1-e973-45c2-8c99-86ae460dfb1d/small.jpg",
+ :medium "http://cloudfront.net/108c11d1-e973-45c2-8c99-86ae460dfb1d/med.jpg",
+ :large "http://cloudfront.net/108c11d1-e973-45c2-8c99-86ae460dfb1d/large.jpg"}
+ {:name "Mission Soul Food Pizzeria", :categories ["Soul Food" "Pizzeria"], :phone "415-437-3479", :id "9905fe61-44cb-4626-843b-5d725c7949bb"}
+ {:service "yelp", :yelp-photo-id "0e7ee5ce-7a90-4431-959f-948658ec504c", :categories ["Soul Food" "Pizzeria"]}]
+ ["Alcatraz Pizza Churros is a fantastic and world-famous place to watch the Giants game in the spring."
+ {:small "http://cloudfront.net/c97060df-c900-4330-bc2d-8277ca9844b2/small.jpg",
+ :medium "http://cloudfront.net/c97060df-c900-4330-bc2d-8277ca9844b2/med.jpg",
+ :large "http://cloudfront.net/c97060df-c900-4330-bc2d-8277ca9844b2/large.jpg"}
+ {:name "Alcatraz Pizza Churros", :categories ["Pizza" "Churros"], :phone "415-754-7867", :id "df95e4f1-8719-42af-a15d-3ee00de6e04f"}
+ {:service "foursquare", :foursquare-photo-id "645a21e2-d948-4e57-a2c2-a29c6a6a32d8", :mayor "lucky_pigeon"}]
+ ["Marina No-MSG Sushi is a wonderful and family-friendly place to have a birthday party in July."
+ {:small "http://cloudfront.net/7ad88c11-910e-4e48-b42c-3a2050f6f52b/small.jpg",
+ :medium "http://cloudfront.net/7ad88c11-910e-4e48-b42c-3a2050f6f52b/med.jpg",
+ :large "http://cloudfront.net/7ad88c11-910e-4e48-b42c-3a2050f6f52b/large.jpg"}
+ {:name "Marina No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-856-5937", :id "d51013a3-8547-4705-a5f0-cb11d8206481"}
+ {:service "twitter", :mentions ["@marina_no_msg_sushi"], :tags ["#no-msg" "#sushi"], :username "sameer"}]
+ ["Haight Soul Food Sushi is a groovy and historical place to have a drink weekend evenings."
+ {:small "http://cloudfront.net/87a2f10c-18f9-4382-ab09-c5c8b92835b9/small.jpg",
+ :medium "http://cloudfront.net/87a2f10c-18f9-4382-ab09-c5c8b92835b9/med.jpg",
+ :large "http://cloudfront.net/87a2f10c-18f9-4382-ab09-c5c8b92835b9/large.jpg"}
+ {:name "Haight Soul Food Sushi", :categories ["Soul Food" "Sushi"], :phone "415-371-8026", :id "b4df5eb7-d8cd-431d-9d43-381984ec81ae"}
+ {:service "flare", :username "tupac"}]
+ ["SF British Pop-Up Food Stand is a horrible and amazing place to drink a craft beer with your pet dog."
+ {:small "http://cloudfront.net/25cf609f-25e8-4575-9ce0-e3037368fc53/small.jpg",
+ :medium "http://cloudfront.net/25cf609f-25e8-4575-9ce0-e3037368fc53/med.jpg",
+ :large "http://cloudfront.net/25cf609f-25e8-4575-9ce0-e3037368fc53/large.jpg"}
+ {:name "SF British Pop-Up Food Stand", :categories ["British" "Pop-Up Food Stand"], :phone "415-441-3725", :id "19eac087-7b1c-4668-a26c-d7c02cbcd3f6"}
+ {:service "yelp", :yelp-photo-id "e60013b6-4660-4767-8500-d55ccf154362", :categories ["British" "Pop-Up Food Stand"]}]
+ ["Haight Soul Food Café is a amazing and family-friendly place to take visiting friends and relatives on Saturday night."
+ {:small "http://cloudfront.net/a6b38881-d547-43f5-8a6f-429b73c92321/small.jpg",
+ :medium "http://cloudfront.net/a6b38881-d547-43f5-8a6f-429b73c92321/med.jpg",
+ :large "http://cloudfront.net/a6b38881-d547-43f5-8a6f-429b73c92321/large.jpg"}
+ {:name "Haight Soul Food Café", :categories ["Soul Food" "Café"], :phone "415-257-1769", :id "a1796c4b-da2b-474f-9fd6-4fa96c1eac70"}
+ {:service "flare", :username "sameer"}]
+ ["Oakland European Liquor Store is a wonderful and underappreciated place to people-watch in July."
+ {:small "http://cloudfront.net/09b212d7-4cfe-42d7-92bd-2be6b0c4239a/small.jpg",
+ :medium "http://cloudfront.net/09b212d7-4cfe-42d7-92bd-2be6b0c4239a/med.jpg",
+ :large "http://cloudfront.net/09b212d7-4cfe-42d7-92bd-2be6b0c4239a/large.jpg"}
+ {:name "Oakland European Liquor Store", :categories ["European" "Liquor Store"], :phone "415-559-1516", :id "e342e7b7-e82d-475d-a822-b2df9c84850d"}
+ {:service "flare", :username "rasta_toucan"}]
+ ["Nob Hill Free-Range Ice Cream Truck is a atmospheric and world-famous place to have brunch on Saturday night."
+ {:small "http://cloudfront.net/fcf20e3b-3966-467a-9a91-0a1be39e0c86/small.jpg",
+ :medium "http://cloudfront.net/fcf20e3b-3966-467a-9a91-0a1be39e0c86/med.jpg",
+ :large "http://cloudfront.net/fcf20e3b-3966-467a-9a91-0a1be39e0c86/large.jpg"}
+ {:name "Nob Hill Free-Range Ice Cream Truck", :categories ["Free-Range" "Ice Cream Truck"], :phone "415-787-4049", :id "08d1e93c-105f-4abf-a9ec-b2e3cd30747e"}
+ {:service "flare", :username "jessica"}]
+ ["Lucky's Gluten-Free Gastro Pub is a family-friendly and family-friendly place to watch the Warriors game weekday afternoons."
+ {:small "http://cloudfront.net/4929ecb6-e987-4a98-be9b-aa01ace293b1/small.jpg",
+ :medium "http://cloudfront.net/4929ecb6-e987-4a98-be9b-aa01ace293b1/med.jpg",
+ :large "http://cloudfront.net/4929ecb6-e987-4a98-be9b-aa01ace293b1/large.jpg"}
+ {:name "Lucky's Gluten-Free Gastro Pub", :categories ["Gluten-Free" "Gastro Pub"], :phone "415-391-6443", :id "7ccf8bbb-74b4-48f7-aa7c-43872f63cb1b"}
+ {:service "facebook", :facebook-photo-id "1be63daf-2a0c-4514-a7a3-d20264346b9d", :url "http://facebook.com/photos/1be63daf-2a0c-4514-a7a3-d20264346b9d"}]
+ ["Sunset American Churros is a well-decorated and horrible place to watch the Giants game on public holidays."
+ {:small "http://cloudfront.net/98e6d78e-7926-44d8-b94d-12fa9903485c/small.jpg",
+ :medium "http://cloudfront.net/98e6d78e-7926-44d8-b94d-12fa9903485c/med.jpg",
+ :large "http://cloudfront.net/98e6d78e-7926-44d8-b94d-12fa9903485c/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "yelp", :yelp-photo-id "2852b37d-d922-4259-be12-744fa4bfee02", :categories ["American" "Churros"]}]
+ ["Kyle's European Churros is a family-friendly and fantastic place to have brunch in July."
+ {:small "http://cloudfront.net/33370b35-d26b-48be-a6f0-135d09d82dd6/small.jpg",
+ :medium "http://cloudfront.net/33370b35-d26b-48be-a6f0-135d09d82dd6/med.jpg",
+ :large "http://cloudfront.net/33370b35-d26b-48be-a6f0-135d09d82dd6/large.jpg"}
+ {:name "Kyle's European Churros", :categories ["European" "Churros"], :phone "415-233-8392", :id "5270240c-6e6e-4512-9344-3dc497d6ea49"}
+ {:service "yelp", :yelp-photo-id "c151203a-b7d1-45c7-89c5-f874054cb524", :categories ["European" "Churros"]}]
+ ["Tenderloin Cage-Free Sushi is a world-famous and underground place to drink a craft beer on a Tuesday afternoon."
+ {:small "http://cloudfront.net/6ec6cac2-7492-4432-af7f-291301d03031/small.jpg",
+ :medium "http://cloudfront.net/6ec6cac2-7492-4432-af7f-291301d03031/med.jpg",
+ :large "http://cloudfront.net/6ec6cac2-7492-4432-af7f-291301d03031/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "twitter", :mentions ["@tenderloin_cage_free_sushi"], :tags ["#cage-free" "#sushi"], :username "sameer"}]
+ ["Kyle's Japanese Hotel & Restaurant is a wonderful and decent place to catch a bite to eat with friends."
+ {:small "http://cloudfront.net/d4806e59-38d0-4dc2-87b9-49c4ef406fd1/small.jpg",
+ :medium "http://cloudfront.net/d4806e59-38d0-4dc2-87b9-49c4ef406fd1/med.jpg",
+ :large "http://cloudfront.net/d4806e59-38d0-4dc2-87b9-49c4ef406fd1/large.jpg"}
+ {:name "Kyle's Japanese Hotel & Restaurant", :categories ["Japanese" "Hotel & Restaurant"], :phone "415-337-5387", :id "eced4f41-b627-4553-a297-888871038b69"}
+ {:service "foursquare", :foursquare-photo-id "7efa0b90-41f8-42b4-b148-b981eb3d2c0f", :mayor "cam_saul"}]
+ ["Haight Soul Food Pop-Up Food Stand is a decent and atmospheric place to nurse a hangover weekend mornings."
+ {:small "http://cloudfront.net/73c98d12-5bf9-40a1-b119-708f84d0fc74/small.jpg",
+ :medium "http://cloudfront.net/73c98d12-5bf9-40a1-b119-708f84d0fc74/med.jpg",
+ :large "http://cloudfront.net/73c98d12-5bf9-40a1-b119-708f84d0fc74/large.jpg"}
+ {:name "Haight Soul Food Pop-Up Food Stand", :categories ["Soul Food" "Pop-Up Food Stand"], :phone "415-741-8726", :id "9735184b-1299-410f-a98e-10d9c548af42"}
+ {:service "foursquare", :foursquare-photo-id "87cbe196-2aa6-45d1-87b8-bf9027c655c1", :mayor "cam_saul"}]
+ ["Tenderloin Gluten-Free Bar & Grill is a popular and wonderful place to sip Champagne on Saturday night."
+ {:small "http://cloudfront.net/03a096b6-2326-4e11-9326-29793d4a03d5/small.jpg",
+ :medium "http://cloudfront.net/03a096b6-2326-4e11-9326-29793d4a03d5/med.jpg",
+ :large "http://cloudfront.net/03a096b6-2326-4e11-9326-29793d4a03d5/large.jpg"}
+ {:name "Tenderloin Gluten-Free Bar & Grill", :categories ["Gluten-Free" "Bar & Grill"], :phone "415-904-0956", :id "0d7e235a-eea8-45b3-aaa7-23b4ea2b50f2"}
+ {:service "facebook", :facebook-photo-id "07b3bf42-0187-4f24-9d2a-b6cb5419fe6b", :url "http://facebook.com/photos/07b3bf42-0187-4f24-9d2a-b6cb5419fe6b"}]
+ ["Lower Pac Heights Deep-Dish Ice Cream Truck is a amazing and family-friendly place to have a birthday party Friday nights."
+ {:small "http://cloudfront.net/a93dc0cc-7974-4a90-a899-fdcd468c5f8d/small.jpg",
+ :medium "http://cloudfront.net/a93dc0cc-7974-4a90-a899-fdcd468c5f8d/med.jpg",
+ :large "http://cloudfront.net/a93dc0cc-7974-4a90-a899-fdcd468c5f8d/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Ice Cream Truck", :categories ["Deep-Dish" "Ice Cream Truck"], :phone "415-495-1414", :id "d5efa2f2-496d-41b2-8b85-3d002a22a2bc"}
+ {:service "yelp", :yelp-photo-id "d8cfa65d-018c-4a07-baa5-ef38e019b53e", :categories ["Deep-Dish" "Ice Cream Truck"]}]
+ ["Sunset American Churros is a historical and swell place to catch a bite to eat on a Tuesday afternoon."
+ {:small "http://cloudfront.net/f7e89230-3e54-487f-aa62-c941fa30e833/small.jpg",
+ :medium "http://cloudfront.net/f7e89230-3e54-487f-aa62-c941fa30e833/med.jpg",
+ :large "http://cloudfront.net/f7e89230-3e54-487f-aa62-c941fa30e833/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "yelp", :yelp-photo-id "e73b3ca1-da16-42f7-99ed-11e978abae41", :categories ["American" "Churros"]}]
+ ["Kyle's Low-Carb Grill is a decent and great place to watch the Warriors game in the fall."
+ {:small "http://cloudfront.net/b24e4e79-6771-4b12-b614-eb702200e544/small.jpg",
+ :medium "http://cloudfront.net/b24e4e79-6771-4b12-b614-eb702200e544/med.jpg",
+ :large "http://cloudfront.net/b24e4e79-6771-4b12-b614-eb702200e544/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "foursquare", :foursquare-photo-id "abf79d51-a26b-48f8-8267-28af692327b7", :mayor "lucky_pigeon"}]
+ ["Pacific Heights No-MSG Sushi is a world-famous and groovy place to have breakfast during summer."
+ {:small "http://cloudfront.net/3ee22abf-acd2-433f-9d18-00747bb907b3/small.jpg",
+ :medium "http://cloudfront.net/3ee22abf-acd2-433f-9d18-00747bb907b3/med.jpg",
+ :large "http://cloudfront.net/3ee22abf-acd2-433f-9d18-00747bb907b3/large.jpg"}
+ {:name "Pacific Heights No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-354-9547", :id "b15b66a8-f3da-4b65-8156-80f5518fdd5a"}
+ {:service "facebook", :facebook-photo-id "24bc49af-3dd9-4d57-bd9c-204aacd68eea", :url "http://facebook.com/photos/24bc49af-3dd9-4d57-bd9c-204aacd68eea"}]
+ ["Lower Pac Heights Deep-Dish Liquor Store is a delicious and underappreciated place to have a after-work cocktail in the fall."
+ {:small "http://cloudfront.net/585e25e5-5ae1-403b-acdf-a5069173d053/small.jpg",
+ :medium "http://cloudfront.net/585e25e5-5ae1-403b-acdf-a5069173d053/med.jpg",
+ :large "http://cloudfront.net/585e25e5-5ae1-403b-acdf-a5069173d053/large.jpg"}
+ {:name "Lower Pac Heights Deep-Dish Liquor Store", :categories ["Deep-Dish" "Liquor Store"], :phone "415-497-3039", :id "4d4eabfc-ff1f-4bc6-88b0-2f55489ff666"}
+ {:service "foursquare", :foursquare-photo-id "c57cddd8-4867-43cf-8f71-892e87788b73", :mayor "jessica"}]
+ ["Pacific Heights Free-Range Eatery is a decent and acceptable place to take visiting friends and relatives Friday nights."
+ {:small "http://cloudfront.net/d0f3968e-c660-45eb-9d17-bcd3b9229956/small.jpg",
+ :medium "http://cloudfront.net/d0f3968e-c660-45eb-9d17-bcd3b9229956/med.jpg",
+ :large "http://cloudfront.net/d0f3968e-c660-45eb-9d17-bcd3b9229956/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "twitter", :mentions ["@pacific_heights_free_range_eatery"], :tags ["#free-range" "#eatery"], :username "mandy"}]
+ ["Marina Cage-Free Liquor Store is a popular and wonderful place to take visiting friends and relatives weekend mornings."
+ {:small "http://cloudfront.net/88852ac8-d7e1-4cba-b4e3-ec810088b8a9/small.jpg",
+ :medium "http://cloudfront.net/88852ac8-d7e1-4cba-b4e3-ec810088b8a9/med.jpg",
+ :large "http://cloudfront.net/88852ac8-d7e1-4cba-b4e3-ec810088b8a9/large.jpg"}
+ {:name "Marina Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-571-0783", :id "ad68f549-3000-407e-ab98-7f314cfa4653"}
+ {:service "yelp", :yelp-photo-id "6301ba32-41f7-44ff-872e-3c6f96e34ebb", :categories ["Cage-Free" "Liquor Store"]}]
+ ["Mission Japanese Coffee House is a popular and swell place to have a drink on public holidays."
+ {:small "http://cloudfront.net/5b8270f9-29aa-4d47-8a64-23b26dc7e688/small.jpg",
+ :medium "http://cloudfront.net/5b8270f9-29aa-4d47-8a64-23b26dc7e688/med.jpg",
+ :large "http://cloudfront.net/5b8270f9-29aa-4d47-8a64-23b26dc7e688/large.jpg"}
+ {:name "Mission Japanese Coffee House", :categories ["Japanese" "Coffee House"], :phone "415-561-0506", :id "60dd274e-0cbf-4521-946d-8a4e0f151150"}
+ {:service "yelp", :yelp-photo-id "7c9bc27a-7478-4bec-b6e1-99657346b360", :categories ["Japanese" "Coffee House"]}]
+ ["Joe's Homestyle Eatery is a swell and groovy place to take a date in June."
+ {:small "http://cloudfront.net/6b7c484a-4839-4f61-b32d-690fbffe08d8/small.jpg",
+ :medium "http://cloudfront.net/6b7c484a-4839-4f61-b32d-690fbffe08d8/med.jpg",
+ :large "http://cloudfront.net/6b7c484a-4839-4f61-b32d-690fbffe08d8/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "twitter", :mentions ["@joes_homestyle_eatery"], :tags ["#homestyle" "#eatery"], :username "sameer"}]
+ ["Nob Hill Free-Range Ice Cream Truck is a well-decorated and modern place to watch the Giants game after baseball games."
+ {:small "http://cloudfront.net/f2c105a6-db11-44c4-a0a7-5adac712a5f1/small.jpg",
+ :medium "http://cloudfront.net/f2c105a6-db11-44c4-a0a7-5adac712a5f1/med.jpg",
+ :large "http://cloudfront.net/f2c105a6-db11-44c4-a0a7-5adac712a5f1/large.jpg"}
+ {:name "Nob Hill Free-Range Ice Cream Truck", :categories ["Free-Range" "Ice Cream Truck"], :phone "415-787-4049", :id "08d1e93c-105f-4abf-a9ec-b2e3cd30747e"}
+ {:service "twitter", :mentions ["@nob_hill_free_range_ice_cream_truck"], :tags ["#free-range" "#ice" "#cream" "#truck"], :username "jane"}]
+ ["Lucky's Gluten-Free Café is a horrible and historical place to conduct a business meeting on Saturday night."
+ {:small "http://cloudfront.net/e1af0686-6fdb-415a-baa1-2e076dd1af2a/small.jpg",
+ :medium "http://cloudfront.net/e1af0686-6fdb-415a-baa1-2e076dd1af2a/med.jpg",
+ :large "http://cloudfront.net/e1af0686-6fdb-415a-baa1-2e076dd1af2a/large.jpg"}
+ {:name "Lucky's Gluten-Free Café", :categories ["Gluten-Free" "Café"], :phone "415-740-2328", :id "379af987-ad40-4a93-88a6-0233e1c14649"}
+ {:service "facebook", :facebook-photo-id "f37c703b-0e19-4b91-9fc0-3945524300ed", :url "http://facebook.com/photos/f37c703b-0e19-4b91-9fc0-3945524300ed"}]
+ ["Kyle's Low-Carb Grill is a decent and underground place to have brunch on Taco Tuesday."
+ {:small "http://cloudfront.net/b29b4f66-ef21-47e1-be7e-a3cd319c2110/small.jpg",
+ :medium "http://cloudfront.net/b29b4f66-ef21-47e1-be7e-a3cd319c2110/med.jpg",
+ :large "http://cloudfront.net/b29b4f66-ef21-47e1-be7e-a3cd319c2110/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "flare", :username "kyle"}]
+ ["Rasta's Paleo Churros is a popular and family-friendly place to conduct a business meeting on a Tuesday afternoon."
+ {:small "http://cloudfront.net/ab6f99aa-a1b9-4f3b-904a-fdc16c363827/small.jpg",
+ :medium "http://cloudfront.net/ab6f99aa-a1b9-4f3b-904a-fdc16c363827/med.jpg",
+ :large "http://cloudfront.net/ab6f99aa-a1b9-4f3b-904a-fdc16c363827/large.jpg"}
+ {:name "Rasta's Paleo Churros", :categories ["Paleo" "Churros"], :phone "415-915-0309", :id "3bf48ec6-434b-43b1-be28-7644975ecaf9"}
+ {:service "flare", :username "amy"}]
+ ["Kyle's Old-Fashioned Pop-Up Food Stand is a world-famous and family-friendly place to have a drink with your pet dog."
+ {:small "http://cloudfront.net/7333d3c2-37c6-4a9d-96ab-019ac1174b91/small.jpg",
+ :medium "http://cloudfront.net/7333d3c2-37c6-4a9d-96ab-019ac1174b91/med.jpg",
+ :large "http://cloudfront.net/7333d3c2-37c6-4a9d-96ab-019ac1174b91/large.jpg"}
+ {:name "Kyle's Old-Fashioned Pop-Up Food Stand", :categories ["Old-Fashioned" "Pop-Up Food Stand"], :phone "415-638-8972", :id "7da187e8-bd01-48ca-ad93-7a02a442d9eb"}
+ {:service "foursquare", :foursquare-photo-id "e99162db-5fc6-4164-9537-a35aee30f51c", :mayor "kyle"}]
+ ["Joe's Homestyle Eatery is a horrible and exclusive place to watch the Giants game the first Sunday of the month."
+ {:small "http://cloudfront.net/bd701a19-53c9-4cc2-aecd-f1e3c499493e/small.jpg",
+ :medium "http://cloudfront.net/bd701a19-53c9-4cc2-aecd-f1e3c499493e/med.jpg",
+ :large "http://cloudfront.net/bd701a19-53c9-4cc2-aecd-f1e3c499493e/large.jpg"}
+ {:name "Joe's Homestyle Eatery", :categories ["Homestyle" "Eatery"], :phone "415-950-1337", :id "5cc18489-dfaf-417b-900f-5d1d61b961e8"}
+ {:service "facebook", :facebook-photo-id "87163e8d-0bcf-4d20-b3a8-ab895ddfef15", :url "http://facebook.com/photos/87163e8d-0bcf-4d20-b3a8-ab895ddfef15"}]
+ ["Lucky's Deep-Dish Gastro Pub is a horrible and underground place to have a birthday party with your pet dog."
+ {:small "http://cloudfront.net/30ca52de-38cc-4194-9afb-f8879e55cbf5/small.jpg",
+ :medium "http://cloudfront.net/30ca52de-38cc-4194-9afb-f8879e55cbf5/med.jpg",
+ :large "http://cloudfront.net/30ca52de-38cc-4194-9afb-f8879e55cbf5/large.jpg"}
+ {:name "Lucky's Deep-Dish Gastro Pub", :categories ["Deep-Dish" "Gastro Pub"], :phone "415-487-4085", :id "0136c454-0968-41cd-a237-ceec5724cab8"}
+ {:service "foursquare", :foursquare-photo-id "08c45fbc-d085-4e2d-8b69-3e2d89f457a9", :mayor "amy"}]
+ ["Sameer's GMO-Free Pop-Up Food Stand is a swell and world-famous place to take visiting friends and relatives during summer."
+ {:small "http://cloudfront.net/271d9185-e724-4afd-b3a2-b8d9eee096eb/small.jpg",
+ :medium "http://cloudfront.net/271d9185-e724-4afd-b3a2-b8d9eee096eb/med.jpg",
+ :large "http://cloudfront.net/271d9185-e724-4afd-b3a2-b8d9eee096eb/large.jpg"}
+ {:name "Sameer's GMO-Free Pop-Up Food Stand", :categories ["GMO-Free" "Pop-Up Food Stand"], :phone "415-217-7891", :id "a829efc7-7e03-4e73-b072-83d10d1e3953"}
+ {:service "twitter", :mentions ["@sameers_gmo_free_pop_up_food_stand"], :tags ["#gmo-free" "#pop-up" "#food" "#stand"], :username "joe"}]
+ ["Nob Hill Korean Taqueria is a classic and classic place to take a date after baseball games."
+ {:small "http://cloudfront.net/8f8cfa52-8973-4af0-9226-1df9eda589d9/small.jpg",
+ :medium "http://cloudfront.net/8f8cfa52-8973-4af0-9226-1df9eda589d9/med.jpg",
+ :large "http://cloudfront.net/8f8cfa52-8973-4af0-9226-1df9eda589d9/large.jpg"}
+ {:name "Nob Hill Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-107-7332", :id "a43c184c-90f5-488c-bb3b-00ea2666d90e"}
+ {:service "twitter", :mentions ["@nob_hill_korean_taqueria"], :tags ["#korean" "#taqueria"], :username "amy"}]
+ ["Lucky's Afgan Sushi is a swell and amazing place to drink a craft beer the second Saturday of the month."
+ {:small "http://cloudfront.net/77cdaadd-b53a-48f5-b434-8b9b2262e5cf/small.jpg",
+ :medium "http://cloudfront.net/77cdaadd-b53a-48f5-b434-8b9b2262e5cf/med.jpg",
+ :large "http://cloudfront.net/77cdaadd-b53a-48f5-b434-8b9b2262e5cf/large.jpg"}
+ {:name "Lucky's Afgan Sushi", :categories ["Afgan" "Sushi"], :phone "415-188-3506", :id "4a47d0d2-0123-4bb9-b941-38702f0697e9"}
+ {:service "facebook", :facebook-photo-id "ba479234-45d6-4e25-aba9-5f820f0ba318", :url "http://facebook.com/photos/ba479234-45d6-4e25-aba9-5f820f0ba318"}]
+ ["Lucky's Deep-Dish Gastro Pub is a delicious and amazing place to sip a glass of expensive wine in June."
+ {:small "http://cloudfront.net/9c59add8-379d-4f9a-81a8-7346e88b25d5/small.jpg",
+ :medium "http://cloudfront.net/9c59add8-379d-4f9a-81a8-7346e88b25d5/med.jpg",
+ :large "http://cloudfront.net/9c59add8-379d-4f9a-81a8-7346e88b25d5/large.jpg"}
+ {:name "Lucky's Deep-Dish Gastro Pub", :categories ["Deep-Dish" "Gastro Pub"], :phone "415-487-4085", :id "0136c454-0968-41cd-a237-ceec5724cab8"}
+ {:service "foursquare", :foursquare-photo-id "8c374317-71fe-4112-ab02-53450a771d48", :mayor "joe"}]
+ ["Pacific Heights Free-Range Eatery is a exclusive and wonderful place to pitch an investor in July."
+ {:small "http://cloudfront.net/fe3f8af1-a494-48af-b6c2-a4d16f99c506/small.jpg",
+ :medium "http://cloudfront.net/fe3f8af1-a494-48af-b6c2-a4d16f99c506/med.jpg",
+ :large "http://cloudfront.net/fe3f8af1-a494-48af-b6c2-a4d16f99c506/large.jpg"}
+ {:name "Pacific Heights Free-Range Eatery", :categories ["Free-Range" "Eatery"], :phone "415-901-6541", :id "88b361c8-ce69-4b2e-b0f2-9deedd574af6"}
+ {:service "flare", :username "cam_saul"}]
+ ["Tenderloin Cage-Free Sushi is a fantastic and modern place to take a date during summer."
+ {:small "http://cloudfront.net/546084bf-adf8-4f19-9a77-09b06e67c07d/small.jpg",
+ :medium "http://cloudfront.net/546084bf-adf8-4f19-9a77-09b06e67c07d/med.jpg",
+ :large "http://cloudfront.net/546084bf-adf8-4f19-9a77-09b06e67c07d/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "twitter", :mentions ["@tenderloin_cage_free_sushi"], :tags ["#cage-free" "#sushi"], :username "sameer"}]
+ ["Polk St. Japanese Liquor Store is a delicious and decent place to drink a craft beer the first Sunday of the month."
+ {:small "http://cloudfront.net/3f9ee642-6113-4d6c-ba97-2e51be75474f/small.jpg",
+ :medium "http://cloudfront.net/3f9ee642-6113-4d6c-ba97-2e51be75474f/med.jpg",
+ :large "http://cloudfront.net/3f9ee642-6113-4d6c-ba97-2e51be75474f/large.jpg"}
+ {:name "Polk St. Japanese Liquor Store", :categories ["Japanese" "Liquor Store"], :phone "415-726-7986", :id "b57ceac5-328d-4b65-9909-a1f9abc93015"}
+ {:service "facebook", :facebook-photo-id "4e3e3372-d489-4ec6-9b80-c3615d7bb110", :url "http://facebook.com/photos/4e3e3372-d489-4ec6-9b80-c3615d7bb110"}]
+ ["Sunset Homestyle Grill is a overrated and popular place to have a after-work cocktail weekday afternoons."
+ {:small "http://cloudfront.net/27bffcc4-0017-4759-aeb9-5b78d1bf7ec3/small.jpg",
+ :medium "http://cloudfront.net/27bffcc4-0017-4759-aeb9-5b78d1bf7ec3/med.jpg",
+ :large "http://cloudfront.net/27bffcc4-0017-4759-aeb9-5b78d1bf7ec3/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "facebook", :facebook-photo-id "e40f9858-278e-4b0f-aa49-57295cdad381", :url "http://facebook.com/photos/e40f9858-278e-4b0f-aa49-57295cdad381"}]
+ ["Cam's Old-Fashioned Coffee House is a groovy and popular place to conduct a business meeting weekend evenings."
+ {:small "http://cloudfront.net/ef480d7a-3256-450b-9631-b38e9848a3f3/small.jpg",
+ :medium "http://cloudfront.net/ef480d7a-3256-450b-9631-b38e9848a3f3/med.jpg",
+ :large "http://cloudfront.net/ef480d7a-3256-450b-9631-b38e9848a3f3/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-868-2973", :id "27592c2b-e682-44bb-be28-8e9a622becca"}
+ {:service "flare", :username "jane"}]
+ ["Joe's Modern Coffee House is a swell and swell place to catch a bite to eat in the spring."
+ {:small "http://cloudfront.net/95a7cf90-5437-4f75-9bee-e61c08daca75/small.jpg",
+ :medium "http://cloudfront.net/95a7cf90-5437-4f75-9bee-e61c08daca75/med.jpg",
+ :large "http://cloudfront.net/95a7cf90-5437-4f75-9bee-e61c08daca75/large.jpg"}
+ {:name "Joe's Modern Coffee House", :categories ["Modern" "Coffee House"], :phone "415-331-5269", :id "cd9e3610-9ead-4f0b-ad93-cd53611d49fe"}
+ {:service "foursquare", :foursquare-photo-id "a81b8c97-cde1-40d8-8a54-05fc2c6074b4", :mayor "rasta_toucan"}]
+ ["Marina Homestyle Pop-Up Food Stand is a exclusive and modern place to have brunch the second Saturday of the month."
+ {:small "http://cloudfront.net/a9541f11-91c0-4a36-bb2f-5b41fcd7d6f9/small.jpg",
+ :medium "http://cloudfront.net/a9541f11-91c0-4a36-bb2f-5b41fcd7d6f9/med.jpg",
+ :large "http://cloudfront.net/a9541f11-91c0-4a36-bb2f-5b41fcd7d6f9/large.jpg"}
+ {:name "Marina Homestyle Pop-Up Food Stand", :categories ["Homestyle" "Pop-Up Food Stand"], :phone "415-094-4567", :id "88a7ae3c-8b36-4901-a0c5-b82342cba6cd"}
+ {:service "twitter", :mentions ["@marina_homestyle_pop_up_food_stand"], :tags ["#homestyle" "#pop-up" "#food" "#stand"], :username "biggie"}]
+ ["Mission Japanese Coffee House is a amazing and decent place to catch a bite to eat on public holidays."
+ {:small "http://cloudfront.net/4af17c4d-013b-47b6-83af-46fce1f5ceba/small.jpg",
+ :medium "http://cloudfront.net/4af17c4d-013b-47b6-83af-46fce1f5ceba/med.jpg",
+ :large "http://cloudfront.net/4af17c4d-013b-47b6-83af-46fce1f5ceba/large.jpg"}
+ {:name "Mission Japanese Coffee House", :categories ["Japanese" "Coffee House"], :phone "415-561-0506", :id "60dd274e-0cbf-4521-946d-8a4e0f151150"}
+ {:service "foursquare", :foursquare-photo-id "c628a149-96fc-4ece-a89c-d07f0d57bc83", :mayor "biggie"}]
+ ["Kyle's Free-Range Taqueria is a underground and groovy place to have a drink during summer."
+ {:small "http://cloudfront.net/c7533c61-98b3-4592-b02c-15d34d4b2da6/small.jpg",
+ :medium "http://cloudfront.net/c7533c61-98b3-4592-b02c-15d34d4b2da6/med.jpg",
+ :large "http://cloudfront.net/c7533c61-98b3-4592-b02c-15d34d4b2da6/large.jpg"}
+ {:name "Kyle's Free-Range Taqueria", :categories ["Free-Range" "Taqueria"], :phone "415-201-7832", :id "7aeb9416-4fe6-45f9-8849-6b8ba6d3f3b9"}
+ {:service "foursquare", :foursquare-photo-id "29bdfc7c-9766-463f-a8c0-4568fa583604", :mayor "bob"}]
+ ["Sameer's GMO-Free Pop-Up Food Stand is a delicious and family-friendly place to people-watch weekday afternoons."
+ {:small "http://cloudfront.net/dffdba53-41d7-4b09-bacd-9dacd98f576d/small.jpg",
+ :medium "http://cloudfront.net/dffdba53-41d7-4b09-bacd-9dacd98f576d/med.jpg",
+ :large "http://cloudfront.net/dffdba53-41d7-4b09-bacd-9dacd98f576d/large.jpg"}
+ {:name "Sameer's GMO-Free Pop-Up Food Stand", :categories ["GMO-Free" "Pop-Up Food Stand"], :phone "415-217-7891", :id "a829efc7-7e03-4e73-b072-83d10d1e3953"}
+ {:service "facebook", :facebook-photo-id "8a7c76a5-9099-4e2e-b6d8-8eebe10acf72", :url "http://facebook.com/photos/8a7c76a5-9099-4e2e-b6d8-8eebe10acf72"}]
+ ["Mission Japanese Coffee House is a underappreciated and delicious place to drink a craft beer on public holidays."
+ {:small "http://cloudfront.net/6326e639-414c-4a23-8997-d6165cf61ea5/small.jpg",
+ :medium "http://cloudfront.net/6326e639-414c-4a23-8997-d6165cf61ea5/med.jpg",
+ :large "http://cloudfront.net/6326e639-414c-4a23-8997-d6165cf61ea5/large.jpg"}
+ {:name "Mission Japanese Coffee House", :categories ["Japanese" "Coffee House"], :phone "415-561-0506", :id "60dd274e-0cbf-4521-946d-8a4e0f151150"}
+ {:service "yelp", :yelp-photo-id "ec651838-e2d7-45c1-8b8a-70f80f87fae5", :categories ["Japanese" "Coffee House"]}]
+ ["Cam's Mexican Gastro Pub is a historical and underappreciated place to conduct a business meeting with friends."
+ {:small "http://cloudfront.net/6e3a5256-275f-4056-b61a-25990b4bb484/small.jpg",
+ :medium "http://cloudfront.net/6e3a5256-275f-4056-b61a-25990b4bb484/med.jpg",
+ :large "http://cloudfront.net/6e3a5256-275f-4056-b61a-25990b4bb484/large.jpg"}
+ {:name "Cam's Mexican Gastro Pub", :categories ["Mexican" "Gastro Pub"], :phone "415-320-9123", :id "bb958ac5-758e-4f42-b984-6b0e13f25194"}
+ {:service "twitter", :mentions ["@cams_mexican_gastro_pub"], :tags ["#mexican" "#gastro" "#pub"], :username "kyle"}]
+ ["Haight Mexican Restaurant is a well-decorated and popular place to have breakfast Friday nights."
+ {:small "http://cloudfront.net/6c89c785-1e69-449f-9eb8-81f5adaa40a3/small.jpg",
+ :medium "http://cloudfront.net/6c89c785-1e69-449f-9eb8-81f5adaa40a3/med.jpg",
+ :large "http://cloudfront.net/6c89c785-1e69-449f-9eb8-81f5adaa40a3/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "twitter", :mentions ["@haight_mexican_restaurant"], :tags ["#mexican" "#restaurant"], :username "bob"}]
+ ["Chinatown Paleo Food Truck is a great and underappreciated place to take a date in the spring."
+ {:small "http://cloudfront.net/57814010-b3cc-424f-ba74-4e2cc39e838d/small.jpg",
+ :medium "http://cloudfront.net/57814010-b3cc-424f-ba74-4e2cc39e838d/med.jpg",
+ :large "http://cloudfront.net/57814010-b3cc-424f-ba74-4e2cc39e838d/large.jpg"}
+ {:name "Chinatown Paleo Food Truck", :categories ["Paleo" "Food Truck"], :phone "415-583-4380", :id "aa9b5ce9-db74-470e-8573-f2faca24d546"}
+ {:service "twitter", :mentions ["@chinatown_paleo_food_truck"], :tags ["#paleo" "#food" "#truck"], :username "bob"}]
+ ["Lucky's Cage-Free Liquor Store is a overrated and fantastic place to have a birthday party in the fall."
+ {:small "http://cloudfront.net/b1686642-2751-4c46-9bbf-cf37fdb35fd2/small.jpg",
+ :medium "http://cloudfront.net/b1686642-2751-4c46-9bbf-cf37fdb35fd2/med.jpg",
+ :large "http://cloudfront.net/b1686642-2751-4c46-9bbf-cf37fdb35fd2/large.jpg"}
+ {:name "Lucky's Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-341-3219", :id "968eac8d-1fd0-443d-a7ff-b48810ab0f69"}
+ {:service "flare", :username "sameer"}]
+ ["Pacific Heights No-MSG Sushi is a horrible and horrible place to people-watch the second Saturday of the month."
+ {:small "http://cloudfront.net/dd186a13-fd25-4114-9f7e-ea2e045638b8/small.jpg",
+ :medium "http://cloudfront.net/dd186a13-fd25-4114-9f7e-ea2e045638b8/med.jpg",
+ :large "http://cloudfront.net/dd186a13-fd25-4114-9f7e-ea2e045638b8/large.jpg"}
+ {:name "Pacific Heights No-MSG Sushi", :categories ["No-MSG" "Sushi"], :phone "415-354-9547", :id "b15b66a8-f3da-4b65-8156-80f5518fdd5a"}
+ {:service "facebook", :facebook-photo-id "362ae2f8-3bca-4a80-8b34-708aaac74139", :url "http://facebook.com/photos/362ae2f8-3bca-4a80-8b34-708aaac74139"}]
+ ["Alcatraz Pizza Churros is a swell and acceptable place to catch a bite to eat Friday nights."
+ {:small "http://cloudfront.net/59cd5ba5-a68d-4d65-b104-9c0b7cc090f3/small.jpg",
+ :medium "http://cloudfront.net/59cd5ba5-a68d-4d65-b104-9c0b7cc090f3/med.jpg",
+ :large "http://cloudfront.net/59cd5ba5-a68d-4d65-b104-9c0b7cc090f3/large.jpg"}
+ {:name "Alcatraz Pizza Churros", :categories ["Pizza" "Churros"], :phone "415-754-7867", :id "df95e4f1-8719-42af-a15d-3ee00de6e04f"}
+ {:service "facebook", :facebook-photo-id "8ab454e9-36ae-4824-a60b-bcacaaa56a76", :url "http://facebook.com/photos/8ab454e9-36ae-4824-a60b-bcacaaa56a76"}]
+ ["Marina Modern Bar & Grill is a exclusive and world-famous place to catch a bite to eat weekend evenings."
+ {:small "http://cloudfront.net/98d2956f-a799-49c8-9e39-cefd74ae6280/small.jpg",
+ :medium "http://cloudfront.net/98d2956f-a799-49c8-9e39-cefd74ae6280/med.jpg",
+ :large "http://cloudfront.net/98d2956f-a799-49c8-9e39-cefd74ae6280/large.jpg"}
+ {:name "Marina Modern Bar & Grill", :categories ["Modern" "Bar & Grill"], :phone "415-203-8530", :id "806144f1-bb7a-4271-8fcb-fc6550f51676"}
+ {:service "flare", :username "amy"}]
+ ["Rasta's British Food Truck is a amazing and great place to sip Champagne on a Tuesday afternoon."
+ {:small "http://cloudfront.net/d0061644-021c-4ee1-a2e2-1c0da0c0348a/small.jpg",
+ :medium "http://cloudfront.net/d0061644-021c-4ee1-a2e2-1c0da0c0348a/med.jpg",
+ :large "http://cloudfront.net/d0061644-021c-4ee1-a2e2-1c0da0c0348a/large.jpg"}
+ {:name "Rasta's British Food Truck", :categories ["British" "Food Truck"], :phone "415-958-9031", :id "b6616c97-01d0-488f-a855-bcd6efe2b899"}
+ {:service "foursquare", :foursquare-photo-id "bf141876-b610-4fcb-a1c2-d292d8989929", :mayor "amy"}]
+ ["Lucky's Deep-Dish Gastro Pub is a classic and well-decorated place to have a birthday party in the spring."
+ {:small "http://cloudfront.net/eb4cef56-fac6-4407-b952-ed5da677a144/small.jpg",
+ :medium "http://cloudfront.net/eb4cef56-fac6-4407-b952-ed5da677a144/med.jpg",
+ :large "http://cloudfront.net/eb4cef56-fac6-4407-b952-ed5da677a144/large.jpg"}
+ {:name "Lucky's Deep-Dish Gastro Pub", :categories ["Deep-Dish" "Gastro Pub"], :phone "415-487-4085", :id "0136c454-0968-41cd-a237-ceec5724cab8"}
+ {:service "twitter", :mentions ["@luckys_deep_dish_gastro_pub"], :tags ["#deep-dish" "#gastro" "#pub"], :username "cam_saul"}]
+ ["Sameer's Chinese Restaurant is a underappreciated and popular place to watch the Warriors game Friday nights."
+ {:small "http://cloudfront.net/d201302e-4e74-4db8-84f2-bd3dec57c1d8/small.jpg",
+ :medium "http://cloudfront.net/d201302e-4e74-4db8-84f2-bd3dec57c1d8/med.jpg",
+ :large "http://cloudfront.net/d201302e-4e74-4db8-84f2-bd3dec57c1d8/large.jpg"}
+ {:name "Sameer's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-707-3659", :id "51a9545e-7e1e-40f1-b550-09067b648f20"}
+ {:service "foursquare", :foursquare-photo-id "f7875634-d317-4cb5-a04a-cf6babd14144", :mayor "rasta_toucan"}]
+ ["Nob Hill Korean Taqueria is a well-decorated and underappreciated place to catch a bite to eat on Thursdays."
+ {:small "http://cloudfront.net/4e782847-17da-4f87-bc31-fb61f22f3928/small.jpg",
+ :medium "http://cloudfront.net/4e782847-17da-4f87-bc31-fb61f22f3928/med.jpg",
+ :large "http://cloudfront.net/4e782847-17da-4f87-bc31-fb61f22f3928/large.jpg"}
+ {:name "Nob Hill Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-107-7332", :id "a43c184c-90f5-488c-bb3b-00ea2666d90e"}
+ {:service "foursquare", :foursquare-photo-id "ffbd6d15-24cf-4dd3-a168-40ac03cd2f18", :mayor "rasta_toucan"}]
+ ["SoMa British Bakery is a fantastic and modern place to take a date on public holidays."
+ {:small "http://cloudfront.net/cda97264-0585-4313-91c5-2d022eae6048/small.jpg",
+ :medium "http://cloudfront.net/cda97264-0585-4313-91c5-2d022eae6048/med.jpg",
+ :large "http://cloudfront.net/cda97264-0585-4313-91c5-2d022eae6048/large.jpg"}
+ {:name "SoMa British Bakery", :categories ["British" "Bakery"], :phone "415-909-5728", :id "662cb0d0-8ee6-4db7-aaf1-89eb2530feda"}
+ {:service "facebook", :facebook-photo-id "9ecd820a-7017-4be2-a4b1-18ab0da5e233", :url "http://facebook.com/photos/9ecd820a-7017-4be2-a4b1-18ab0da5e233"}]
+ ["Haight Mexican Restaurant is a exclusive and swell place to nurse a hangover on a Tuesday afternoon."
+ {:small "http://cloudfront.net/a8b906e6-9b89-4e89-b997-1476ba37e137/small.jpg",
+ :medium "http://cloudfront.net/a8b906e6-9b89-4e89-b997-1476ba37e137/med.jpg",
+ :large "http://cloudfront.net/a8b906e6-9b89-4e89-b997-1476ba37e137/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "foursquare", :foursquare-photo-id "4a084c4a-884f-4907-9b96-390b543cb03f", :mayor "biggie"}]
+ ["Sameer's Chinese Restaurant is a horrible and well-decorated place to have a drink on public holidays."
+ {:small "http://cloudfront.net/658de6d7-a7c1-4130-a5e5-d65946445068/small.jpg",
+ :medium "http://cloudfront.net/658de6d7-a7c1-4130-a5e5-d65946445068/med.jpg",
+ :large "http://cloudfront.net/658de6d7-a7c1-4130-a5e5-d65946445068/large.jpg"}
+ {:name "Sameer's Chinese Restaurant", :categories ["Chinese" "Restaurant"], :phone "415-707-3659", :id "51a9545e-7e1e-40f1-b550-09067b648f20"}
+ {:service "facebook", :facebook-photo-id "2f1c35f8-83fb-4c81-a92c-00a81d9c93de", :url "http://facebook.com/photos/2f1c35f8-83fb-4c81-a92c-00a81d9c93de"}]
+ ["Chinatown Paleo Food Truck is a groovy and decent place to drink a craft beer during summer."
+ {:small "http://cloudfront.net/8fc01dbf-d0ff-4a50-b460-6e92367ced21/small.jpg",
+ :medium "http://cloudfront.net/8fc01dbf-d0ff-4a50-b460-6e92367ced21/med.jpg",
+ :large "http://cloudfront.net/8fc01dbf-d0ff-4a50-b460-6e92367ced21/large.jpg"}
+ {:name "Chinatown Paleo Food Truck", :categories ["Paleo" "Food Truck"], :phone "415-583-4380", :id "aa9b5ce9-db74-470e-8573-f2faca24d546"}
+ {:service "foursquare", :foursquare-photo-id "62fdb59c-0629-4adb-b4e1-6a6cb7c7e280", :mayor "mandy"}]
+ ["Rasta's Mexican Sushi is a acceptable and exclusive place to have a drink weekday afternoons."
+ {:small "http://cloudfront.net/74795ea3-50d8-450a-b82b-33e6a1bb2e2c/small.jpg",
+ :medium "http://cloudfront.net/74795ea3-50d8-450a-b82b-33e6a1bb2e2c/med.jpg",
+ :large "http://cloudfront.net/74795ea3-50d8-450a-b82b-33e6a1bb2e2c/large.jpg"}
+ {:name "Rasta's Mexican Sushi", :categories ["Mexican" "Sushi"], :phone "415-387-1284", :id "e4912a22-e6ac-4806-8377-6497bf533a21"}
+ {:service "foursquare", :foursquare-photo-id "089ff188-9374-4b13-93e6-005c9767dabb", :mayor "bob"}]
+ ["Haight Mexican Restaurant is a modern and groovy place to watch the Warriors game on a Tuesday afternoon."
+ {:small "http://cloudfront.net/5e14844c-74af-4fdd-861d-293877f4505c/small.jpg",
+ :medium "http://cloudfront.net/5e14844c-74af-4fdd-861d-293877f4505c/med.jpg",
+ :large "http://cloudfront.net/5e14844c-74af-4fdd-861d-293877f4505c/large.jpg"}
+ {:name "Haight Mexican Restaurant", :categories ["Mexican" "Restaurant"], :phone "415-758-8690", :id "a5e3f0ac-f6e8-4e71-a0a2-3f10f48b4ab1"}
+ {:service "yelp", :yelp-photo-id "42494912-52c5-4492-83c8-76454f465d99", :categories ["Mexican" "Restaurant"]}]
+ ["Nob Hill Gluten-Free Coffee House is a horrible and classic place to people-watch during summer."
+ {:small "http://cloudfront.net/b3276e40-75ad-497a-a2d9-a3d3dfdf39cc/small.jpg",
+ :medium "http://cloudfront.net/b3276e40-75ad-497a-a2d9-a3d3dfdf39cc/med.jpg",
+ :large "http://cloudfront.net/b3276e40-75ad-497a-a2d9-a3d3dfdf39cc/large.jpg"}
+ {:name "Nob Hill Gluten-Free Coffee House", :categories ["Gluten-Free" "Coffee House"], :phone "415-605-9554", :id "df57ff6d-1b5f-46da-b292-32321c6b1a7e"}
+ {:service "facebook", :facebook-photo-id "d326a510-ac21-46f3-8474-078ef511cc54", :url "http://facebook.com/photos/d326a510-ac21-46f3-8474-078ef511cc54"}]
+ ["Mission British Café is a underground and groovy place to have brunch weekday afternoons."
+ {:small "http://cloudfront.net/67d2f053-4bf1-43da-9135-0751266acd32/small.jpg",
+ :medium "http://cloudfront.net/67d2f053-4bf1-43da-9135-0751266acd32/med.jpg",
+ :large "http://cloudfront.net/67d2f053-4bf1-43da-9135-0751266acd32/large.jpg"}
+ {:name "Mission British Café", :categories ["British" "Café"], :phone "415-715-7004", :id "c99899e3-439c-4444-9dc4-5598632aec8d"}
+ {:service "foursquare", :foursquare-photo-id "1df360d1-5d63-4a28-9c37-966dc7e616f0", :mayor "joe"}]
+ ["SoMa Japanese Churros is a classic and popular place to watch the Warriors game on public holidays."
+ {:small "http://cloudfront.net/a0c29909-96a1-4292-95b7-0d3daaf25634/small.jpg",
+ :medium "http://cloudfront.net/a0c29909-96a1-4292-95b7-0d3daaf25634/med.jpg",
+ :large "http://cloudfront.net/a0c29909-96a1-4292-95b7-0d3daaf25634/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "foursquare", :foursquare-photo-id "2dda53d5-9b31-4f4e-b36b-e37b45e67de7", :mayor "biggie"}]
+ ["Haight Soul Food Hotel & Restaurant is a amazing and acceptable place to have breakfast weekday afternoons."
+ {:small "http://cloudfront.net/836d04ac-32b2-4c7a-888f-155ca6e93634/small.jpg",
+ :medium "http://cloudfront.net/836d04ac-32b2-4c7a-888f-155ca6e93634/med.jpg",
+ :large "http://cloudfront.net/836d04ac-32b2-4c7a-888f-155ca6e93634/large.jpg"}
+ {:name "Haight Soul Food Hotel & Restaurant", :categories ["Soul Food" "Hotel & Restaurant"], :phone "415-786-9541", :id "11a72eb3-9e96-4703-9a01-e8c2a9469046"}
+ {:service "flare", :username "bob"}]
+ ["Lower Pac Heights Cage-Free Coffee House is a atmospheric and well-decorated place to have brunch weekend mornings."
+ {:small "http://cloudfront.net/37488ad8-7f52-40e4-9330-505b7174701d/small.jpg",
+ :medium "http://cloudfront.net/37488ad8-7f52-40e4-9330-505b7174701d/med.jpg",
+ :large "http://cloudfront.net/37488ad8-7f52-40e4-9330-505b7174701d/large.jpg"}
+ {:name "Lower Pac Heights Cage-Free Coffee House", :categories ["Cage-Free" "Coffee House"], :phone "415-697-9309", :id "02b1f618-41a0-406b-96dd-1a017f630b81"}
+ {:service "facebook", :facebook-photo-id "01dcf27f-6233-415d-8b8b-4fe7a841b457", :url "http://facebook.com/photos/01dcf27f-6233-415d-8b8b-4fe7a841b457"}]
+ ["Haight Gormet Pizzeria is a fantastic and modern place to pitch an investor during winter."
+ {:small "http://cloudfront.net/482b6b0e-88ab-4963-bc96-00add6dde0ec/small.jpg",
+ :medium "http://cloudfront.net/482b6b0e-88ab-4963-bc96-00add6dde0ec/med.jpg",
+ :large "http://cloudfront.net/482b6b0e-88ab-4963-bc96-00add6dde0ec/large.jpg"}
+ {:name "Haight Gormet Pizzeria", :categories ["Gormet" "Pizzeria"], :phone "415-869-2197", :id "0425bdd0-3f57-4108-80e3-78335327355a"}
+ {:service "yelp", :yelp-photo-id "ad5aa48a-bdda-4396-86f3-1dc63b40a0d1", :categories ["Gormet" "Pizzeria"]}]
+ ["Rasta's Paleo Café is a wonderful and family-friendly place to have a drink on Taco Tuesday."
+ {:small "http://cloudfront.net/96553ade-9bcd-464f-888e-7b4b621e44fd/small.jpg",
+ :medium "http://cloudfront.net/96553ade-9bcd-464f-888e-7b4b621e44fd/med.jpg",
+ :large "http://cloudfront.net/96553ade-9bcd-464f-888e-7b4b621e44fd/large.jpg"}
+ {:name "Rasta's Paleo Café", :categories ["Paleo" "Café"], :phone "415-392-6341", :id "4f9e69be-f06c-46a0-bb8b-f3ddd8218ca1"}
+ {:service "facebook", :facebook-photo-id "f62fb4d0-d254-4496-a5c9-01ed4f7a3651", :url "http://facebook.com/photos/f62fb4d0-d254-4496-a5c9-01ed4f7a3651"}]
+ ["Kyle's Low-Carb Grill is a horrible and popular place to nurse a hangover weekend mornings."
+ {:small "http://cloudfront.net/048415e9-f535-44c3-85ce-cb08a29bb107/small.jpg",
+ :medium "http://cloudfront.net/048415e9-f535-44c3-85ce-cb08a29bb107/med.jpg",
+ :large "http://cloudfront.net/048415e9-f535-44c3-85ce-cb08a29bb107/large.jpg"}
+ {:name "Kyle's Low-Carb Grill", :categories ["Low-Carb" "Grill"], :phone "415-992-8278", :id "b27f50c6-55eb-48b0-9fee-17a6ef5243bd"}
+ {:service "flare", :username "bob"}]
+ ["Pacific Heights Red White & Blue Bar & Grill is a modern and historical place to have a after-work cocktail with your pet dog."
+ {:small "http://cloudfront.net/7b7cbf78-f8fe-4cb1-a086-2e9cdd0fba9c/small.jpg",
+ :medium "http://cloudfront.net/7b7cbf78-f8fe-4cb1-a086-2e9cdd0fba9c/med.jpg",
+ :large "http://cloudfront.net/7b7cbf78-f8fe-4cb1-a086-2e9cdd0fba9c/large.jpg"}
+ {:name "Pacific Heights Red White & Blue Bar & Grill", :categories ["Red White & Blue" "Bar & Grill"], :phone "415-208-2550", :id "c7547aa1-94c1-44bd-bf5a-8655e4698ed8"}
+ {:service "foursquare", :foursquare-photo-id "124a768c-40b4-433c-b907-4ebcb575dd51", :mayor "biggie"}]
+ ["Sunset American Churros is a overrated and wonderful place to take a date in July."
+ {:small "http://cloudfront.net/18ddcbe9-b183-4281-8f43-5f318e8d841e/small.jpg",
+ :medium "http://cloudfront.net/18ddcbe9-b183-4281-8f43-5f318e8d841e/med.jpg",
+ :large "http://cloudfront.net/18ddcbe9-b183-4281-8f43-5f318e8d841e/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "yelp", :yelp-photo-id "ad2c2b45-b959-48cc-aac7-c049a3902c3a", :categories ["American" "Churros"]}]
+ ["Chinatown Paleo Food Truck is a great and modern place to have a birthday party on Thursdays."
+ {:small "http://cloudfront.net/2ca5c924-bb42-4f7f-a6bd-eb17b1c9e6aa/small.jpg",
+ :medium "http://cloudfront.net/2ca5c924-bb42-4f7f-a6bd-eb17b1c9e6aa/med.jpg",
+ :large "http://cloudfront.net/2ca5c924-bb42-4f7f-a6bd-eb17b1c9e6aa/large.jpg"}
+ {:name "Chinatown Paleo Food Truck", :categories ["Paleo" "Food Truck"], :phone "415-583-4380", :id "aa9b5ce9-db74-470e-8573-f2faca24d546"}
+ {:service "yelp", :yelp-photo-id "1f41e84f-2cbb-4579-a7d4-43d4e8532353", :categories ["Paleo" "Food Truck"]}]
+ ["Market St. European Ice Cream Truck is a popular and historical place to pitch an investor on Thursdays."
+ {:small "http://cloudfront.net/2731d670-e7d3-4ade-a1da-d1381355276f/small.jpg",
+ :medium "http://cloudfront.net/2731d670-e7d3-4ade-a1da-d1381355276f/med.jpg",
+ :large "http://cloudfront.net/2731d670-e7d3-4ade-a1da-d1381355276f/large.jpg"}
+ {:name "Market St. European Ice Cream Truck", :categories ["European" "Ice Cream Truck"], :phone "415-555-4197", :id "4ed53fe4-4bd9-4fa3-8f61-374ea75129ca"}
+ {:service "yelp", :yelp-photo-id "b1d569ba-ab45-4965-af9d-366dd4bc44bb", :categories ["European" "Ice Cream Truck"]}]
+ ["Haight Gormet Pizzeria is a well-decorated and amazing place to take visiting friends and relatives on Taco Tuesday."
+ {:small "http://cloudfront.net/485712f2-ec47-43df-9a32-f872aed21d81/small.jpg",
+ :medium "http://cloudfront.net/485712f2-ec47-43df-9a32-f872aed21d81/med.jpg",
+ :large "http://cloudfront.net/485712f2-ec47-43df-9a32-f872aed21d81/large.jpg"}
+ {:name "Haight Gormet Pizzeria", :categories ["Gormet" "Pizzeria"], :phone "415-869-2197", :id "0425bdd0-3f57-4108-80e3-78335327355a"}
+ {:service "twitter", :mentions ["@haight_gormet_pizzeria"], :tags ["#gormet" "#pizzeria"], :username "rasta_toucan"}]
+ ["SoMa TaquerÃa Diner is a well-decorated and acceptable place to have a after-work cocktail weekend evenings."
+ {:small "http://cloudfront.net/c9e18865-81de-4444-93fa-dd77ff19977e/small.jpg",
+ :medium "http://cloudfront.net/c9e18865-81de-4444-93fa-dd77ff19977e/med.jpg",
+ :large "http://cloudfront.net/c9e18865-81de-4444-93fa-dd77ff19977e/large.jpg"}
+ {:name "SoMa TaquerÃa Diner", :categories ["TaquerÃa" "Diner"], :phone "415-947-9521", :id "f97ede4a-074f-4e24-babc-5c44f2be9c36"}
+ {:service "flare", :username "bob"}]
+ ["Cam's Soul Food Ice Cream Truck is a acceptable and fantastic place to people-watch with your pet toucan."
+ {:small "http://cloudfront.net/f38cd426-8b7f-4481-96b2-cb44095a0709/small.jpg",
+ :medium "http://cloudfront.net/f38cd426-8b7f-4481-96b2-cb44095a0709/med.jpg",
+ :large "http://cloudfront.net/f38cd426-8b7f-4481-96b2-cb44095a0709/large.jpg"}
+ {:name "Cam's Soul Food Ice Cream Truck", :categories ["Soul Food" "Ice Cream Truck"], :phone "415-270-8888", :id "f474e587-1801-43ea-93d5-4c4fd96460b8"}
+ {:service "flare", :username "lucky_pigeon"}]
+ ["Tenderloin Cage-Free Sushi is a delicious and delicious place to have breakfast with your pet toucan."
+ {:small "http://cloudfront.net/45dc5a3b-a0c5-4f69-afc8-711cfc5f84b5/small.jpg",
+ :medium "http://cloudfront.net/45dc5a3b-a0c5-4f69-afc8-711cfc5f84b5/med.jpg",
+ :large "http://cloudfront.net/45dc5a3b-a0c5-4f69-afc8-711cfc5f84b5/large.jpg"}
+ {:name "Tenderloin Cage-Free Sushi", :categories ["Cage-Free" "Sushi"], :phone "415-348-0644", :id "0b6c036f-82b0-4008-bdfe-5360dd93fb75"}
+ {:service "flare", :username "bob"}]
+ ["Polk St. Korean Taqueria is a horrible and atmospheric place to people-watch in July."
+ {:small "http://cloudfront.net/fc6f7000-2347-49dc-aeff-22559cfd7ce8/small.jpg",
+ :medium "http://cloudfront.net/fc6f7000-2347-49dc-aeff-22559cfd7ce8/med.jpg",
+ :large "http://cloudfront.net/fc6f7000-2347-49dc-aeff-22559cfd7ce8/large.jpg"}
+ {:name "Polk St. Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-511-5531", :id "ddb09b32-6f0b-4e54-98c7-14398f16ca4e"}
+ {:service "foursquare", :foursquare-photo-id "e48f5b9f-a12e-4339-b6d7-992c44aa481b", :mayor "kyle"}]
+ ["Sunset Homestyle Grill is a world-famous and modern place to sip Champagne Friday nights."
+ {:small "http://cloudfront.net/d3f31d2b-f10a-44cb-91a7-37e5b9491fbc/small.jpg",
+ :medium "http://cloudfront.net/d3f31d2b-f10a-44cb-91a7-37e5b9491fbc/med.jpg",
+ :large "http://cloudfront.net/d3f31d2b-f10a-44cb-91a7-37e5b9491fbc/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "flare", :username "jessica"}]
+ ["Chinatown American Bakery is a underground and underappreciated place to have brunch in June."
+ {:small "http://cloudfront.net/1707f0ac-6df5-4340-a5ef-c31609c4ead0/small.jpg",
+ :medium "http://cloudfront.net/1707f0ac-6df5-4340-a5ef-c31609c4ead0/med.jpg",
+ :large "http://cloudfront.net/1707f0ac-6df5-4340-a5ef-c31609c4ead0/large.jpg"}
+ {:name "Chinatown American Bakery", :categories ["American" "Bakery"], :phone "415-658-7393", :id "cf55cdbd-c614-4be1-8496-0e11b195d16f"}
+ {:service "twitter", :mentions ["@chinatown_american_bakery"], :tags ["#american" "#bakery"], :username "amy"}]
+ ["Pacific Heights Red White & Blue Bar & Grill is a swell and acceptable place to take visiting friends and relatives with your pet toucan."
+ {:small "http://cloudfront.net/37a5f9f6-b1bd-405f-bec2-fad8a476cf62/small.jpg",
+ :medium "http://cloudfront.net/37a5f9f6-b1bd-405f-bec2-fad8a476cf62/med.jpg",
+ :large "http://cloudfront.net/37a5f9f6-b1bd-405f-bec2-fad8a476cf62/large.jpg"}
+ {:name "Pacific Heights Red White & Blue Bar & Grill", :categories ["Red White & Blue" "Bar & Grill"], :phone "415-208-2550", :id "c7547aa1-94c1-44bd-bf5a-8655e4698ed8"}
+ {:service "yelp", :yelp-photo-id "6f0c3b95-145b-4b9f-8c63-a04ca70e3835", :categories ["Red White & Blue" "Bar & Grill"]}]
+ ["Sunset American Churros is a popular and delicious place to watch the Giants game on Taco Tuesday."
+ {:small "http://cloudfront.net/75a631a2-43b1-47a3-a7a6-687c853b857c/small.jpg",
+ :medium "http://cloudfront.net/75a631a2-43b1-47a3-a7a6-687c853b857c/med.jpg",
+ :large "http://cloudfront.net/75a631a2-43b1-47a3-a7a6-687c853b857c/large.jpg"}
+ {:name "Sunset American Churros", :categories ["American" "Churros"], :phone "415-191-5018", :id "2e88c921-29fb-489b-a956-d3ba1182da73"}
+ {:service "twitter", :mentions ["@sunset_american_churros"], :tags ["#american" "#churros"], :username "amy"}]
+ ["Sunset Homestyle Grill is a underappreciated and swell place to watch the Giants game on Thursdays."
+ {:small "http://cloudfront.net/2bd0472b-267c-4be6-992d-94e72edfe719/small.jpg",
+ :medium "http://cloudfront.net/2bd0472b-267c-4be6-992d-94e72edfe719/med.jpg",
+ :large "http://cloudfront.net/2bd0472b-267c-4be6-992d-94e72edfe719/large.jpg"}
+ {:name "Sunset Homestyle Grill", :categories ["Homestyle" "Grill"], :phone "415-356-7052", :id "c57673cd-f2d0-4bbc-aed0-6c166d7cf2c3"}
+ {:service "foursquare", :foursquare-photo-id "9ae208eb-c7c1-43b1-9a1e-f7a4d276e8e2", :mayor "cam_saul"}]
+ ["Rasta's British Food Truck is a classic and historical place to sip a glass of expensive wine Friday nights."
+ {:small "http://cloudfront.net/253137fd-7a54-431e-a991-a1a5175ff9fc/small.jpg",
+ :medium "http://cloudfront.net/253137fd-7a54-431e-a991-a1a5175ff9fc/med.jpg",
+ :large "http://cloudfront.net/253137fd-7a54-431e-a991-a1a5175ff9fc/large.jpg"}
+ {:name "Rasta's British Food Truck", :categories ["British" "Food Truck"], :phone "415-958-9031", :id "b6616c97-01d0-488f-a855-bcd6efe2b899"}
+ {:service "facebook", :facebook-photo-id "647413c2-f132-46e9-ac47-155cec8346d0", :url "http://facebook.com/photos/647413c2-f132-46e9-ac47-155cec8346d0"}]
+ ["Polk St. Korean Taqueria is a groovy and great place to watch the Giants game on public holidays."
+ {:small "http://cloudfront.net/fabc9014-285d-41b4-8b1c-a66ecae0e8b0/small.jpg",
+ :medium "http://cloudfront.net/fabc9014-285d-41b4-8b1c-a66ecae0e8b0/med.jpg",
+ :large "http://cloudfront.net/fabc9014-285d-41b4-8b1c-a66ecae0e8b0/large.jpg"}
+ {:name "Polk St. Korean Taqueria", :categories ["Korean" "Taqueria"], :phone "415-511-5531", :id "ddb09b32-6f0b-4e54-98c7-14398f16ca4e"}
+ {:service "flare", :username "jessica"}]
+ ["Nob Hill Gluten-Free Coffee House is a decent and acceptable place to watch the Giants game on Taco Tuesday."
+ {:small "http://cloudfront.net/9e1072a8-82ee-46ee-a625-578384e641f7/small.jpg",
+ :medium "http://cloudfront.net/9e1072a8-82ee-46ee-a625-578384e641f7/med.jpg",
+ :large "http://cloudfront.net/9e1072a8-82ee-46ee-a625-578384e641f7/large.jpg"}
+ {:name "Nob Hill Gluten-Free Coffee House", :categories ["Gluten-Free" "Coffee House"], :phone "415-605-9554", :id "df57ff6d-1b5f-46da-b292-32321c6b1a7e"}
+ {:service "foursquare", :foursquare-photo-id "2d74b28c-aab1-489e-a18b-1bfb3495cc19", :mayor "sameer"}]
+ ["Oakland American Grill is a acceptable and popular place to conduct a business meeting on Taco Tuesday."
+ {:small "http://cloudfront.net/beff31d4-4685-4805-bf89-dd705ada2fe2/small.jpg",
+ :medium "http://cloudfront.net/beff31d4-4685-4805-bf89-dd705ada2fe2/med.jpg",
+ :large "http://cloudfront.net/beff31d4-4685-4805-bf89-dd705ada2fe2/large.jpg"}
+ {:name "Oakland American Grill", :categories ["American" "Grill"], :phone "415-660-0889", :id "856f907d-b669-4b9c-8337-bf9c88883746"}
+ {:service "foursquare", :foursquare-photo-id "18546192-88d1-4c74-a40e-b502d32f7a5b", :mayor "mandy"}]
+ ["Pacific Heights Soul Food Coffee House is a decent and swell place to catch a bite to eat on Saturday night."
+ {:small "http://cloudfront.net/2018a275-f498-47bf-a15b-e7b1c57147f0/small.jpg",
+ :medium "http://cloudfront.net/2018a275-f498-47bf-a15b-e7b1c57147f0/med.jpg",
+ :large "http://cloudfront.net/2018a275-f498-47bf-a15b-e7b1c57147f0/large.jpg"}
+ {:name "Pacific Heights Soul Food Coffee House", :categories ["Soul Food" "Coffee House"], :phone "415-838-3464", :id "6aed1816-4c64-4f76-8e2a-619528e5b48d"}
+ {:service "twitter", :mentions ["@pacific_heights_soul_food_coffee_house"], :tags ["#soul" "#food" "#coffee" "#house"], :username "jane"}]
+ ["Polk St. Deep-Dish Hotel & Restaurant is a delicious and acceptable place to take a date on Taco Tuesday."
+ {:small "http://cloudfront.net/1bc7f807-4ee1-4c37-af6e-918e978b95fd/small.jpg",
+ :medium "http://cloudfront.net/1bc7f807-4ee1-4c37-af6e-918e978b95fd/med.jpg",
+ :large "http://cloudfront.net/1bc7f807-4ee1-4c37-af6e-918e978b95fd/large.jpg"}
+ {:name "Polk St. Deep-Dish Hotel & Restaurant", :categories ["Deep-Dish" "Hotel & Restaurant"], :phone "415-666-8681", :id "47f1698e-ae11-46f5-818b-85a59d0affba"}
+ {:service "foursquare", :foursquare-photo-id "2efbeca5-5a55-4310-abdd-936ae97bc1bc", :mayor "biggie"}]
+ ["Pacific Heights Soul Food Coffee House is a fantastic and popular place to watch the Giants game in July."
+ {:small "http://cloudfront.net/4ad94fa2-4174-4617-872b-a925006d0841/small.jpg",
+ :medium "http://cloudfront.net/4ad94fa2-4174-4617-872b-a925006d0841/med.jpg",
+ :large "http://cloudfront.net/4ad94fa2-4174-4617-872b-a925006d0841/large.jpg"}
+ {:name "Pacific Heights Soul Food Coffee House", :categories ["Soul Food" "Coffee House"], :phone "415-838-3464", :id "6aed1816-4c64-4f76-8e2a-619528e5b48d"}
+ {:service "twitter", :mentions ["@pacific_heights_soul_food_coffee_house"], :tags ["#soul" "#food" "#coffee" "#house"], :username "cam_saul"}]
+ ["Tenderloin Gormet Restaurant is a horrible and underground place to have brunch in July."
+ {:small "http://cloudfront.net/7120084f-5792-425f-8469-170b6fa01df1/small.jpg",
+ :medium "http://cloudfront.net/7120084f-5792-425f-8469-170b6fa01df1/med.jpg",
+ :large "http://cloudfront.net/7120084f-5792-425f-8469-170b6fa01df1/large.jpg"}
+ {:name "Tenderloin Gormet Restaurant", :categories ["Gormet" "Restaurant"], :phone "415-127-4197", :id "54a9eac8-d80d-4af8-b6d7-34651a60e59c"}
+ {:service "yelp", :yelp-photo-id "86617b70-de39-40aa-9ca2-9c33c5bd1fa4", :categories ["Gormet" "Restaurant"]}]
+ ["Pacific Heights Red White & Blue Bar & Grill is a underappreciated and modern place to meet new friends with friends."
+ {:small "http://cloudfront.net/a0d24e43-c01d-4b02-b236-e8dc2155aa37/small.jpg",
+ :medium "http://cloudfront.net/a0d24e43-c01d-4b02-b236-e8dc2155aa37/med.jpg",
+ :large "http://cloudfront.net/a0d24e43-c01d-4b02-b236-e8dc2155aa37/large.jpg"}
+ {:name "Pacific Heights Red White & Blue Bar & Grill", :categories ["Red White & Blue" "Bar & Grill"], :phone "415-208-2550", :id "c7547aa1-94c1-44bd-bf5a-8655e4698ed8"}
+ {:service "twitter", :mentions ["@pacific_heights_red_white_&_blue_bar_&_grill"], :tags ["#red" "#white" "#&" "#blue" "#bar" "#&" "#grill"], :username "mandy"}]
+ ["Nob Hill Gluten-Free Coffee House is a underappreciated and swell place to take visiting friends and relatives with your pet dog."
+ {:small "http://cloudfront.net/1e92e043-2910-4d1b-b72e-43608cc0e2ff/small.jpg",
+ :medium "http://cloudfront.net/1e92e043-2910-4d1b-b72e-43608cc0e2ff/med.jpg",
+ :large "http://cloudfront.net/1e92e043-2910-4d1b-b72e-43608cc0e2ff/large.jpg"}
+ {:name "Nob Hill Gluten-Free Coffee House", :categories ["Gluten-Free" "Coffee House"], :phone "415-605-9554", :id "df57ff6d-1b5f-46da-b292-32321c6b1a7e"}
+ {:service "flare", :username "jane"}]
+ ["Mission Japanese Coffee House is a modern and historical place to take visiting friends and relatives on Taco Tuesday."
+ {:small "http://cloudfront.net/7dcd5015-ddf0-40db-a38e-c40308a00720/small.jpg",
+ :medium "http://cloudfront.net/7dcd5015-ddf0-40db-a38e-c40308a00720/med.jpg",
+ :large "http://cloudfront.net/7dcd5015-ddf0-40db-a38e-c40308a00720/large.jpg"}
+ {:name "Mission Japanese Coffee House", :categories ["Japanese" "Coffee House"], :phone "415-561-0506", :id "60dd274e-0cbf-4521-946d-8a4e0f151150"}
+ {:service "facebook", :facebook-photo-id "83699a56-416c-49cc-a31a-dd6b4c5aa91b", :url "http://facebook.com/photos/83699a56-416c-49cc-a31a-dd6b4c5aa91b"}]
+ ["Oakland Low-Carb Bakery is a modern and fantastic place to conduct a business meeting on a Tuesday afternoon."
+ {:small "http://cloudfront.net/6b16ed76-4ccb-4ce2-b255-55f69271ddf1/small.jpg",
+ :medium "http://cloudfront.net/6b16ed76-4ccb-4ce2-b255-55f69271ddf1/med.jpg",
+ :large "http://cloudfront.net/6b16ed76-4ccb-4ce2-b255-55f69271ddf1/large.jpg"}
+ {:name "Oakland Low-Carb Bakery", :categories ["Low-Carb" "Bakery"], :phone "415-546-0101", :id "da7dd72d-60fb-495b-a2c0-1e2ae73a1a86"}
+ {:service "twitter", :mentions ["@oakland_low_carb_bakery"], :tags ["#low-carb" "#bakery"], :username "bob"}]
+ ["Cam's Old-Fashioned Coffee House is a world-famous and decent place to sip a glass of expensive wine on a Tuesday afternoon."
+ {:small "http://cloudfront.net/1282e126-e15b-4aa4-a3dc-869ea9d6d6c2/small.jpg",
+ :medium "http://cloudfront.net/1282e126-e15b-4aa4-a3dc-869ea9d6d6c2/med.jpg",
+ :large "http://cloudfront.net/1282e126-e15b-4aa4-a3dc-869ea9d6d6c2/large.jpg"}
+ {:name "Cam's Old-Fashioned Coffee House", :categories ["Old-Fashioned" "Coffee House"], :phone "415-868-2973", :id "27592c2b-e682-44bb-be28-8e9a622becca"}
+ {:service "yelp", :yelp-photo-id "de90a66b-d19e-4665-b0c2-c64ba899a02b", :categories ["Old-Fashioned" "Coffee House"]}]
+ ["Rasta's Mexican Sushi is a fantastic and atmospheric place to have a after-work cocktail weekday afternoons."
+ {:small "http://cloudfront.net/65dc9189-9de4-4bdc-bdfb-e2ff8247829b/small.jpg",
+ :medium "http://cloudfront.net/65dc9189-9de4-4bdc-bdfb-e2ff8247829b/med.jpg",
+ :large "http://cloudfront.net/65dc9189-9de4-4bdc-bdfb-e2ff8247829b/large.jpg"}
+ {:name "Rasta's Mexican Sushi", :categories ["Mexican" "Sushi"], :phone "415-387-1284", :id "e4912a22-e6ac-4806-8377-6497bf533a21"}
+ {:service "flare", :username "amy"}]
+ ["SoMa Japanese Churros is a underappreciated and swell place to take a date Friday nights."
+ {:small "http://cloudfront.net/b8fe2a0a-3cfc-4e39-afb7-c1fa4ff708e2/small.jpg",
+ :medium "http://cloudfront.net/b8fe2a0a-3cfc-4e39-afb7-c1fa4ff708e2/med.jpg",
+ :large "http://cloudfront.net/b8fe2a0a-3cfc-4e39-afb7-c1fa4ff708e2/large.jpg"}
+ {:name "SoMa Japanese Churros", :categories ["Japanese" "Churros"], :phone "415-404-1510", :id "373858b2-e634-45d0-973d-4d0fed8c438b"}
+ {:service "facebook", :facebook-photo-id "bdd68c35-bffc-4091-b32c-bf8bf3a8f834", :url "http://facebook.com/photos/bdd68c35-bffc-4091-b32c-bf8bf3a8f834"}]
+ ["Lucky's Cage-Free Liquor Store is a modern and groovy place to take a date with friends."
+ {:small "http://cloudfront.net/6bccb82b-1102-4f60-aa9b-372ee1164118/small.jpg",
+ :medium "http://cloudfront.net/6bccb82b-1102-4f60-aa9b-372ee1164118/med.jpg",
+ :large "http://cloudfront.net/6bccb82b-1102-4f60-aa9b-372ee1164118/large.jpg"}
+ {:name "Lucky's Cage-Free Liquor Store", :categories ["Cage-Free" "Liquor Store"], :phone "415-341-3219", :id "968eac8d-1fd0-443d-a7ff-b48810ab0f69"}
+ {:service "flare", :username "lucky_pigeon"}]]]]
diff --git a/test/metabase/test/data/dataset_definitions/places-cam-likes.edn b/test/metabase/test/data/dataset_definitions/places-cam-likes.edn
new file mode 100644
index 0000000000000000000000000000000000000000..e5faa8b12016704e953dace669b6c300499863ca
--- /dev/null
+++ b/test/metabase/test/data/dataset_definitions/places-cam-likes.edn
@@ -0,0 +1,7 @@
+[["places" [{:field-name "name"
+ :base-type :CharField}
+ {:field-name "liked"
+ :base-type :BooleanField}]
+ [["Tempest" true]
+ ["Bullit" true]
+ ["The Dentist" false]]]]
diff --git a/test/metabase/test/data/dataset_definitions/sad-toucan-incidents.edn b/test/metabase/test/data/dataset_definitions/sad-toucan-incidents.edn
index 58e8bc5efd08964fbf3146097b99f96375f2cd94..5fb8b7796927fb3e5fba3b68861332ad23aacab7 100644
--- a/test/metabase/test/data/dataset_definitions/sad-toucan-incidents.edn
+++ b/test/metabase/test/data/dataset_definitions/sad-toucan-incidents.edn
@@ -1,205 +1,205 @@
-["incidents" [{:field-name "severity"
- :base-type :IntegerField}
- {:field-name "timestamp"
- :base-type :BigIntegerField
- :special-type :timestamp_milliseconds}]
- [[4 1433587200000]
- [0 1433965860000]
- [5 1433864520000]
- [3 1435016940000]
- [3 1434764700000]
- [3 1433253540000]
- [5 1434995940000]
- [2 1433383260000]
- [1 1434247980000]
- [0 1434389160000]
- [2 1433276880000]
- [2 1433857980000]
- [5 1433879640000]
- [1 1435482840000]
- [3 1433745540000]
- [2 1434700080000]
- [5 1433536440000]
- [3 1434157800000]
- [1 1435150440000]
- [2 1434702960000]
- [3 1433749020000]
- [2 1435255140000]
- [5 1434358080000]
- [4 1433410440000]
- [2 1434737820000]
- [0 1433794800000]
- [5 1433323500000]
- [4 1434914760000]
- [3 1433397480000]
- [5 1435158240000]
- [4 1434952620000]
- [0 1434060000000]
- [3 1433395440000]
- [2 1435029300000]
- [5 1433272620000]
- [0 1433944080000]
- [5 1434577620000]
- [0 1434753060000]
- [1 1433991600000]
- [5 1433578500000]
- [4 1435365600000]
- [4 1433243460000]
- [1 1433279820000]
- [2 1433288820000]
- [3 1435010460000]
- [3 1435106400000]
- [4 1433535060000]
- [1 1433641260000]
- [1 1433184900000]
- [4 1434937080000]
- [0 1435441740000]
- [2 1434872700000]
- [4 1434705600000]
- [2 1435095120000]
- [1 1433898300000]
- [1 1434519780000]
- [1 1435240020000]
- [2 1434663960000]
- [5 1435363560000]
- [4 1434663000000]
- [5 1435351860000]
- [4 1434975600000]
- [2 1434971400000]
- [2 1433675100000]
- [2 1435088280000]
- [0 1433549160000]
- [1 1434094740000]
- [1 1434904080000]
- [5 1433211180000]
- [1 1433751900000]
- [4 1434982440000]
- [1 1433826360000]
- [5 1435060020000]
- [5 1434450780000]
- [1 1434236700000]
- [1 1433280000000]
- [1 1434135600000]
- [5 1434338340000]
- [4 1435389960000]
- [3 1434302820000]
- [0 1434102900000]
- [3 1435444560000]
- [1 1433174760000]
- [4 1434933840000]
- [0 1433959800000]
- [0 1433977440000]
- [0 1433233200000]
- [4 1434164460000]
- [4 1435193040000]
- [4 1435124760000]
- [0 1434969660000]
- [1 1434867540000]
- [3 1433440560000]
- [2 1433688720000]
- [2 1434946500000]
- [1 1433973720000]
- [4 1434517080000]
- [3 1434709320000]
- [5 1433583780000]
- [5 1433693040000]
- [2 1435229280000]
- [2 1435362780000]
- [2 1435107540000]
- [5 1435048440000]
- [5 1434709800000]
- [4 1433449500000]
- [1 1434947760000]
- [5 1433832300000]
- [1 1433548500000]
- [0 1434071940000]
- [1 1434263820000]
- [2 1433592360000]
- [5 1433652720000]
- [2 1435506960000]
- [2 1433492460000]
- [5 1433785620000]
- [3 1433309820000]
- [2 1433886480000]
- [2 1435106220000]
- [0 1434353280000]
- [1 1435506780000]
- [4 1434954000000]
- [5 1434502080000]
- [1 1433794440000]
- [5 1434456660000]
- [4 1434751200000]
- [3 1433193540000]
- [2 1435190460000]
- [2 1433594280000]
- [3 1433790660000]
- [5 1433365620000]
- [5 1433192640000]
- [5 1435532520000]
- [0 1434284520000]
- [4 1433654760000]
- [3 1433948340000]
- [5 1433223420000]
- [4 1435068540000]
- [4 1433939580000]
- [2 1434707040000]
- [5 1435233180000]
- [1 1433179380000]
- [0 1434963540000]
- [2 1433538780000]
- [4 1434607980000]
- [2 1433481420000]
- [2 1435148820000]
- [1 1433994840000]
- [4 1435476420000]
- [2 1435405440000]
- [3 1433553960000]
- [1 1433764800000]
- [2 1433542920000]
- [2 1435425840000]
- [1 1434731340000]
- [5 1433846040000]
- [0 1434582480000]
- [0 1435514580000]
- [2 1434812580000]
- [3 1434521820000]
- [4 1434166320000]
- [0 1435103460000]
- [0 1434291000000]
- [3 1433517180000]
- [1 1433383980000]
- [1 1435210860000]
- [0 1434403920000]
- [4 1433714580000]
- [2 1433954940000]
- [5 1435044600000]
- [0 1435365360000]
- [1 1434212880000]
- [1 1434920580000]
- [0 1433551620000]
- [2 1433494440000]
- [5 1434398340000]
- [4 1433154660000]
- [0 1435334040000]
- [1 1435123680000]
- [0 1433674140000]
- [4 1434714240000]
- [3 1435336860000]
- [5 1433377980000]
- [1 1434252120000]
- [4 1435038120000]
- [3 1434278880000]
- [0 1433366220000]
- [0 1434029880000]
- [4 1433789280000]
- [2 1435343340000]
- [4 1434343500000]
- [5 1433398500000]
- [3 1434805860000]
- [1 1435215180000]
- [3 1435010160000]
- [1 1434436140000]
- [5 1434972240000]
- [5 1434851640000]
- [1 1434107400000]
- [4 1435492320000]]]
+[["incidents" [{:field-name "severity"
+ :base-type :IntegerField}
+ {:field-name "timestamp"
+ :base-type :BigIntegerField
+ :special-type :timestamp_milliseconds}]
+ [[4 1433587200000]
+ [0 1433965860000]
+ [5 1433864520000]
+ [3 1435016940000]
+ [3 1434764700000]
+ [3 1433253540000]
+ [5 1434995940000]
+ [2 1433383260000]
+ [1 1434247980000]
+ [0 1434389160000]
+ [2 1433276880000]
+ [2 1433857980000]
+ [5 1433879640000]
+ [1 1435482840000]
+ [3 1433745540000]
+ [2 1434700080000]
+ [5 1433536440000]
+ [3 1434157800000]
+ [1 1435150440000]
+ [2 1434702960000]
+ [3 1433749020000]
+ [2 1435255140000]
+ [5 1434358080000]
+ [4 1433410440000]
+ [2 1434737820000]
+ [0 1433794800000]
+ [5 1433323500000]
+ [4 1434914760000]
+ [3 1433397480000]
+ [5 1435158240000]
+ [4 1434952620000]
+ [0 1434060000000]
+ [3 1433395440000]
+ [2 1435029300000]
+ [5 1433272620000]
+ [0 1433944080000]
+ [5 1434577620000]
+ [0 1434753060000]
+ [1 1433991600000]
+ [5 1433578500000]
+ [4 1435365600000]
+ [4 1433243460000]
+ [1 1433279820000]
+ [2 1433288820000]
+ [3 1435010460000]
+ [3 1435106400000]
+ [4 1433535060000]
+ [1 1433641260000]
+ [1 1433184900000]
+ [4 1434937080000]
+ [0 1435441740000]
+ [2 1434872700000]
+ [4 1434705600000]
+ [2 1435095120000]
+ [1 1433898300000]
+ [1 1434519780000]
+ [1 1435240020000]
+ [2 1434663960000]
+ [5 1435363560000]
+ [4 1434663000000]
+ [5 1435351860000]
+ [4 1434975600000]
+ [2 1434971400000]
+ [2 1433675100000]
+ [2 1435088280000]
+ [0 1433549160000]
+ [1 1434094740000]
+ [1 1434904080000]
+ [5 1433211180000]
+ [1 1433751900000]
+ [4 1434982440000]
+ [1 1433826360000]
+ [5 1435060020000]
+ [5 1434450780000]
+ [1 1434236700000]
+ [1 1433280000000]
+ [1 1434135600000]
+ [5 1434338340000]
+ [4 1435389960000]
+ [3 1434302820000]
+ [0 1434102900000]
+ [3 1435444560000]
+ [1 1433174760000]
+ [4 1434933840000]
+ [0 1433959800000]
+ [0 1433977440000]
+ [0 1433233200000]
+ [4 1434164460000]
+ [4 1435193040000]
+ [4 1435124760000]
+ [0 1434969660000]
+ [1 1434867540000]
+ [3 1433440560000]
+ [2 1433688720000]
+ [2 1434946500000]
+ [1 1433973720000]
+ [4 1434517080000]
+ [3 1434709320000]
+ [5 1433583780000]
+ [5 1433693040000]
+ [2 1435229280000]
+ [2 1435362780000]
+ [2 1435107540000]
+ [5 1435048440000]
+ [5 1434709800000]
+ [4 1433449500000]
+ [1 1434947760000]
+ [5 1433832300000]
+ [1 1433548500000]
+ [0 1434071940000]
+ [1 1434263820000]
+ [2 1433592360000]
+ [5 1433652720000]
+ [2 1435506960000]
+ [2 1433492460000]
+ [5 1433785620000]
+ [3 1433309820000]
+ [2 1433886480000]
+ [2 1435106220000]
+ [0 1434353280000]
+ [1 1435506780000]
+ [4 1434954000000]
+ [5 1434502080000]
+ [1 1433794440000]
+ [5 1434456660000]
+ [4 1434751200000]
+ [3 1433193540000]
+ [2 1435190460000]
+ [2 1433594280000]
+ [3 1433790660000]
+ [5 1433365620000]
+ [5 1433192640000]
+ [5 1435532520000]
+ [0 1434284520000]
+ [4 1433654760000]
+ [3 1433948340000]
+ [5 1433223420000]
+ [4 1435068540000]
+ [4 1433939580000]
+ [2 1434707040000]
+ [5 1435233180000]
+ [1 1433179380000]
+ [0 1434963540000]
+ [2 1433538780000]
+ [4 1434607980000]
+ [2 1433481420000]
+ [2 1435148820000]
+ [1 1433994840000]
+ [4 1435476420000]
+ [2 1435405440000]
+ [3 1433553960000]
+ [1 1433764800000]
+ [2 1433542920000]
+ [2 1435425840000]
+ [1 1434731340000]
+ [5 1433846040000]
+ [0 1434582480000]
+ [0 1435514580000]
+ [2 1434812580000]
+ [3 1434521820000]
+ [4 1434166320000]
+ [0 1435103460000]
+ [0 1434291000000]
+ [3 1433517180000]
+ [1 1433383980000]
+ [1 1435210860000]
+ [0 1434403920000]
+ [4 1433714580000]
+ [2 1433954940000]
+ [5 1435044600000]
+ [0 1435365360000]
+ [1 1434212880000]
+ [1 1434920580000]
+ [0 1433551620000]
+ [2 1433494440000]
+ [5 1434398340000]
+ [4 1433154660000]
+ [0 1435334040000]
+ [1 1435123680000]
+ [0 1433674140000]
+ [4 1434714240000]
+ [3 1435336860000]
+ [5 1433377980000]
+ [1 1434252120000]
+ [4 1435038120000]
+ [3 1434278880000]
+ [0 1433366220000]
+ [0 1434029880000]
+ [4 1433789280000]
+ [2 1435343340000]
+ [4 1434343500000]
+ [5 1433398500000]
+ [3 1434805860000]
+ [1 1435215180000]
+ [3 1435010160000]
+ [1 1434436140000]
+ [5 1434972240000]
+ [5 1434851640000]
+ [1 1434107400000]
+ [4 1435492320000]]]]
diff --git a/test/metabase/test/data/dataset_definitions/tupac-sightings.edn b/test/metabase/test/data/dataset_definitions/tupac-sightings.edn
new file mode 100644
index 0000000000000000000000000000000000000000..8dc653570b9f81ad4b08d381ddab67639fc12bfb
--- /dev/null
+++ b/test/metabase/test/data/dataset_definitions/tupac-sightings.edn
@@ -0,0 +1,1188 @@
+[ ;; 151 cities where Tupac was sighted
+ ["cities" [{:field-name "name"
+ :base-type :CharField}
+ {:field-name "latitude"
+ :base-type :FloatField}
+ {:field-name "longitude"
+ :base-type :FloatField}]
+ [["Akron" 41.0817920535084 -81.5219209322972]
+ ["Albany" 42.6674396618158 -73.8032049534362]
+ ["Albuquerque" 35.1148836731619 -106.627751577878]
+ ["Alexandria" 38.8186997503841 -77.0858077256885]
+ ["Anaheim" 33.8389260476165 -117.857765556473]
+ ["Anchorage" 61.0441759440684 -149.317282345864]
+ ["Arlington" 32.6996733810689 -97.1234704915865]
+ ["Arlington" 38.8796716891319 -77.1101494956843]
+ ["Atlanta" 33.7627546508682 -84.4222210251942]
+ ["Augusta" 33.3587049511624 -82.0353614297146]
+ ["Aurora" 39.6829234764587 -104.801856234634]
+ ["Austin" 30.2811666886503 -97.7268018580761]
+ ["Bakersfield" 35.3497352318818 -119.020412340043]
+ ["Baltimore" 39.3079126779924 -76.6158047952206]
+ ["Beaverton" 45.4756765002984 -122.820584221168]
+ ["Bellevue" 47.597620293295 -122.15422185066]
+ ["Bellingham" 48.7525911906983 -122.471025622103]
+ ["Boise" 43.6023952293065 -116.227317564419]
+ ["Boston" 42.3159590543845 -71.0926496280165]
+ ["Boulder" 40.0229365258329 -105.244998687629]
+ ["Buffalo" 42.9017620570981 -78.8472534370662]
+ ["Cambridge" 42.3755766457887 -71.1167535125691]
+ ["Charlotte" 35.2056919002986 -80.8260730320272]
+ ["Charlottesville" 38.0371765904751 -78.4860323531533]
+ ["Chesapeake" 36.6766812143194 -76.3025623546478]
+ ["Chicago" 41.8305783388926 -87.6755413323617]
+ ["Chula Vista" 32.626632415851 -117.009996322615]
+ ["Cincinnati" 39.1414967359386 -84.5061046117095]
+ ["Clearwater" 27.9896873468532 -82.7636681734622]
+ ["Cleveland" 41.4768555457116 -81.6800971756204]
+ ["Clyde Hill" 47.6303314801144 -122.218092425819]
+ ["Colorado Springs" 38.8629105185554 -104.782777886895]
+ ["Columbus" 39.9911167233777 -82.9947879280307]
+ ["Corpus Christi" 27.7378308029161 -97.4242164195629]
+ ["Dallas" 32.7821103162561 -96.7944036928693]
+ ["Davis" 38.5561009581373 -121.742879527372]
+ ["Dayton" 39.7686549511815 -84.197470586754]
+ ["Denver" 39.721934011119 -104.952125307829]
+ ["Des Moines" 41.5828901149763 -93.6261357354458]
+ ["Detroit" 42.3734324907707 -83.1192830974792]
+ ["El Paso" 31.8527366456146 -106.437432184932]
+ ["Eugene" 44.0652642601219 -123.123736166724]
+ ["Everett" 47.9374878985497 -122.214849312017]
+ ["Fort Lauderdale" 26.1358082277767 -80.1378893726993]
+ ["Fort Wayne" 41.0872780865436 -85.1384060832903]
+ ["Fort Worth" 32.7663396353216 -97.3356345187694]
+ ["Fremont" 37.5333775623542 -121.957091347667]
+ ["Fresno" 36.7805903786084 -119.779079608054]
+ ["Garland" 32.9263207437171 -96.6374134768194]
+ ["Glendale" 34.1812803215057 -118.24646056346]
+ ["Grand Rapids" 42.9691806613517 -85.6603083499934]
+ ["Hampton" 37.0533821444422 -76.3660864085499]
+ ["Hartford" 41.7660197342967 -72.6850000548942]
+ ["Hayward" 37.6463670565486 -122.07277816616]
+ ["Helena" 46.5992924413936 -112.016069747163]
+ ["Henderson" 36.0138699691504 -115.037689539722]
+ ["Honolulu" 21.4569326275069 -157.974373556969]
+ ["Houston" 29.7764362197286 -95.3651230119171]
+ ["Hunts Point" 47.6410595002837 -122.229135327003]
+ ["Irvine" 33.6719891580586 -117.783008427859]
+ ["Jackson" 32.316935168835 -90.2098972397546]
+ ["Jacksonville" 30.3333720559405 -81.6288065567485]
+ ["Jersey City" 40.7190488637139 -74.0675498734043]
+ ["Kalamazoo" 42.2741656245187 -85.586492146159]
+ ["Kansas City" 38.9914922886076 -94.5260577002287]
+ ["Kirkland" 47.68520829684 -122.189924198143]
+ ["Knoxville" 35.9669953208027 -83.9111386400784]
+ ["Lakeland" 28.0356877353262 -81.9508948933358]
+ ["Las Vegas" 36.2126726731643 -115.254149344792]
+ ["Lexington" 38.0262914937546 -84.4987785910852]
+ ["Lincoln" 40.8001715993849 -96.6926317459259]
+ ["Little Rock" 34.7166927686759 -92.3577554360521]
+ ["Long Beach" 33.8022586219213 -118.164345602519]
+ ["Los Angeles" 34.1168924900067 -118.407485160702]
+ ["Louisville" 38.2229690706391 -85.7410949937769]
+ ["Madison" 43.0792492314128 -89.392662422459]
+ ["Medina" 47.6255209894124 -122.233349126709]
+ ["Memphis" 35.1131803117294 -89.9090185894135]
+ ["Mesa" 33.4072402344463 -111.726389674979]
+ ["Miami" 25.7828297237406 -80.2228137752082]
+ ["Milwaukee" 43.0643427023987 -87.9671060879089]
+ ["Milwaukie" 45.4450767641419 -122.622632140126]
+ ["Minneapolis" 44.9625414277315 -93.2672555017126]
+ ["Missoula" 46.8685902870306 -114.005902431975]
+ ["Mobile" 30.6547259173221 -88.1553977386548]
+ ["Naples" 26.1587503746239 -81.7962378361265]
+ ["Nashville" 36.1855607755911 -86.8250314714374]
+ ["New Haven" 41.3115704632735 -72.9264676283595]
+ ["New Orleans" 30.0293197552914 -89.9149069136045]
+ ["New York City-Bronx" 40.8537117842137 -73.8686083003131]
+ ["New York City-Brooklyn" 40.6454313132955 -73.9514634643416]
+ ["New York City-Manhattan" 40.7790280008683 -73.9682155016616]
+ ["New York City-Queens" 40.7057905663726 -73.8207037600514]
+ ["New York City-Staten Island" 40.5797731980336 -74.1545946387289]
+ ["Newark" 40.7379787453333 -74.1882793111043]
+ ["North Las Vegas" 36.2711553454136 -115.123033298601]
+ ["Oakland" 37.7914090275801 -122.215423402358]
+ ["Olympia" 47.0436341347608 -122.896387701753]
+ ["Orlando" 28.4796212485055 -81.3447620209753]
+ ["Palo Alto" 37.4335900036863 -122.135538168664]
+ ["Pasadena" 34.1599825432176 -118.138639952087]
+ ["Philadelphia" 40.009526014341 -75.1318578136832]
+ ["Phoenix" 33.5795069972023 -112.092671333315]
+ ["Pittsburgh" 40.439500421903 -79.9773949383043]
+ ["Portland" 45.5369157557102 -122.648933078017]
+ ["Portland" 43.678844752771 -70.2941431474095]
+ ["Providence" 41.8241725222703 -71.422691257313]
+ ["Raleigh" 35.829648055409 -78.6380947174502]
+ ["Reno" 39.5508028689511 -119.8506298122]
+ ["Richmond" 37.5322643352472 -77.4784703051123]
+ ["Riverside" 33.9400306735386 -117.396395696286]
+ ["Rochester" 43.167830520014 -77.6138736068905]
+ ["Sacramento" 38.5671166069908 -121.471296542466]
+ ["Saint Louis" 38.6360316825051 -90.2453544320815]
+ ["Saint Paul" 44.9478914144525 -93.1039343709839]
+ ["Saint Petersburg" 27.7895017580028 -82.6654213054873]
+ ["Salem" 44.9185348717088 -123.014117759134]
+ ["Salt Lake City" 40.7782220737918 -111.923084842336]
+ ["San Antonio" 29.4811966511466 -98.5236400309898]
+ ["San Bernardino" 34.1339049146125 -117.29839235886]
+ ["San Diego" 32.8355617562572 -117.120115226693]
+ ["San Francisco" 37.7520506324268 -122.439057167332]
+ ["San Jose" 37.3045412212888 -121.861732804876]
+ ["San Mateo" 37.5508416313235 -122.314040951104]
+ ["Santa Ana" 33.7412802074209 -117.886630249593]
+ ["Santa Barbara" 34.4282665548587 -119.711400156564]
+ ["Sarasota" 27.3390821133524 -82.5377194510764]
+ ["Scottsdale" 33.6860427845044 -111.865122305566]
+ ["Seattle" 47.6209993109222 -122.333419649848]
+ ["Shreveport" 32.461248105777 -93.7877977154645]
+ ["South Bend" 41.6754424773283 -86.2525189842617]
+ ["Spokane" 47.672830992754 -117.41516549912]
+ ["Springfield" 42.1153255306358 -72.5398033914331]
+ ["Stamford" 41.104294099486 -73.5588778160019]
+ ["Stockton" 37.9722307674717 -121.309646158666]
+ ["Syracuse" 43.0401198298712 -76.1430411047429]
+ ["Tacoma" 47.2428813687102 -122.454978108353]
+ ["Tampa" 27.9894376460191 -82.4514464104274]
+ ["Tempe" 33.3877338548602 -111.92702634973]
+ ["Toledo" 41.6613112707445 -83.5889096955469]
+ ["Torrance" 33.8345668365423 -118.341466805704]
+ ["Trenton" 40.2241118992646 -74.7629611313216]
+ ["Tucson" 32.1918968185482 -110.896315856667]
+ ["Vancouver" 45.6327188549691 -122.58863138705]
+ ["Virginia Beach" 36.8711060362061 -76.0742459988519]
+ ["Washington" 38.9125861956381 -77.0136629966983]
+ ["West Palm Beach" 26.7523625822009 -80.1447671616657]
+ ["Wichita" 37.6780693015935 -97.3350738800709]
+ ["Woodinville" 47.7565941148677 -122.147987034539]
+ ["Yarrow Point" 47.644837594726 -122.217089807854]
+ ["Youngstown" 41.098932107642 -80.6459111496382]]]
+
+ ;; 15 Categories "where" Tupac was sighted
+ ["categories" [{:field-name "name"
+ :base-type :CharField}]
+ [["At a Restaurant"]
+ ["At the Movies"]
+ ["Walking Down the Street"]
+ ["At the Grocery Store"]
+ ["In the Mall"]
+ ["On TV"]
+ ["At Starbucks"]
+ ["In the Expa Office"]
+ ["In the Park"]
+ ["At the Airport"]
+ ["Working as a Limo Driver"]
+ ["Working at a Pet Store"]
+ ["Wearing a Biggie Shirt"]
+ ["In a Drum Circle"]
+ ["Dressed like a Hipster"]]]
+
+ ;; 1000 random sightings of Tupac
+ ["sightings" [{:field-name "city_id"
+ :base-type :IntegerField
+ :fk :cities}
+ {:field-name "category_id"
+ :base-type :IntegerField
+ :fk :categories}
+ {:field-name "timestamp"
+ :base-type :BigIntegerField
+ :special-type :timestamp_seconds}]
+ [[23 14 927183600]
+ [65 13 978854400]
+ [60 10 886752000]
+ [141 13 1129100400]
+ [51 4 1261814400]
+ [1 12 887443200]
+ [135 1 1021878000]
+ [133 4 1076659200]
+ [128 1 1228550400]
+ [104 9 1420272000]
+ [81 12 1273993200]
+ [40 3 1001228400]
+ [11 8 1039075200]
+ [129 1 1249974000]
+ [138 13 912931200]
+ [50 10 1002351600]
+ [88 1 995698800]
+ [151 9 983865600]
+ [26 1 1366614000]
+ [6 7 1053759600]
+ [76 11 873097200]
+ [2 14 1430118000]
+ [106 8 971938800]
+ [68 5 1191740400]
+ [119 11 1269327600]
+ [8 8 1437289200]
+ [139 4 843807600]
+ [64 2 1340521200]
+ [142 4 1205049600]
+ [144 10 1425970800]
+ [2 4 940057200]
+ [105 11 935823600]
+ [56 11 1448092800]
+ [90 2 1296028800]
+ [8 13 1416384000]
+ [48 8 967964400]
+ [54 1 1016870400]
+ [134 13 1190617200]
+ [71 12 1233734400]
+ [74 3 977126400]
+ [6 3 1303282800]
+ [65 8 1150527600]
+ [67 11 957682800]
+ [13 15 1022914800]
+ [126 1 1202630400]
+ [49 13 1245222000]
+ [44 9 1237100400]
+ [11 3 1052204400]
+ [45 9 1261296000]
+ [134 15 965631600]
+ [123 7 1155625200]
+ [99 8 914572800]
+ [36 15 827568000]
+ [115 12 1368687600]
+ [140 2 1208502000]
+ [68 2 1444114800]
+ [115 6 858499200]
+ [135 6 1329120000]
+ [130 13 1329120000]
+ [48 6 923040000]
+ [106 7 869036400]
+ [26 15 1342162800]
+ [130 10 1250492400]
+ [58 15 886406400]
+ [131 13 1143100800]
+ [129 11 1050044400]
+ [2 11 1271228400]
+ [112 2 918460800]
+ [49 2 1022310000]
+ [21 6 1382166000]
+ [127 9 1328688000]
+ [106 4 1108454400]
+ [8 4 1186124400]
+ [122 7 1131868800]
+ [130 2 829033200]
+ [20 13 1266998400]
+ [2 13 936342000]
+ [117 15 1365231600]
+ [55 9 832575600]
+ [37 15 1328083200]
+ [6 11 833958000]
+ [101 11 1365145200]
+ [88 3 1002438000]
+ [67 1 1406271600]
+ [87 1 1050217200]
+ [115 14 1235030400]
+ [20 2 930380400]
+ [37 12 1315033200]
+ [122 2 1118127600]
+ [86 10 1425715200]
+ [128 14 1030258800]
+ [15 7 1160636400]
+ [55 12 1438066800]
+ [39 5 1257753600]
+ [129 11 945417600]
+ [147 6 1319612400]
+ [52 9 1013760000]
+ [67 13 1177657200]
+ [2 14 1141459200]
+ [106 12 1297756800]
+ [23 9 1061103600]
+ [58 7 891504000]
+ [93 9 1105862400]
+ [150 3 1122361200]
+ [45 6 1408518000]
+ [82 3 988441200]
+ [94 4 939970800]
+ [89 14 1214636400]
+ [146 2 1429599600]
+ [91 6 1143014400]
+ [87 15 887529600]
+ [47 14 1145430000]
+ [9 12 1374130800]
+ [65 8 1320739200]
+ [85 3 1033887600]
+ [46 12 975398400]
+ [12 10 913017600]
+ [25 3 959929200]
+ [139 4 1145343600]
+ [30 11 1302332400]
+ [2 8 1197014400]
+ [94 1 1262505600]
+ [44 13 1027494000]
+ [39 3 1172995200]
+ [73 15 1198569600]
+ [68 10 924937200]
+ [22 9 1073548800]
+ [90 6 1085295600]
+ [128 8 908953200]
+ [8 8 1039939200]
+ [7 3 1120546800]
+ [29 13 1184655600]
+ [61 8 1254553200]
+ [147 7 1383984000]
+ [22 6 890380800]
+ [54 15 920966400]
+ [38 5 1105603200]
+ [133 8 844844400]
+ [149 12 936169200]
+ [38 6 991551600]
+ [115 11 846489600]
+ [24 13 1126854000]
+ [111 5 1412924400]
+ [98 2 1444633200]
+ [57 14 832834800]
+ [58 9 964681200]
+ [91 15 1291622400]
+ [102 12 847785600]
+ [89 11 990774000]
+ [52 13 1147503600]
+ [87 1 1284706800]
+ [46 12 1431759600]
+ [134 5 1081839600]
+ [146 9 1050476400]
+ [137 12 1304406000]
+ [86 6 917856000]
+ [134 1 916905600]
+ [94 6 1440140400]
+ [86 5 1342422000]
+ [11 13 1381302000]
+ [68 14 826963200]
+ [75 13 940834800]
+ [20 9 1045987200]
+ [17 15 1134979200]
+ [58 2 871196400]
+ [48 3 1374303600]
+ [31 14 1415433600]
+ [125 6 1381647600]
+ [147 12 1169193600]
+ [82 8 862210800]
+ [23 14 864198000]
+ [31 13 1376636400]
+ [19 6 899881200]
+ [57 10 969606000]
+ [72 3 994057200]
+ [56 1 1131696000]
+ [13 1 1155452400]
+ [29 6 1068796800]
+ [100 12 1276671600]
+ [83 14 1324022400]
+ [142 3 1323504000]
+ [135 14 1330675200]
+ [50 14 1226044800]
+ [53 3 959929200]
+ [71 9 840697200]
+ [70 13 917164800]
+ [130 3 1182322800]
+ [64 11 904633200]
+ [33 10 1267171200]
+ [74 5 820656000]
+ [112 8 1228896000]
+ [54 7 1096354800]
+ [21 14 848044800]
+ [100 15 1391673600]
+ [50 7 1190185200]
+ [127 2 1063004400]
+ [68 3 1067065200]
+ [70 8 1153465200]
+ [133 1 1449734400]
+ [42 14 1157439600]
+ [123 7 1106726400]
+ [2 13 919238400]
+ [20 1 991378800]
+ [120 6 1095058800]
+ [84 12 946281600]
+ [102 4 1225609200]
+ [149 6 1345878000]
+ [70 8 1322294400]
+ [133 10 1275030000]
+ [77 6 1068192000]
+ [66 9 937724400]
+ [106 11 1226563200]
+ [140 2 1059980400]
+ [118 4 894351600]
+ [137 9 1336374000]
+ [48 11 883728000]
+ [101 13 932281200]
+ [125 9 904287600]
+ [38 1 872665200]
+ [60 10 1397977200]
+ [103 6 1058943600]
+ [31 6 1042963200]
+ [62 3 1171958400]
+ [45 14 1312182000]
+ [6 6 1243407600]
+ [103 3 1055833200]
+ [145 12 1332486000]
+ [29 8 1243494000]
+ [92 2 1371366000]
+ [142 4 926406000]
+ [111 7 1160550000]
+ [71 1 868863600]
+ [64 9 821520000]
+ [150 15 896338800]
+ [115 3 1068537600]
+ [119 7 1216623600]
+ [108 8 1107849600]
+ [16 13 1214895600]
+ [148 5 890640000]
+ [17 7 1182495600]
+ [135 1 1229587200]
+ [120 5 1317106800]
+ [37 10 832316400]
+ [35 13 1214982000]
+ [72 3 1408777200]
+ [131 3 1165824000]
+ [47 11 1187679600]
+ [8 12 1392192000]
+ [139 15 1185606000]
+ [107 13 1119682800]
+ [114 14 1002178800]
+ [13 11 1099468800]
+ [11 9 1354521600]
+ [13 5 820656000]
+ [8 4 1396767600]
+ [87 12 1260259200]
+ [119 10 835599600]
+ [54 8 1123484400]
+ [19 14 1167638400]
+ [74 13 1195372800]
+ [51 9 980236800]
+ [128 8 1437548400]
+ [31 4 1431759600]
+ [49 11 920016000]
+ [144 5 1000882800]
+ [27 12 1202716800]
+ [7 2 1442732400]
+ [129 9 1003993200]
+ [14 12 1169884800]
+ [115 11 989650800]
+ [137 8 1090652400]
+ [51 8 1282978800]
+ [107 2 1017043200]
+ [57 2 997254000]
+ [25 6 1119942000]
+ [46 13 1207465200]
+ [18 7 1327046400]
+ [87 14 992934000]
+ [126 12 976521600]
+ [28 6 1432105200]
+ [149 10 1007884800]
+ [12 15 1385193600]
+ [89 1 1235894400]
+ [22 12 1214290800]
+ [4 9 1068364800]
+ [98 14 831798000]
+ [107 1 945244800]
+ [148 3 1113375600]
+ [37 11 1342854000]
+ [131 15 1226822400]
+ [68 5 1173682800]
+ [149 7 911808000]
+ [100 8 1319439600]
+ [30 7 1288767600]
+ [42 2 1130482800]
+ [72 15 901954800]
+ [88 6 1082876400]
+ [35 2 1246431600]
+ [109 15 1060758000]
+ [37 9 1431241200]
+ [131 6 1374390000]
+ [63 10 825840000]
+ [63 4 905065200]
+ [120 5 1087023600]
+ [101 14 848736000]
+ [112 3 1219129200]
+ [59 2 1344495600]
+ [24 2 1363503600]
+ [108 15 1230105600]
+ [134 3 1287990000]
+ [55 4 1236582000]
+ [48 7 860227200]
+ [19 13 1049698800]
+ [129 15 1256281200]
+ [105 5 849168000]
+ [98 3 853401600]
+ [84 7 1071475200]
+ [136 2 1429858800]
+ [13 13 1329206400]
+ [127 2 1337670000]
+ [58 11 1353657600]
+ [98 10 998031600]
+ [15 7 1251874800]
+ [73 10 1431414000]
+ [73 12 1121151600]
+ [72 13 1055919600]
+ [55 5 1005984000]
+ [10 15 823593600]
+ [34 8 981619200]
+ [4 2 1119510000]
+ [7 11 1326441600]
+ [110 11 1400655600]
+ [9 7 826704000]
+ [63 2 1045123200]
+ [16 15 1342767600]
+ [138 6 1246950000]
+ [66 12 1360051200]
+ [16 7 1350198000]
+ [128 9 1423036800]
+ [58 10 1109836800]
+ [54 8 1007884800]
+ [80 9 1416211200]
+ [136 13 889776000]
+ [57 7 1113289200]
+ [61 14 1230278400]
+ [113 6 956905200]
+ [28 2 1391500800]
+ [95 5 1016006400]
+ [120 1 1026975600]
+ [126 11 1306566000]
+ [135 4 1309158000]
+ [118 9 1376895600]
+ [74 7 1282028400]
+ [95 4 1256194800]
+ [1 11 1223190000]
+ [33 1 832575600]
+ [26 14 1315983600]
+ [78 1 1420617600]
+ [76 7 946713600]
+ [116 1 1022310000]
+ [77 8 1131523200]
+ [24 5 1218697200]
+ [134 8 1192345200]
+ [124 9 1296547200]
+ [141 9 998895600]
+ [131 8 1086764400]
+ [70 6 1298016000]
+ [41 15 1435906800]
+ [117 7 1057734000]
+ [29 3 1239174000]
+ [16 15 980236800]
+ [60 4 1173513600]
+ [96 5 832489200]
+ [68 3 1364799600]
+ [53 5 1020582000]
+ [52 5 1382857200]
+ [52 4 1333522800]
+ [61 13 1357545600]
+ [1 13 1295856000]
+ [139 5 1125644400]
+ [6 4 1247209200]
+ [35 4 1002092400]
+ [70 5 1020927600]
+ [105 11 1345359600]
+ [85 6 1323504000]
+ [94 10 1432623600]
+ [59 6 1197273600]
+ [149 2 1013155200]
+ [56 5 1108540800]
+ [84 11 880185600]
+ [109 2 895820400]
+ [12 7 1027148400]
+ [8 9 1165046400]
+ [99 3 1069574400]
+ [4 14 1413615600]
+ [28 12 1096268400]
+ [95 4 888307200]
+ [149 6 971938800]
+ [15 15 1442732400]
+ [19 9 1074931200]
+ [91 12 868950000]
+ [50 12 997513200]
+ [73 3 821606400]
+ [35 6 887184000]
+ [6 7 866530800]
+ [76 2 1281164400]
+ [83 3 1185519600]
+ [22 3 1302159600]
+ [114 1 897289200]
+ [114 9 1378105200]
+ [137 4 1434092400]
+ [33 13 979459200]
+ [1 5 944121600]
+ [102 13 1281510000]
+ [82 14 836550000]
+ [144 15 956559600]
+ [3 11 1010563200]
+ [4 2 1160463600]
+ [78 15 1088406000]
+ [84 10 1205996400]
+ [16 3 1232870400]
+ [89 12 884073600]
+ [109 14 858585600]
+ [133 10 968137200]
+ [136 9 1172995200]
+ [1 1 1151823600]
+ [110 14 1023951600]
+ [57 1 869554800]
+ [8 7 917078400]
+ [117 5 1308898800]
+ [31 3 976348800]
+ [51 3 1370847600]
+ [43 8 893055600]
+ [110 10 901090800]
+ [62 6 1401865200]
+ [80 12 1256281200]
+ [104 2 1012636800]
+ [71 10 1203667200]
+ [81 1 1158476400]
+ [120 2 1342940400]
+ [131 9 1159081200]
+ [97 10 1216623600]
+ [93 9 1080979200]
+ [62 10 1066719600]
+ [49 14 1060498800]
+ [124 10 836722800]
+ [68 13 1049356800]
+ [139 2 910339200]
+ [88 13 877330800]
+ [114 3 1181890800]
+ [98 1 1278486000]
+ [40 5 1214636400]
+ [12 11 891676800]
+ [142 10 908348400]
+ [119 9 997426800]
+ [30 11 923900400]
+ [45 14 1308294000]
+ [58 12 838364400]
+ [80 4 1019286000]
+ [114 10 1171008000]
+ [4 4 1048838400]
+ [139 12 1299052800]
+ [43 15 838882800]
+ [66 4 1140336000]
+ [31 2 1196582400]
+ [6 2 1049616000]
+ [14 8 1033542000]
+ [122 14 1230969600]
+ [44 6 902818800]
+ [30 7 976262400]
+ [17 12 1431327600]
+ [129 8 1363676400]
+ [102 5 1443942000]
+ [104 11 959065200]
+ [41 15 905324400]
+ [19 14 1231228800]
+ [53 13 1049616000]
+ [139 6 1077696000]
+ [58 12 946022400]
+ [96 10 858240000]
+ [70 14 1218265200]
+ [61 8 1371193200]
+ [56 10 1177743600]
+ [140 10 858499200]
+ [44 4 844585200]
+ [19 4 1291622400]
+ [140 15 1214118000]
+ [41 3 1436684400]
+ [97 4 1318057200]
+ [20 10 923641200]
+ [52 5 922953600]
+ [104 2 891590400]
+ [102 8 1045468800]
+ [142 4 928393200]
+ [19 8 1320998400]
+ [149 9 1176447600]
+ [80 4 1163059200]
+ [25 5 847785600]
+ [51 8 1444719600]
+ [144 3 1235808000]
+ [48 4 1319439600]
+ [18 15 923986800]
+ [92 6 1245740400]
+ [8 15 1420444800]
+ [83 10 1009267200]
+ [63 10 882172800]
+ [17 9 1017648000]
+ [88 14 863938800]
+ [21 6 831798000]
+ [91 5 1101888000]
+ [2 14 1161414000]
+ [124 6 1062572400]
+ [122 14 1272870000]
+ [105 6 1433401200]
+ [5 14 1441090800]
+ [146 9 1071648000]
+ [124 11 1229068800]
+ [138 15 1056524400]
+ [43 2 1082444400]
+ [124 12 1123052400]
+ [113 2 1105344000]
+ [81 4 941007600]
+ [112 13 1360051200]
+ [2 11 1311490800]
+ [9 11 893574000]
+ [88 11 1265097600]
+ [2 10 967014000]
+ [27 14 966495600]
+ [42 2 1348729200]
+ [47 8 1340521200]
+ [110 6 1276326000]
+ [2 14 958374000]
+ [75 8 1386835200]
+ [142 9 879580800]
+ [135 8 1341730800]
+ [35 3 1153724400]
+ [17 9 1208847600]
+ [91 2 938761200]
+ [66 4 1076918400]
+ [99 1 1091775600]
+ [110 12 858758400]
+ [136 14 844326000]
+ [53 11 1296806400]
+ [16 10 1390032000]
+ [50 10 978768000]
+ [22 10 1015228800]
+ [79 15 1029826800]
+ [118 7 960102000]
+ [144 12 1079942400]
+ [102 7 1307084400]
+ [122 12 948268800]
+ [90 13 1204185600]
+ [48 15 827740800]
+ [119 11 1190012400]
+ [78 5 1215673200]
+ [107 3 842166000]
+ [12 12 847612800]
+ [72 8 1111478400]
+ [30 12 1056697200]
+ [105 11 1427526000]
+ [91 7 1285311600]
+ [46 1 1000191600]
+ [147 11 1375426800]
+ [25 13 1116831600]
+ [74 8 1392537600]
+ [88 14 1157958000]
+ [107 3 1236326400]
+ [78 9 863766000]
+ [50 3 910944000]
+ [139 11 962953200]
+ [115 1 1295337600]
+ [26 3 1298707200]
+ [102 1 1170403200]
+ [76 11 823852800]
+ [123 11 966322800]
+ [76 13 1430118000]
+ [41 2 1307170800]
+ [2 2 903423600]
+ [41 15 908866800]
+ [60 12 1419667200]
+ [71 9 1182322800]
+ [147 10 1286953200]
+ [20 7 868431600]
+ [27 9 1170748800]
+ [102 4 1393920000]
+ [37 8 964681200]
+ [80 15 1019372400]
+ [129 4 1193554800]
+ [93 15 1235980800]
+ [4 1 867913200]
+ [92 11 925714800]
+ [120 13 883036800]
+ [55 5 933145200]
+ [18 11 1150354800]
+ [78 5 1140681600]
+ [1 11 1229241600]
+ [128 9 1177225200]
+ [69 13 1087801200]
+ [23 7 889430400]
+ [103 10 1362038400]
+ [134 5 1271142000]
+ [119 9 1439449200]
+ [41 12 852969600]
+ [79 1 1335855600]
+ [117 14 1434178800]
+ [49 4 1263801600]
+ [92 10 976953600]
+ [18 9 965804400]
+ [84 6 826185600]
+ [71 11 1321948800]
+ [74 7 912585600]
+ [53 13 1031900400]
+ [38 3 1050994800]
+ [58 4 844239600]
+ [116 15 1305529200]
+ [149 13 1070870400]
+ [115 1 1368860400]
+ [138 12 1077350400]
+ [110 1 1118386800]
+ [126 4 1143014400]
+ [138 1 1281596400]
+ [85 14 845449200]
+ [129 4 854870400]
+ [104 13 1041062400]
+ [138 10 1329724800]
+ [109 3 927010800]
+ [71 9 857894400]
+ [5 5 902473200]
+ [35 3 1130050800]
+ [127 4 1266652800]
+ [73 11 1354867200]
+ [134 1 918720000]
+ [118 13 1046332800]
+ [74 9 1043308800]
+ [79 10 1225177200]
+ [67 14 1254639600]
+ [20 15 1423296000]
+ [33 7 1403938800]
+ [41 5 1186815600]
+ [23 9 957596400]
+ [31 3 834476400]
+ [4 9 1011772800]
+ [102 14 1113116400]
+ [122 15 1269327600]
+ [14 3 883036800]
+ [91 5 1225609200]
+ [75 4 1295424000]
+ [94 4 961138800]
+ [54 6 927270000]
+ [30 1 1001401200]
+ [75 2 915609600]
+ [117 15 1256713200]
+ [35 5 973152000]
+ [114 12 929343600]
+ [60 10 1059375600]
+ [20 12 1344668400]
+ [18 6 1411801200]
+ [15 5 1239951600]
+ [102 1 949564800]
+ [65 10 1018940400]
+ [128 14 866271600]
+ [101 9 884592000]
+ [23 15 1278572400]
+ [81 3 1055487600]
+ [31 15 993625200]
+ [82 2 868518000]
+ [56 8 942134400]
+ [16 10 1180940400]
+ [59 4 1260950400]
+ [10 6 1430204400]
+ [86 8 976176000]
+ [19 2 1411110000]
+ [4 6 1025074800]
+ [33 14 1194508800]
+ [58 12 963212400]
+ [147 9 826358400]
+ [119 4 974448000]
+ [117 2 1008403200]
+ [151 5 1403506800]
+ [52 2 1296115200]
+ [87 13 1329120000]
+ [136 9 1028185200]
+ [30 10 1150354800]
+ [36 10 1449820800]
+ [111 13 1243839600]
+ [35 7 1153983600]
+ [9 7 1343026800]
+ [39 2 1270450800]
+ [106 10 1348383600]
+ [86 7 1145430000]
+ [18 10 917164800]
+ [11 3 1145689200]
+ [25 14 988095600]
+ [67 1 981532800]
+ [12 10 924159600]
+ [69 4 1176793200]
+ [95 13 1245394800]
+ [51 13 967878000]
+ [20 13 1314428400]
+ [69 15 1161068400]
+ [38 2 1134374400]
+ [150 10 1008489600]
+ [85 1 1368687600]
+ [49 13 1266825600]
+ [82 15 1006761600]
+ [81 14 1218265200]
+ [29 7 961657200]
+ [104 14 1194249600]
+ [71 9 1248246000]
+ [10 5 866617200]
+ [125 7 1313391600]
+ [136 2 942393600]
+ [91 4 834390000]
+ [68 14 1102752000]
+ [149 4 892623600]
+ [26 11 1199174400]
+ [92 9 849686400]
+ [79 6 950083200]
+ [109 6 1381993200]
+ [108 4 906447600]
+ [116 10 994921200]
+ [52 11 1000278000]
+ [82 9 1361606400]
+ [114 10 1431327600]
+ [130 13 891504000]
+ [71 8 877158000]
+ [31 5 933663600]
+ [50 15 1123398000]
+ [29 5 1173168000]
+ [146 3 1136966400]
+ [12 9 847699200]
+ [114 14 1057993200]
+ [41 15 1076745600]
+ [143 13 1338966000]
+ [145 11 1053586800]
+ [89 6 1049958000]
+ [21 4 1350457200]
+ [94 11 1331881200]
+ [147 9 1433833200]
+ [52 12 1318057200]
+ [26 14 1074067200]
+ [81 5 1251183600]
+ [73 13 1330329600]
+ [88 13 1049958000]
+ [102 5 922435200]
+ [61 13 848476800]
+ [135 6 1435820400]
+ [15 10 1326614400]
+ [77 5 1064214000]
+ [24 7 1403766000]
+ [47 2 1257926400]
+ [150 12 997254000]
+ [90 10 1251183600]
+ [50 13 868345200]
+ [51 4 1350025200]
+ [112 1 1052982000]
+ [6 8 1120719600]
+ [47 9 978595200]
+ [34 11 885542400]
+ [53 6 1037865600]
+ [43 13 871023600]
+ [59 2 985161600]
+ [11 14 1207983600]
+ [60 8 1229414400]
+ [125 11 1202976000]
+ [62 10 983692800]
+ [105 12 1414479600]
+ [33 12 1086073200]
+ [75 4 1030345200]
+ [99 11 1296806400]
+ [60 10 883123200]
+ [2 9 1450080000]
+ [100 1 1096268400]
+ [27 12 935564400]
+ [135 3 1135238400]
+ [69 14 880012800]
+ [47 5 936342000]
+ [27 1 953193600]
+ [19 4 1159254000]
+ [89 11 1147849200]
+ [22 3 987750000]
+ [18 10 1006848000]
+ [2 7 1270191600]
+ [6 5 1022569200]
+ [106 15 1119769200]
+ [28 8 1014883200]
+ [96 8 1283756400]
+ [75 11 1096009200]
+ [99 1 862038000]
+ [75 9 1077004800]
+ [103 9 922435200]
+ [20 14 1049356800]
+ [65 8 1042876800]
+ [113 9 1021359600]
+ [81 1 1380610800]
+ [5 13 1213081200]
+ [66 2 958978800]
+ [75 8 872319600]
+ [121 2 1276153200]
+ [40 9 834994800]
+ [42 15 1427007600]
+ [14 11 1282028400]
+ [102 2 1202371200]
+ [122 9 1417507200]
+ [79 1 1112428800]
+ [46 12 1425542400]
+ [3 1 1240383600]
+ [145 14 1058684400]
+ [121 3 835772400]
+ [11 11 1301122800]
+ [92 2 1432623600]
+ [138 8 1224399600]
+ [30 14 1423382400]
+ [66 10 1313996400]
+ [108 1 1145948400]
+ [17 11 1207897200]
+ [17 7 1038902400]
+ [94 14 1221202800]
+ [110 1 1388563200]
+ [108 11 1371366000]
+ [37 10 1165478400]
+ [75 7 1303369200]
+ [32 10 1386144000]
+ [130 9 1010736000]
+ [57 11 1370502000]
+ [6 13 944208000]
+ [96 12 1296979200]
+ [123 4 1087369200]
+ [37 9 907311600]
+ [24 5 1240815600]
+ [74 4 1265356800]
+ [144 11 1097391600]
+ [6 4 1425110400]
+ [82 4 1424419200]
+ [86 2 1416211200]
+ [84 11 1065250800]
+ [74 11 1411887600]
+ [13 9 915696000]
+ [121 8 903078000]
+ [101 4 955695600]
+ [144 6 1000796400]
+ [73 14 1324713600]
+ [128 4 1429772400]
+ [4 8 830415600]
+ [69 7 995958000]
+ [19 13 1304492400]
+ [118 15 1224399600]
+ [130 14 960534000]
+ [143 10 1303628400]
+ [145 13 848736000]
+ [98 6 1176188400]
+ [84 9 1087455600]
+ [134 12 927874800]
+ [139 15 1413961200]
+ [11 4 1370070000]
+ [115 15 846313200]
+ [72 11 1274684400]
+ [140 12 1247641200]
+ [107 11 1005120000]
+ [6 14 1162972800]
+ [119 3 1326700800]
+ [114 9 1207897200]
+ [74 9 859017600]
+ [70 7 1085468400]
+ [60 9 1046160000]
+ [151 12 1366959600]
+ [95 3 1237791600]
+ [97 13 1122188400]
+ [2 6 1387958400]
+ [67 5 1328083200]
+ [41 6 1423209600]
+ [50 8 1181545200]
+ [10 14 1125212400]
+ [60 6 1253170800]
+ [143 5 977558400]
+ [114 8 1205218800]
+ [33 3 945158400]
+ [52 5 1262332800]
+ [146 11 1256022000]
+ [107 15 1280991600]
+ [29 15 1345100400]
+ [142 9 1098687600]
+ [14 5 1101628800]
+ [26 4 1099900800]
+ [56 10 965890800]
+ [148 7 853142400]
+ [143 9 877158000]
+ [105 6 1326009600]
+ [43 3 1428562800]
+ [139 7 1290412800]
+ [144 9 1125903600]
+ [138 5 1045555200]
+ [4 1 968050800]
+ [123 12 1449993600]
+ [99 1 839142000]
+ [131 1 1149490800]
+ [71 13 1445842800]
+ [33 10 1339657200]
+ [107 6 900918000]
+ [25 6 994921200]
+ [15 4 1054710000]
+ [10 7 1447401600]
+ [3 5 930898800]
+ [27 8 1023001200]
+ [24 6 1384761600]
+ [24 10 851155200]
+ [142 9 1369638000]
+ [33 15 1340348400]
+ [140 1 1035442800]
+ [111 10 1273906800]
+ [102 10 927356400]
+ [66 7 880185600]
+ [115 3 1093158000]
+ [119 4 977212800]
+ [76 13 1222585200]
+ [69 1 1025679600]
+ [104 14 1057734000]
+ [33 5 955350000]
+ [147 3 1283497200]
+ [18 12 1206687600]
+ [62 2 868172400]
+ [104 8 962434800]
+ [60 11 1218783600]
+ [101 9 1161673200]
+ [90 6 1420099200]
+ [8 14 1334473200]
+ [121 6 1447228800]
+ [55 13 1242975600]
+ [80 13 1176966000]
+ [68 15 1116226800]
+ [104 13 1149922800]
+ [49 3 1242543600]
+ [60 2 958978800]
+ [123 10 894697200]
+ [119 6 1158217200]
+ [66 10 847353600]
+ [71 10 1165046400]
+ [65 5 1272265200]
+ [56 10 1081321200]
+ [87 6 1343026800]
+ [7 8 965977200]
+ [23 2 1099296000]
+ [62 2 913104000]
+ [8 8 1349334000]
+ [115 6 953971200]
+ [75 6 1059980400]
+ [73 2 1329984000]
+ [9 9 1182150000]
+ [108 7 1198656000]
+ [67 15 1402210800]
+ [151 7 969865200]
+ [38 5 1114239600]
+ [100 12 1129186800]
+ [108 6 1092553200]
+ [5 10 1441695600]
+ [128 7 1269068400]
+ [52 13 1003215600]
+ [99 15 1216969200]
+ [121 6 1337497200]
+ [117 5 887184000]
+ [143 1 1017734400]
+ [49 11 1182409200]
+ [80 2 881308800]
+ [5 7 881308800]
+ [75 11 1146034800]
+ [42 14 887443200]
+ [66 12 1354348800]
+ [21 1 981964800]
+ [30 4 1050044400]
+ [72 5 974102400]
+ [10 5 1334041200]
+ [137 6 1284274800]
+ [35 2 1437548400]
+ [75 3 1392537600]
+ [75 5 1353830400]
+ [130 6 1402729200]
+ [16 12 1293523200]
+ [59 14 1178953200]
+ [58 5 1245567600]
+ [98 11 1435474800]
+ [25 12 1231660800]
+ [146 7 844498800]
+ [23 5 1272438000]
+ [68 5 1141718400]
+ [55 2 1115017200]
+ [21 3 1017907200]
+ [47 10 1364454000]
+ [135 13 1065078000]
+ [11 15 933663600]
+ [119 9 1263715200]
+ [140 15 1291968000]
+ [38 6 1108454400]
+ [49 3 1056265200]
+ [12 8 1153551600]
+ [71 2 1368946800]
+ [125 1 1446624000]
+ [83 11 921916800]
+ [89 3 878544000]
+ [7 15 1123138800]
+ [26 10 1430031600]]]]
diff --git a/test/metabase/test/data/datasets.clj b/test/metabase/test/data/datasets.clj
index 8daf54e42d1b9e08eca6107b6216050e8f9fd692..0311c108dd0f3a8c5dc532b6827fac8985871a9c 100644
--- a/test/metabase/test/data/datasets.clj
+++ b/test/metabase/test/data/datasets.clj
@@ -11,7 +11,9 @@
[table :refer [Table]])
(metabase.test.data [data :as data]
[h2 :as h2]
- [mongo :as mongo])
+ [mongo :as mongo]
+ [mysql :as mysql]
+ [postgres :as postgres])
[metabase.util :as u]))
;; # IDataset
@@ -37,6 +39,8 @@
(e.g., `h2` would want to upcase these names; `mongo` would want to use `\"_id\"` in place of `\"id\"`.")
(id-field-type [this]
"Return the `base_type` of the `id` `Field` (e.g. `:IntegerField` or `:BigIntegerField`).")
+ (sum-field-type [this]
+ "Return the `base_type` of a aggregate summed field.")
(timestamp-field-type [this]
"Return the `base_type` of a `TIMESTAMP` `Field` like `users.last_login`."))
@@ -50,85 +54,123 @@
(load-data! [_]
@mongo-data/mongo-test-db
(assert (integer? @mongo-data/mongo-test-db-id)))
+
(dataset-loader [_]
(mongo/dataset-loader))
+
(db [_]
@mongo-data/mongo-test-db)
+
(table-name->table [_ table-name]
(mongo-data/table-name->table table-name))
+
(table-name->id [_ table-name]
(mongo-data/table-name->id table-name))
+
(field-name->id [_ table-name field-name]
(mongo-data/field-name->id table-name (if (= field-name :id) :_id
field-name)))
- (fks-supported? [_]
- false)
(format-name [_ table-or-field-name]
(if (= table-or-field-name "id") "_id"
table-or-field-name))
- (id-field-type [_]
- :IntegerField)
- (timestamp-field-type [_]
- :DateField))
+
+ (fks-supported? [_] false)
+ (id-field-type [_] :IntegerField)
+ (sum-field-type [_] :IntegerField)
+ (timestamp-field-type [_] :DateField))
-;; ## Generic SQL (H2)
+;; ## Generic SQL
;; TODO - Mongo implementation (etc.) might find these useful
(def ^:private memoized-table-name->id
(memoize
(fn [db-id table-name]
- (sel :one :id Table :name (s/upper-case (name table-name)), :db_id db-id))))
+ {:pre [(string? table-name)]
+ :post [(integer? %)]}
+ (sel :one :id Table :name table-name, :db_id db-id))))
(def ^:private memoized-field-name->id
(memoize
(fn [db-id table-name field-name]
- (sel :one :id Field :name (s/upper-case (name field-name)), :table_id (memoized-table-name->id db-id table-name)))))
-
-(def ^:private generic-sql-db
- (delay ))
-
-(deftype GenericSqlDriverData [dbpromise]
+ {:pre [(string? field-name)]
+ :post [(integer? %)]}
+ (sel :one :id Field :name field-name, :table_id (memoized-table-name->id db-id table-name)))))
+
+(defn- generic-sql-load-data! [{:keys [dbpromise], :as this}]
+ (when-not (realized? dbpromise)
+ (deliver dbpromise ((u/runtime-resolved-fn 'metabase.test.data 'get-or-create-database!) (dataset-loader this) data/test-data)))
+ @dbpromise)
+
+(def ^:private GenericSQLIDatasetMixin
+ {:load-data! generic-sql-load-data!
+ :db generic-sql-load-data!
+ :table-name->id (fn [this table-name]
+ (memoized-table-name->id (:id (db this)) (name table-name)))
+ :table-name->table (fn [this table-name]
+ (Table (table-name->id this (name table-name))))
+ :field-name->id (fn [this table-name field-name]
+ (memoized-field-name->id (:id (db this)) (name table-name) (name field-name)))
+ :format-name (fn [_ table-or-field-name]
+ table-or-field-name)
+ :fks-supported? (constantly true)
+ :timestamp-field-type (constantly :DateTimeField)
+ :id-field-type (constantly :IntegerField)})
+
+
+;;; ### H2
+
+(defrecord H2DriverData [dbpromise])
+
+(extend H2DriverData
IDataset
- (dataset-loader [_]
- (h2/dataset-loader))
-
- (load-data! [this]
- (when-not (realized? dbpromise)
- (deliver dbpromise ((u/runtime-resolved-fn 'metabase.test.data 'get-or-create-database!) (dataset-loader this) data/test-data)))
- @dbpromise)
-
- (db [this]
- (load-data! this))
-
- (table-name->id [this table-name]
- (memoized-table-name->id (:id (db this)) table-name))
-
- (table-name->table [this table-name]
- (sel :one Table :id (table-name->id this table-name)))
-
- (field-name->id [this table-name field-name]
- (memoized-field-name->id (:id (db this)) table-name field-name))
+ (merge GenericSQLIDatasetMixin
+ {:dataset-loader (fn [_]
+ (h2/dataset-loader))
+ :table-name->id (fn [this table-name]
+ (memoized-table-name->id (:id (db this)) (s/upper-case (name table-name))))
+ :table-name->table (fn [this table-name]
+ (Table (table-name->id this (s/upper-case (name table-name)))))
+ :field-name->id (fn [this table-name field-name]
+ (memoized-field-name->id (:id (db this)) (s/upper-case (name table-name)) (s/upper-case (name field-name))))
+ :format-name (fn [_ table-or-field-name]
+ (clojure.string/upper-case table-or-field-name))
+ :id-field-type (constantly :BigIntegerField)
+ :sum-field-type (constantly :BigIntegerField)}))
+
+
+;;; ### Postgres
+
+(defrecord PostgresDriverData [dbpromise])
+
+(extend PostgresDriverData
+ IDataset
+ (merge GenericSQLIDatasetMixin
+ {:dataset-loader (fn [_]
+ (postgres/dataset-loader))
+ :sum-field-type (constantly :IntegerField)}))
- (fks-supported? [_]
- true)
- (format-name [_ table-or-field-name]
- (clojure.string/upper-case table-or-field-name))
+;;; ### MySQL
- (id-field-type [_]
- :BigIntegerField)
+(defrecord MySQLDriverData [dbpromise])
- (timestamp-field-type [_]
- :DateTimeField))
+(extend MySQLDriverData
+ IDataset
+ (merge GenericSQLIDatasetMixin
+ {:dataset-loader (fn [_]
+ (mysql/dataset-loader))
+ :sum-field-type (constantly :BigIntegerField)}))
;; # Concrete Instances
(def dataset-name->dataset
"Map of dataset keyword name -> dataset instance (i.e., an object that implements `IDataset`)."
- {:mongo (MongoDriverData.)
- :generic-sql (GenericSqlDriverData. (promise))})
+ {:mongo (MongoDriverData.)
+ :h2 (H2DriverData. (promise))
+ :postgres (PostgresDriverData. (promise))
+ :mysql (MySQLDriverData. (promise))})
(def ^:const all-valid-dataset-names
"Set of names of all valid datasets."
@@ -137,13 +179,13 @@
;; # Logic for determining which datasets to test against
-;; By default, we'll test against against only the :generic-sql (H2) dataset; otherwise, you can specify which
+;; By default, we'll test against against only the :h2 (H2) dataset; otherwise, you can specify which
;; datasets to test against by setting the env var `MB_TEST_DATASETS` to a comma-separated list of dataset names, e.g.
;;
-;; # test against :generic-sql and :mongo
+;; # test against :h2 and :mongo
;; MB_TEST_DATASETS=generic-sql,mongo
;;
-;; # just test against :generic-sql (default)
+;; # just test against :h2 (default)
;; MB_TEST_DATASETS=generic-sql
(defn- get-test-datasets-from-env
@@ -160,21 +202,23 @@
dataset-name))
set)))
-(def test-dataset-names
- "Delay that returns set of names of drivers we should run tests against.
- By default, this returns only `:generic-sql`, but can be overriden by setting env var `MB_TEST_DATASETS`."
- (delay (let [datasets (or (get-test-datasets-from-env)
- #{:generic-sql})]
- (log/info (color/green "Running QP tests against these datasets: " datasets))
- datasets)))
+(defonce ^:const
+ ^{:doc (str "Set of names of drivers we should run tests against. "
+ "By default, this only contains `:h2` but can be overriden by setting env var `MB_TEST_DATASETS`.")}
+ test-dataset-names
+ (let [datasets (or (get-test-datasets-from-env)
+ #{:h2})]
+ (log/info (color/green "Running QP tests against these datasets: " datasets))
+ datasets))
;; # Helper Macros
(def ^:dynamic *dataset*
"The dataset we're currently testing against, bound by `with-dataset`.
- Defaults to `:generic-sql`."
- (dataset-name->dataset :generic-sql))
+ Defaults to `:h2`."
+ (dataset-name->dataset (if (contains? test-dataset-names :h2) :h2
+ (first test-dataset-names))))
(defmacro with-dataset
"Bind `*dataset*` to the dataset with DATASET-NAME and execute BODY."
@@ -185,7 +229,7 @@
(defmacro when-testing-dataset
"Execute BODY only if we're currently testing against DATASET-NAME."
[dataset-name & body]
- `(when (contains? @test-dataset-names ~dataset-name)
+ `(when (contains? test-dataset-names ~dataset-name)
~@body))
(defmacro with-dataset-when-testing
@@ -226,3 +270,16 @@
`*dataset*` is bound to the current dataset inside each test."
[expected actual]
`(expect-with-datasets ~all-valid-dataset-names ~expected ~actual))
+
+(defmacro dataset-case
+ "Case statement that switches off of the current dataset.
+
+ (dataset-case
+ :h2 ...
+ :postgres ...)"
+ [& pairs]
+ `(cond ~@(mapcat (fn [[dataset then]]
+ (assert (contains? all-valid-dataset-names dataset))
+ [`(= *dataset* (dataset-name->dataset ~dataset))
+ then])
+ (partition 2 pairs))))
diff --git a/test/metabase/test/data/generic_sql.clj b/test/metabase/test/data/generic_sql.clj
new file mode 100644
index 0000000000000000000000000000000000000000..d6791d7c6bcb9ec0e584429a981b87b8be565b6b
--- /dev/null
+++ b/test/metabase/test/data/generic_sql.clj
@@ -0,0 +1,81 @@
+(ns metabase.test.data.generic-sql
+ "Common functionality for various Generic SQL dataset loaders."
+ (:require [clojure.tools.logging :as log]
+ [korma.core :as k]
+ [metabase.driver.generic-sql.interface :refer [quote-name]]
+ [metabase.test.data.interface :as i])
+ (:import (metabase.test.data.interface DatabaseDefinition
+ TableDefinition)))
+
+(defprotocol IGenericSQLDatasetLoader
+ "Methods that generic SQL dataset loaders should implement so they can use the shared functions in `metabase.test.data.generic-sql`."
+ (execute-sql! [this ^DatabaseDefinition database-definition ^String raw-sql]
+ "Execute RAW-SQL against database defined by DATABASE-DEFINITION.")
+
+ (korma-entity [this ^DatabaseDefinition database-definition ^TableDefinition table-definition]
+ "Return a Korma entity (e.g., one that can be passed to `select` or `sel` for the table
+ defined by TABLE-DEFINITION in the database defined by DATABASE-DEFINITION.")
+
+ (pk-sql-type ^String [this]
+ "SQL that should be used for creating the PK Table ID, e.g. `SERIAL` or `BIGINT AUTOINCREMENT`.")
+
+ (pk-field-name ^String [this]
+ "e.g. `id` or `ID`.")
+
+ (field-base-type->sql-type ^String [this base-type]
+ "Given a `Field.base_type`, return the SQL type we should use for that column when creating a DB."))
+
+
+(defn create-physical-table! [dataset-loader database-definition {:keys [table-name field-definitions], :as table-definition}]
+ ;; Drop the table if it already exists
+ (i/drop-physical-table! dataset-loader database-definition table-definition)
+
+ ;; Now create the new table
+ (execute-sql! dataset-loader database-definition
+ (let [quot (partial quote-name dataset-loader)
+ pk-field-name (quot (pk-field-name dataset-loader))]
+ (format "CREATE TABLE %s (%s, %s %s, PRIMARY KEY (%s));"
+ (quot table-name)
+ (->> field-definitions
+ (map (fn [{:keys [field-name base-type]}]
+ (format "%s %s" (quot field-name) (field-base-type->sql-type dataset-loader base-type))))
+ (interpose ", ")
+ (apply str))
+ pk-field-name (pk-sql-type dataset-loader)
+ pk-field-name))))
+
+
+(defn drop-physical-table! [dataset-loader database-definition {:keys [table-name]}]
+ (execute-sql! dataset-loader database-definition
+ (format "DROP TABLE IF EXISTS %s;" (quote-name dataset-loader table-name))))
+
+
+(defn create-physical-db! [dataset-loader {:keys [table-definitions], :as database-definition}]
+ (let [quot (partial quote-name dataset-loader)]
+ ;; Create all the Tables
+ (doseq [^TableDefinition table-definition table-definitions]
+ (i/create-physical-table! dataset-loader database-definition table-definition))
+
+ ;; Now add the foreign key constraints
+ (doseq [{:keys [table-name field-definitions]} table-definitions]
+ (doseq [{dest-table-name :fk, field-name :field-name} field-definitions]
+ (when dest-table-name
+ (let [dest-table-name (name dest-table-name)]
+ (execute-sql! dataset-loader database-definition
+ (format "ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s);"
+ (quot table-name)
+ (quot (format "FK_%s_%s_%s" table-name field-name dest-table-name))
+ (quot field-name)
+ (quot dest-table-name)
+ (quot (pk-field-name dataset-loader))))))))))
+
+
+(defn load-table-data! [dataset-loader database-definition table-definition]
+ (let [rows (:rows table-definition)
+ fields-for-insert (map :field-name (:field-definitions table-definition))]
+ (-> (korma-entity dataset-loader database-definition table-definition)
+ (k/insert (k/values (->> (for [row rows]
+ (for [v row]
+ (if (instance? java.util.Date v) (java.sql.Timestamp. (.getTime ^java.util.Date v))
+ v)))
+ (map (partial zipmap fields-for-insert))))))))
diff --git a/test/metabase/test/data/h2.clj b/test/metabase/test/data/h2.clj
index ceaf1a6417eff8dee25ca9073b4f214d557988bb..9b3aa789bf20c74e04fe162bc22d11902ea09e81 100644
--- a/test/metabase/test/data/h2.clj
+++ b/test/metabase/test/data/h2.clj
@@ -5,131 +5,111 @@
[clojure.string :as s]
(korma [core :as k]
[db :as kdb])
- [metabase.test.data.interface :refer :all])
+ (metabase.test.data [generic-sql :as generic]
+ [interface :refer :all]))
(:import (metabase.test.data.interface DatabaseDefinition
FieldDefinition
TableDefinition)))
-;; ## DatabaseDefinition helper functions
+(def ^:private ^:const field-base-type->sql-type
+ {:BigIntegerField "BIGINT"
+ :BooleanField "BOOL"
+ :CharField "VARCHAR(254)"
+ :DateField "DATE"
+ :DateTimeField "DATETIME"
+ :DecimalField "DECIMAL"
+ :FloatField "FLOAT"
+ :IntegerField "INTEGER"
+ :TextField "TEXT"
+ :TimeField "TIME"})
-(defn filename
- "Return filename that should be used for connecting to H2 database defined by DATABASE-DEFINITION.
- This does not include the `.mv.db` extension."
- [^DatabaseDefinition database-definition]
- (format "%s/target/%s" (System/getProperty "user.dir") (escaped-name database-definition)))
+;; ## DatabaseDefinition helper functions
-(defn connection-details
+(defn- connection-details
"Return a Metabase `Database.details` for H2 database defined by DATABASE-DEFINITION."
- [^DatabaseDefinition database-definition]
- {:db (format (if (:short-lived? database-definition) "file:%s" ; for short-lived connections don't create a server thread and don't use a keep-alive connection
- "file:%s;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1")
- (filename database-definition))})
+ [^DatabaseDefinition {:keys [short-lived?], :as database-definition}]
+ {:db (format "mem:%s" (escaped-name database-definition))
+ :short-lived? short-lived?})
-(defn korma-connection-pool
+(defn- korma-connection-pool
"Return an H2 korma connection pool to H2 database defined by DATABASE-DEFINITION."
[^DatabaseDefinition database-definition]
(kdb/create-db (kdb/h2 (assoc (connection-details database-definition)
- :naming {:keys s/lower-case
- :fields s/upper-case}))))
+ :naming {:keys s/lower-case
+ :fields s/upper-case}))))
-(defn exec-sql
- "Execute RAW-SQL against H2 instance of H2 database defined by DATABASE-DEFINITION."
- [^DatabaseDefinition database-definition ^String raw-sql]
- (log/info raw-sql)
- (k/exec-raw (korma-connection-pool database-definition) raw-sql))
+;; ## Implementation
+(defn- format-for-h2 [obj]
+ (cond
+ (:database-name obj) (update-in obj [:table-definitions] (partial map format-for-h2))
+ (:table-name obj) (-> obj
+ (update-in [:table-name] s/upper-case)
+ (update-in [:field-definitions] (partial map format-for-h2)))
+ (:field-name obj) (cond-> (update-in obj [:field-name] s/upper-case)
+ (:fk obj) (update-in [:fk] (comp s/upper-case name)))))
-;; ## TableDefinition helper functions
-(defn korma-entity
- "Return a Korma entity (e.g., one that can be passed to `select` or `sel` for the table
- defined by TABLE-DEFINITION in the H2 database defined by DATABASE-DEFINITION."
- [^TableDefinition table-definition ^DatabaseDefinition database-definition]
- (-> (k/create-entity (:table-name table-definition))
- (k/database (korma-connection-pool database-definition))))
+;; ## Public Concrete DatasetLoader instance
+;; For some reason this doesn't seem to work if we define IDatasetLoader methods inline, but does work when we explicitly use extend-protocol
+(defrecord H2DatasetLoader []
+ generic/IGenericSQLDatasetLoader
+ (generic/execute-sql! [_ database-definition raw-sql]
+ (log/debug raw-sql)
+ (k/exec-raw (korma-connection-pool database-definition) raw-sql))
-;; ## Internal Stuff
+ (generic/korma-entity [_ database-definition table-definition]
+ (-> (k/create-entity (:table-name table-definition))
+ (k/database (korma-connection-pool database-definition))))
-(def ^:private ^:const field-base-type->sql-type
- "Map of `Field.base_type` to the SQL type we should use for that column when creating a DB."
- {:BigIntegerField "BIGINT"
- :BooleanField "BOOL"
- :CharField "VARCHAR(254)"
- :DateField "DATE"
- :DateTimeField "DATETIME"
- :DecimalField "DECIMAL"
- :FloatField "FLOAT"
- :IntegerField "INTEGER"
- :TextField "TEXT"
- :TimeField "TIME"})
+ (generic/pk-sql-type [_] "BIGINT AUTO_INCREMENT")
+ (generic/pk-field-name [_] "ID")
+
+ (generic/field-base-type->sql-type [_ field-type]
+ (field-base-type->sql-type field-type)))
-;; ## Public Concrete DatasetLoader instance
-;; For some reason this doesn't seem to work if we define IDatasetLoader methods inline, but does work when we explicitly use extend-protocol
-(defrecord H2DatasetLoader [])
(extend-protocol IDatasetLoader
H2DatasetLoader
(engine [_]
:h2)
(database->connection-details [_ database-definition]
- (connection-details database-definition))
+ ;; Return details with the GUEST user added so SQL queries are allowed.
+ (let [details (connection-details database-definition)]
+ (update details :db str ";USER=GUEST;PASSWORD=guest")))
(drop-physical-db! [_ database-definition]
- (let [file (io/file (format "%s.mv.db" (filename database-definition)))]
- (when (.exists file)
- (.delete file))))
+ ;; Nothing to do here - there are no physical dbs <3
+ )
(create-physical-table! [this database-definition table-definition]
- ;; Drop the table if it already exists
- (drop-physical-table! this database-definition table-definition)
-
- ;; Now create the new table
- (exec-sql
- database-definition
- (format "CREATE TABLE \"%s\" (%s, \"ID\" BIGINT AUTO_INCREMENT, PRIMARY KEY (\"ID\"));"
- (s/upper-case (:table-name table-definition))
- (->> (:field-definitions table-definition)
- (map (fn [{:keys [field-name base-type]}]
- (format "\"%s\" %s" (s/upper-case field-name) (base-type field-base-type->sql-type))))
- (interpose ", ")
- (apply str)))))
+ (generic/create-physical-table! this database-definition (format-for-h2 table-definition)))
(create-physical-db! [this database-definition]
- ;; Create all the Tables
- (doseq [^TableDefinition table-definition (:table-definitions database-definition)]
- (log/info (format "Creating table '%s'..." (:table-name table-definition)))
- (create-physical-table! this database-definition table-definition))
-
- ;; Now add the foreign key constraints
- (doseq [^TableDefinition table-definition (:table-definitions database-definition)]
- (let [table-name (s/upper-case (:table-name table-definition))]
- (doseq [{dest-table-name :fk, field-name :field-name} (:field-definitions table-definition)]
- (when dest-table-name
- (let [field-name (s/upper-case field-name)
- dest-table-name (s/upper-case (name dest-table-name))]
- (exec-sql
- database-definition
- (format "ALTER TABLE \"%s\" ADD CONSTRAINT IF NOT EXISTS \"FK_%s_%s\" FOREIGN KEY (\"%s\") REFERENCES \"%s\" (\"ID\");"
- table-name
- field-name dest-table-name
- field-name
- dest-table-name))))))))
-
- (load-table-data! [_ database-definition table-definition]
- (let [rows (:rows table-definition)
- fields-for-insert (map :field-name (:field-definitions table-definition))]
- (-> (korma-entity table-definition database-definition)
- (k/insert (k/values (map (partial zipmap fields-for-insert)
- rows))))))
-
- (drop-physical-table! [_ database-definition table-definition]
- (exec-sql
- database-definition
- (format "DROP TABLE IF EXISTS \"%s\";" (s/upper-case (:table-name table-definition))))))
+ ;; Disable the undo log (i.e., transactions) for this DB session because the bulk operations to load data don't need to be atomic
+ (generic/execute-sql! this database-definition "SET UNDO_LOG = 0;")
+
+ ;; Create the "physical" database which in this case actually just means creating the schema
+ (generic/create-physical-db! this (format-for-h2 database-definition))
+
+ ;; Now create a non-admin account 'GUEST' which will be used from here on out
+ (generic/execute-sql! this database-definition "CREATE USER IF NOT EXISTS GUEST PASSWORD 'guest';")
+ ;; Grant the GUEST account SELECT permissions for all the Tables in this DB
+ (doseq [{:keys [table-name]} (:table-definitions database-definition)]
+ (generic/execute-sql! this database-definition (format "GRANT SELECT ON %s TO GUEST;" table-name)))
+
+ ;; If this isn't a "short-lived" database we need to set DB_CLOSE_DELAY to -1 here because only admins are allowed to do it
+ ;; so we can't set it via the connection string :/
+ (when-not (:short-lived? database-definition)
+ (generic/execute-sql! this database-definition "SET DB_CLOSE_DELAY -1;")))
+
+ (load-table-data! [this database-definition table-definition]
+ (generic/load-table-data! this database-definition table-definition))
+
+ (drop-physical-table! [this database-definition table-definition]
+ (generic/drop-physical-table! this database-definition (format-for-h2 table-definition))))
(defn dataset-loader []
- (let [loader (->H2DatasetLoader)]
- (assert (satisfies? IDatasetLoader loader))
- loader))
+ (->H2DatasetLoader))
diff --git a/test/metabase/test/data/interface.clj b/test/metabase/test/data/interface.clj
index 2f2cc2d8ee8cda9f7916253e45734709ca7c6e37..ed844828cdbf8938f4c083e621d1e0f279745415 100644
--- a/test/metabase/test/data/interface.clj
+++ b/test/metabase/test/data/interface.clj
@@ -50,10 +50,11 @@
(s/upper-case (:table-name this))}]))
DatabaseDefinition
- (metabase-instance [this engine-kw]
+ (metabase-instance [{:keys [database-name]} engine-kw]
+ (assert (string? database-name))
(assert (keyword? engine-kw))
(setup-db-if-needed :auto-migrate true)
- (sel :one Database :name (:database-name this) :engine (name engine-kw))))
+ (sel :one Database :name database-name, :engine (name engine-kw))))
;; ## IDatasetLoader
@@ -92,7 +93,11 @@
(defn create-field-definition
"Create a new `FieldDefinition`; verify its values."
^FieldDefinition [{:keys [field-name base-type field-type special-type fk], :as field-definition-map}]
- (assert (contains? field/base-types base-type))
+ (assert (or (contains? field/base-types base-type)
+ (and (map? base-type)
+ (string? (:native base-type))))
+ (str (format "Invalid field base type: '%s'\n" base-type)
+ "Field base-type should be either a valid base type like :TextField or be some native type wrapped in a map, like {:native \"JSON\"}."))
(when field-type
(assert (contains? field/field-types field-type)))
(when special-type
diff --git a/test/metabase/test/data/mongo.clj b/test/metabase/test/data/mongo.clj
index 8c12a2b6e86b0e0594c5ff722807ff10d29e094c..8e21f47110cffbdcd53d3d0783ac1d923624557a 100644
--- a/test/metabase/test/data/mongo.clj
+++ b/test/metabase/test/data/mongo.clj
@@ -22,29 +22,35 @@
(create-physical-db! [_ _])
(drop-physical-db! [this database-definition]
- (mg/drop-db (mg/connect (database->connection-details this database-definition))
- (escaped-name database-definition)))
+ (with-open [mongo-connection (mg/connect (database->connection-details this database-definition))]
+ (mg/drop-db mongo-connection (escaped-name database-definition))))
;; Nothing to do here, collection is created when we add documents to it
(create-physical-table! [_ _ _])
(drop-physical-table! [this database-definition {:keys [table-name]}]
- (with-mongo-connection [^com.mongodb.DBApiLayer mongo-db (database->connection-details this database-definition)]
+ (with-mongo-connection [^com.mongodb.DB mongo-db (database->connection-details this database-definition)]
(mc/drop mongo-db (name table-name))))
(load-table-data! [this database-definition {:keys [field-definitions table-name rows]}]
- (with-mongo-connection [^com.mongodb.DBApiLayer mongo-db (database->connection-details this database-definition)]
+ (with-mongo-connection [^com.mongodb.DB mongo-db (database->connection-details this database-definition)]
(let [field-names (->> field-definitions
(map :field-name)
(map keyword))]
;; Use map-indexed so we can get an ID for each row (index + 1)
(doseq [[i row] (map-indexed (partial vector) rows)]
- (try
- ;; Insert each row
- (mc/insert mongo-db (name table-name) (assoc (zipmap field-names row)
- :_id (inc i)))
- ;; If row already exists then nothing to do
- (catch com.mongodb.MongoException$DuplicateKey _)))))))
+ (let [row (for [v row]
+ ;; Conver all the java.sql.Timestamps to java.util.Date, because the Mongo driver insists on being obnoxious and going from
+ ;; using Timestamps in 2.x to Dates in 3.x
+ (if (= (type v) java.sql.Timestamp)
+ (java.util.Date. (.getTime ^java.sql.Timestamp v))
+ v))]
+ (try
+ ;; Insert each row
+ (mc/insert mongo-db (name table-name) (assoc (zipmap field-names row)
+ :_id (inc i)))
+ ;; If row already exists then nothing to do
+ (catch com.mongodb.MongoException _))))))))
(defn ^MongoDatasetLoader dataset-loader []
(->MongoDatasetLoader))
diff --git a/test/metabase/test/data/mysql.clj b/test/metabase/test/data/mysql.clj
new file mode 100644
index 0000000000000000000000000000000000000000..3f536efe55001fe9044f90ccad37af50f7488efc
--- /dev/null
+++ b/test/metabase/test/data/mysql.clj
@@ -0,0 +1,105 @@
+(ns metabase.test.data.mysql
+ "Code for creating / destroying a MySQL database from a `DatabaseDefinition`."
+ (:require [clojure.java.jdbc :as jdbc]
+ [clojure.tools.logging :as log]
+ [environ.core :refer [env]]
+ (korma [core :as k]
+ [db :as kdb])
+ [metabase.driver.generic-sql.interface :refer [ISqlDriverQuoteName quote-name]]
+ (metabase.test.data [generic-sql :as generic]
+ [interface :refer :all]))
+ (:import (metabase.test.data.interface DatabaseDefinition
+ FieldDefinition
+ TableDefinition)))
+
+(def ^:private ^:const field-base-type->sql-type
+ {:BigIntegerField "BIGINT"
+ :BooleanField "BOOLEAN" ; Synonym of TINYINT(1)
+ :CharField "VARCHAR(254)"
+ :DateField "DATE"
+ :DateTimeField "TIMESTAMP"
+ :DecimalField "DECIMAL"
+ :FloatField "DOUBLE"
+ :IntegerField "INTEGER"
+ :TextField "TEXT"
+ :TimeField "TIME"})
+
+(defn- mysql-connection-details [^DatabaseDefinition {:keys [short-lived?]}]
+ {:host "localhost"
+ :port 3306
+ :short-lived? short-lived?
+ :user (if (env :circleci) "ubuntu"
+ "root")})
+
+(defn- db-connection-details [^DatabaseDefinition database-definition]
+ (assoc (mysql-connection-details database-definition)
+ :db (:database-name database-definition)))
+
+(defn- execute! [scope ^DatabaseDefinition database-definition & format-strings]
+ (jdbc/execute! (-> ((case scope
+ :mysql mysql-connection-details
+ :db db-connection-details) database-definition)
+ kdb/mysql
+ (assoc :make-pool? false))
+ [(apply format format-strings)]
+ :transaction? false))
+
+
+(defrecord MySQLDatasetLoader []
+ generic/IGenericSQLDatasetLoader
+ (generic/execute-sql! [_ database-definition raw-sql]
+ (log/debug raw-sql)
+ (execute! :db database-definition raw-sql))
+
+ (generic/korma-entity [_ database-definition table-definition]
+ (-> (k/create-entity (:table-name table-definition))
+ (k/database (-> (db-connection-details database-definition)
+ kdb/mysql
+ (assoc :make-pool? false)
+ kdb/create-db))))
+
+ (generic/pk-sql-type [_] "INTEGER NOT NULL AUTO_INCREMENT")
+ (generic/pk-field-name [_] "id")
+
+ (generic/field-base-type->sql-type [_ field-type]
+ (if (map? field-type) (:native field-type)
+ (field-base-type->sql-type field-type)))
+
+ ISqlDriverQuoteName
+ (quote-name [_ nm]
+ (str \` nm \`)))
+
+(extend-protocol IDatasetLoader
+ MySQLDatasetLoader
+ (engine [_]
+ :mysql)
+
+ (database->connection-details [_ database-definition]
+ (assoc (db-connection-details database-definition)
+ :timezone :America/Los_Angeles))
+
+ (drop-physical-db! [_ database-definition]
+ (execute! :mysql database-definition "DROP DATABASE IF EXISTS `%s`;" (:database-name database-definition)))
+
+ (drop-physical-table! [this database-definition table-definition]
+ (generic/drop-physical-table! this database-definition table-definition))
+
+ (create-physical-table! [this database-definition table-definition]
+ (generic/create-physical-table! this database-definition table-definition))
+
+ (create-physical-db! [this database-definition]
+ (drop-physical-db! this database-definition)
+ (execute! :mysql database-definition "CREATE DATABASE `%s`;" (:database-name database-definition))
+
+ ;; double check that we can connect to the newly created DB
+ (metabase.driver/can-connect-with-details? :mysql (db-connection-details database-definition) :rethrow-exceptions)
+
+ ;; call the generic implementation to create Tables + FKs
+ (generic/create-physical-db! this database-definition))
+
+ (load-table-data! [this database-definition table-definition]
+ (generic/load-table-data! this database-definition table-definition)))
+
+
+(defn dataset-loader []
+ (MySQLDatasetLoader.))
diff --git a/test/metabase/test/data/postgres.clj b/test/metabase/test/data/postgres.clj
new file mode 100644
index 0000000000000000000000000000000000000000..eb93d87a52aa1c18af38c81b0ba94953cf4c2c9a
--- /dev/null
+++ b/test/metabase/test/data/postgres.clj
@@ -0,0 +1,102 @@
+(ns metabase.test.data.postgres
+ "Code for creating / destroying a Postgres database from a `DatabaseDefinition`."
+ (:require [clojure.java.jdbc :as jdbc]
+ [clojure.tools.logging :as log]
+ [environ.core :refer [env]]
+ (korma [core :as k]
+ [db :as kdb])
+ (metabase.test.data [generic-sql :as generic]
+ [interface :refer :all]))
+ (:import (metabase.test.data.interface DatabaseDefinition
+ FieldDefinition
+ TableDefinition)))
+
+(def ^:private ^:const field-base-type->sql-type
+ {:BigIntegerField "BIGINT"
+ :BooleanField "BOOL"
+ :CharField "VARCHAR(254)"
+ :DateField "DATE"
+ :DateTimeField "TIMESTAMP"
+ :DecimalField "DECIMAL"
+ :FloatField "FLOAT"
+ :IntegerField "INTEGER"
+ :TextField "TEXT"
+ :TimeField "TIME"
+ :UUIDField "UUID"})
+
+(defn- pg-connection-details [^DatabaseDefinition {:keys [short-lived?]}]
+ (merge {:host "localhost"
+ :port 5432
+ :short-lived? short-lived?}
+ ;; HACK
+ (when (env :circleci)
+ {:user "ubuntu"})))
+
+(defn- db-connection-details [^DatabaseDefinition database-definition]
+ (assoc (pg-connection-details database-definition)
+ :db (:database-name database-definition)))
+
+(defn- execute! [scope ^DatabaseDefinition database-definition & format-strings]
+ (jdbc/execute! (-> ((case scope
+ :pg pg-connection-details
+ :db db-connection-details) database-definition)
+ kdb/postgres
+ (assoc :make-pool? false))
+ [(apply format format-strings)]
+ :transaction? false))
+
+
+(defrecord PostgresDatasetLoader []
+ generic/IGenericSQLDatasetLoader
+ (generic/execute-sql! [_ database-definition raw-sql]
+ (log/debug raw-sql)
+ (execute! :db database-definition raw-sql))
+
+ (generic/korma-entity [_ database-definition table-definition]
+ (-> (k/create-entity (:table-name table-definition))
+ (k/database (-> (db-connection-details database-definition)
+ kdb/postgres
+ (assoc :make-pool? false)
+ kdb/create-db))))
+
+ (generic/pk-sql-type [_] "SERIAL")
+ (generic/pk-field-name [_] "id")
+
+ (generic/field-base-type->sql-type [_ field-type]
+ (if (map? field-type) (:native field-type)
+ (field-base-type->sql-type field-type))))
+
+(extend-protocol IDatasetLoader
+ PostgresDatasetLoader
+ (engine [_]
+ :postgres)
+
+ (database->connection-details [_ database-definition]
+ (assoc (db-connection-details database-definition)
+ :timezone :America/Los_Angeles))
+
+ (drop-physical-db! [_ database-definition]
+ (execute! :pg database-definition "DROP DATABASE IF EXISTS \"%s\";" (:database-name database-definition)))
+
+ (drop-physical-table! [this database-definition table-definition]
+ (generic/drop-physical-table! this database-definition table-definition))
+
+ (create-physical-table! [this database-definition table-definition]
+ (generic/create-physical-table! this database-definition table-definition))
+
+ (create-physical-db! [this {:keys [database-name], :as database-definition}]
+ (drop-physical-db! this database-definition)
+ (execute! :pg database-definition "CREATE DATABASE \"%s\";" database-name)
+
+ ;; double check that we can connect to the newly created DB
+ (metabase.driver/can-connect-with-details? :postgres (db-connection-details database-definition) :rethrow-exceptions)
+
+ ;; call the generic implementation to create Tables + FKs
+ (generic/create-physical-db! this database-definition))
+
+ (load-table-data! [this database-definition table-definition]
+ (generic/load-table-data! this database-definition table-definition)))
+
+
+(defn dataset-loader []
+ (->PostgresDatasetLoader))
diff --git a/test/metabase/test/data/users.clj b/test/metabase/test/data/users.clj
index fe648603da699e04c2cda905825265aa31231415..85e0275b315f09f210f2b30f28358819662f4c0e 100644
--- a/test/metabase/test/data/users.clj
+++ b/test/metabase/test/data/users.clj
@@ -4,8 +4,7 @@
(metabase [db :refer :all]
[http-client :as http])
(metabase.models [user :refer [User]])
- [metabase.test.util :refer [random-name]])
- (:import com.metabase.corvus.api.ApiException))
+ [metabase.test.util :refer [random-name]]))
(declare fetch-or-create-user)
@@ -52,9 +51,9 @@
[& {:as kwargs}]
(let [first-name (random-name)
defaults {:first_name first-name
- :last_name (random-name)
- :email (.toLowerCase ^String (str first-name "@metabase.com"))
- :password first-name}]
+ :last_name (random-name)
+ :email (.toLowerCase ^String (str first-name "@metabase.com"))
+ :password first-name}]
(->> (merge defaults kwargs)
(m/mapply ins User))))
@@ -112,11 +111,12 @@
(fn call-client [& args]
(try
(apply http/client (user->token username) args)
- (catch ApiException e
- (if-not (= (.getStatusCode e) 401) (throw e)
- ;; If we got a 401 unauthenticated clear the tokens cache + recur
- (do (reset! tokens {})
- (apply call-client args)))))))))
+ (catch Throwable e
+ (let [{:keys [status-code]} (ex-data e)]
+ (if-not (= status-code 401) (throw e)
+ ;; If we got a 401 unauthenticated clear the tokens cache + recur
+ (do (reset! tokens {})
+ (apply call-client args))))))))))
;; ## Implementation
diff --git a/test/metabase/test/util/q.clj b/test/metabase/test/util/q.clj
new file mode 100644
index 0000000000000000000000000000000000000000..f85d452e9e29cd868853c82e19f627771ea15dd1
--- /dev/null
+++ b/test/metabase/test/util/q.clj
@@ -0,0 +1,283 @@
+(ns metabase.test.util.q
+ (:refer-clojure :exclude [or and filter use = != < > <= >=])
+ (:require [clojure.core :as core]
+ [clojure.core.match :refer [match]]
+ [metabase.db :as db]
+ [metabase.driver :as driver]
+ [metabase.test.data :as data]
+ (metabase.test.data [datasets :as datasets]
+ dataset-definitions)
+ [metabase.util :as u]))
+
+;;; # HELPER FNs
+
+;;; ## TOKEN SPLITTING
+
+(def ^:private ^:const top-level-tokens
+ '#{use of dataset return aggregate breakout fields filter limit order page})
+
+(defn- qualify-token [token]
+ (symbol (str "metabase.test.util.q/" token)))
+
+(defn- qualify-form [[f & args]]
+ `(~(qualify-token f) ~@args))
+
+(defn- split-with-tokens [tokens args]
+ (loop [acc [], current-group [], [arg & more] args]
+ (cond
+ (nil? arg) (->> (conj acc (apply list current-group))
+ (core/filter seq)
+ (map qualify-form))
+ (contains? tokens arg) (recur (conj acc (apply list current-group)) [arg] more)
+ :else (recur acc (conj current-group arg) more))))
+
+
+;;; ## ID LOOKUP
+
+(def ^:dynamic *db* nil)
+(def ^:dynamic *table-name* nil)
+
+(defn db-id []
+ {:post [(integer? %)]}
+ (core/or (:id *db*)
+ (data/db-id)))
+
+(defn id [& args]
+ {:pre [(every? keyword? args)]
+ :post [(core/or (integer? %)
+ (println (str "Couldn't find ID of: " args)))]}
+ (if *db*
+ (:id (apply data/-temp-get *db* (map name args)))
+ (apply data/id args)))
+
+(defmacro field [f]
+ {:pre [(symbol? f)]}
+ (core/or
+ (let [f (name f)]
+ (u/cond-let
+ ;; x->y <-> ["fk->" x y]
+ [[_ from to] (re-matches #"^(.+)->(.+)$" f)]
+ ["fk->" `(field ~(symbol from)) `(field ~(symbol to))]
+
+ ;; x...y <-> ?
+ [[_ f sub] (re-matches #"^(.+)\.\.\.(.+)$" f)]
+ `(~@(macroexpand-1 `(field ~(symbol f))) ~(keyword sub))
+
+ ;; ag.0 <-> ["aggregation" 0]
+ [[_ ag-field-index] (re-matches #"^ag\.(\d+)$" f)]
+ ["aggregation" (Integer/parseInt ag-field-index)]
+
+ ;; table.field <-> (id table field)
+ [[_ table field] (re-matches #"^([^\.]+)\.([^\.]+)$" f)]
+ `(id ~(keyword table) ~(keyword field))))
+
+ ;; fallback : (id *table-name* field)
+ `(id *table-name* ~(keyword f))))
+
+(defn resolve-dataset [dataset]
+ (var-get (core/or (resolve dataset)
+ (ns-resolve 'metabase.test.data.dataset-definitions dataset)
+ (throw (Exception. (format "Don't know how to find dataset '%s'." dataset))))))
+
+
+;;; # DSL KEYWORD MACROS
+
+;;; ## USE
+
+(defmacro use [query db]
+ (assoc-in query [:context :driver] (keyword db)))
+
+
+;;; ## OF
+
+(defmacro of [query table-name]
+ (-> query
+ (assoc-in [:query :source_table] `(id ~(keyword table-name)))
+ (assoc-in [:context :table-name] (keyword table-name))))
+
+
+;;; ## DATASET
+
+(defmacro dataset [query dataset-name]
+ (assoc-in query [:context :dataset] `'~dataset-name))
+
+
+;;; ## RETURN
+
+(defmacro return [query & args]
+ (assoc-in query [:context :return] (vec (mapcat (fn [arg]
+ (cond
+ (core/= arg 'rows) [:data :rows]
+ (core/= arg 'first-row) [:data :rows first]
+ :else [arg]))
+ args))))
+
+
+;;; ## AGGREGATE
+
+(defmacro aggregate [query & args]
+ (assoc-in query [:query :aggregation] (match (vec args)
+ ['rows] ["rows"]
+ ['count] ["count"]
+ ['count id] ["count" `(field ~id)]
+ ['avg id] ["avg" `(field ~id)]
+ ['distinct id] ["distinct" `(field ~id)]
+ ['stddev id] ["stddev" `(field ~id)]
+ ['sum id] ["sum" `(field ~id)]
+ ['cum-sum id] ["cum_sum" `(field ~id)])))
+
+
+;;; ## BREAKOUT
+
+(defmacro breakout [query & fields]
+ (assoc-in query [:query :breakout] (vec (for [field fields]
+ `(field ~field)))))
+
+
+;;; ## FIELDS
+
+(defmacro fields [query & fields]
+ (assoc-in query [:query :fields] (vec (for [field fields]
+ `(field ~field)))))
+
+
+;;; ## FILTER
+
+(def ^:const ^:private filter-clause-tokens
+ '#{inside not-null is-null between starts-with ends-with contains = != < > <= >=})
+
+(defmacro and [& clauses]
+ `["AND" ~@clauses])
+
+(defmacro or [& clauses]
+ `["OR" ~@clauses])
+
+(defmacro inside [{:keys [lat lon]}]
+ `["INSIDE" (field ~(:field lat)) (field ~(:field lon)) ~(:max lat) ~(:min lon) ~(:min lat) ~(:max lon)])
+
+(defmacro not-null [field]
+ `["NOT_NULL" (field ~field)])
+
+(defmacro is-null [field]
+ `["IS_NULL" (field ~field)])
+
+(defmacro between [field min max]
+ `["BETWEEN" (field ~field) ~min ~max])
+
+(defmacro starts-with [field arg]
+ `["STARTS_WITH" (field ~field) ~arg])
+
+(defmacro ends-with [field arg]
+ `["ENDS_WITH" (field ~field) ~arg])
+
+(defmacro contains [field arg]
+ `["CONTAINS" (field ~field) ~arg])
+
+(defmacro = [field & args]
+ `["=" (field ~field) ~@args])
+
+(defmacro != [field & args]
+ `["!=" (field ~field) ~@args])
+
+(defmacro < [field arg]
+ `["<" (field ~field) ~arg])
+
+(defmacro <= [field arg]
+ `["<=" (field ~field) ~arg])
+
+(defmacro > [field arg]
+ `[">" (field ~field) ~arg])
+
+(defmacro >= [field arg]
+ `[">=" (field ~field) ~arg])
+
+(defn- filter-split [tokens]
+ (->> (loop [clauses [], current-clause [], [token & more] tokens]
+ (cond
+ (nil? token) (conj clauses (apply list current-clause))
+ (core/= token 'and) (conj clauses (apply list current-clause) `(and ~@(filter-split more)))
+ (core/= token 'or) (conj clauses (apply list current-clause) `(or ~@(filter-split more)))
+ (contains? filter-clause-tokens token) (recur (conj clauses (apply list current-clause))
+ [(qualify-token token)]
+ more)
+ :else (recur clauses
+ (conj current-clause token)
+ more)))
+ (core/filter seq)))
+
+(defmacro filter* [& args]
+ (first (filter-split args)))
+
+(defmacro filter [query & args]
+ (assoc-in query [:query :filter] `(filter* ~@args)))
+
+
+;;; ## LIMIT
+
+(defmacro limit [query limit]
+ {:pre [(integer? limit)]}
+ (assoc-in query [:query :limit] limit))
+
+
+;;; ## ORDER
+
+(defmacro order* [field-symb]
+ (let [[_ field +-] (re-matches #"^(.+[^\-+])([\-+])?$" (name field-symb))]
+ (assert field (format "Invalid field passed to order: '%s'" field-symb))
+ [`(field ~(symbol field)) (case (keyword (core/or +- '+))
+ :+ "ascending"
+ :- "descending")]))
+
+(defmacro order [query & fields]
+ (assoc-in query [:query :order_by] (vec (for [field fields]
+ `(order* ~field)))))
+
+
+;;; ## PAGE
+
+(defmacro page [query page items-symb items]
+ (assert (and (integer? page)
+ (core/= items-symb 'items)
+ (integer? items))
+ "page clause should be of the form page <page-num> items <items-per-page>")
+ (assoc-in query [:query :page] {:page page
+ :items items}))
+
+
+;;; # TOP-LEVEL MACRO IMPL
+
+(defmacro with-temp-db [dataset query]
+ (if-not dataset
+ query
+ `(data/with-temp-db [db# (data/dataset-loader) (resolve-dataset ~dataset)]
+ (binding [*db* db#]
+ ~query))))
+
+(defmacro with-driver [driver query]
+ (if-not driver
+ query
+ `(datasets/with-dataset ~driver
+ ~query)))
+
+(defmacro Q** [{:keys [driver dataset return table-name]} query]
+ (assert table-name
+ "Table name not specified in query, did you include an 'of' clause?")
+ `(do (db/setup-db-if-needed)
+ (->> (with-driver ~driver
+ (binding [*table-name* ~table-name]
+ (with-temp-db ~dataset
+ (driver/process-query ~query))))
+ ~@return)))
+
+(defmacro Q* [q & [form & more]]
+ (if-not form
+ `(Q** ~(:context q) ~(dissoc q :context))
+ `(Q* ~(macroexpand `(-> ~q ~form)) ~@more)))
+
+(defmacro Q [& args]
+ `(Q* {:database (db-id)
+ :type :query
+ :query {}
+ :context {:driver nil
+ :dataset nil}}
+ ~@(split-with-tokens top-level-tokens args)))
diff --git a/test/metabase/test_setup.clj b/test/metabase/test_setup.clj
index ddcaa52c200edf5a7b254c88c9f226827bee41e9..cab0377bae3edd71007e3949af59ca097d07f327 100644
--- a/test/metabase/test_setup.clj
+++ b/test/metabase/test_setup.clj
@@ -8,10 +8,9 @@
[db :as db]
[task :as task]
[util :as u])
+ (metabase.models [table :refer [Table]])
[metabase.test.data.datasets :as datasets]))
-(declare clear-test-db)
-
;; # ---------------------------------------- EXPECTAIONS FRAMEWORK SETTINGS ------------------------------
;; ## GENERAL SETTINGS
@@ -68,29 +67,27 @@
(defn load-test-datasets
"Call `load-data!` on all the datasets we're testing against."
[]
- (doseq [dataset-name @datasets/test-dataset-names]
+ (doseq [dataset-name datasets/test-dataset-names]
(log/info (format "Loading test data: %s..." (name dataset-name)))
- (datasets/load-data! (datasets/dataset-name->dataset dataset-name))))
+ (let [dataset (datasets/dataset-name->dataset dataset-name)]
+ (datasets/load-data! dataset)
+
+ ;; Check that dataset is loaded and working
+ (assert (Table (datasets/table-name->id dataset :venues))
+ (format "Loading test dataset %s failed: could not find 'venues' Table!" dataset-name)))))
(defn test-startup
{:expectations-options :before-run}
[]
- (log/info "Starting up Metabase unit test runner")
-
- ;; clear out any previous test data that's lying around
- (log/info "Clearing out test DB...")
- (clear-test-db)
- (log/info "Setting up test DB and running migrations...")
- (db/setup-db :auto-migrate true)
-
- ;; Load the test datasets
- (load-test-datasets)
-
- ;; startup test web server
- (core/start-jetty)
-
- ;; start the task runner
- (task/start-task-runner!))
+ ;; We can shave about a second from unit test launch time by doing the various setup stages in on different threads
+ (let [setup-db (future (time (do (log/info "Setting up test DB and running migrations...")
+ (db/setup-db :auto-migrate true)
+ (load-test-datasets)
+ (metabase.models.setting/set :site-name "Metabase Test"))))
+ start-task-runner! (future (task/start-task-runner!))]
+ (core/start-jetty)
+ @setup-db
+ @start-task-runner!))
(defn test-teardown
@@ -99,18 +96,3 @@
(log/info "Shutting down Metabase unit test runner")
(task/stop-task-runner!)
(core/stop-jetty))
-
-
-;; ## DB Setup
-
-(defn- clear-test-db
- "Delete the test db file if it's still lying around."
- []
- (let [filename (-> (re-find #"file:(\w+\.db).*" (db/db-file)) second)] ; db-file is prefixed with "file:", so we strip that off
- (map (fn [file-extension] ; delete the database files, e.g. `metabase.db.h2.db`, `metabase.db.trace.db`, etc.
- (let [file (str filename file-extension)]
- (when (.exists (io/file file))
- (io/delete-file file))))
- [".h2.db"
- ".trace.db"
- ".lock.db"])))
diff --git a/test/metabase/util/password_test.clj b/test/metabase/util/password_test.clj
index 3087e7f5406f19de29be82ab7f0c1861b9835461..6a3177e8838339437ac2d7e418394d6e439f743d 100644
--- a/test/metabase/util/password_test.clj
+++ b/test/metabase/util/password_test.clj
@@ -1,26 +1,47 @@
(ns metabase.util.password-test
(:require [expectations :refer :all]
+ [metabase.test.util :refer [resolve-private-fns]]
[metabase.util.password :refer :all]))
;; Password Complexity testing
-;; TODO - need a way to test other complexity scenarios. DI on the config would make this easier.
-
-; fail due to being too short (min 8 chars)
-(expect false (is-complex? "god"))
-(expect false (is-complex? "god12"))
-(expect false (is-complex? "god4!"))
-(expect false (is-complex? "Agod4!"))
-
-; fail due to missing complexity
-(expect false (is-complex? "password"))
-(expect false (is-complex? "password1"))
-(expect false (is-complex? "password1!"))
-(expect false (is-complex? "passworD!"))
-(expect false (is-complex? "passworD1"))
-
-; these passwords should be good
-(expect true (is-complex? "passworD1!"))
-(expect true (is-complex? "paSS&&word1"))
-(expect true (is-complex? "passW0rd))"))
-(expect true (is-complex? "^^Wut4nG^^"))
+
+(resolve-private-fns metabase.util.password count-occurrences password-has-char-counts?)
+
+;; Check that password occurance counting works
+(expect {:total 3, :lower 3, :upper 0, :letter 3, :digit 0, :special 0} (count-occurrences "abc"))
+(expect {:total 8, :lower 0, :upper 8, :letter 8, :digit 0, :special 0} (count-occurrences "PASSWORD"))
+(expect {:total 3, :lower 0, :upper 0, :letter 0, :digit 3, :special 0} (count-occurrences "123"))
+(expect {:total 8, :lower 4, :upper 2, :letter 6, :digit 0, :special 2} (count-occurrences "GoodPw!!"))
+(expect {:total 9, :lower 7, :upper 1, :letter 8, :digit 1, :special 0} (count-occurrences "passworD1"))
+(expect {:total 10, :lower 3, :upper 2, :letter 5, :digit 1, :special 4} (count-occurrences "^^Wut4nG^^"))
+
+;; Check that password length complexity applies
+(expect true (password-has-char-counts? {:total 3} "god1"))
+(expect true (password-has-char-counts? {:total 4} "god1"))
+(expect false (password-has-char-counts? {:total 5} "god1"))
+
+;; Check that testing password character type complexity works
+(expect true (password-has-char-counts? {} "ABC"))
+(expect false (password-has-char-counts? {:lower 1} "ABC"))
+(expect true (password-has-char-counts? {:lower 1} "abc"))
+(expect false (password-has-char-counts? {:digit 1} "abc"))
+(expect true (password-has-char-counts? {:digit 1, :special 2} "!0!"))
+
+;; Do some tests that combine both requirements
+(expect false (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "^aA2"))
+(expect false (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "password"))
+(expect false (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "password1"))
+(expect false (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "password1!"))
+(expect false (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "passworD!"))
+(expect false (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "passworD1"))
+(expect true (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "passworD1!"))
+(expect true (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "paSS&&word1"))
+(expect true (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "passW0rd))"))
+(expect true (password-has-char-counts? {:total 6, :lower 1, :upper 1, :digit 1, :special 1} "^^Wut4nG^^"))
+
+;; Do some tests with the default (:normal) password requirements
+(expect false (is-complex? "ABC"))
+(expect false (is-complex? "ABCDEF"))
+(expect true (is-complex? "ABCDE1"))
+(expect true (is-complex? "123456"))
diff --git a/test_resources/log4j.properties b/test_resources/log4j.properties
index c2e7b0ff2c176e956b635b668a1d84c07dc6ee6e..ae523b34df347ae8d6725198163be4286e9441a6 100644
--- a/test_resources/log4j.properties
+++ b/test_resources/log4j.properties
@@ -18,3 +18,5 @@ log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p%c - %m%n
log4j.logger.com.mchange=WARN
log4j.logger.liquibase=WARN
log4j.logger.metabase=INFO
+log4j.logger.org.eclipse.jetty=WARN
+log4j.logger.org.mongodb=WARN
diff --git a/webpack.config.js b/webpack.config.js
index a1eae0e5784cfdf9dfe9edf59869b82572a5b27f..8e1c00c580e3408a7c2d46b999be60b5e25da217 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,9 +7,11 @@ var webpackPostcssTools = require('webpack-postcss-tools');
var CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
var NgAnnotatePlugin = require('ng-annotate-webpack-plugin');
var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
var _ = require('underscore');
var glob = require('glob');
+var fs = require('fs');
var BASE_PATH = __dirname + '/resources/frontend_client/app/';
@@ -42,16 +44,18 @@ module.exports = {
// output to "dist"
output: {
path: __dirname + '/resources/frontend_client/app/dist',
- filename: '[name].bundle.js'
+ // NOTE: the filename on disk won't include "?[chunkhash]" but the URL in index.html generated by HtmlWebpackPlugin will:
+ filename: '[name].bundle.js?[chunkhash]',
+ publicPath: '/app/dist'
},
module: {
loaders: [
// JavaScript
- { test: /\.js$/, exclude: /node_modules/, loader: 'babel', query: { cacheDirectory: '.babel_cache' }},
+ { test: /\.js$/, exclude: /node_modules/, loader: 'babel', query: { cacheDirectory: '.babel_cache', optional: ['es7.asyncFunctions'] }},
{ test: /\.js$/, exclude: /node_modules|\.spec\.js/, loader: 'eslint' },
// CSS
- { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?sourceMap!cssnext-loader') }
+ { test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?-restructuring&compatibility!cssnext-loader') }
// { test: /\.css$/, loader: 'style-loader!css-loader!cssnext-loader' }
],
noParse: [
@@ -72,7 +76,7 @@ module.exports = {
'angular-route': __dirname + '/node_modules/angular-route/angular-route.min.js',
'angular-sanitize': __dirname + '/node_modules/angular-sanitize/angular-sanitize.min.js',
// angular 3rd-party
- 'angular-bootstrap': __dirname + '/node_modules/angular-bootstrap/dist/ui-bootstrap-tpls.min.js',
+ 'angular-ui-bootstrap': __dirname + '/node_modules/angular-ui-bootstrap/ui-bootstrap-tpls.min.js',
'angular-cookie': __dirname + '/node_modules/angular-cookie/angular-cookie.min.js',
'angular-gridster': __dirname + '/node_modules/angular-gridster/dist/angular-gridster.min.js',
'angular-http-auth': __dirname + '/node_modules/angular-http-auth/src/http-auth-interceptor.js',
@@ -87,18 +91,19 @@ module.exports = {
'ace/mode-sql': __dirname + '/node_modules/ace-builds/src-min-noconflict/mode-sql.js',
'ace/snippets/sql': __dirname + '/node_modules/ace-builds/src-min-noconflict/snippets/sql.js',
// react
- 'react': __dirname + '/node_modules/react/dist/react-with-addons.js',
+ 'react': __dirname + '/node_modules/react/dist/react-with-addons.min.js',
'react-onclickoutside': __dirname + '/node_modules/react-onclickoutside/index.js',
- 'react-datepicker': __dirname + '/node_modules/react-datepicker/react-datepicker.js',
- 'fixed-data-table': __dirname + '/node_modules/fixed-data-table/dist/fixed-data-table.js',
+ 'fixed-data-table': __dirname + '/node_modules/fixed-data-table/dist/fixed-data-table.min.js',
+ // misc
'moment': __dirname + '/node_modules/moment/min/moment.min.js',
'tether': __dirname + '/node_modules/tether/tether.min.js',
'underscore': __dirname + '/node_modules/underscore/underscore-min.js',
'jquery': __dirname + '/node_modules/jquery/dist/jquery.min.js',
'd3': __dirname + '/node_modules/d3/d3.min.js',
'crossfilter': __dirname + '/node_modules/crossfilter/index.js',
- 'dc': __dirname + '/node_modules/dc/dc.js',
- 'd3-tip': __dirname + '/node_modules/d3-tip/index.js'
+ 'dc': __dirname + '/node_modules/dc/dc.min.js',
+ 'd3-tip': __dirname + '/node_modules/d3-tip/index.js',
+ 'humanize': __dirname + '/node_modules/humanize-plus/public/src/humanize.js'
}
},
@@ -113,7 +118,13 @@ module.exports = {
minChunks: Infinity // (with more entries, this ensures that no other module goes into the vendor chunk)
}),
// Extracts initial CSS into a standard stylesheet that can be loaded in parallel with JavaScript
- new ExtractTextPlugin('styles.bundle.css')
+ // NOTE: the filename on disk won't include "?[chunkhash]" but the URL in index.html generated by HtmlWebpackPlugin will:
+ new ExtractTextPlugin('[name].bundle.css?[contenthash]'),
+ new HtmlWebpackPlugin({
+ filename: '../../index.html',
+ template: 'resources/frontend_client/index_template.html',
+ inject: 'head'
+ })
],
// CSSNext configuration
@@ -125,12 +136,26 @@ module.exports = {
},
import: {
path: ['resources/frontend_client/app/css']
- }
+ },
+ compress: false
},
+};
+
+// development environment:
+if (/^dev/.test(process.env["METABASE_ENV"])) {
+ // replace minified files with un-minified versions
+ for (var name in module.exports.resolve.alias) {
+ var minified = module.exports.resolve.alias[name];
+ var unminified = minified.replace(/[.-]min/, '');
+ if (minified !== unminified && fs.existsSync(unminified)) {
+ module.exports.resolve.alias[name] = unminified;
+ }
+ }
+
// SourceMaps
// Normal source map works better but takes longer to build
- // devtool: 'source-map'
+ // module.exports.devtool = 'source-map';
// Eval source map doesn't work with CSS but is faster to build
- // devtool: 'eval-source-map'
-};
+ // module.exports.devtool = 'eval-source-map';
+}