GNOME.org
 

[libgda] Added GdaData.Record and GdaData.RecordSingleId. Removed Object and ObjectSingleId

commit f5f2ea14b72f102d3eba93ba78a1b6ecdc94a60c
Author: Daniel Espinosa <despinosa src gnome org>
Date:   Wed Jan 4 16:44:16 2012 -0600

    Added GdaData.Record and GdaData.RecordSingleId. Removed Object and ObjectSingleId
    
    * GdaData.Object and ObjectSingleId has renamed to Record and RecordSingleId.

 libgda/data/DataObject.vala         |   85 ---------------------
 libgda/data/DataObjectSingleId.vala |  142 -----------------------------------
 libgda/data/GdaData-5.0.gir         |   46 ++++++------
 libgda/data/Makefile.am             |    4 +-
 samples/vala/SampleDataObject.vala  |    8 +-
 tests/vala/CheckDataObject.vala     |    6 +-
 6 files changed, 32 insertions(+), 259 deletions(-)
---
diff --git a/libgda/data/GdaData-5.0.gir b/libgda/data/GdaData-5.0.gir
index d01125e..75661d4 100644
--- a/libgda/data/GdaData-5.0.gir
+++ b/libgda/data/GdaData-5.0.gir
@@ -16,12 +16,12 @@
 		<member name="update" c:identifier="GDA_DATA_DB_OBJECT_ERROR_UPDATE" value="1"/>
 		<member name="save" c:identifier="GDA_DATA_DB_OBJECT_ERROR_SAVE" value="2"/>
 	</enumeration>
-	<class name="Object" c:type="GdaDataObject" glib:type-name="GdaDataObject" glib:get-type="gda_data_object_get_type" glib:type-struct="ObjectClass" parent="GObject.Object" abstract="1">
+	<class name="Record" c:type="GdaDataRecord" glib:type-name="GdaDataRecord" glib:get-type="gda_data_record_get_type" glib:type-struct="RecordClass" parent="GObject.Object" abstract="1">
 		<field name="parent_instance">
 			<type name="GObject.Object" c:type="GObject"/>
 		</field>
 		<field name="priv">
-			<type name="ObjectPrivate" c:type="GdaDataObjectPrivate*"/>
+			<type name="RecordPrivate" c:type="GdaDataRecordPrivate*"/>
 		</field>
 		<field name="_model">
 			<type name="Gee.HashMap" c:type="GeeHashMap*">
@@ -31,7 +31,7 @@
 				</type>
 			</type>
 		</field>
-		<method name="get_value" c:identifier="gda_data_object_get_value" throws="1">
+		<method name="get_value" c:identifier="gda_data_record_get_value" throws="1">
 			<parameters>
 				<parameter name="field" transfer-ownership="none">
 					<type name="utf8" c:type="const gchar*"/>
@@ -41,7 +41,7 @@
 				<type name="gpointer" c:type="gpointer"/>
 			</return-value>
 		</method>
-		<method name="set_value" c:identifier="gda_data_object_set_value" throws="1">
+		<method name="set_value" c:identifier="gda_data_record_set_value" throws="1">
 			<parameters>
 				<parameter name="field" transfer-ownership="none">
 					<type name="utf8" c:type="const gchar*"/>
@@ -54,7 +54,7 @@
 				<type name="none"/>
 			</return-value>
 		</method>
-		<method name="save" c:identifier="gda_data_object_save" throws="1">
+		<method name="save" c:identifier="gda_data_record_save" throws="1">
 			<return-value transfer-ownership="full">
 				<type name="none"/>
 			</return-value>
@@ -64,7 +64,7 @@
 				<type name="none"/>
 			</return-value>
 		</virtual-method>
-		<method name="update" c:identifier="gda_data_object_update" throws="1">
+		<method name="update" c:identifier="gda_data_record_update" throws="1">
 			<return-value transfer-ownership="full">
 				<type name="none"/>
 			</return-value>
@@ -74,7 +74,7 @@
 				<type name="none"/>
 			</return-value>
 		</virtual-method>
-		<method name="append" c:identifier="gda_data_object_append" throws="1">
+		<method name="append" c:identifier="gda_data_record_append" throws="1">
 			<return-value transfer-ownership="full">
 				<type name="gboolean" c:type="gboolean"/>
 			</return-value>
@@ -84,7 +84,7 @@
 				<type name="gboolean" c:type="gboolean"/>
 			</return-value>
 		</virtual-method>
