summaryrefslogtreecommitdiff
path: root/python/skytools/dbstruct.py
diff options
context:
space:
mode:
authormartinko2014-04-02 14:55:14 +0000
committermartinko2014-04-02 14:55:14 +0000
commitfc1e1f4b7a9b50418c41045c92fbe31947b83796 (patch)
tree2d2f66bde621f7ad0dd012911ad19fbdcfa7ffcc /python/skytools/dbstruct.py
parent3cfc1ad65876845641fbf2868994e6c6b53dd9ff (diff)
parent62abe7b14dedaba7a6dd5678c8e0b4e3335ed81c (diff)
Merge branch 'release/3.2'skytools_3_2
Diffstat (limited to 'python/skytools/dbstruct.py')
-rw-r--r--python/skytools/dbstruct.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/skytools/dbstruct.py b/python/skytools/dbstruct.py
index e1a7012c..089d2096 100644
--- a/python/skytools/dbstruct.py
+++ b/python/skytools/dbstruct.py
@@ -552,7 +552,7 @@ class BaseStruct(object):
#print "Loading %s, name=%s, args=%s" % (repr(eclass), repr(name), repr(args))
sql = eclass.get_load_sql(curs.connection.server_version)
curs.execute(sql % args)
- for row in curs.dictfetchall():
+ for row in curs.fetchall():
elem_list.append(eclass(name, row))
return elem_list
@@ -637,8 +637,9 @@ class TableStruct(BaseStruct):
# load seqs
for col in self.col_list:
if col.seqname:
+ fqname = quote_fqident(col.seqname)
owner = self.fqname + '.' + quote_ident(col.name)
- seq_args = { 'fqname': col.seqname, 'owner': skytools.quote_literal(owner) }
+ seq_args = { 'fqname': fqname, 'owner': skytools.quote_literal(owner) }
self.seq_list += self._load_elem(curs, col.seqname, seq_args, TSeq)
self.object_list += self.seq_list