Skip to content

Commit 9d2504a

Browse files
committed
Change rows {convert,query} to be lazy
1 parent 4bdfc97 commit 9d2504a

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

rows/cli.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,27 +379,30 @@ def query(input_encoding, output_encoding, input_locale, output_locale,
379379
if input_locale is not None:
380380
with rows.locale_context(input_locale):
381381
table = import_from_source(source, DEFAULT_INPUT_ENCODING,
382-
samples=samples)
382+
lazy=True, samples=samples)
383383
else:
384384
table = import_from_source(source, DEFAULT_INPUT_ENCODING,
385-
samples=samples)
385+
lazy=True, samples=samples)
386386

387387
sqlite_connection = sqlite3.Connection(':memory:')
388388
rows.export_to_sqlite(table,
389389
sqlite_connection,
390390
table_name='table1')
391-
result = rows.import_from_sqlite(sqlite_connection, query=query)
391+
result = rows.import_from_sqlite(sqlite_connection, query=query,
392+
lazy=True, samples=samples)
392393

393394
else:
394395
# TODO: if all sources are SQLite we can also optimize the import
395396
if input_locale is not None:
396397
with rows.locale_context(input_locale):
397398
tables = [_import_table(source, encoding=input_encoding,
398-
verify_ssl=verify_ssl, samples=samples)
399+
verify_ssl=verify_ssl, lazy=True,
400+
samples=samples)
399401
for source in sources]
400402
else:
401403
tables = [_import_table(source, encoding=input_encoding,
402-
verify_ssl=verify_ssl, samples=samples)
404+
verify_ssl=verify_ssl, lazy=True,
405+
samples=samples)
403406
for source in sources]
404407

405408
sqlite_connection = sqlite3.Connection(':memory:')
@@ -408,7 +411,8 @@ def query(input_encoding, output_encoding, input_locale, output_locale,
408411
sqlite_connection,
409412
table_name='table{}'.format(index))
410413

411-
result = rows.import_from_sqlite(sqlite_connection, query=query)
414+
result = rows.import_from_sqlite(sqlite_connection, query=query,
415+
lazy=True, samples=samples)
412416

413417
# TODO: may use sys.stdout.encoding if output_file = '-'
414418
output_encoding = output_encoding or sys.stdout.encoding or \

0 commit comments

Comments
 (0)