Revision 4491
Added by Aaron Marcuse-Kubitza almost 12 years ago
| sql_io.py | ||
|---|---|---|
| 238 | 238 |
elif is_func_result(in_col): in_col = table # omit col name |
| 239 | 239 |
return strings.ustr(in_col) |
| 240 | 240 |
|
| 241 |
str_ = str(out_table) |
|
| 241 |
str_ = strings.ustr(out_table)
|
|
| 242 | 242 |
if is_func: |
| 243 | 243 |
str_ += '('
|
| 244 | 244 |
|
| 245 | 245 |
try: value_in_col = mapping['value'] |
| 246 | 246 |
except KeyError: |
| 247 |
str_ += ', '.join((str(k)+'='+in_col_str(v) |
|
| 247 |
str_ += ', '.join((strings.ustr(k)+'='+in_col_str(v)
|
|
| 248 | 248 |
for k, v in mapping.iteritems())) |
| 249 | 249 |
else: str_ += in_col_str(value_in_col) |
| 250 | 250 |
|
| ... | ... | |
| 254 | 254 |
try: in_col = mapping[out_col] |
| 255 | 255 |
except KeyError: str_ += '_pkeys' |
| 256 | 256 |
else: # has a rank column, so hierarchical |
| 257 |
str_ += '['+str(out_col)+'='+in_col_str(in_col)+']' |
|
| 257 |
str_ += '['+strings.ustr(out_col)+'='+in_col_str(in_col)+']'
|
|
| 258 | 258 |
return str_ |
| 259 | 259 |
|
| 260 | 260 |
def put_table(db, out_table, in_tables, mapping, row_ct_ref=None, default=None, |
Also available in: Unified diff
Replaced str() with strings.ustr() (or equivalent) everywhere needed, to avoid future UnicodeEncodeErrors