-		<method name="to_string" c:identifier="gda_data_object_to_string">
+		<method name="to_string" c:identifier="gda_data_record_to_string">
 			<return-value transfer-ownership="full">
 				<type name="utf8" c:type="gchar*"/>
 			</return-value>
@@ -108,7 +108,7 @@
 			<type name="Gda.Connection" c:type="GdaConnection*"/>
 		</property>
 	</class>
-	<record name="ObjectClass" c:type="GdaDataObjectClass" glib:is-gtype-struct-for="Object">
+	<record name="RecordClass" c:type="GdaDataRecordClass" glib:is-gtype-struct-for="Record">
 		<field name="parent_class">
 			<type name="GObject.ObjectClass" c:type="GObjectClass"/>
 		</field>
@@ -116,7 +116,7 @@
 			<callback name="save" c:type="save" throws="1">
 				<parameters>
 					<parameter name="self" transfer-ownership="none">
-						<type name="GdaData.Object" c:type="GdaDataObject*"/>
+						<type name="GdaData.Record" c:type="GdaDataRecord*"/>
 					</parameter>
 				</parameters>
 				<return-value transfer-ownership="full">
@@ -128,7 +128,7 @@
 			<callback name="update" c:type="update" throws="1">
 				<parameters>
 					<parameter name="self" transfer-ownership="none">
-						<type name="GdaData.Object" c:type="GdaDataObject*"/>
+						<type name="GdaData.Record" c:type="GdaDataRecord*"/>
 					</parameter>
 				</parameters>
 				<return-value transfer-ownership="full">
@@ -140,7 +140,7 @@
 			<callback name="append" c:type="append" throws="1">
 				<parameters>
 					<parameter name="self" transfer-ownership="none">
-						<type name="GdaData.Object" c:type="GdaDataObject*"/>
+						<type name="GdaData.Record" c:type="GdaDataRecord*"/>
 					</parameter>
 				</parameters>
 				<return-value transfer-ownership="full">
@@ -152,7 +152,7 @@
 			<callback name="to_string" c:type="to_string">
 				<parameters>
 					<parameter name="self" transfer-ownership="none">
-						<type name="GdaData.Object" c:type="GdaDataObject*"/>
+						<type name="GdaData.Record" c:type="GdaDataRecord*"/>
 					</parameter>
 				</parameters>
 				<return-value transfer-ownership="full">
@@ -161,15 +161,15 @@
 			</callback>
 		</field>
 	</record>
-	<record name="ObjectPrivate" c:type="GdaDataObjectPrivate" disguised="1"/>
-	<class name="ObjectSingleId" c:type="GdaDataObjectSingleId" glib:type-name="GdaDataObjectSingleId" glib:get-type="gda_data_object_single_id_get_type" glib:type-struct="ObjectSingleIdClass" parent="GdaData.Object" abstract="1">
+	<record name="RecordPrivate" c:type="GdaDataRecordPrivate" disguised="1"/>
+	<class name="RecordSingleId" c:type="GdaDataRecordSingleId" glib:type-name="GdaDataRecordSingleId" glib:get-type="gda_data_record_single_id_get_type" glib:type-struct="RecordSingleIdClass" parent="GdaData.Record" abstract="1">
 		<field name="parent_instance">
-			<type name="GdaData.Object" c:type="GdaDataObject"/>
+			<type name="GdaData.Record" c:type="GdaDataRecord"/>
 		</field>
 		<field name="priv">
-			<type name="ObjectSingleIdPrivate" c:type="GdaDataObjectSingleIdPrivate*"/>
+			<type name="RecordSingleIdPrivate" c:type="GdaDataRecordSingleIdPrivate*"/>
 		</field>
-		<method name="get_id" c:identifier="gda_data_object_single_id_get_id">
+		<method name="get_id" c:identifier="gda_data_record_single_id_get_id">
 			<parameters>
 				<parameter name="result" direction="out" transfer-ownership="full" caller-allocates="1">
 					<type name="GObject.Value" c:type="GValue"/>
@@ -179,7 +179,7 @@
 				<type name="none"/>
 			</return-value>
 		</method>
-		<method name="set_id" c:identifier="gda_data_object_single_id_set_id" throws="1">
+		<method name="set_id" c:identifier="gda_data_record_single_id_set_id" throws="1">
 			<parameters>
 				<parameter name="v" transfer-ownership="none">
 					<type name="GObject.Value" c:type="GValue"/>
@@ -189,7 +189,7 @@
 				<type name="none"/>
 			</return-value>
 		</method>
