Skip to content

Commit 0cd9976

Browse files
author
Mmoncadaisla
committed
CR: Move cartodbfy step to ContextManager create_table_from_query method
1 parent f2ccf87 commit 0cd9976

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

cartoframes/io/carto.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,7 @@ def copy_table(table_name, new_table_name, credentials=None, if_exists='fail', l
304304
query = 'SELECT * FROM {}'.format(table_name)
305305

306306
context_manager = ContextManager(credentials)
307-
new_table_name = context_manager.create_table_from_query(query, new_table_name, if_exists)
308-
309-
if cartodbfy is True:
310-
schema = context_manager.get_schema()
311-
cartodbfy_query = _cartodbfy_query(new_table_name, schema)
312-
context_manager.execute_long_running_query(cartodbfy_query)
307+
new_table_name = context_manager.create_table_from_query(query, new_table_name, if_exists, cartodbfy)
313308

314309
if log_enabled:
315310
log.info('Success! Table "{0}" copied to table "{1}" correctly'.format(table_name, new_table_name))
@@ -348,12 +343,7 @@ def create_table_from_query(
348343
', '.join(IF_EXISTS_OPTIONS)))
349344

350345
context_manager = ContextManager(credentials)
351-
new_table_name = context_manager.create_table_from_query(query, new_table_name, if_exists)
352-
353-
if cartodbfy is True:
354-
schema = context_manager.get_schema()
355-
cartodbfy_query = _cartodbfy_query(new_table_name, schema)
356-
context_manager.execute_long_running_query(cartodbfy_query)
346+
new_table_name = context_manager.create_table_from_query(query, new_table_name, if_exists, cartodbfy)
357347

358348
if log_enabled:
359349
log.info('Success! Table "{0}" created correctly'.format(new_table_name))

cartoframes/io/managers/context_manager.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def copy_from(self, gdf, table_name, if_exists='fail', cartodbfy=True,
122122

123123
return table_name
124124

125-
def create_table_from_query(self, query, table_name, if_exists):
125+
def create_table_from_query(self, query, table_name, if_exists, cartodbfy=True):
126126
schema = self.get_schema()
127127
table_name = self.normalize_table_name(table_name)
128128

@@ -140,6 +140,10 @@ def create_table_from_query(self, query, table_name, if_exists):
140140
else:
141141
self._drop_create_table_from_query(table_name, schema, query)
142142

143+
if cartodbfy is True:
144+
cartodbfy_query = _cartodbfy_query(table_name, schema)
145+
self.execute_long_running_query(cartodbfy_query)
146+
143147
return table_name
144148

145149
def list_tables(self, schema=None):

0 commit comments

Comments
 (0)