[libgdamm] Fix the build with the latest libgdamm, which slightly broke API and ABI.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [libgdamm] Fix the build with the latest libgdamm, which slightly broke API and ABI.
Date: Tue, 23 Mar 2010 21:32:42 +0000 (UTC)
commit d42850895cf7edaac40474095b0ca65a043a4bc3
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Mar 23 22:32:34 2010 +0100

    Fix the build with the latest libgdamm, which slightly broke API and ABI.
    
    * libgda/src/libgda_enums.defs: Regenerated.
    * libgda/src/sqlbuilder.hg: Adapt the SqlError exception wrapper to mention
    GdaSqlError instead of GdaSqlErrorType.

 ChangeLog                    |    8 +
 libgda/src/libgda_enums.defs | 1089 ++++++++++++++++++++++++++++++++----------
 libgda/src/sqlbuilder.hg     |    2 +-
 3 files changed, 837 insertions(+), 262 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 44a3904..0d7b770 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-23  Murray Cumming  <murrayc murrayc com>
+
+  Fix the build with the latest libgdamm, which slightly broke API and ABI.
+  
+	* libgda/src/libgda_enums.defs: Regenerated.
+	* libgda/src/sqlbuilder.hg: Adapt the SqlError exception wrapper to mention
+	GdaSqlError instead of GdaSqlErrorType.
+
 2010-02-27  Murray Cumming  <murrayc murrayc-x61>
 
   Connection: Add statement_execute_non_select_builder(SqlBuilder)
diff --git a/libgda/src/libgda_enums.defs b/libgda/src/libgda_enums.defs
index 6fe6ca2..7d1bfe4 100644
--- a/libgda/src/libgda_enums.defs
+++ b/libgda/src/libgda_enums.defs
@@ -1,184 +1,27 @@
-;; From /usr/include/libgda-4.0/sql-parser/gda-sql-parser.h
+;; From gda-batch.h
 
-(define-enum-extended SqlParserError
-  (in-module "Gda")
-  (c-name "GdaSqlParserError")
-  (values
-    '("syntax-error" "GDA_SQL_PARSER_SYNTAX_ERROR" "0")
-    '("overflow-error" "GDA_SQL_PARSER_OVERFLOW_ERROR" "1")
-    '("empty-sql-error" "GDA_SQL_PARSER_EMPTY_SQL_ERROR" "2")
-  )
-)
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_BATCH_CONFLICTING_PARAMETER_ERROR
+;; } GdaBatchError;
 
