Skip to content

Schemas #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
deniszgonjanin wants to merge 4 commits into from
Closed

Schemas #340

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc2c1e0
Support setting schemas on tables
Apr 12, 2016
6513235
default schema should be None
Apr 13, 2016
5c57063
no need to specify schema in Table call anymore
Apr 13, 2016
76f1838
clean up
Apr 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions caravel/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@ def get_sqla_engine(self):
def safe_sqlalchemy_uri(self):
return self.sqlalchemy_uri

def schema(self):
extra = self.get_extra()
return extra.get('metadata_params', {}).get('schema', '')

def grains(self):
"""Defines time granularity database-specific expressions.

Expand Down Expand Up @@ -500,6 +504,10 @@ def sql_url(self):
def sql_link(self):
return '<a href="{}">SQL</a>'.format(self.sql_url)

@property
def schema(self):
return self.database.schema() or None

def query( # sqla
self, groupby, metrics,
granularity,
Expand Down Expand Up @@ -593,6 +601,7 @@ def query( # sqla
select_exprs += metrics_exprs
qry = select(select_exprs)
from_clause = table(self.table_name)
from_clause.schema = self.schema
if not columns:
qry = qry.group_by(*groupby_exprs)

Expand Down