No longer require SQLite3 to be compiled with metadata support

This commit is contained in:
Pierre Pronchery 2012-12-07 03:49:01 +01:00
parent 7b0ef8d70d
commit cfa088ef23

View File

@ -273,8 +273,8 @@ static int _sqlite3_prepare_query(SQLite3 * sqlite3,
}
/* obtain the column names */
for(i = 0; i < argc; i++)
/* XXX cast or duplicate name */
columns[i] = sqlite3_column_origin_name(statement->stmt, i);
/* XXX may fail */
columns[i] = strdup(sqlite3_column_name(statement->stmt, i));
for(cnt = 0; (i = sqlite3_step(statement->stmt)) == SQLITE_ROW; cnt++)
{
#ifdef DEBUG
@ -322,6 +322,8 @@ static int _sqlite3_prepare_query(SQLite3 * sqlite3,
free(argv[i]);
}
free(argv);
for(i = 0; i < argc; i++)
free(columns[i]);
free(columns);
if(ret == 0 && i != SQLITE_DONE)
ret = -error_set_code(1, "%s", sqlite3_errmsg(sqlite3->handle));