diff options
| author | Ernestas Kulik <ernestas.kulik@gmail.com> | 2015-10-11 12:30:24 +0300 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-12 12:23:07 +0200 |
| commit | ab1d119793db2b78a00b44d4de3d3902c0e98eab (patch) | |
| tree | d2a48fa1dbd8d7322f023edd471c232d5790bb3b | |
| parent | 9a7b1963af282220535c7701805ea72fd6f1462c (diff) | |
| download | vala-ab1d119793db2b78a00b44d4de3d3902c0e98eab.tar.gz | |
sqlite3: Allow some values to be nullable
This fixes Database.get_table() as it throws an error when compiling in
strict non-null mode and also features tweaks in Database.{_,}exec and
Statement.column_text signatures to accomodate potential null returns.
https://bugzilla.gnome.org/show_bug.cgi?id=754238
| -rw-r--r-- | vapi/sqlite3.vapi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vapi/sqlite3.vapi b/vapi/sqlite3.vapi index d2eb03707..cd331df00 100644 --- a/vapi/sqlite3.vapi +++ b/vapi/sqlite3.vapi @@ -29,10 +29,10 @@ namespace Sqlite { public int busy_timeout (int ms); public int changes (); [CCode (cname = "sqlite3_exec")] - public int _exec (string sql, Callback? callback = null, [CCode (type = "char**")] out unowned string errmsg = null); + public int _exec (string sql, Callback? callback = null, [CCode (type = "char**")] out unowned string? errmsg = null); [CCode (cname = "_sqlite3_exec")] - public int exec (string sql, Callback? callback = null, out string errmsg = null) { - unowned string sqlite_errmsg; + public int exec (string sql, Callback? callback = null, out string? errmsg = null) { + unowned string? sqlite_errmsg; var ec = this._exec (sql, callback, out sqlite_errmsg); if (&errmsg != null) { errmsg = sqlite_errmsg; @@ -52,7 +52,7 @@ namespace Sqlite { private static void free_table ([CCode (array_length = false)] string[] result); [CCode (cname = "_sqlite3_get_table")] public int get_table (string sql, out string[] resultp, out int nrow, out int ncolumn, out string? errmsg = null) { - unowned string sqlite_errmsg; + unowned string? sqlite_errmsg; unowned string[] sqlite_resultp; var ec = this._get_table (sql, out sqlite_resultp, out nrow, out ncolumn, out sqlite_errmsg); @@ -376,7 +376,7 @@ namespace Sqlite { public double column_double (int col); public int column_int (int col); public int64 column_int64 (int col); - public unowned string column_text (int col); + public unowned string? column_text (int col); public int column_type (int col); public unowned Value column_value (int col); public unowned string column_name (int index); |