MySQL Lists: commits: Connector/ODBC 5 commit: r749

List:	Commits	« Previous Message Next Message »
From:	jbalint	Date:	December 15 2006 1:27pm
Subject:	Connector/ODBC 5 commit: r749 - trunk/SDK/MYSQLPlus/Library
View as plain text
Modified:
   trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
   trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
   trunk/SDK/MYSQLPlus/Library/MResult.cpp
   trunk/SDK/MYSQLPlus/Library/MResult.h
   trunk/SDK/MYSQLPlus/Library/MResultPlus.h
   trunk/SDK/MYSQLPlus/Library/MResultRes.cpp
Log:
some cleanup/fixes

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2006-12-14 22:50:36 UTC (rev 748)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.cpp	2006-12-15 12:27:41 UTC (rev 749)
@@ -24,7 +24,7 @@
     pDataPtr            = NULL;
     pnIndicatorPtr      = NULL;
     pnOctetLengthPtr    = NULL;
-    nParamterType       = SQL_PARAM_INPUT;
+    nParameterType       = SQL_PARAM_INPUT;
     nType               = SQL_C_DEFAULT;
 
     MYODBCDbgReturn2();
@@ -375,7 +375,7 @@
     if ( !MYODBCC::isDescParameterType( nParameterType ) )
         MYODBCDbgReturn( getDescriptor()->getDiagnostic()->doAppend(
MDiagnostic::STATE_HY092B ) );
     
-    this->nParamterType = nParamterType;
+    this->nParameterType = nParameterType;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1093,7 +1093,7 @@
             break;
 
         case SQL_DESC_PARAMETER_TYPE:
-            *((SQLSMALLINT *)pValuePtr) = getParamterType();
+            *((SQLSMALLINT *)pValuePtr) = getParameterType();
             break;
 
         case SQL_DESC_PRECISION:
@@ -1397,11 +1397,11 @@
     MYODBCDbgReturn3( "%p", pnOctetLengthPtr );
 }
 
-SQLSMALLINT MDescriptorRecord::getParamterType()
+SQLSMALLINT MDescriptorRecord::getParameterType()
 {
     MYODBCDbgEnter();
 
-    MYODBCDbgReturn3( "%d", nParamterType );
+    MYODBCDbgReturn3( "%d", nParameterType );
 }
 
 SQLSMALLINT MDescriptorRecord::getPrecision()
@@ -1512,7 +1512,7 @@
     descriptorrecord.nNullable                    = nNullable;
     descriptorrecord.nNumPrecRadix                = nNumPrecRadix;
     descriptorrecord.nOctetLength                 = nOctetLength;
-    descriptorrecord.nParamterType                = nParamterType;
+    descriptorrecord.nParameterType               = nParameterType;
     descriptorrecord.nPrecision                   = nPrecision;
     descriptorrecord.nRowver                      = nRowver;
     descriptorrecord.nScale                       = nScale;

Modified: trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h	2006-12-14 22:50:36 UTC (rev 748)
+++ trunk/SDK/MYSQLPlus/Library/MDescriptorRecord.h	2006-12-15 12:27:41 UTC (rev 749)
@@ -132,7 +132,7 @@
     virtual SQLINTEGER  getNumPrecRadix();
     virtual SQLINTEGER  getOctetLength();
     virtual SQLINTEGER *getOctetLengthPtr();
-    virtual SQLSMALLINT getParamterType();
+    virtual SQLSMALLINT getParameterType();
     virtual SQLSMALLINT getPrecision();
     virtual SQLSMALLINT getRowver();
     virtual SQLSMALLINT getScale();
@@ -180,7 +180,7 @@
     SQLINTEGER  nNumPrecRadix;                  /*!< */
     SQLINTEGER  nOctetLength;                   /*!< */
     SQLINTEGER *pnOctetLengthPtr;               /*!< */
-    SQLSMALLINT nParamterType;                  /*!< */
+    SQLSMALLINT nParameterType;                 /*!< */
     SQLSMALLINT nPrecision;                     /*!< */
     SQLSMALLINT nRowver;                        /*!< */
     SQLSMALLINT nScale;                         /*!< */

