Skip to content
This repository was archived by the owner on Feb 21, 2020. It is now read-only.

Commit af4e482

Browse files
committed
Made changes requested for
#24
1 parent a82ff7c commit af4e482

1 file changed

Lines changed: 22 additions & 25 deletions

File tree

sqla_vertica_python/vertica_python.py

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -210,35 +210,32 @@ def get_columns(self, connection, table_name, schema=None, **kw):
210210
""".format(table_name=table_name, schema_conditional=schema_conditional)
211211
colobjs = []
212212
column_select_results = list(connection.execute(column_select))
213-
for row in column_select_results:
214-
if row.is_identity:
215-
# get sequence info.
216-
seqinfo = connection.execute("""
217-
SELECT
218-
sequence_name as name,
219-
minimum as start,
220-
increment_by as increment
221-
FROM v_catalog.sequences
222-
WHERE identity_table_name = '{table_name}'
223-
{schema_conditional}
224-
""".format(
225-
table_name=table_name,
226-
schema_conditional=(
227-
"" if schema is None
228-
else "AND sequence_schema = '{schema}'".format(schema=schema)
229-
)
213+
for row in list(connection.execute(column_select)):
214+
sequence_info = connection.execute("""
215+
SELECT
216+
sequence_name as name,
217+
minimum as start,
218+
increment_by as increment
219+
FROM v_catalog.sequences
220+
WHERE identity_table_name = '{table_name}'
221+
{schema_conditional}
222+
""".format(
223+
table_name=table_name,
224+
schema_conditional=(
225+
"" if schema is None
226+
else "AND sequence_schema = '{schema}'".format(schema=schema)
230227
)
231-
).fetchone()
232-
else:
233-
seqinfo = None
228+
)
229+
).first() if row.is_identity else None
230+
234231
colobj = self._get_column_info(
235232
row.column_name,
236233
row.data_type,
237234
row.is_nullable,
238235
row.column_default,
239236
row.is_identity,
240237
(row.column_name in primary_key_columns),
241-
seqinfo
238+
sequence_info
242239
)
243240
if colobj:
244241
colobjs.append(colobj)
@@ -266,18 +263,18 @@ def _get_column_info(self, name, data_type, is_nullable, default, is_identity, i
266263
if callable(typeobj):
267264
typeobj = typeobj(*typeargs, **typekwargs)
268265

269-
cinfo = {
266+
column_info = {
270267
'name': name,
271268
'type': typeobj,
272269
'nullable': is_nullable,
273270
'default': default,
274271
'primary_key': (is_primary_key or is_identity)
275272
}
276273
if is_identity:
277-
cinfo['autoincrement'] = True
274+
column_info['autoincrement'] = True
278275
if sequence:
279-
cinfo['sequence'] = dict(sequence)
280-
return cinfo
276+
column_info['sequence'] = dict(sequence)
277+
return column_info
281278

282279
@reflection.cache
283280
def get_unique_constraints(self, connection, table_name, schema=None, **kw):

0 commit comments

Comments
 (0)