From 3e8a033a778c8dd3559f047a2734125fa897be34 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin
Date: Wed, 6 Apr 2016 08:52:13 -0700
Subject: [PATCH] Better installation docs
---
_sources/installation.txt | 29 +++++++++++++++++++++++++++++
index.html | 2 ++
installation.html | 25 +++++++++++++++++++++++++
searchindex.js | 2 +-
4 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/_sources/installation.txt b/_sources/installation.txt
index 40a7035335e..f4bf8748436 100644
--- a/_sources/installation.txt
+++ b/_sources/installation.txt
@@ -44,6 +44,9 @@ attempt it: ::
C:\> set INCLUDE=C:\OpenSSL-1.0.1f-64bit\include;%INCLUDE%
C:\> pip install cryptography
+ # You may also have to create C:\Temp
+ C:\> md C:\Temp
+
Caravel installation and initialization
---------------------------------------
@@ -135,6 +138,32 @@ data source's configuration, to your database's and ultimately falls back
into your global default defined in ``CACHE_CONFIG``.
+Deeper SQLAlchemy integration
+-----------------------------
+
+It is possible to tweak the database connection information using the
+parameters exposed by SQLAlchemy. In the ``Database`` edit view, you will
+find an ``extra`` field as a ``JSON`` blob.
+
+.. image:: _static/img/tutorial/add_db.png
+
+This JSON string contains extra configuration elements. The ``engine_params``
+object gets unpacked into the
+`sqlalchemy.create_engine `_ call,
+while the ``metadata_params`` get unpacked into the
+`sqlalchemy.MetaData `_ call. Refer to the SQLAlchemy docs for more information.
+
+
+Postgres & Redshift
+-------------------
+
+Postgres and Redshift use the concept of **schema** as a logical entity
+on top of the **database**. For Caravel to connect to a specific schema,
+you can either specify it in the ``metadata_params`` key of the ``extra``
+JSON blob described above, or you can use a database user name to connect to
+the database that matches the schema name you are interested it.
+
+
Druid
-----
diff --git a/index.html b/index.html
index b7a288677b4..c3e35742e30 100644
--- a/index.html
+++ b/index.html
@@ -241,6 +241,8 @@ to the user
Caravel installation and initialization
Configuration
Caching
+Deeper SQLAlchemy integration
+Postgres & Redshift
Druid
diff --git a/installation.html b/installation.html
index d5e0ea96366..b2dde3b6e89 100644
--- a/installation.html
+++ b/installation.html
@@ -91,6 +91,8 @@
Caravel installation and initialization
Configuration
Caching
+Deeper SQLAlchemy integration
+Postgres & Redshift
Druid
@@ -161,6 +163,9 @@ attempt it:
C:\> set LIB=C:\OpenSSL-1.0.1f-64bit\lib;%LIB%
C:\> set INCLUDE=C:\OpenSSL-1.0.1f-64bit\include;%INCLUDE%
C:\> pip install cryptography
+
+# You may also have to create C:\Temp
+C:\> md C:\Temp
@@ -245,6 +250,26 @@ up the “timeout searchpath”, from your slice configuration, to your
data source’s configuration, to your database’s and ultimately falls back
into your global default defined in
+
Deeper SQLAlchemy integration
+
It is possible to tweak the database connection information using the
+parameters exposed by SQLAlchemy. In the Database edit view, you will
+find an extra field as a JSON blob.
+

+
This JSON string contains extra configuration elements. The engine_params
+object gets unpacked into the
+sqlalchemy.create_engine call,
+while the metadata_params get unpacked into the
+sqlalchemy.MetaData call. Refer to the SQLAlchemy docs for more information.
+
+
+
Postgres & Redshift
+
Postgres and Redshift use the concept of schema as a logical entity
+on top of the database. For Caravel to connect to a specific schema,
+you can either specify it in the metadata_params key of the extra
+JSON blob described above, or you can use a database user name to connect to
+the database that matches the schema name you are interested it.
+