Modified: trunk/SDK/MYSQLPlus/Library/MResult.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult.cpp	2006-12-14 22:50:36 UTC (rev 748)
+++ trunk/SDK/MYSQLPlus/Library/MResult.cpp	2006-12-15 12:27:41 UTC (rev 749)
@@ -263,9 +263,9 @@
         \internal
         \todo
 
-        Decouple MResult from MStatement more not less.
+        Decouple MResult from MCommand more not less.
     */
-    Q_ASSERT( pStatement );
+    Q_ASSERT( pCommand );
 
     bResultSetRowsKnown = false;
     nBuffered           = BUFFERED_UNBUFFERED;              // no ResultSet buffering 
@@ -4794,7 +4794,7 @@
 /*  pDescriptorRecord->setnum_prec_radix;               - type specific     */   
 /*  pDescriptorRecord->setoctet_length;                 - type specific     */
 /*  pDescriptorRecord->setoctet_length_ptr;             - N/A               */
-/*  pDescriptorRecord->setparamter_type;                - N/A               */
+/*  pDescriptorRecord->setparameter_type;               - N/A               */
 /*  pDescriptorRecord->setprecision;                    - type specific     */   
     pDescriptorRecord->setRowver( SQL_FALSE );            /* - also type specific   */
     pDescriptorRecord->setScale( pField->decimals );

