GNOME.org
 

gnomemm r2001 - in libgdamm/trunk: . libgda/src tools/m4

Author: jhs
Date: Tue Jan 20 14:16:45 2009
New Revision: 2001
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2001&view=rev

Log:
2009-01-20  Johannes Schmid  <jschmid openismus com>

	* libgda/src/libgda_enums.defs:
	* libgda/src/libgda_methods.defs:
	* libgda/src/libgda_signals.defs:
	Regenerated
	
	* libgda/src/sqlparser.hg:
	* tools/m4/convert_libgdamm.m4:
	Wrap GdaSqlParserError

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/libgda_enums.defs
   libgdamm/trunk/libgda/src/libgda_methods.defs
   libgdamm/trunk/libgda/src/libgda_signals.defs
   libgdamm/trunk/libgda/src/sqlparser.hg
   libgdamm/trunk/tools/m4/convert_libgdamm.m4

Modified: libgdamm/trunk/libgda/src/libgda_enums.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_enums.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_enums.defs	Tue Jan 20 14:16:45 2009
@@ -76,14 +76,10 @@
     '("dsn-not-found-error" "GDA_CONNECTION_DSN_NOT_FOUND_ERROR" "0")
     '("provider-not-found-error" "GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR" "1")
     '("provider-error" "GDA_CONNECTION_PROVIDER_ERROR" "2")
-    '("conn-open-error" "GDA_CONNECTION_CONN_OPEN_ERROR" "3")
-    '("do-query-error" "GDA_CONNECTION_DO_QUERY_ERROR" "4")
-    '("nonexist-dsn-error" "GDA_CONNECTION_NONEXIST_DSN_ERROR" "5")
-    '("no-cnc-spec-error" "GDA_CONNECTION_NO_CNC_SPEC_ERROR" "6")
-    '("no-provider-spec-error" "GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR" "7")
-    '("open-error" "GDA_CONNECTION_OPEN_ERROR" "8")
-    '("execute-command-error" "GDA_CONNECTION_EXECUTE_COMMAND_ERROR" "9")
-    '("statement-type-error" "GDA_CONNECTION_STATEMENT_TYPE_ERROR" "10")
+    '("no-cnc-spec-error" "GDA_CONNECTION_NO_CNC_SPEC_ERROR" "3")
+    '("no-provider-spec-error" "GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR" "4")
+    '("open-error" "GDA_CONNECTION_OPEN_ERROR" "5")
+    '("statement-type-error" "GDA_CONNECTION_STATEMENT_TYPE_ERROR" "6")
   )
 )
 
@@ -214,24 +210,29 @@
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-data-model-iter.h
-
-(define-enum-extended DataModelIterError
+(define-enum-extended DataModelError
   (in-module "Gda")
-  (c-name "GdaDataModelIterError")
+  (c-name "GdaDataModelError")
   (values
-    '("r" "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR" "0")
+    '("row-out-of-range-error" "GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR" "0")
+    '("column-out-of-range-error" "GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR" "1")
+    '("values-list-error" "GDA_DATA_MODEL_VALUES_LIST_ERROR" "2")
+    '("value-type-error" "GDA_DATA_MODEL_VALUE_TYPE_ERROR" "3")
+    '("row-not-found-error" "GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR" "4")
+    '("access-error" "GDA_DATA_MODEL_ACCESS_ERROR" "5")
+    '("feature-non-supported-error" "GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR" "6")
+    '("file-exist-error" "GDA_DATA_MODEL_FILE_EXIST_ERROR" "7")
+    '("xml-format-error" "GDA_DATA_MODEL_XML_FORMAT_ERROR" "8")
   )
 )
 
-;; From /usr/include/libgda-4.0/libgda/gda-data-model-query.h
+;; From /usr/include/libgda-4.0/libgda/gda-data-model-iter.h
 
-(define-enum-extended DataModelQueryError
+(define-enum-extended DataModelIterError
   (in-module "Gda")
-  (c-name "GdaDataModelQueryError")
+  (c-name "GdaDataModelIterError")
   (values
-    '("select-statement-error" "GDA_DATA_MODEL_QUERY_SELECT_STATEMENT_ERROR" "0")
-    '("connection-error" "GDA_DATA_MODEL_QUERY_CONNECTION_ERROR" "1")
+    '("r" "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR" "0")
   )
 )
 
@@ -265,11 +266,13 @@
   (in-module "Gda")
   (c-name "GdaEasyCreateTableFlag")
   (values
-    '("pkey-flag" "GDA_EASY_CREATE_TABLE_PKEY_FLAG" "1 << 0")
-    '("not-null-flag" "GDA_EASY_CREATE_TABLE_NOT_NULL_FLAG" "1 << 1")
-    '("unique-flag" "GDA_EASY_CREATE_TABLE_UNIQUE_FLAG" "1 << 2")
-    '("autoinc-flag" "GDA_EASY_CREATE_TABLE_AUTOINC_FLAG" "1 << 3")
-    '("pkey-autoinc-flag" "GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG" "0x1")
+    '("nothing-flag" "GDA_EASY_CREATE_TABLE_NOTHING_FLAG" "1 << 0")
+    '("pkey-flag" "GDA_EASY_CREATE_TABLE_PKEY_FLAG" "1 << 1")
+    '("not-null-flag" "GDA_EASY_CREATE_TABLE_NOT_NULL_FLAG" "1 << 2")
+    '("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")
   )
 )
 
@@ -475,15 +478,6 @@
   )
 )
 
