Skip to content
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

Get table name directly #35724

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Get table name directly #35724

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 2 deletions corehq/apps/userreports/sql/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ def get_existing_table_from_db(self):

@property
def table_exists(self):
return self.engine.has_table(self.get_table().name)
table_name = _get_table_name_for_adapter(self.override_table_name, self.config)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return self.engine.has_table(table_name)

@memoized
def get_sqlalchemy_orm_table(self):
Expand Down Expand Up @@ -368,9 +369,13 @@ class ErrorRaisingMultiDBAdapter(MultiDBSqlAdapter):
mirror_adapter_cls = ErrorRaisingIndicatorSqlAdapter


def _get_table_name_for_adapter(override_table_name, config):
return override_table_name or get_table_name(config.domain, config.table_id)


def get_indicator_table(indicator_config, metadata, override_table_name=None):
sql_columns = [column_to_sql(col) for col in indicator_config.get_columns()]
table_name = override_table_name or get_table_name(indicator_config.domain, indicator_config.table_id)
table_name = _get_table_name_for_adapter(override_table_name, indicator_config)
columns_by_col_id = {col.database_column_name.decode('utf-8') for col in indicator_config.get_columns()}
extra_indices = []

Expand Down
Loading