-		<method name="sql" c:identifier="gda_data_object_single_id_sql">
+		<method name="sql" c:identifier="gda_data_record_single_id_sql">
 			<return-value transfer-ownership="full">
 				<type name="Gda.SqlBuilder" c:type="GdaSqlBuilder*"/>
 			</return-value>
@@ -201,12 +201,12 @@
 			<type name="gint" c:type="gint"/>
 		</property>
 	</class>
-	<record name="ObjectSingleIdClass" c:type="GdaDataObjectSingleIdClass" glib:is-gtype-struct-for="ObjectSingleId">
+	<record name="RecordSingleIdClass" c:type="GdaDataRecordSingleIdClass" glib:is-gtype-struct-for="RecordSingleId">
 		<field name="parent_class">
-			<type name="GdaData.ObjectClass" c:type="GdaDataObjectClass"/>
+			<type name="GdaData.RecordClass" c:type="GdaDataRecordClass"/>
 		</field>
 	</record>
-	<record name="ObjectSingleIdPrivate" c:type="GdaDataObjectSingleIdPrivate" disguised="1"/>
+	<record name="RecordSingleIdPrivate" c:type="GdaDataRecordSingleIdPrivate" disguised="1"/>
 	<class name="Field" c:type="GdaDataField" glib:type-name="GdaDataField" glib:get-type="gda_data_field_get_type" glib:type-struct="FieldClass" parent="GObject.Object">
 		<field name="parent_instance">
 			<type name="GObject.Object" c:type="GObject"/>
diff --git a/libgda/data/Makefile.am b/libgda/data/Makefile.am
index ef12796..01c3a6b 100644
--- a/libgda/data/Makefile.am
+++ b/libgda/data/Makefile.am
@@ -32,8 +32,8 @@ VALAFLAGS = \
     $(NULL)
 
 object_persistance_sources = \
-	DataObject.vala \
-	DataObjectSingleId.vala \
+	Record.vala \
+	RecordSingleId.vala \
 	SelectQuery.vala \
 	$(NULL)
 
diff --git a/samples/vala/SampleDataObject.vala b/samples/vala/SampleDataObject.vala
index 5c86b0c..44ef96f 100644
--- a/samples/vala/SampleDataObject.vala
+++ b/samples/vala/SampleDataObject.vala
@@ -22,7 +22,7 @@ using GdaData;
 
 namespace Sample {
 
-	class Record : GdaData.ObjectSingleId {
+	class Record : RecordSingleId {
 		private static string dbtable = "user";
 		
 		/**
@@ -76,7 +76,7 @@ namespace Sample {
 		}
 	}
 
-	class App : GLib.Object {
+	class App : Object {
 		public Gda.Connection connection;
 		
 		public void init ()
@@ -99,7 +99,7 @@ namespace Sample {
 			throws Error
 		{
 			stdout.printf (">>> DEMO: Modifying Records\n");
-			var rcd = new Record ();
+			var rcd = new Sample.Record ();
 			rcd.connection = this.connection;
 			try { rcd.set_id (name); }
 			catch (Error e) { stdout.printf ("ERROR: Record no opened\n" + e.message + "\n"); }
@@ -141,7 +141,7 @@ namespace Sample {
 			throws Error
 		{
 			stdout.printf("DEMO: Appending Objects...\n");
-			var ob = new Record ();
+			var ob = new Sample.Record ();
 			ob.connection = this.connection;
 			ob.name = "Jacob Sanders PhD.";
 			ob.append ();
diff --git a/tests/vala/CheckDataObject.vala b/tests/vala/CheckDataObject.vala
index 9d4c6a8..78275a6 100644
--- a/tests/vala/CheckDataObject.vala
+++ b/tests/vala/CheckDataObject.vala
@@ -21,7 +21,7 @@ using Gda;
 using GdaData;
 
 namespace Check {
-	class Record : GdaData.ObjectSingleId
+	class Record : RecordSingleId
 	{
 		public static string t = "user";
 		public override string table { 
@@ -64,7 +64,7 @@ namespace Check {
 		{
 			stdout.printf(">>> NEW TEST: Gda.DataObject API tests\n");
 			int fails = 0;
-			var r = new Record ();
+			var r = new Check.Record ();
 			r.connection = this.connection;
 			stdout.printf("Setting ID to 1\n");
 			try {
@@ -167,7 +167,7 @@ namespace Check {
 			stdout.printf(">>> NEW TEST: Gda.DataObject Adding new objects to DB\n");
 			int fails = 0;
 			try {
-				var n = new Record ();
+				var n = new Check.Record ();
 				n.connection = this.connection;
 				n.set_value ("id", 3);
 				n.set_value ("name", "GdaDataNewName");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]