-(define-enum-extended SqlParserMode
+(define-enum-extended BatchError
   (in-module "Gda")
-  (c-name "GdaSqlParserMode")
+  (c-name "GdaBatchError")
   (values
-    '("parse" "GDA_SQL_PARSER_MODE_PARSE" "0")
-    '("delimit" "GDA_SQL_PARSER_MODE_DELIMIT" "1")
+    '("conflicting-parameter-error" "GDA_BATCH_CONFLICTING_PARAMETER_ERROR" "0")
   )
 )
 
-(define-enum-extended SqlParserFlavour
-  (in-module "Gda")
-  (c-name "GdaSqlParserFlavour")
-  (values
-    '("standard" "GDA_SQL_PARSER_FLAVOUR_STANDARD" "0")
-    '("sqlite" "GDA_SQL_PARSER_FLAVOUR_SQLITE" "1")
-    '("mysql" "GDA_SQL_PARSER_FLAVOUR_MYSQL" "2")
-    '("oracle" "GDA_SQL_PARSER_FLAVOUR_ORACLE" "3")
-    '("postgresql" "GDA_SQL_PARSER_FLAVOUR_POSTGRESQL" "4")
-  )
-)
-
-;; From /usr/include/libgda-4.0/sql-parser/gda-statement-struct-compound.h
-
-(define-enum-extended SqlStatementCompoundType
-  (in-module "Gda")
-  (c-name "GdaSqlStatementCompoundType")
-  (values
-    '("union" "GDA_SQL_STATEMENT_COMPOUND_UNION" "0")
-    '("union-all" "GDA_SQL_STATEMENT_COMPOUND_UNION_ALL" "1")
-    '("intersect" "GDA_SQL_STATEMENT_COMPOUND_INTERSECT" "2")
-    '("intersect-all" "GDA_SQL_STATEMENT_COMPOUND_INTERSECT_ALL" "3")
-    '("except" "GDA_SQL_STATEMENT_COMPOUND_EXCEPT" "4")
-    '("except-all" "GDA_SQL_STATEMENT_COMPOUND_EXCEPT_ALL" "5")
-  )
-)
+;; From gda-config.h
 
-;; From /usr/include/libgda-4.0/sql-parser/gda-statement-struct-decl.h
-
-(define-enum-extended SqlErrorType
-  (in-module "Gda")
-  (c-name "GdaSqlErrorType")
-  (values
-    '("structure-contents-error" "GDA_SQL_STRUCTURE_CONTENTS_ERROR" "0")
-    '("malformed-identifier-error" "GDA_SQL_MALFORMED_IDENTIFIER_ERROR" "1")
-    '("missing-identifier-error" "GDA_SQL_MISSING_IDENTIFIER_ERROR" "2")
-    '("validation-error" "GDA_SQL_VALIDATION_ERROR" "3")
-  )
-)
-
-(define-enum-extended SqlStatementType
-  (in-module "Gda")
-  (c-name "GdaSqlStatementType")
-  (values
-    '("select" "GDA_SQL_STATEMENT_SELECT" "0")
-    '("insert" "GDA_SQL_STATEMENT_INSERT" "1")
-    '("update" "GDA_SQL_STATEMENT_UPDATE" "2")
-    '("delete" "GDA_SQL_STATEMENT_DELETE" "3")
-    '("compound" "GDA_SQL_STATEMENT_COMPOUND" "4")
-    '("begin" "GDA_SQL_STATEMENT_BEGIN" "5")
-    '("rollback" "GDA_SQL_STATEMENT_ROLLBACK" "6")
-    '("commit" "GDA_SQL_STATEMENT_COMMIT" "7")
-    '("savepoint" "GDA_SQL_STATEMENT_SAVEPOINT" "8")
-    '("rollback-savepoint" "GDA_SQL_STATEMENT_ROLLBACK_SAVEPOINT" "9")
-    '("delete-savepoint" "GDA_SQL_STATEMENT_DELETE_SAVEPOINT" "10")
-    '("unknown" "GDA_SQL_STATEMENT_UNKNOWN" "11")
-    '("none" "GDA_SQL_STATEMENT_NONE" "12")
-  )
-)
-
-(define-enum-extended SqlAnyPartType
-  (in-module "Gda")
-  (c-name "GdaSqlAnyPartType")
-  (values
-    '("stmt-select" "GDA_SQL_ANY_STMT_SELECT" "#error")
-    '("stmt-insert" "GDA_SQL_ANY_STMT_INSERT" "1")
-    '("stmt-update" "GDA_SQL_ANY_STMT_UPDATE" "2")
-    '("stmt-delete" "GDA_SQL_ANY_STMT_DELETE" "3")
-    '("stmt-compound" "GDA_SQL_ANY_STMT_COMPOUND" "4")
-    '("stmt-begin" "GDA_SQL_ANY_STMT_BEGIN" "5")
-    '("stmt-rollback" "GDA_SQL_ANY_STMT_ROLLBACK" "6")
-    '("stmt-commit" "GDA_SQL_ANY_STMT_COMMIT" "7")
-    '("stmt-savepoint" "GDA_SQL_ANY_STMT_SAVEPOINT" "8")
-    '("stmt-rollback-savepoint" "GDA_SQL_ANY_STMT_ROLLBACK_SAVEPOINT" "9")
-    '("stmt-delete-savepoint" "GDA_SQL_ANY_STMT_DELETE_SAVEPOINT" "10")
-    '("stmt-unknown" "GDA_SQL_ANY_STMT_UNKNOWN" "11")
-    '("expr" "GDA_SQL_ANY_EXPR" "500")
-    '("sql-field" "GDA_SQL_ANY_SQL_FIELD" "501")
-    '("sql-table" "GDA_SQL_ANY_SQL_TABLE" "502")
-    '("sql-function" "GDA_SQL_ANY_SQL_FUNCTION" "503")
-    '("sql-operation" "GDA_SQL_ANY_SQL_OPERATION" "504")
-    '("sql-case" "GDA_SQL_ANY_SQL_CASE" "505")
-    '("sql-select-field" "GDA_SQL_ANY_SQL_SELECT_FIELD" "506")
-    '("sql-select-target" "GDA_SQL_ANY_SQL_SELECT_TARGET" "507")
-    '("sql-select-join" "GDA_SQL_ANY_SQL_SELECT_JOIN" "508")
-    '("sql-select-from" "GDA_SQL_ANY_SQL_SELECT_FROM" "509")
-    '("sql-select-order" "GDA_SQL_ANY_SQL_SELECT_ORDER" "510")
-  )
-)
-
-;; From /usr/include/libgda-4.0/sql-parser/gda-statement-struct-parts.h
-
-(define-enum-extended SqlOperatorType
-  (in-module "Gda")
-  (c-name "GdaSqlOperatorType")
-  (values
-    '("and" "GDA_SQL_OPERATOR_TYPE_AND" "0")
-    '("or" "GDA_SQL_OPERATOR_TYPE_OR" "1")
-    '("eq" "GDA_SQL_OPERATOR_TYPE_EQ" "2")
-    '("is" "GDA_SQL_OPERATOR_TYPE_IS" "3")
-    '("like" "GDA_SQL_OPERATOR_TYPE_LIKE" "4")
-    '("between" "GDA_SQL_OPERATOR_TYPE_BETWEEN" "5")
-    '("gt" "GDA_SQL_OPERATOR_TYPE_GT" "6")
-    '("lt" "GDA_SQL_OPERATOR_TYPE_LT" "7")
-    '("geq" "GDA_SQL_OPERATOR_TYPE_GEQ" "8")
-    '("leq" "GDA_SQL_OPERATOR_TYPE_LEQ" "9")
-    '("diff" "GDA_SQL_OPERATOR_TYPE_DIFF" "10")
-    '("regexp" "GDA_SQL_OPERATOR_TYPE_REGEXP" "11")
-    '("regexp-ci" "GDA_SQL_OPERATOR_TYPE_REGEXP_CI" "12")
-    '("not-regexp" "GDA_SQL_OPERATOR_TYPE_NOT_REGEXP" "13")
-    '("not-regexp-ci" "GDA_SQL_OPERATOR_TYPE_NOT_REGEXP_CI" "14")
-    '("similar" "GDA_SQL_OPERATOR_TYPE_SIMILAR" "15")
-    '("isnull" "GDA_SQL_OPERATOR_TYPE_ISNULL" "16")
-    '("isnotnull" "GDA_SQL_OPERATOR_TYPE_ISNOTNULL" "17")
-    '("not" "GDA_SQL_OPERATOR_TYPE_NOT" "18")
-    '("in" "GDA_SQL_OPERATOR_TYPE_IN" "19")
-    '("notin" "GDA_SQL_OPERATOR_TYPE_NOTIN" "20")
-    '("concat" "GDA_SQL_OPERATOR_TYPE_CONCAT" "21")
-    '("plus" "GDA_SQL_OPERATOR_TYPE_PLUS" "22")
-    '("minus" "GDA_SQL_OPERATOR_TYPE_MINUS" "23")
-    '("star" "GDA_SQL_OPERATOR_TYPE_STAR" "24")
-    '("div" "GDA_SQL_OPERATOR_TYPE_DIV" "25")
-    '("rem" "GDA_SQL_OPERATOR_TYPE_REM" "26")
-    '("bitand" "GDA_SQL_OPERATOR_TYPE_BITAND" "27")
-    '("bitor" "GDA_SQL_OPERATOR_TYPE_BITOR" "28")
-    '("bitnot" "GDA_SQL_OPERATOR_TYPE_BITNOT" "29")
-  )
-)
-
-(define-enum-extended SqlSelectJoinType
-  (in-module "Gda")
-  (c-name "GdaSqlSelectJoinType")
-  (values
-    '("cross" "GDA_SQL_SELECT_JOIN_CROSS" "0")
-    '("natural" "GDA_SQL_SELECT_JOIN_NATURAL" "1")
-    '("inner" "GDA_SQL_SELECT_JOIN_INNER" "2")
-    '("left" "GDA_SQL_SELECT_JOIN_LEFT" "3")
-    '("right" "GDA_SQL_SELECT_JOIN_RIGHT" "4")
-    '("full" "GDA_SQL_SELECT_JOIN_FULL" "5")
-  )
-)
-
-;; From /usr/include/libgda-4.0/libgda/gda-binreloc.h
-
-(define-enum-extended PrefixDir
-  (in-module "Gda")
-  (c-name "GdaPrefixDir")
-  (values
-    '("no-dir" "GDA_NO_DIR" "0")
-    '("bin-dir" "GDA_BIN_DIR" "1")
-    '("sbin-dir" "GDA_SBIN_DIR" "2")
-    '("data-dir" "GDA_DATA_DIR" "3")
-    '("locale-dir" "GDA_LOCALE_DIR" "4")
-    '("lib-dir" "GDA_LIB_DIR" "5")
-    '("libexec-dir" "GDA_LIBEXEC_DIR" "6")
-    '("etc-dir" "GDA_ETC_DIR" "7")
-  )
-)
-
-;; From /usr/include/libgda-4.0/libgda/gda-config.h
+;; Original typedef:
+;; typedef enum {
+;;         GDA_CONFIG_DSN_NOT_FOUND_ERROR,
+;; 	GDA_CONFIG_PERMISSION_ERROR,
+;; 	GDA_CONFIG_PROVIDER_NOT_FOUND_ERROR,
+;; 	GDA_CONFIG_PROVIDER_CREATION_ERROR
+;; } GdaConfigError;
 
 (define-enum-extended ConfigError
   (in-module "Gda")
@@ -191,7 +34,16 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-connection-event.h
+;; From gda-connection-event.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_CONNECTION_EVENT_NOTICE,
+;; 	GDA_CONNECTION_EVENT_WARNING,
+;; 	GDA_CONNECTION_EVENT_ERROR,
+;; 	GDA_CONNECTION_EVENT_COMMAND
+;; 	
+;; } GdaConnectionEventType;
 
 (define-enum-extended ConnectionEventType
   (in-module "Gda")
@@ -204,6 +56,30 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;        GDA_CONNECTION_EVENT_CODE_CONSTRAINT_VIOLATION,
+;;        GDA_CONNECTION_EVENT_CODE_RESTRICT_VIOLATION,
+;;        GDA_CONNECTION_EVENT_CODE_NOT_NULL_VIOLATION,
+;;        GDA_CONNECTION_EVENT_CODE_FOREIGN_KEY_VIOLATION,
+;;        GDA_CONNECTION_EVENT_CODE_UNIQUE_VIOLATION,
+;;        GDA_CONNECTION_EVENT_CODE_CHECK_VIOLATION,
+;;        GDA_CONNECTION_EVENT_CODE_INSUFFICIENT_PRIVILEGES,
+;;        GDA_CONNECTION_EVENT_CODE_UNDEFINED_COLUMN,
+;;        GDA_CONNECTION_EVENT_CODE_UNDEFINED_FUNCTION,
+;;        GDA_CONNECTION_EVENT_CODE_UNDEFINED_TABLE,
+;;        GDA_CONNECTION_EVENT_CODE_DUPLICATE_COLUMN,
+;;        GDA_CONNECTION_EVENT_CODE_DUPLICATE_DATABASE,
+;;        GDA_CONNECTION_EVENT_CODE_DUPLICATE_FUNCTION,
+;;        GDA_CONNECTION_EVENT_CODE_DUPLICATE_SCHEMA,
+;;        GDA_CONNECTION_EVENT_CODE_DUPLICATE_TABLE,
+;;        GDA_CONNECTION_EVENT_CODE_DUPLICATE_ALIAS,
+;;        GDA_CONNECTION_EVENT_CODE_DUPLICATE_OBJECT,
+;;        GDA_CONNECTION_EVENT_CODE_SYNTAX_ERROR,
+;;        GDA_CONNECTION_EVENT_CODE_UNKNOWN
+;; } GdaConnectionEventCode;
+
 (define-enum-extended ConnectionEventCode
   (in-module "Gda")
   (c-name "GdaConnectionEventCode")
@@ -230,7 +106,22 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-connection.h
+;; From gda-connection.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_CONNECTION_DSN_NOT_FOUND_ERROR,
+;; 	GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR,
+;; 	GDA_CONNECTION_PROVIDER_ERROR,
+;; 	GDA_CONNECTION_NO_CNC_SPEC_ERROR,
+;; 	GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR,
+;; 	GDA_CONNECTION_OPEN_ERROR,
+;; 	GDA_CONNECTION_STATEMENT_TYPE_ERROR,
+;; 	GDA_CONNECTION_CANT_LOCK_ERROR,
+;; 	GDA_CONNECTION_TASK_NOT_FOUND_ERROR,
+;; 	GDA_CONNECTION_UNSUPPORTED_THREADS_ERROR,
+;; 	GDA_CONNECTION_CLOSED_ERROR
+;; } GdaConnectionError;
 
 (define-enum-extended ConnectionError
   (in-module "Gda")
@@ -246,20 +137,51 @@
     '("cant-lock-error" "GDA_CONNECTION_CANT_LOCK_ERROR" "7")
     '("task-not-found-error" "GDA_CONNECTION_TASK_NOT_FOUND_ERROR" "8")
     '("unsupported-threads-error" "GDA_CONNECTION_UNSUPPORTED_THREADS_ERROR" "9")
+    '("closed-error" "GDA_CONNECTION_CLOSED_ERROR" "10")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;         GDA_CONNECTION_OPTIONS_NONE = 0,
+;; 	GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0,
+;; 	GDA_CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE = 1 << 1,
+;; 	GDA_CONNECTION_OPTIONS_THREAD_SAFE = 1 << 2
+;; } GdaConnectionOptions;
+
 (define-flags-extended ConnectionOptions
   (in-module "Gda")
   (c-name "GdaConnectionOptions")
   (values
-    '("none" "GDA_CONNECTION_OPTIONS_NONE" "0")
+    '("none" "GDA_CONNECTION_OPTIONS_NONE" "0x0")
     '("read-only" "GDA_CONNECTION_OPTIONS_READ_ONLY" "1 << 0")
     '("sql-identifiers-case-sensitive" "GDA_CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE" "1 << 1")
     '("thread-safe" "GDA_CONNECTION_OPTIONS_THREAD_SAFE" "1 << 2")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_CONNECTION_FEATURE_AGGREGATES,
+;; 	GDA_CONNECTION_FEATURE_BLOBS,
+;; 	GDA_CONNECTION_FEATURE_INDEXES,
+;; 	GDA_CONNECTION_FEATURE_INHERITANCE,
+;; 	GDA_CONNECTION_FEATURE_NAMESPACES,
+;; 	GDA_CONNECTION_FEATURE_PROCEDURES,
+;; 	GDA_CONNECTION_FEATURE_SEQUENCES,
+;; 	GDA_CONNECTION_FEATURE_SQL,
+;; 	GDA_CONNECTION_FEATURE_TRANSACTIONS,
+;; 	GDA_CONNECTION_FEATURE_SAVEPOINTS,
+;; 	GDA_CONNECTION_FEATURE_SAVEPOINTS_REMOVE,
+;; 	GDA_CONNECTION_FEATURE_TRIGGERS,
+;; 	GDA_CONNECTION_FEATURE_UPDATABLE_CURSOR,
+;; 	GDA_CONNECTION_FEATURE_USERS,
+;; 	GDA_CONNECTION_FEATURE_VIEWS,
+;; 	GDA_CONNECTION_FEATURE_XA_TRANSACTIONS,
+;; 
+;; 	GDA_CONNECTION_FEATURE_LAST
+;; } GdaConnectionFeature;
+
 (define-enum-extended ConnectionFeature
   (in-module "Gda")
   (c-name "GdaConnectionFeature")
@@ -284,6 +206,26 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_CONNECTION_SCHEMA_AGGREGATES,
+;; 	GDA_CONNECTION_SCHEMA_DATABASES,
+;; 	GDA_CONNECTION_SCHEMA_FIELDS,
+;; 	GDA_CONNECTION_SCHEMA_INDEXES,
+;; 	GDA_CONNECTION_SCHEMA_LANGUAGES,
+;; 	GDA_CONNECTION_SCHEMA_NAMESPACES,
+;; 	GDA_CONNECTION_SCHEMA_PARENT_TABLES,
+;; 	GDA_CONNECTION_SCHEMA_PROCEDURES,
+;; 	GDA_CONNECTION_SCHEMA_SEQUENCES,
+;; 	GDA_CONNECTION_SCHEMA_TABLES,
+;; 	GDA_CONNECTION_SCHEMA_TRIGGERS,
+;; 	GDA_CONNECTION_SCHEMA_TYPES,
+;; 	GDA_CONNECTION_SCHEMA_USERS,
+;; 	GDA_CONNECTION_SCHEMA_VIEWS,
+;; 	GDA_CONNECTION_SCHEMA_CONSTRAINTS,
+;; 	GDA_CONNECTION_SCHEMA_TABLE_CONTENTS
+;; } GdaConnectionSchema;
+
 (define-enum-extended ConnectionSchema
   (in-module "Gda")
   (c-name "GdaConnectionSchema")
@@ -307,6 +249,16 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_CONNECTION_META_NAMESPACES,
+;; 	GDA_CONNECTION_META_TYPES,
+;; 	GDA_CONNECTION_META_TABLES,
+;; 	GDA_CONNECTION_META_VIEWS,
+;; 	GDA_CONNECTION_META_FIELDS,
+;; 	GDA_CONNECTION_META_INDEXES
+;; } GdaConnectionMetaType;
+
 (define-enum-extended ConnectionMetaType
   (in-module "Gda")
   (c-name "GdaConnectionMetaType")
@@ -316,10 +268,19 @@
     '("tables" "GDA_CONNECTION_META_TABLES" "2")
     '("views" "GDA_CONNECTION_META_VIEWS" "3")
     '("fields" "GDA_CONNECTION_META_FIELDS" "4")
+    '("indexes" "GDA_CONNECTION_META_INDEXES" "5")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-data-comparator.h
+;; From gda-data-comparator.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_COMPARATOR_MISSING_DATA_MODEL_ERROR,
+;; 	GDA_DATA_COMPARATOR_COLUMN_TYPES_MISMATCH_ERROR,
+;; 	GDA_DATA_COMPARATOR_MODEL_ACCESS_ERROR,
+;; 	GDA_DATA_COMPARATOR_USER_CANCELLED_ERROR
+;; } GdaDataComparatorError;
 
 (define-enum-extended DataComparatorError
   (in-module "Gda")
@@ -332,6 +293,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DIFF_ADD_ROW,
+;; 	GDA_DIFF_REMOVE_ROW,
+;; 	GDA_DIFF_MODIFY_ROW
+;; } GdaDiffType;
+
 (define-enum-extended DiffType
   (in-module "Gda")
   (c-name "GdaDiffType")
@@ -342,7 +310,37 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-data-model.h
+;; From gda-data-meta-wrapper.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_META_WRAPPER_MODE_LC, /* quote identifier if there are some non lower case chars */
+;; 	GDA_DATA_META_WRAPPER_MODE_UC  /* quote identifier if there are some non upper case chars */
+;; } GdaDataMetaWrapperMode;
+
+(define-enum-extended DataMetaWrapperMode
+  (in-module "Gda")
+  (c-name "GdaDataMetaWrapperMode")
+  (values
+    '("lc" "GDA_DATA_META_WRAPPER_MODE_LC" "0")
+    '("uc" "GDA_DATA_META_WRAPPER_MODE_UC" "1")
+  )
+)
+
+;; From gda-data-model.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_MODEL_ACCESS_RANDOM = 1 << 0,
+;; 	GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD = 1 << 1,
+;; 	GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD = 1 << 2,
+;; 	GDA_DATA_MODEL_ACCESS_CURSOR = GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD | GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD,
+;; 	GDA_DATA_MODEL_ACCESS_INSERT  = 1 << 3,
+;; 	GDA_DATA_MODEL_ACCESS_UPDATE  = 1 << 4,
+;; 	GDA_DATA_MODEL_ACCESS_DELETE  = 1 << 5,
+;; 	GDA_DATA_MODEL_ACCESS_WRITE = GDA_DATA_MODEL_ACCESS_INSERT | GDA_DATA_MODEL_ACCESS_UPDATE |
+;; 	GDA_DATA_MODEL_ACCESS_DELETE
+;; } GdaDataModelAccessFlags;
 
 (define-flags-extended DataModelAccessFlags
   (in-module "Gda")
@@ -351,14 +349,21 @@
     '("random" "GDA_DATA_MODEL_ACCESS_RANDOM" "1 << 0")
     '("cursor-forward" "GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD" "1 << 1")
     '("cursor-backward" "GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD" "1 << 2")
-    '("cursor" "GDA_DATA_MODEL_ACCESS_CURSOR" "0x2")
+    '("cursor" "GDA_DATA_MODEL_ACCESS_CURSOR" "0x6")
     '("insert" "GDA_DATA_MODEL_ACCESS_INSERT" "1 << 3")
     '("update" "GDA_DATA_MODEL_ACCESS_UPDATE" "1 << 4")
     '("delete" "GDA_DATA_MODEL_ACCESS_DELETE" "1 << 5")
-    '("write" "GDA_DATA_MODEL_ACCESS_WRITE" "0x8")
+    '("write" "GDA_DATA_MODEL_ACCESS_WRITE" "0x38")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_MODEL_HINT_START_BATCH_UPDATE,
+;; 	GDA_DATA_MODEL_HINT_END_BATCH_UPDATE,
+;; 	GDA_DATA_MODEL_HINT_REFRESH
+;; } GdaDataModelHint;
+
 (define-enum-extended DataModelHint
   (in-module "Gda")
   (c-name "GdaDataModelHint")
@@ -369,6 +374,12 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_MODEL_IO_DATA_ARRAY_XML,
+;; 	GDA_DATA_MODEL_IO_TEXT_SEPARATED
+;; } GdaDataModelIOFormat;
+
 (define-enum-extended DataModelIOFormat
   (in-module "Gda")
   (c-name "GdaDataModelIOFormat")
@@ -378,6 +389,19 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR,
+;; 	GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR,
+;; 	GDA_DATA_MODEL_VALUES_LIST_ERROR,
+;; 	GDA_DATA_MODEL_VALUE_TYPE_ERROR,
+;; 	GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,
+;; 	GDA_DATA_MODEL_ACCESS_ERROR,
+;; 	GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
+;; 	GDA_DATA_MODEL_FILE_EXIST_ERROR,
+;; 	GDA_DATA_MODEL_XML_FORMAT_ERROR
+;; } GdaDataModelError;
+
 (define-enum-extended DataModelError
   (in-module "Gda")
   (c-name "GdaDataModelError")
@@ -394,17 +418,32 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-data-model-iter.h
+;; From gda-data-model-iter.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;; 	GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR
+;; } GdaDataModelIterError;
 
 (define-enum-extended DataModelIterError
   (in-module "Gda")
   (c-name "GdaDataModelIterError")
   (values
-    '("r" "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR" "0")
+    '("column-out-of-range-error" "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR" "0")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-data-proxy.h
+;; From gda-data-proxy.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_PROXY_COMMIT_ERROR,
+;; 	GDA_DATA_PROXY_COMMIT_CANCELLED,
+;; 	GDA_DATA_PROXY_READ_ONLY_VALUE,
+;; 	GDA_DATA_PROXY_READ_ONLY_ROW,
+;; 	GDA_DATA_PROXY_FILTER_ERROR
+;; } GdaDataProxyError;
 
 (define-enum-extended DataProxyError
   (in-module "Gda")
@@ -418,7 +457,63 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-easy.h
+;; From gda-data-select-extra.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;; 	FIRST_QUERY = 0,
+;;         INS_QUERY  = 0,
+;;         UPD_QUERY  = 1,
+;;         DEL_QUERY  = 2,
+;; 	NB_QUERIES = 3
+;; } ModType;
+
+(define-enum-extended ModType
+  (in-module "Gda")
+  (c-name "ModType")
+  (values
+    '("first-query" "FIRST_QUERY" "0")
+    '("ins-query" "INS_QUERY" "0")
+    '("upd-query" "UPD_QUERY" "1")
+    '("del-query" "DEL_QUERY" "2")
+    '("nb-queries" "NB_QUERIES" "3")
+  )
+)
+
+;; From gda-data-select.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
+;; 	GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
+;; 	GDA_DATA_SELECT_CONNECTION_ERROR,
+;; 	GDA_DATA_SELECT_ACCESS_ERROR,
+;; 	GDA_DATA_SELECT_SQL_ERROR,
+;; 	GDA_DATA_SELECT_SAFETY_LOCKED_ERROR
+;; } GdaDataSelectError;
+
+(define-enum-extended DataSelectError
+  (in-module "Gda")
+  (c-name "GdaDataSelectError")
+  (values
+    '("modification-statement-error" "GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR" "0")
+    '("missing-modification-statement-error" "GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR" "1")
+    '("connection-error" "GDA_DATA_SELECT_CONNECTION_ERROR" "2")
+    '("access-error" "GDA_DATA_SELECT_ACCESS_ERROR" "3")
+    '("sql-error" "GDA_DATA_SELECT_SQL_ERROR" "4")
+    '("safety-locked-error" "GDA_DATA_SELECT_SAFETY_LOCKED_ERROR" "5")
+  )
+)
+
+;; From gda-easy.h
+
+;; Original typedef:
+;; typedef enum  {
+;;     GDA_EASY_OBJECT_NAME_ERROR,
+;;     GDA_EASY_INCORRECT_VALUE_ERROR,
+;;     GDA_EASY_OPERATION_ERROR
+;; } GdaEasyError;
 
 (define-enum-extended EasyError
   (in-module "Gda")
@@ -430,6 +525,19 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;; 	GDA_EASY_CREATE_TABLE_NOTHING_FLAG   = 1 << 0,
+;; 	GDA_EASY_CREATE_TABLE_PKEY_FLAG      = 1 << 1,
+;; 	GDA_EASY_CREATE_TABLE_NOT_NULL_FLAG  = 1 << 2,
+;; 	GDA_EASY_CREATE_TABLE_UNIQUE_FLAG    = 1 << 3,
+;; 	GDA_EASY_CREATE_TABLE_AUTOINC_FLAG   = 1 << 4,
+;; 	GDA_EASY_CREATE_TABLE_FKEY_FLAG      = 1 << 5,
+;; 	/* Flags combinations */
+;; 	GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG = GDA_EASY_CREATE_TABLE_PKEY_FLAG | GDA_EASY_CREATE_TABLE_AUTOINC_FLAG
+;; } GdaEasyCreateTableFlag;
+
 (define-flags-extended EasyCreateTableFlag
   (in-module "Gda")
   (c-name "GdaEasyCreateTableFlag")
@@ -440,11 +548,20 @@
     '("unique-flag" "GDA_EASY_CREATE_TABLE_UNIQUE_FLAG" "1 << 3")
     '("autoinc-flag" "GDA_EASY_CREATE_TABLE_AUTOINC_FLAG" "1 << 4")
     '("fkey-flag" "GDA_EASY_CREATE_TABLE_FKEY_FLAG" "1 << 5")
-    '("pkey-autoinc-flag" "GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG" "0x2")
+    '("pkey-autoinc-flag" "GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG" "0x12")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-enums.h
+;; From gda-enums.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_TRANSACTION_ISOLATION_UNKNOWN,
+;; 	GDA_TRANSACTION_ISOLATION_READ_COMMITTED,
+;; 	GDA_TRANSACTION_ISOLATION_READ_UNCOMMITTED,
+;; 	GDA_TRANSACTION_ISOLATION_REPEATABLE_READ,
+;; 	GDA_TRANSACTION_ISOLATION_SERIALIZABLE
+;; } GdaTransactionIsolation;
 
 (define-enum-extended TransactionIsolation
   (in-module "Gda")
@@ -458,11 +575,26 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum  {
+;; 	GDA_VALUE_ATTR_NONE           = 0,
+;;         GDA_VALUE_ATTR_IS_NULL        = 1 << 0,
+;;         GDA_VALUE_ATTR_CAN_BE_NULL    = 1 << 1,
+;;         GDA_VALUE_ATTR_IS_DEFAULT     = 1 << 2,
+;;         GDA_VALUE_ATTR_CAN_BE_DEFAULT = 1 << 3,
+;;         GDA_VALUE_ATTR_IS_UNCHANGED   = 1 << 4,
+;;         GDA_VALUE_ATTR_ACTIONS_SHOWN  = 1 << 5,
+;;         GDA_VALUE_ATTR_DATA_NON_VALID = 1 << 6,
+;;         GDA_VALUE_ATTR_HAS_VALUE_ORIG = 1 << 7,
+;; 	GDA_VALUE_ATTR_NO_MODIF       = 1 << 8,
+;; 	GDA_VALUE_ATTR_UNUSED         = 1 << 9
+;; } GdaValueAttribute;
+
 (define-flags-extended ValueAttribute
   (in-module "Gda")
   (c-name "GdaValueAttribute")
   (values
-    '("none" "GDA_VALUE_ATTR_NONE" "0")
+    '("none" "GDA_VALUE_ATTR_NONE" "0x0")
     '("is-null" "GDA_VALUE_ATTR_IS_NULL" "1 << 0")
     '("can-be-null" "GDA_VALUE_ATTR_CAN_BE_NULL" "1 << 1")
     '("is-default" "GDA_VALUE_ATTR_IS_DEFAULT" "1 << 2")
@@ -476,6 +608,12 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SQL_IDENTIFIERS_LOWER_CASE = 1 << 0,
+;; 	GDA_SQL_IDENTIFIERS_UPPER_CASE = 1 << 1
+;; } GdaSqlIdentifierStyle;
+
 (define-flags-extended SqlIdentifierStyle
   (in-module "Gda")
   (c-name "GdaSqlIdentifierStyle")
@@ -485,7 +623,14 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-holder.h
+;; From gda-holder.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_HOLDER_STRING_CONVERSION_ERROR,
+;; 	GDA_HOLDER_VALUE_TYPE_ERROR,
+;; 	GDA_HOLDER_VALUE_NULL_ERROR
+;; } GdaHolderError;
 
 (define-enum-extended HolderError
   (in-module "Gda")
@@ -497,7 +642,23 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-meta-store.h
+;; From gda-meta-store.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_META_STORE_INCORRECT_SCHEMA_ERROR,
+;; 	GDA_META_STORE_UNSUPPORTED_PROVIDER_ERROR,
+;; 	GDA_META_STORE_INTERNAL_ERROR,
+;; 	GDA_META_STORE_META_CONTEXT_ERROR,
+;; 	GDA_META_STORE_MODIFY_CONTENTS_ERROR,
+;; 	GDA_META_STORE_EXTRACT_SQL_ERROR,
+;; 	GDA_META_STORE_ATTRIBUTE_NOT_FOUND_ERROR,
+;; 	GDA_META_STORE_ATTRIBUTE_ERROR,
+;; 	GDA_META_STORE_SCHEMA_OBJECT_NOT_FOUND_ERROR,
+;; 	GDA_META_STORE_SCHEMA_OBJECT_CONFLICT_ERROR,
+;; 	GDA_META_STORE_SCHEMA_OBJECT_DESCR_ERROR,
+;; 	GDA_META_STORE_TRANSACTION_ALREADY_STARTED_ERROR
+;; } GdaMetaStoreError;
 
 (define-enum-extended MetaStoreError
   (in-module "Gda")
@@ -518,6 +679,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_META_STORE_ADD,
+;; 	GDA_META_STORE_REMOVE,
+;; 	GDA_META_STORE_MODIFY
+;; } GdaMetaStoreChangeType;
+
 (define-enum-extended MetaStoreChangeType
   (in-module "Gda")
   (c-name "GdaMetaStoreChangeType")
@@ -528,7 +696,14 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-meta-struct.h
+;; From gda-meta-struct.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_META_STRUCT_UNKNOWN_OBJECT_ERROR,
+;;         GDA_META_STRUCT_DUPLICATE_OBJECT_ERROR,
+;;         GDA_META_STRUCT_INCOHERENCE_ERROR
+;; } GdaMetaStructError;
 
 (define-enum-extended MetaStructError
   (in-module "Gda")
@@ -540,6 +715,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_META_DB_UNKNOWN,
+;; 	GDA_META_DB_TABLE,
+;; 	GDA_META_DB_VIEW
+;; } GdaMetaDbObjectType;
+
 (define-enum-extended MetaDbObjectType
   (in-module "Gda")
   (c-name "GdaMetaDbObjectType")
@@ -550,17 +732,33 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_META_STRUCT_FEATURE_NONE              = 0,
+;; 	GDA_META_STRUCT_FEATURE_FOREIGN_KEYS      = 1 << 0,
+;; 	GDA_META_STRUCT_FEATURE_VIEW_DEPENDENCIES = 1 << 1,
+;; 
+;; 	GDA_META_STRUCT_FEATURE_ALL               = GDA_META_STRUCT_FEATURE_FOREIGN_KEYS |
+;; 	                                            GDA_META_STRUCT_FEATURE_VIEW_DEPENDENCIES
+;; } GdaMetaStructFeature;
+
 (define-flags-extended MetaStructFeature
   (in-module "Gda")
   (c-name "GdaMetaStructFeature")
   (values
-    '("none" "GDA_META_STRUCT_FEATURE_NONE" "0")
+    '("none" "GDA_META_STRUCT_FEATURE_NONE" "0x0")
     '("foreign-keys" "GDA_META_STRUCT_FEATURE_FOREIGN_KEYS" "1 << 0")
     '("view-dependencies" "GDA_META_STRUCT_FEATURE_VIEW_DEPENDENCIES" "1 << 1")
-    '("all" "GDA_META_STRUCT_FEATURE_ALL" "0x1")
+    '("all" "GDA_META_STRUCT_FEATURE_ALL" "0x3")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_META_SORT_ALHAPETICAL,
+;; 	GDA_META_SORT_DEPENDENCIES
+;; } GdaMetaSortType;
+
 (define-enum-extended MetaSortType
   (in-module "Gda")
   (c-name "GdaMetaSortType")
@@ -570,15 +768,44 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_META_GRAPH_COLUMNS = 1 << 0
+;; } GdaMetaGraphInfo;
+
 (define-flags-extended MetaGraphInfo
   (in-module "Gda")
   (c-name "GdaMetaGraphInfo")
   (values
-    '("s" "GDA_META_GRAPH_COLUMNS" "1 << 0")
+    '("columns" "GDA_META_GRAPH_COLUMNS" "1 << 0")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-server-operation.h
+;; From gda-server-operation.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SERVER_OPERATION_CREATE_DB,
+;; 	GDA_SERVER_OPERATION_DROP_DB,
+;; 		
+;; 	GDA_SERVER_OPERATION_CREATE_TABLE,
+;; 	GDA_SERVER_OPERATION_DROP_TABLE,
+;; 	GDA_SERVER_OPERATION_RENAME_TABLE,
+;; 
+;; 	GDA_SERVER_OPERATION_ADD_COLUMN,
+;; 	GDA_SERVER_OPERATION_DROP_COLUMN,
+;; 
+;; 	GDA_SERVER_OPERATION_CREATE_INDEX,
+;; 	GDA_SERVER_OPERATION_DROP_INDEX,
+;; 
+;; 	GDA_SERVER_OPERATION_CREATE_VIEW,
+;; 	GDA_SERVER_OPERATION_DROP_VIEW,
+;; 
+;; 	GDA_SERVER_OPERATION_COMMENT_TABLE,
+;; 	GDA_SERVER_OPERATION_COMMENT_COLUMN,
+;; 
+;; 	GDA_SERVER_OPERATION_LAST
+;; } GdaServerOperationType;
 
 (define-enum-extended ServerOperationType
   (in-module "Gda")
@@ -601,6 +828,18 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SERVER_OPERATION_NODE_PARAMLIST,
+;; 	GDA_SERVER_OPERATION_NODE_DATA_MODEL,
+;; 	GDA_SERVER_OPERATION_NODE_PARAM,
+;; 	GDA_SERVER_OPERATION_NODE_SEQUENCE,
+;; 	GDA_SERVER_OPERATION_NODE_SEQUENCE_ITEM,
+;; 
+;; 	GDA_SERVER_OPERATION_NODE_DATA_MODEL_COLUMN,
+;; 	GDA_SERVER_OPERATION_NODE_UNKNOWN
+;; } GdaServerOperationNodeType;
+
 (define-enum-extended ServerOperationNodeType
   (in-module "Gda")
   (c-name "GdaServerOperationNodeType")
@@ -615,6 +854,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SERVER_OPERATION_STATUS_OPTIONAL,
+;; 	GDA_SERVER_OPERATION_STATUS_REQUIRED,
+;; 	GDA_SERVER_OPERATION_STATUS_UNKNOWN
+;; } GdaServerOperationNodeStatus;
+
 (define-enum-extended ServerOperationNodeStatus
   (in-module "Gda")
   (c-name "GdaServerOperationNodeStatus")
@@ -625,7 +871,23 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-server-provider.h
+;; From gda-server-provider.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;         GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
+;; 	GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
+;; 	GDA_SERVER_PROVIDER_EMPTY_STMT_ERROR,
+;; 	GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
+;; 	GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
+;; 	GDA_SERVER_PROVIDER_OPERATION_ERROR,
+;; 	GDA_SERVER_PROVIDER_INTERNAL_ERROR,
+;; 	GDA_SERVER_PROVIDER_BUSY_ERROR,
+;; 	GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,
+;; 	GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
+;; 	GDA_SERVER_PROVIDER_DATA_ERROR
+;; } GdaServerProviderError;
 
 (define-enum-extended ServerProviderError
   (in-module "Gda")
@@ -645,7 +907,15 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-set.h
+;; From gda-set.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;; 	GDA_SET_XML_SPEC_ERROR,
+;; 	GDA_SET_HOLDER_NOT_FOUND_ERROR,
+;; 	GDA_SET_INVALID_ERROR
+;; } GdaSetError;
 
 (define-enum-extended SetError
   (in-module "Gda")
@@ -657,7 +927,13 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-sql-builder.h
+;; From gda-sql-builder.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SQL_BUILDER_WRONG_TYPE_ERROR,
+;; 	GDA_SQL_BUILDER_MISUSE_ERROR
+;; } GdaSqlBuilderError;
 
 (define-enum-extended SqlBuilderError
   (in-module "Gda")
@@ -668,7 +944,19 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-statement.h
+;; From gda-statement.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;; 	GDA_STATEMENT_PARSE_ERROR,
+;; 	GDA_STATEMENT_SYNTAX_ERROR,
+;; 	GDA_STATEMENT_NO_CNC_ERROR,
+;; 	GDA_STATEMENT_CNC_CLOSED_ERROR,
+;; 	GDA_STATEMENT_EXEC_ERROR,
+;; 	GDA_STATEMENT_PARAM_TYPE_ERROR,
+;; 	GDA_STATEMENT_PARAM_ERROR
+;; } GdaStatementError;
 
 (define-enum-extended StatementError
   (in-module "Gda")
@@ -684,6 +972,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_STATEMENT_MODEL_RANDOM_ACCESS   = 1 << 0,
+;; 	GDA_STATEMENT_MODEL_CURSOR_FORWARD  = 1 << 1,
+;; 	GDA_STATEMENT_MODEL_CURSOR_BACKWARD = 1 << 2,
+;; 	GDA_STATEMENT_MODEL_CURSOR          = GDA_STATEMENT_MODEL_CURSOR_FORWARD | GDA_STATEMENT_MODEL_CURSOR_BACKWARD,
+;; 	GDA_STATEMENT_MODEL_ALLOW_NOPARAM   = 1 << 3
+;; } GdaStatementModelUsage;
+
 (define-flags-extended StatementModelUsage
   (in-module "Gda")
   (c-name "GdaStatementModelUsage")
@@ -691,16 +988,28 @@
     '("random-access" "GDA_STATEMENT_MODEL_RANDOM_ACCESS" "1 << 0")
     '("cursor-forward" "GDA_STATEMENT_MODEL_CURSOR_FORWARD" "1 << 1")
     '("cursor-backward" "GDA_STATEMENT_MODEL_CURSOR_BACKWARD" "1 << 2")
-    '("cursor" "GDA_STATEMENT_MODEL_CURSOR" "0x2")
+    '("cursor" "GDA_STATEMENT_MODEL_CURSOR" "0x6")
     '("allow-noparam" "GDA_STATEMENT_MODEL_ALLOW_NOPARAM" "1 << 3")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_STATEMENT_SQL_PARAMS_AS_VALUES   = 0,
+;;         GDA_STATEMENT_SQL_PRETTY             = 1 << 0,
+;;         GDA_STATEMENT_SQL_PARAMS_LONG        = 1 << 1,
+;;         GDA_STATEMENT_SQL_PARAMS_SHORT       = 1 << 2,
+;;         GDA_STATEMENT_SQL_PARAMS_AS_COLON    = 1 << 3,
+;;         GDA_STATEMENT_SQL_PARAMS_AS_DOLLAR   = 1 << 4,
+;;         GDA_STATEMENT_SQL_PARAMS_AS_QMARK    = 1 << 5,
+;;         GDA_STATEMENT_SQL_PARAMS_AS_UQMARK   = 1 << 6
+;; } GdaStatementSqlFlag;
+
 (define-flags-extended StatementSqlFlag
   (in-module "Gda")
   (c-name "GdaStatementSqlFlag")
   (values
-    '("params-as-values" "GDA_STATEMENT_SQL_PARAMS_AS_VALUES" "0")
+    '("params-as-values" "GDA_STATEMENT_SQL_PARAMS_AS_VALUES" "0x0")
     '("pretty" "GDA_STATEMENT_SQL_PRETTY" "1 << 0")
     '("params-long" "GDA_STATEMENT_SQL_PARAMS_LONG" "1 << 1")
     '("params-short" "GDA_STATEMENT_SQL_PARAMS_SHORT" "1 << 2")
@@ -711,7 +1020,14 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-transaction-status.h
+;; From gda-transaction-status.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_TRANSACTION_STATUS_EVENT_SAVEPOINT,
+;; 	GDA_TRANSACTION_STATUS_EVENT_SQL,
+;; 	GDA_TRANSACTION_STATUS_EVENT_SUB_TRANSACTION
+;; } GdaTransactionStatusEventType;
 
 (define-enum-extended TransactionStatusEventType
   (in-module "Gda")
@@ -723,6 +1039,12 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_TRANSACTION_STATUS_STATE_OK,
+;; 	GDA_TRANSACTION_STATUS_STATE_FAILED
+;; } GdaTransactionStatusState;
+
 (define-enum-extended TransactionStatusState
   (in-module "Gda")
   (c-name "GdaTransactionStatusState")
@@ -732,37 +1054,59 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-tree.h
+;; From gda-tree.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_TREE_UNKNOWN_ERROR
+;; } GdaTreeError;
 
 (define-enum-extended TreeError
   (in-module "Gda")
   (c-name "GdaTreeError")
   (values
-    '("r" "GDA_TREE_UNKNOWN_ERROR" "0")
+    '("unknown-error" "GDA_TREE_UNKNOWN_ERROR" "0")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-tree-manager.h
+;; From gda-tree-manager.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_TREE_MANAGER_UNKNOWN_ERROR
+;; } GdaTreeManagerError;
 
 (define-enum-extended TreeManagerError
   (in-module "Gda")
   (c-name "GdaTreeManagerError")
   (values
-    '("r" "GDA_TREE_MANAGER_UNKNOWN_ERROR" "0")
+    '("unknown-error" "GDA_TREE_MANAGER_UNKNOWN_ERROR" "0")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-tree-node.h
+;; From gda-tree-node.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_TREE_NODE_UNKNOWN_ERROR
+;; } GdaTreeNodeError;
 
 (define-enum-extended TreeNodeError
   (in-module "Gda")
   (c-name "GdaTreeNodeError")
   (values
-    '("r" "GDA_TREE_NODE_UNKNOWN_ERROR" "0")
+    '("unknown-error" "GDA_TREE_NODE_UNKNOWN_ERROR" "0")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-xa-transaction.h
+;; From gda-xa-transaction.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;         GDA_XA_TRANSACTION_ALREADY_REGISTERED_ERROR,
+;; 	GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR
+;; } GdaXaTransactionError;
 
 (define-enum-extended XaTransactionError
   (in-module "Gda")
@@ -773,80 +1117,303 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda-ui/gdaui-data-widget.h
+;; From gda-sql-parser.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;; 	GDA_SQL_PARSER_SYNTAX_ERROR,
+;; 	GDA_SQL_PARSER_OVERFLOW_ERROR,
+;; 	GDA_SQL_PARSER_EMPTY_SQL_ERROR
+;; } GdaSqlParserError;
+
+(define-enum-extended SqlParserError
+  (in-module "Gda")
+  (c-name "GdaSqlParserError")
+  (values
+    '("syntax-error" "GDA_SQL_PARSER_SYNTAX_ERROR" "0")
+    '("overflow-error" "GDA_SQL_PARSER_OVERFLOW_ERROR" "1")
+    '("empty-sql-error" "GDA_SQL_PARSER_EMPTY_SQL_ERROR" "2")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;         GDA_SQL_PARSER_MODE_PARSE,
+;;         GDA_SQL_PARSER_MODE_DELIMIT
+;; } GdaSqlParserMode;
+
+(define-enum-extended SqlParserMode
+  (in-module "Gda")
+  (c-name "GdaSqlParserMode")
+  (values
+    '("parse" "GDA_SQL_PARSER_MODE_PARSE" "0")
+    '("delimit" "GDA_SQL_PARSER_MODE_DELIMIT" "1")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;         GDA_SQL_PARSER_FLAVOUR_STANDARD   = 0,
+;;         GDA_SQL_PARSER_FLAVOUR_SQLITE     = 1,
+;;         GDA_SQL_PARSER_FLAVOUR_MYSQL      = 2,
+;;         GDA_SQL_PARSER_FLAVOUR_ORACLE     = 3,
+;;         GDA_SQL_PARSER_FLAVOUR_POSTGRESQL = 4
+;; } GdaSqlParserFlavour;
+
+(define-enum-extended SqlParserFlavour
+  (in-module "Gda")
+  (c-name "GdaSqlParserFlavour")
+  (values
+    '("standard" "GDA_SQL_PARSER_FLAVOUR_STANDARD" "0")
+    '("sqlite" "GDA_SQL_PARSER_FLAVOUR_SQLITE" "1")
+    '("mysql" "GDA_SQL_PARSER_FLAVOUR_MYSQL" "2")
+    '("oracle" "GDA_SQL_PARSER_FLAVOUR_ORACLE" "3")
+    '("postgresql" "GDA_SQL_PARSER_FLAVOUR_POSTGRESQL" "4")
+  )
+)
+
+;; From gda-statement-struct-compound.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SQL_STATEMENT_COMPOUND_UNION,
+;; 	GDA_SQL_STATEMENT_COMPOUND_UNION_ALL,
+;; 	GDA_SQL_STATEMENT_COMPOUND_INTERSECT,
+;; 	GDA_SQL_STATEMENT_COMPOUND_INTERSECT_ALL,
+;; 	GDA_SQL_STATEMENT_COMPOUND_EXCEPT,
+;; 	GDA_SQL_STATEMENT_COMPOUND_EXCEPT_ALL
+;; } GdaSqlStatementCompoundType;
+
+(define-enum-extended SqlStatementCompoundType
+  (in-module "Gda")
+  (c-name "GdaSqlStatementCompoundType")
+  (values
+    '("union" "GDA_SQL_STATEMENT_COMPOUND_UNION" "0")
+    '("union-all" "GDA_SQL_STATEMENT_COMPOUND_UNION_ALL" "1")
+    '("intersect" "GDA_SQL_STATEMENT_COMPOUND_INTERSECT" "2")
+    '("intersect-all" "GDA_SQL_STATEMENT_COMPOUND_INTERSECT_ALL" "3")
+    '("except" "GDA_SQL_STATEMENT_COMPOUND_EXCEPT" "4")
+    '("except-all" "GDA_SQL_STATEMENT_COMPOUND_EXCEPT_ALL" "5")
+  )
+)
+
+;; From gda-statement-struct-decl.h
 
-(define-enum-extended DataWidgetWriteMode
-  (in-module "Gdaui")
-  (c-name "GdauiDataWidgetWriteMode")
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SQL_STRUCTURE_CONTENTS_ERROR,
+;; 	GDA_SQL_MALFORMED_IDENTIFIER_ERROR,
+;; 	GDA_SQL_MISSING_IDENTIFIER_ERROR,
+;; 	GDA_SQL_VALIDATION_ERROR
+;; } GdaSqlError;
+
+(define-enum-extended SqlError
+  (in-module "Gda")
+  (c-name "GdaSqlError")
   (values
-    '("demand" "GDAUI_DATA_WIDGET_WRITE_ON_DEMAND" "0")
-    '("row-change" "GDAUI_DATA_WIDGET_WRITE_ON_ROW_CHANGE" "1")
-    '("value-activated" "GDAUI_DATA_WIDGET_WRITE_ON_VALUE_ACTIVATED" "2")
-    '("value-change" "GDAUI_DATA_WIDGET_WRITE_ON_VALUE_CHANGE" "3")
+    '("structure-contents-error" "GDA_SQL_STRUCTURE_CONTENTS_ERROR" "0")
+    '("malformed-identifier-error" "GDA_SQL_MALFORMED_IDENTIFIER_ERROR" "1")
+    '("missing-identifier-error" "GDA_SQL_MISSING_IDENTIFIER_ERROR" "2")
+    '("validation-error" "GDA_SQL_VALIDATION_ERROR" "3")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda-ui/gdaui-data-widget-info.h
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SQL_STATEMENT_SELECT,
+;; 	GDA_SQL_STATEMENT_INSERT,
+;; 	GDA_SQL_STATEMENT_UPDATE,
+;; 	GDA_SQL_STATEMENT_DELETE,
+;; 	GDA_SQL_STATEMENT_COMPOUND,
+;; 
+;; 	GDA_SQL_STATEMENT_BEGIN,
+;; 	GDA_SQL_STATEMENT_ROLLBACK,
+;; 	GDA_SQL_STATEMENT_COMMIT,
+;; 
+;; 	GDA_SQL_STATEMENT_SAVEPOINT,
+;; 	GDA_SQL_STATEMENT_ROLLBACK_SAVEPOINT,
+;; 	GDA_SQL_STATEMENT_DELETE_SAVEPOINT,
+;; 
+;; 	GDA_SQL_STATEMENT_UNKNOWN,
+;; 	GDA_SQL_STATEMENT_NONE
+;; } GdaSqlStatementType;
 
-(define-flags-extended DataWidgetInfoFlag
-  (in-module "Gdaui")
-  (c-name "GdauiDataWidgetInfoFlag")
+(define-enum-extended SqlStatementType
+  (in-module "Gda")
+  (c-name "GdaSqlStatementType")
   (values
-    '("none" "GDAUI_DATA_WIDGET_INFO_NONE" "0")
-    '("current-row" "GDAUI_DATA_WIDGET_INFO_CURRENT_ROW" "1 << 0")
-    '("row-modify-buttons" "GDAUI_DATA_WIDGET_INFO_ROW_MODIFY_BUTTONS" "1 << 2")
-    '("row-move-buttons" "GDAUI_DATA_WIDGET_INFO_ROW_MOVE_BUTTONS" "1 << 3")
-    '("chunck-change-buttons" "GDAUI_DATA_WIDGET_INFO_CHUNCK_CHANGE_BUTTONS" "1 << 4")
-    '("no-filter" "GDAUI_DATA_WIDGET_INFO_NO_FILTER" "1 << 5")
+    '("select" "GDA_SQL_STATEMENT_SELECT" "0")
+    '("insert" "GDA_SQL_STATEMENT_INSERT" "1")
+    '("update" "GDA_SQL_STATEMENT_UPDATE" "2")
+    '("delete" "GDA_SQL_STATEMENT_DELETE" "3")
+    '("compound" "GDA_SQL_STATEMENT_COMPOUND" "4")
+    '("begin" "GDA_SQL_STATEMENT_BEGIN" "5")
+    '("rollback" "GDA_SQL_STATEMENT_ROLLBACK" "6")
+    '("commit" "GDA_SQL_STATEMENT_COMMIT" "7")
+    '("savepoint" "GDA_SQL_STATEMENT_SAVEPOINT" "8")
+    '("rollback-savepoint" "GDA_SQL_STATEMENT_ROLLBACK_SAVEPOINT" "9")
+    '("delete-savepoint" "GDA_SQL_STATEMENT_DELETE_SAVEPOINT" "10")
+    '("unknown" "GDA_SQL_STATEMENT_UNKNOWN" "11")
+    '("none" "GDA_SQL_STATEMENT_NONE" "12")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda-ui/gdaui-enums.h
+;; Original typedef:
+;; typedef enum {
+;; 	/* complete statements */
+;; 	GDA_SQL_ANY_STMT_SELECT = GDA_SQL_STATEMENT_SELECT,
+;; 	GDA_SQL_ANY_STMT_INSERT = GDA_SQL_STATEMENT_INSERT,
+;; 	GDA_SQL_ANY_STMT_UPDATE = GDA_SQL_STATEMENT_UPDATE,
+;; 	GDA_SQL_ANY_STMT_DELETE = GDA_SQL_STATEMENT_DELETE,
+;; 	GDA_SQL_ANY_STMT_COMPOUND = GDA_SQL_STATEMENT_COMPOUND,
+;; 	GDA_SQL_ANY_STMT_BEGIN = GDA_SQL_STATEMENT_BEGIN,
+;; 	GDA_SQL_ANY_STMT_ROLLBACK = GDA_SQL_STATEMENT_ROLLBACK,
+;; 	GDA_SQL_ANY_STMT_COMMIT = GDA_SQL_STATEMENT_COMMIT,
+;; 	GDA_SQL_ANY_STMT_SAVEPOINT = GDA_SQL_STATEMENT_SAVEPOINT,
+;; 	GDA_SQL_ANY_STMT_ROLLBACK_SAVEPOINT = GDA_SQL_STATEMENT_ROLLBACK_SAVEPOINT,
+;; 	GDA_SQL_ANY_STMT_DELETE_SAVEPOINT = GDA_SQL_STATEMENT_DELETE_SAVEPOINT,
+;; 	GDA_SQL_ANY_STMT_UNKNOWN = GDA_SQL_STATEMENT_UNKNOWN,
+;; 	
+;; 	/* individual parts */
+;; 	GDA_SQL_ANY_EXPR = 500,
+;; 	GDA_SQL_ANY_SQL_FIELD,
+;; 	GDA_SQL_ANY_SQL_TABLE,
+;; 	GDA_SQL_ANY_SQL_FUNCTION,
+;; 	GDA_SQL_ANY_SQL_OPERATION,
+;; 	GDA_SQL_ANY_SQL_CASE,
+;; 	GDA_SQL_ANY_SQL_SELECT_FIELD,
+;; 	GDA_SQL_ANY_SQL_SELECT_TARGET,
+;; 	GDA_SQL_ANY_SQL_SELECT_JOIN,
+;; 	GDA_SQL_ANY_SQL_SELECT_FROM,
+;; 	GDA_SQL_ANY_SQL_SELECT_ORDER
+;; } GdaSqlAnyPartType;
 
-(define-flags-extended ActionMode
-  (in-module "Gdaui")
-  (c-name "GdauiActionMode")
+(define-enum-extended SqlAnyPartType
+  (in-module "Gda")
+  (c-name "GdaSqlAnyPartType")
   (values
-    '("navigation-arrows" "GDAUI_ACTION_NAVIGATION_ARROWS" "1 << 0")
-    '("navigation-scroll" "GDAUI_ACTION_NAVIGATION_SCROLL" "1 << 1")
-    '("modif-auto-commit" "GDAUI_ACTION_MODIF_AUTO_COMMIT" "1 << 2")
-    '("modif-commit-immediate" "GDAUI_ACTION_MODIF_COMMIT_IMMEDIATE" "1 << 3")
-    '("ask-confirm-update" "GDAUI_ACTION_ASK_CONFIRM_UPDATE" "1 << 4")
-    '("ask-confirm-delete" "GDAUI_ACTION_ASK_CONFIRM_DELETE" "1 << 5")
-    '("ask-confirm-insert" "GDAUI_ACTION_ASK_CONFIRM_INSERT" "1 << 6")
-    '("report-error" "GDAUI_ACTION_REPORT_ERROR" "1 << 7")
+    '("stmt-select" "GDA_SQL_ANY_STMT_SELECT" "0")
+    '("stmt-insert" "GDA_SQL_ANY_STMT_INSERT" "1")
+    '("stmt-update" "GDA_SQL_ANY_STMT_UPDATE" "2")
+    '("stmt-delete" "GDA_SQL_ANY_STMT_DELETE" "3")
+    '("stmt-compound" "GDA_SQL_ANY_STMT_COMPOUND" "4")
+    '("stmt-begin" "GDA_SQL_ANY_STMT_BEGIN" "5")
+    '("stmt-rollback" "GDA_SQL_ANY_STMT_ROLLBACK" "6")
+    '("stmt-commit" "GDA_SQL_ANY_STMT_COMMIT" "7")
+    '("stmt-savepoint" "GDA_SQL_ANY_STMT_SAVEPOINT" "8")
+    '("stmt-rollback-savepoint" "GDA_SQL_ANY_STMT_ROLLBACK_SAVEPOINT" "9")
+    '("stmt-delete-savepoint" "GDA_SQL_ANY_STMT_DELETE_SAVEPOINT" "10")
+    '("stmt-unknown" "GDA_SQL_ANY_STMT_UNKNOWN" "11")
+    '("expr" "GDA_SQL_ANY_EXPR" "500")
+    '("sql-field" "GDA_SQL_ANY_SQL_FIELD" "501")
+    '("sql-table" "GDA_SQL_ANY_SQL_TABLE" "502")
+    '("sql-function" "GDA_SQL_ANY_SQL_FUNCTION" "503")
+    '("sql-operation" "GDA_SQL_ANY_SQL_OPERATION" "504")
+    '("sql-case" "GDA_SQL_ANY_SQL_CASE" "505")
+    '("sql-select-field" "GDA_SQL_ANY_SQL_SELECT_FIELD" "506")
+    '("sql-select-target" "GDA_SQL_ANY_SQL_SELECT_TARGET" "507")
+    '("sql-select-join" "GDA_SQL_ANY_SQL_SELECT_JOIN" "508")
+    '("sql-select-from" "GDA_SQL_ANY_SQL_SELECT_FROM" "509")
+    '("sql-select-order" "GDA_SQL_ANY_SQL_SELECT_ORDER" "510")
   )
 )
 
-(define-enum-extended Action
-  (in-module "Gdaui")
-  (c-name "GdauiAction")
+;; From gda-statement-struct-parts.h
+
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SQL_OPERATOR_TYPE_AND,
+;; 	GDA_SQL_OPERATOR_TYPE_OR,
+;; 
+;; 	GDA_SQL_OPERATOR_TYPE_EQ, 
+;; 	GDA_SQL_OPERATOR_TYPE_IS, 
+;; 	GDA_SQL_OPERATOR_TYPE_LIKE,
+;; 	GDA_SQL_OPERATOR_TYPE_BETWEEN,
+;; 	GDA_SQL_OPERATOR_TYPE_GT,
+;; 	GDA_SQL_OPERATOR_TYPE_LT,
+;; 	GDA_SQL_OPERATOR_TYPE_GEQ,
+;; 	GDA_SQL_OPERATOR_TYPE_LEQ,
+;; 	GDA_SQL_OPERATOR_TYPE_DIFF,
+;; 	GDA_SQL_OPERATOR_TYPE_REGEXP,
+;; 	GDA_SQL_OPERATOR_TYPE_REGEXP_CI,
+;; 	GDA_SQL_OPERATOR_TYPE_NOT_REGEXP,
+;; 	GDA_SQL_OPERATOR_TYPE_NOT_REGEXP_CI,
+;; 	GDA_SQL_OPERATOR_TYPE_SIMILAR,
+;; 	GDA_SQL_OPERATOR_TYPE_ISNULL,
+;; 	GDA_SQL_OPERATOR_TYPE_ISNOTNULL,
+;; 	GDA_SQL_OPERATOR_TYPE_NOT,
+;; 	GDA_SQL_OPERATOR_TYPE_IN,
+;; 	GDA_SQL_OPERATOR_TYPE_NOTIN,
+;; 
+;; 	GDA_SQL_OPERATOR_TYPE_CONCAT,
+;; 	GDA_SQL_OPERATOR_TYPE_PLUS,
+;; 	GDA_SQL_OPERATOR_TYPE_MINUS,
+;; 	GDA_SQL_OPERATOR_TYPE_STAR,
+;; 	GDA_SQL_OPERATOR_TYPE_DIV,
+;; 	GDA_SQL_OPERATOR_TYPE_REM,
+;; 	GDA_SQL_OPERATOR_TYPE_BITAND,
+;; 	GDA_SQL_OPERATOR_TYPE_BITOR,
+;; 	GDA_SQL_OPERATOR_TYPE_BITNOT
+;; } GdaSqlOperatorType;
+
+(define-enum-extended SqlOperatorType
+  (in-module "Gda")
+  (c-name "GdaSqlOperatorType")
   (values
-    '("new-data" "GDAUI_ACTION_NEW_DATA" "0")
-    '("write-modified-data" "GDAUI_ACTION_WRITE_MODIFIED_DATA" "1")
-    '("delete-selected-data" "GDAUI_ACTION_DELETE_SELECTED_DATA" "2")
-    '("undelete-selected-data" "GDAUI_ACTION_UNDELETE_SELECTED_DATA" "3")
-    '("reset-data" "GDAUI_ACTION_RESET_DATA" "4")
-    '("move-first-record" "GDAUI_ACTION_MOVE_FIRST_RECORD" "5")
-    '("move-prev-record" "GDAUI_ACTION_MOVE_PREV_RECORD" "6")
-    '("move-next-record" "GDAUI_ACTION_MOVE_NEXT_RECORD" "7")
-    '("move-last-record" "GDAUI_ACTION_MOVE_LAST_RECORD" "8")
-    '("move-first-chunck" "GDAUI_ACTION_MOVE_FIRST_CHUNCK" "9")
-    '("move-prev-chunck" "GDAUI_ACTION_MOVE_PREV_CHUNCK" "10")
-    '("move-next-chunck" "GDAUI_ACTION_MOVE_NEXT_CHUNCK" "11")
-    '("move-last-chunck" "GDAUI_ACTION_MOVE_LAST_CHUNCK" "12")
+    '("and" "GDA_SQL_OPERATOR_TYPE_AND" "0")
+    '("or" "GDA_SQL_OPERATOR_TYPE_OR" "1")
+    '("eq" "GDA_SQL_OPERATOR_TYPE_EQ" "2")
+    '("is" "GDA_SQL_OPERATOR_TYPE_IS" "3")
+    '("like" "GDA_SQL_OPERATOR_TYPE_LIKE" "4")
+    '("between" "GDA_SQL_OPERATOR_TYPE_BETWEEN" "5")
+    '("gt" "GDA_SQL_OPERATOR_TYPE_GT" "6")
+    '("lt" "GDA_SQL_OPERATOR_TYPE_LT" "7")
+    '("geq" "GDA_SQL_OPERATOR_TYPE_GEQ" "8")
+    '("leq" "GDA_SQL_OPERATOR_TYPE_LEQ" "9")
+    '("diff" "GDA_SQL_OPERATOR_TYPE_DIFF" "10")
+    '("regexp" "GDA_SQL_OPERATOR_TYPE_REGEXP" "11")
+    '("regexp-ci" "GDA_SQL_OPERATOR_TYPE_REGEXP_CI" "12")
+    '("not-regexp" "GDA_SQL_OPERATOR_TYPE_NOT_REGEXP" "13")
+    '("not-regexp-ci" "GDA_SQL_OPERATOR_TYPE_NOT_REGEXP_CI" "14")
+    '("similar" "GDA_SQL_OPERATOR_TYPE_SIMILAR" "15")
+    '("isnull" "GDA_SQL_OPERATOR_TYPE_ISNULL" "16")
+    '("isnotnull" "GDA_SQL_OPERATOR_TYPE_ISNOTNULL" "17")
+    '("not" "GDA_SQL_OPERATOR_TYPE_NOT" "18")
+    '("in" "GDA_SQL_OPERATOR_TYPE_IN" "19")
+    '("notin" "GDA_SQL_OPERATOR_TYPE_NOTIN" "20")
+    '("concat" "GDA_SQL_OPERATOR_TYPE_CONCAT" "21")
+    '("plus" "GDA_SQL_OPERATOR_TYPE_PLUS" "22")
+    '("minus" "GDA_SQL_OPERATOR_TYPE_MINUS" "23")
+    '("star" "GDA_SQL_OPERATOR_TYPE_STAR" "24")
+    '("div" "GDA_SQL_OPERATOR_TYPE_DIV" "25")
+    '("rem" "GDA_SQL_OPERATOR_TYPE_REM" "26")
+    '("bitand" "GDA_SQL_OPERATOR_TYPE_BITAND" "27")
+    '("bitor" "GDA_SQL_OPERATOR_TYPE_BITOR" "28")
+    '("bitnot" "GDA_SQL_OPERATOR_TYPE_BITNOT" "29")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda-ui/gdaui-login.h
+;; Original typedef:
+;; typedef enum {
+;; 	GDA_SQL_SELECT_JOIN_CROSS,
+;; 	GDA_SQL_SELECT_JOIN_NATURAL,
+;; 	GDA_SQL_SELECT_JOIN_INNER,
+;; 	GDA_SQL_SELECT_JOIN_LEFT,
+;; 	GDA_SQL_SELECT_JOIN_RIGHT,
+;; 	GDA_SQL_SELECT_JOIN_FULL
+;; } GdaSqlSelectJoinType;
 
-(define-flags-extended LoginMode
-  (in-module "Gdaui")
-  (c-name "GdauiLoginMode")
+(define-enum-extended SqlSelectJoinType
+  (in-module "Gda")
+  (c-name "GdaSqlSelectJoinType")
   (values
-    '("enable-control-centre-mode" "GDA_UI_LOGIN_ENABLE_CONTROL_CENTRE_MODE" "1 << 0")
-    '("hide-dsn-selection-mode" "GDA_UI_LOGIN_HIDE_DSN_SELECTION_MODE" "1 << 1")
-    '("hide-direct-connection-mode" "GDA_UI_LOGIN_HIDE_DIRECT_CONNECTION_MODE" "1 << 2")
+    '("cross" "GDA_SQL_SELECT_JOIN_CROSS" "0")
+    '("natural" "GDA_SQL_SELECT_JOIN_NATURAL" "1")
+    '("inner" "GDA_SQL_SELECT_JOIN_INNER" "2")
+    '("left" "GDA_SQL_SELECT_JOIN_LEFT" "3")
+    '("right" "GDA_SQL_SELECT_JOIN_RIGHT" "4")
+    '("full" "GDA_SQL_SELECT_JOIN_FULL" "5")
   )
 )
 
diff --git a/libgda/src/sqlbuilder.hg b/libgda/src/sqlbuilder.hg
index 4481a01..d9f0f56 100644
--- a/libgda/src/sqlbuilder.hg
+++ b/libgda/src/sqlbuilder.hg
@@ -33,7 +33,7 @@ namespace Gda
 _WRAP_ENUM(SqlOperatorType, GdaSqlOperatorType)
 _WRAP_ENUM(SqlSelectJoinType, GdaSqlSelectJoinType)
 _WRAP_GERROR(SqlBuilderError, GdaSqlBuilderError, GDA_SQL_BUILDER_ERROR)
-_WRAP_GERROR(SqlError, GdaSqlErrorType, GDA_SQL_ERROR)
+_WRAP_GERROR(SqlError, GdaSqlError, GDA_SQL_ERROR)
 
 /*
  * @ingroup Connection
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]