Modified: trunk/SDK/MYSQLPlus/Library/MResult.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult.h	2006-12-14 22:50:36 UTC (rev 748)
+++ trunk/SDK/MYSQLPlus/Library/MResult.h	2006-12-15 12:27:41 UTC (rev 749)
@@ -498,17 +498,17 @@
                 a safety net (no need to verify result is MResultPlus class.
     */
     /*@{*/
-    SQLRETURN doColumnPrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
-    SQLRETURN doColumns( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
-    SQLRETURN doForeignKeys( const QString &stringPKCatalog, const QString
&stringPKSchema, const QString &stringPKTable, const QString
&stringFKCatalog, const QString &stringFKSchema, const QString &stringFKTable
);
-    SQLRETURN doPrimaryKeys( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable );
-    SQLRETURN doProcedures( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringProcedureFilter );
-    SQLRETURN doProcedureColumns( const QString &stringCatalog, const QString
&stringSchema, const QString &stringProcedure, const QString
&stringColumnFilter );
-    SQLRETURN doSpecialColumns( SQLUSMALLINT nIdentifierType, const QString
&stringCatalog, const QString &stringSchema, const QString &stringTable,
SQLUSMALLINT nScope, SQLUSMALLINT nNullable );
-    SQLRETURN doStatistics( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, SQLUSMALLINT nUnique, SQLUSMALLINT
nReserved );
-    SQLRETURN doTablePrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter );
-    SQLRETURN doTables( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringTableTypeFilter );
-    SQLRETURN doTypeInfo( SQLSMALLINT nDataType );
+    virtual SQLRETURN doColumnPrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
+    virtual SQLRETURN doColumns( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
+    virtual SQLRETURN doForeignKeys( const QString &stringPKCatalog, const QString
&stringPKSchema, const QString &stringPKTable, const QString
&stringFKCatalog, const QString &stringFKSchema, const QString &stringFKTable
);
+    virtual SQLRETURN doPrimaryKeys( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable );
+    virtual SQLRETURN doProcedures( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringProcedureFilter );
+    virtual SQLRETURN doProcedureColumns( const QString &stringCatalog, const QString
&stringSchema, const QString &stringProcedure, const QString
&stringColumnFilter );
+    virtual SQLRETURN doSpecialColumns( SQLUSMALLINT nIdentifierType, const QString
&stringCatalog, const QString &stringSchema, const QString &stringTable,
SQLUSMALLINT nScope, SQLUSMALLINT nNullable );
+    virtual SQLRETURN doStatistics( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, SQLUSMALLINT nUnique, SQLUSMALLINT
nReserved );
+    virtual SQLRETURN doTablePrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter );
+    virtual SQLRETURN doTables( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringTableTypeFilter );
+    virtual SQLRETURN doTypeInfo( SQLSMALLINT nDataType );
     /*@}*/
 
     /* doers */

Modified: trunk/SDK/MYSQLPlus/Library/MResultPlus.h
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultPlus.h	2006-12-14 22:50:36 UTC (rev 748)
+++ trunk/SDK/MYSQLPlus/Library/MResultPlus.h	2006-12-15 12:27:41 UTC (rev 749)
@@ -60,17 +60,17 @@
                 to create a ResultSet - but it seems cleaner to implement these in here. 
     */
     /*@{*/
-    SQLRETURN doColumnPrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
-    SQLRETURN doColumns( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
-    SQLRETURN doForeignKeys( const QString &stringPKCatalog, const QString
&stringPKSchema, const QString &stringPKTable, const QString
&stringFKCatalog, const QString &stringFKSchema, const QString &stringFKTable
);
-    SQLRETURN doPrimaryKeys( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable );
-    SQLRETURN doProcedures( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringProcedureFilter );
-    SQLRETURN doProcedureColumns( const QString &stringCatalog, const QString
&stringSchema, const QString &stringProcedure, const QString
&stringColumnFilter );
-    SQLRETURN doSpecialColumns( SQLUSMALLINT nIdentifierType, const QString
&stringCatalog, const QString &stringSchema, const QString &stringTable,
SQLUSMALLINT nScope, SQLUSMALLINT nNullable );
-    SQLRETURN doStatistics( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, SQLUSMALLINT nUnique, SQLUSMALLINT
nReserved );
-    SQLRETURN doTablePrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter );
-    SQLRETURN doTables( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringTableTypeFilter );
-    SQLRETURN doTypeInfo( SQLSMALLINT nDataType );
+    virtual SQLRETURN doColumnPrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
+    virtual SQLRETURN doColumns( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringColumnFilter );
+    virtual SQLRETURN doForeignKeys( const QString &stringPKCatalog, const QString
&stringPKSchema, const QString &stringPKTable, const QString
&stringFKCatalog, const QString &stringFKSchema, const QString &stringFKTable
);
+    virtual SQLRETURN doPrimaryKeys( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable );
+    virtual SQLRETURN doProcedures( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringProcedureFilter );
+    virtual SQLRETURN doProcedureColumns( const QString &stringCatalog, const QString
&stringSchema, const QString &stringProcedure, const QString
&stringColumnFilter );
+    virtual SQLRETURN doSpecialColumns( SQLUSMALLINT nIdentifierType, const QString
&stringCatalog, const QString &stringSchema, const QString &stringTable,
SQLUSMALLINT nScope, SQLUSMALLINT nNullable );
+    virtual SQLRETURN doStatistics( const QString &stringCatalog, const QString
&stringSchema, const QString &stringTable, SQLUSMALLINT nUnique, SQLUSMALLINT
nReserved );
+    virtual SQLRETURN doTablePrivileges( const QString &stringCatalog, const QString
&stringSchemaFilter, const QString &stringTableFilter );
+    virtual SQLRETURN doTables( const QString &stringCatalogFilter, const QString
&stringSchemaFilter, const QString &stringTableFilter, const QString
&stringTableTypeFilter );
+    virtual SQLRETURN doTypeInfo( SQLSMALLINT nDataType );
     /*@}*/
 
     /* isers */

Modified: trunk/SDK/MYSQLPlus/Library/MResultRes.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResultRes.cpp	2006-12-14 22:50:36 UTC (rev 748)
+++ trunk/SDK/MYSQLPlus/Library/MResultRes.cpp	2006-12-15 12:27:41 UTC (rev 749)
@@ -1068,7 +1068,7 @@
 
         case STATE_PREPARED:
 //            getImpParamDesc()->doClear();
-            getImpRowDesc()->doClear();
+//            getImpRowDesc()->doClear();
             setState( STATE_INITIALIZED );
             setBuffered();
             break;
Thread
• Connector/ODBC 5 commit: r749 - trunk/SDK/MYSQLPlus/Library	jbalint	15 Dec