Skip to content

Commit

Permalink
Fixing the thumbs and the galery (#346)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Apr 14, 2016
1 parent 52ebdc5 commit 91a3594
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
Binary file added caravel/assets/images/viz_thumbnails/box_plot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added caravel/assets/images/viz_thumbnails/iframe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified caravel/assets/images/viz_thumbnails/treemap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion docs/gallery.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Gallery
.. image:: _static/img/viz_thumbnails/pivot_table.png
:scale: 25 %

.. image:: _static/img/viz_thumbnails/force_directed.png
.. image:: _static/img/viz_thumbnails/directed_force.png
:scale: 25 %

.. image:: _static/img/viz_thumbnails/compare.png
Expand Down Expand Up @@ -61,3 +61,12 @@ Gallery
.. image:: _static/img/viz_thumbnails/para.png
:scale: 25 %

.. image:: _static/img/viz_thumbnails/iframe.png
:scale: 25 %

.. image:: _static/img/viz_thumbnails/box_plot.png
:scale: 25 %

.. image:: _static/img/viz_thumbnails/treemap.png
:scale: 25 %

12 changes: 6 additions & 6 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -187,21 +187,21 @@ while the ``metadata_params`` get unpacked into the
`sqlalchemy.MetaData <http://docs.sqlalchemy.org/en/rel_1_0/core/metadata.html#sqlalchemy.schema.MetaData>`_ call. Refer to the SQLAlchemy docs for more information.


Postgres & Redshift
-------------------
Schemas (Postgres & Redshift)
-----------------------------

Postgres and Redshift use the concept of **schema** as a logical entity
Postgres and Redshift, as well as other database,
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.
there's a **schema** parameter you can set in the table form.


SSL Access to databases
-----------------------
This example worked with a MySQL database that requires SSL. The configuration
may differ with other backends. This is what was put in the ``extra``
parameter ::

{
"metadata_params": {},
"engine_params": {
Expand Down

0 comments on commit 91a3594

Please sign in to comment.