libgda-4.0: several small miscellaneous fixes

Fixes bug 615421.

diff --git a/vapi/libgda-4.0.vapi b/vapi/libgda-4.0.vapi
index a9125c1a371d3c94076acc5d5e6142465007dca0..83c008b8e7ce058ca9c680f242c337afa5ffd1da 100644 (file)
--- a/vapi/libgda-4.0.vapi
+++ b/vapi/libgda-4.0.vapi
@@ -88,8 +88,8 @@ namespace Gda {
                public static bool dsn_needs_authentication (string dsn_name);
                public static GLib.Quark error_quark ();
                public static unowned Gda.Config @get ();
-               public static unowned Gda.DsnInfo get_dsn_info (string dsn_name);
-               public static unowned Gda.DsnInfo get_dsn_info_at_index (int index);
+               public static Gda.DsnInfo get_dsn_info (string dsn_name);
+               public static Gda.DsnInfo get_dsn_info_at_index (int index);
                public static int get_dsn_info_index (string dsn_name);
                public static int get_nb_dsn ();
                public static unowned Gda.ServerProvider get_provider (string provider_name) throws GLib.Error;
@@ -131,7 +131,7 @@ namespace Gda {
                public unowned Gda.TransactionStatus get_transaction_status ();
                public bool is_opened ();
                public bool open () throws GLib.Error;
-               public static unowned Gda.Connection open_from_dsn (string dsn, string auth_string, Gda.ConnectionOptions options) throws GLib.Error;
+               public static unowned Gda.Connection open_from_dsn (string dsn, string? auth_string, Gda.ConnectionOptions options) throws GLib.Error;
                public static unowned Gda.Connection open_from_string (string provider_name, string? cnc_string, string? auth_string, Gda.ConnectionOptions options) throws GLib.Error;
                public bool perform_operation (Gda.ServerOperation op) throws GLib.Error;
                public unowned string quote_sql_identifier (string id);
@@ -286,8 +286,8 @@ namespace Gda {
                public static GLib.Quark error_quark ();
                public unowned Gda.Holder get_holder_for_field (int col);
                public int get_row ();
-               public GLib.Value get_value_at (int col);
-               public GLib.Value get_value_for_field (string field_name);
+               public unowned GLib.Value? get_value_at (int col);
+               public unowned GLib.Value? get_value_for_field (string field_name);
                public void invalidate_contents ();
                public bool is_valid ();
                public bool move_next ();
@@ -413,16 +413,6 @@ namespace Gda {
                public weak GLib.HashTable values;
        }
        [Compact]
-       [CCode (cheader_filename = "libgda/libgda.h")]
-       public class DsnInfo {
-               public weak string auth_string;
-               public weak string cnc_string;
-               public weak string description;
-               public bool is_system;
-               public weak string name;
-               public weak string provider;
-       }
-       [Compact]
        [CCode (copy_function = "gda_geometricpoint_copy", free_function = "gda_geometricpoint_free", type_id = "GDA_TYPE_GEOMETRIC_POINT", cheader_filename = "libgda/libgda.h")]
        public class GeometricPoint {
                public double x;
@@ -1557,6 +1547,15 @@ namespace Gda {
                public bool trylock ();
                public void unlock ();
        }
+       [CCode (type_id = "GDA_TYPE_DSN_INFO", cheader_filename = "libgda/libgda.h")]
+       public struct DsnInfo {
+               public weak string name;
+               public weak string provider;
+               public weak string description;
+               public weak string cnc_string;
+               public weak string auth_string;
+               public bool is_system;
+       }
        [CCode (type_id = "GDA_TYPE_SQL_PARSER_IFACE", cheader_filename = "libgda/libgda.h")]
        protected struct SqlParserIface {
                public Gda.SqlParser parser;

diff --git a/vapi/packages/libgda-4.0/libgda-4.0.metadata b/vapi/packages/libgda-4.0/libgda-4.0.metadata
index 38136217ee1135edafcef65d878f0b08fe4448ea..91cd2984f402fb00b3dbd5db3caccdcc16bd2469 100644 (file)
--- a/vapi/packages/libgda-4.0/libgda-4.0.metadata
+++ b/vapi/packages/libgda-4.0/libgda-4.0.metadata
@@ -1,6 +1,7 @@
 Gda cheader_filename="libgda/libgda.h"
 gda_connection_open_from_string.cnc_string nullable="1"
 gda_connection_open_from_string.auth_string nullable="1"
+gda_connection_open_from_dsn.auth_string nullable="1"
 gda_connection_statement_execute_non_select.params nullable="1"
 gda_connection_statement_execute_non_select.last_insert_row nullable="1"
 gda_data_model_import_new_xml_node name="from_xml_node"
@@ -13,3 +14,6 @@ GdaSList namespace="GLib" name="SList"
 gda_data_model_array_new_with_g_types ellipsis="1" sentinel=""
 gda_data_model_get_typed_value_at transfer_ownership="0" nullable="1"
 gda_data_model_get_value_at transfer_ownership="0" nullable="1"
+gda_data_model_iter_get_value_at transfer_ownership="0" nullable="1"
+gda_data_model_iter_get_value_for_field transfer_ownership="0" nullable="1"
+GdaDsnInfo is_value_type="1"