-(define-flags-extended SetHint
-  (in-module "Gda")
-  (c-name "GdaSetHint")
-  (values
-    '("read-only" "GDA_SET_HOLDER_READ_ONLY" "1 << 0")
-    '("hide" "GDA_SET_HOLDER_HIDE" "1 << 1")
-  )
-)
-
 ;; From /usr/include/libgda-4.0/libgda/gda-statement.h
 
 (define-enum-extended StatementError

Modified: libgdamm/trunk/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_methods.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_methods.defs	Tue Jan 20 14:16:45 2009
@@ -277,13 +277,9 @@
     '("dsn-not-found-error" "GDA_CONNECTION_DSN_NOT_FOUND_ERROR")
     '("provider-not-found-error" "GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR")
     '("provider-error" "GDA_CONNECTION_PROVIDER_ERROR")
-    '("conn-open-error" "GDA_CONNECTION_CONN_OPEN_ERROR")
-    '("do-query-error" "GDA_CONNECTION_DO_QUERY_ERROR")
-    '("nonexist-dsn-error" "GDA_CONNECTION_NONEXIST_DSN_ERROR")
     '("no-cnc-spec-error" "GDA_CONNECTION_NO_CNC_SPEC_ERROR")
     '("no-provider-spec-error" "GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR")
     '("open-error" "GDA_CONNECTION_OPEN_ERROR")
-    '("execute-command-error" "GDA_CONNECTION_EXECUTE_COMMAND_ERROR")
     '("statement-type-error" "GDA_CONNECTION_STATEMENT_TYPE_ERROR")
   )
 )
@@ -420,6 +416,23 @@
   )
 )
 
+(define-enum DataModelError
+  (in-module "Gda")
+  (c-name "GdaDataModelError")
+  (gtype-id "GDA_TYPE_DATA_MODEL_ERROR")
+  (values
+    '("row-out-of-range-error" "GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR")
+    '("column-out-of-range-error" "GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR")
+    '("values-list-error" "GDA_DATA_MODEL_VALUES_LIST_ERROR")
+    '("value-type-error" "GDA_DATA_MODEL_VALUE_TYPE_ERROR")
+    '("row-not-found-error" "GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR")
+    '("access-error" "GDA_DATA_MODEL_ACCESS_ERROR")
+    '("feature-non-supported-error" "GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR")
+    '("file-exist-error" "GDA_DATA_MODEL_FILE_EXIST_ERROR")
+    '("xml-format-error" "GDA_DATA_MODEL_XML_FORMAT_ERROR")
+  )
+)
+
 (define-enum DataModelIterError
   (in-module "Gda")
   (c-name "GdaDataModelIterError")
@@ -2606,19 +2619,6 @@
 
 ;; From gda-data-model-private.h
 
-(define-method to_xml_node
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_to_xml_node")
-  (return-type "xmlNodePtr")
-  (parameters
-    '("const-gint*" "cols")
-    '("gint" "nb_cols")
-    '("const-gint*" "rows")
-    '("gint" "nb_rows")
-    '("const-gchar*" "name")
-  )
-)
-
 (define-method add_data_from_xml_node
   (of-object "GdaDataModel")
   (c-name "gda_data_model_add_data_from_xml_node")
@@ -3084,45 +3084,20 @@
   (return-type "gboolean")
   (parameters
     '("GdaConnection*" "cnc")
-    '("const-gchar*" "table_name")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-function gda_insert_row_into_table_from_string
-  (c-name "gda_insert_row_into_table_from_string")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnc")
-    '("const-gchar*" "table_name")
+    '("const-gchar*" "table")
     '("GError**" "error")
   )
   (varargs #t)
 )
 
-(define-function gda_update_value_in_table
-  (c-name "gda_update_value_in_table")
+(define-function gda_update_row_in_table
+  (c-name "gda_update_row_in_table")
   (return-type "gboolean")
   (parameters
     '("GdaConnection*" "cnc")
-    '("const-gchar*" "table_name")
-    '("const-gchar*" "search_for_column")
-    '("const-GValue*" "condition")
-    '("const-gchar*" "column_name")
-    '("const-GValue*" "new_value")
-    '("GError**" "error")
-  )
-)
-
-(define-function gda_update_values_in_table
-  (c-name "gda_update_values_in_table")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnc")
-    '("const-gchar*" "table_name")
+    '("const-gchar*" "table")
     '("const-gchar*" "condition_column_name")
-    '("const-GValue*" "condition")
+    '("GValue*" "condition_value")
     '("GError**" "error")
   )
   (varargs #t)
@@ -3133,9 +3108,9 @@
   (return-type "gboolean")
   (parameters
     '("GdaConnection*" "cnc")
-    '("const-gchar*" "table_name")
+    '("const-gchar*" "table")
     '("const-gchar*" "condition_column_name")
-    '("const-GValue*" "condition")
+    '("GValue*" "condition_value")
     '("GError**" "error")
   )
 )
@@ -3213,6 +3188,11 @@
   (return-type "GType")
 )
 
+(define-function gda_data_model_error_get_type
+  (c-name "gda_data_model_error_get_type")
+  (return-type "GType")
+)
+
 (define-function gda_data_model_iter_error_get_type
   (c-name "gda_data_model_iter_error_get_type")
   (return-type "GType")
@@ -5056,6 +5036,15 @@
   )
 )
 
+(define-function gda_utility_data_model_find_column_description
+  (c-name "gda_utility_data_model_find_column_description")
+  (return-type "const-gchar*")
+  (parameters
+    '("GdaDataSelect*" "model")
+    '("const-gchar*" "field_name")
+  )
+)
+
 (define-function gda_utility_holder_load_attributes
   (c-name "gda_utility_holder_load_attributes")
   (return-type "gboolean")
@@ -5108,6 +5097,15 @@
   )
 )
 
