[fdo-commits] r719 - in trunk/Providers/GenericRdbms/Src/MySQL: Fdo SchemaMgr/Ph

[svn_fdo at osgeo.org]

Author: danstoica
Date: 2007-01-29 18:17:57 -0500 (Mon, 29 Jan 2007)
New Revision: 719

Modified:
   trunk/Providers/GenericRdbms/Src/MySQL/Fdo/FdoRdbmsMySqlConnection.cpp
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt16.h
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt32.h
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp
Log:
Port branch 3.2.x to Trunk

Modified: trunk/Providers/GenericRdbms/Src/MySQL/Fdo/FdoRdbmsMySqlConnection.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/Fdo/FdoRdbmsMySqlConnection.cpp	2007-01-29 23:07:26 UTC (rev 718)
+++ trunk/Providers/GenericRdbms/Src/MySQL/Fdo/FdoRdbmsMySqlConnection.cpp	2007-01-29 23:17:57 UTC (rev 719)
@@ -424,6 +424,8 @@
 		rc = gdbiStmt->ExecuteNonQuery();
 		gdbiStmt->Free();
 
+		delete gdbiStmt;
+
 		SetUserNum(-1);
         SetUserSessionId(-1);
 	}

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt16.h
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt16.h	2007-01-29 23:07:26 UTC (rev 718)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt16.h	2007-01-29 23:17:57 UTC (rev 719)
@@ -36,12 +36,15 @@
         FdoSchemaElementState elementState,
         FdoSmPhDbObject* parentObject,
         bool bNullable,
+		bool bIsAutoincremented,
         FdoStringP rootColumnName = L"",
         FdoSmPhRdColumnReader* reader = NULL
     ) :
         FdoSmPhMySqlColumn (reader),
         FdoSmPhColumn     ( columnName, L"SMALLINT", elementState, parentObject, bNullable, rootColumnName)
-    {}
+    {
+		FdoSmPhColumn::SetAutoincrement(bIsAutoincremented); 
+	}
 
     virtual ~FdoSmPhMySqlColumnInt16(void) {}
 

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt32.h
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt32.h	2007-01-29 23:07:26 UTC (rev 718)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/ColumnInt32.h	2007-01-29 23:17:57 UTC (rev 719)
@@ -36,12 +36,15 @@
         FdoSchemaElementState elementState,
         FdoSmPhDbObject* parentObject,
         bool bNullable,
+		bool bIsAutoincremented,
         FdoStringP rootColumnName = L"",
         FdoSmPhRdColumnReader* reader = NULL
     ) :
         FdoSmPhMySqlColumn (reader),
         FdoSmPhColumn     ( columnName, L"INT", elementState, parentObject, bNullable, rootColumnName)
-    {}
+    {
+		FdoSmPhColumn::SetAutoincrement(bIsAutoincremented); 
+	}
 
     virtual ~FdoSmPhMySqlColumnInt32(void) {}
 

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp	2007-01-29 23:07:26 UTC (rev 718)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp	2007-01-29 23:17:57 UTC (rev 719)
@@ -326,24 +326,24 @@
     FdoStringP columnName,
     FdoSchemaElementState elementState,
     bool bNullable,
-    bool bIsAutoincremented,    // Not supported
+    bool bIsAutoincremented,
     FdoStringP rootColumnName,
     FdoSmPhRdColumnReader* colRdr
 )
 {
-    return new FdoSmPhMySqlColumnInt16(columnName, elementState, this, bNullable, rootColumnName, colRdr);
+    return new FdoSmPhMySqlColumnInt16(columnName, elementState, this, bNullable, bIsAutoincremented, rootColumnName, colRdr);
 }
 
 FdoSmPhColumnP FdoSmPhMySqlDbObject::NewColumnInt32(
     FdoStringP columnName,
     FdoSchemaElementState elementState,
     bool bNullable,
-    bool bIsAutoincremented,    // Not supported
+    bool bIsAutoincremented,
     FdoStringP rootColumnName,
     FdoSmPhRdColumnReader* colRdr
 )
 {
-    return new FdoSmPhMySqlColumnInt32(columnName, elementState, this, bNullable, rootColumnName, colRdr);
+    return new FdoSmPhMySqlColumnInt32(columnName, elementState, this, bNullable, bIsAutoincremented, rootColumnName, colRdr);
 }
 
 FdoSmPhColumnP FdoSmPhMySqlDbObject::NewColumnInt64(