X-Git-Url: http://git.datanom.net/lensdb.git/blobdiff_plain/cb1fcc887cc7472e36894464e9a9d85cbc1623f6..refs/heads/release/0.9:/src/sqlite-storage.c diff --git a/src/sqlite-storage.c b/src/sqlite-storage.c index dec4344..2fc1147 100644 --- a/src/sqlite-storage.c +++ b/src/sqlite-storage.c @@ -285,9 +285,9 @@ gint delete_lens(const Row* row) { gint add_maker(const gchar* maker, gchar** error) { gint rc; sqlite3_stmt* stmt; - gint status = 1; + gint status = -1; - rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1)", -1, &stmt, 0); + rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1) returning id", -1, &stmt, 0); if (rc != SQLITE_OK) { gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); @@ -312,18 +312,17 @@ gint add_maker(const gchar* maker, gchar** error) { } rc = sqlite3_step(stmt); - if (rc != SQLITE_DONE) { - gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db)); + if (rc != SQLITE_ROW) { + gchar* err = g_strdup_printf("Couldn't insert maker: %s\n", sqlite3_errmsg(db)); fprintf(stderr, err); show_err_msg(GTK_MESSAGE_ERROR, err); g_free(err); if (error) *error = g_strdup(sqlite3_errmsg(db)); - sqlite3_finalize(stmt); - return status; - } - - status = 0; + } else { + status = sqlite3_column_int64(stmt, 0); + } + sqlite3_finalize(stmt); return status; @@ -414,8 +413,10 @@ void update_maker(const Maker* maker) { } void maker_free(Maker* maker) { - g_free(maker->maker_name); - g_free(maker); + if (maker) { + g_free(maker->maker_name); + g_free(maker); + } } gint delete_maker(const gchar* maker, gchar** error) { @@ -497,7 +498,7 @@ GSList* get_makers() { gint get_maker_id(const gchar* maker) { gint rc; sqlite3_stmt* stmt; - gint id = 0; + gint id = -1; rc = sqlite3_prepare_v2(db, "select id from lensmaker where maker = ?1", -1, &stmt, 0); if (rc != SQLITE_OK) {