+(define-function gda_compute_select_statement_from_update
+  (c-name "gda_compute_select_statement_from_update")
+  (return-type "GdaSqlStatement*")
+  (parameters
+    '("GdaStatement*" "update_stmt")
+    '("GError**" "error")
+  )
+)
+
 (define-function gda_rfc1738_encode
   (c-name "gda_rfc1738_encode")
   (return-type "gchar*")

Modified: libgdamm/trunk/libgda/src/libgda_signals.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_signals.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_signals.defs	Tue Jan 20 14:16:45 2009
@@ -77,7 +77,7 @@
   )
 )
 
-(define-property system-filename
+(define-property user-filename
   (of-object "GdaConfig")
   (prop-type "GParamString")
   (docs "")
@@ -86,7 +86,7 @@
   (construct-only #f)
 )
 
-(define-property user-filename
+(define-property system-filename
   (of-object "GdaConfig")
   (prop-type "GParamString")
   (docs "")
@@ -1039,28 +1039,6 @@
   (construct-only #f)
 )
 
-;; From GdaThreader
-
-(define-signal finished
-  (of-object "GdaThreader")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("guint" "p0")
-    '("gpointer" "p1")
-  )
-)
-
-(define-signal cancelled
-  (of-object "GdaThreader")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("guint" "p0")
-    '("gpointer" "p1")
-  )
-)
-
 ;; From GdaTransactionStatus
 
 ;; From GdaXaTransaction

Modified: libgdamm/trunk/libgda/src/sqlparser.hg
==============================================================================
--- libgdamm/trunk/libgda/src/sqlparser.hg	(original)
+++ libgdamm/trunk/libgda/src/sqlparser.hg	Tue Jan 20 14:16:45 2009
@@ -32,7 +32,8 @@
 {
 
 _WRAP_ENUM(SqlParserMode, GdaSqlParserMode)
-
+_WRAP_GERROR(SqlParserError, GdaSqlParserError, GDA_SQL_PARSER_ERROR)
+		
 // This is a hack to avoid a stupid gcc warning for a correctly escaped comment.
 #if defined __GNUC__
 #pragma GCC system_header

Modified: libgdamm/trunk/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/trunk/tools/m4/convert_libgdamm.m4	(original)
+++ libgdamm/trunk/tools/m4/convert_libgdamm.m4	Tue Jan 20 14:16:45 2009
@@ -132,6 +132,7 @@
 _CONV_ENUM(Gda,MetaSortType)
 _CONV_ENUM(Gda,MetaGraphInfo)
 _CONV_ENUM(Gda,StatementSqlFlag)
+_CONV_ENUM(Gda,SqlParserError)
 
 # structs
 _CONVERSION(`Blob&',`GdaBlob*',__FR2P)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]