Changeset 769 for trunk/src/sql/kernel

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/sql/kernel/qsqldatabase.cpp (modified) (1 diff)
• src/sql/kernel/qsqlquery.cpp (modified) (2 diffs)
• src/sql/kernel/qsqlresult.cpp (modified) (3 diffs)

trunk/src/sql/kernel/qsqldatabase.cpp

@@ -1268 +1268 @@
     \i QSQLITE_BUSY_TIMEOUT
     \i QSQLITE_OPEN_READONLY
+    \i QSQLITE_ENABLE_SHARED_CACHE
     \endlist
 

trunk/src/sql/kernel/qsqlquery.cpp

@@ -823 +823 @@
   the result set.
 
+  \note Calling setForwardOnly after execution of the query will result
+  in unexpected results at best, and crashes at worst.
+
   \sa isForwardOnly(), next(), seek(), QSqlResult::setForwardOnly()
 */
@@ -1000 +1003 @@
   paramType is QSql::Out or QSql::InOut, the placeholder will be
   overwritten with data from the database after the exec() call.
+  In this case, sufficient space must be pre-allocated to store
+  the result into.
 
   To bind a NULL value, use a null QVariant; for example, use
   \c {QVariant(QVariant::String)} if you are binding a string.
+
+  Values cannot be bound to multiple locations in the query, eg:
+  \code
+  INSERT INTO testtable (id, name, samename) VALUES (:id, :name, :name)
+  \endcode
+  Binding to name will bind to the first :name, but not the second.
 
   \sa addBindValue(), prepare(), exec(), boundValue() boundValues()

trunk/src/sql/kernel/qsqlresult.cpp

@@ -137 +137 @@
     }
 
-    return QString::fromUtf16(arr, int(ptr - arr) + 1);
+    return QString(reinterpret_cast<const QChar *>(arr), int(ptr - arr) + 1);
 }
 
@@ -564 +564 @@
     scrollable. isForwardOnly() will always return the correct status of
     the result set.
+
+    \note Calling setForwardOnly after execution of the query will result
+    in unexpected results at best, and crashes at worst.
 
     \sa isForwardOnly(), fetchNext(), QSqlQuery::setForwardOnly()
@@ -708 +711 @@
     placeholder name in the current record (row).
 
-    Note that binding an undefined placeholder will result in undefined behavior.
+   Values cannot be bound to multiple locations in the query, eg:
+   \code
+   INSERT INTO testtable (id, name, samename) VALUES (:id, :name, :name)
+   \endcode
+   Binding to name will bind to the first :name, but not the second.
+
+    \note Binding an undefined placeholder will result in undefined behavior.
+
+    \sa QSqlQuery::bindValue()
 */
 void QSqlResult::bindValue(const QString& placeholder, const QVariant& val,