lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-20 11:07:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidated calls to mdb_sql_reset

Browse Source 
SQL engine was being reset in both dump_results functions.  Rather than having several different functions responsible for resetting the engine depending on the circumstances, the reset now only occurs in run_query, the same function where the query is executed.
This commit is contained in:
William Rogers
2015-05-24 17:05:41 -05:00
parent bcc7ad5a7a
commit 9276aca347
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/mdb-sql.c
View File

@@ -205,15 +205,15 @@ run_query(FILE *out, MdbSQL *sql, char *mybuf, char *delimiter)
else else
printf("Index scanning %s using %s\n", table->name, table->scan_idx->name); printf("Index scanning %s using %s\n", table->name, table->scan_idx->name);
} }
if (noexec) { /* If noexec != on, dump results */
mdb_sql_reset(sql); if (!noexec) {
return;
}
if (pretty_print) if (pretty_print)
dump_results_pp(out, sql); dump_results_pp(out, sql);
else else
dump_results(out, sql, delimiter); dump_results(out, sql, delimiter);
} }
mdb_sql_reset(sql);
}
} }
void print_value(FILE *out, char *v, int sz, int first) void print_value(FILE *out, char *v, int sz, int first)
@@ -281,8 +281,6 @@ dump_results(FILE *out, MdbSQL *sql, char *delimiter)
if (footers) { if (footers) {
print_rows_retrieved(out, row_count); print_rows_retrieved(out, row_count);
} }
mdb_sql_reset(sql);
} }
void void
@@ -343,8 +341,6 @@ dump_results_pp(FILE *out, MdbSQL *sql)
for (j=0;j<sql->num_columns;j++) { for (j=0;j<sql->num_columns;j++) {
g_free(sql->bound_values[j]); g_free(sql->bound_values[j]);
} }
mdb_sql_reset(sql);
} }
int int