2 files changed, 38 insertions, 1 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 8f2e4c0cc6..a7f583c3b8 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1677,6 +1677,38 @@ QSqlRecord QODBCResult::record() const
     return d->rInf;
 }
 
+QVariant QODBCResult::lastInsertId() const
+{
+    QString sql;
+
+    switch (d->driverPrivate->dbmsType) {
+    case QODBCDriverPrivate::MSSqlServer:
+    case QODBCDriverPrivate::Sybase:
+        sql = QLatin1String("SELECT @@IDENTITY;");
+        break;
+    case QODBCDriverPrivate::MySqlServer:
+        sql = QLatin1String("SELECT LAST_INSERT_ID();");
+        break;
+    case QODBCDriverPrivate::PostgreSQL:
+        sql = QLatin1String("SELECT lastval();");
+        break;
+    default:
+        break;
+    }
+
+    if (!sql.isEmpty()) {
+        QSqlQuery qry(driver()->createResult());
+        if (qry.exec(sql) && qry.next())
+            return qry.value(0);
+
+        qSqlWarning(QLatin1String("QODBCResult::lastInsertId: Unable to get lastInsertId"), d);
+    } else {
+        qSqlWarning(QLatin1String("QODBCResult::lastInsertId: not implemented for this DBMS"), d);
+    }
+
+    return QVariant();
+}
+
 QVariant QODBCResult::handle() const
 {
     return QVariant(qRegisterMetaType<SQLHANDLE>("SQLHANDLE"), &d->hStmt);
@@ -1797,12 +1829,16 @@ bool QODBCDriver::hasFeature(DriverFeature f) const
         return true;
     case QuerySize:
     case NamedPlaceholders:
-    case LastInsertId:
     case BatchOperations:
     case SimpleLocking:
     case EventNotifications:
     case CancelQuery:
         return false;
+    case LastInsertId:
+        return (d->dbmsType == QODBCDriverPrivate::MSSqlServer)
+                || (d->dbmsType == QODBCDriverPrivate::Sybase)
+                || (d->dbmsType == QODBCDriverPrivate::MySqlServer)
+                || (d->dbmsType == QODBCDriverPrivate::PostgreSQL);
     case MultipleResultSets:
         return d->hasMultiResultSets;
     case BLOB: {
diff --git a/src/sql/drivers/odbc/qsql_odbc_p.h b/src/sql/drivers/odbc/qsql_odbc_p.h
index c1367165f5..191f64f072 100644
--- a/src/sql/drivers/odbc/qsql_odbc_p.h
+++ b/src/sql/drivers/odbc/qsql_odbc_p.h
@@ -97,6 +97,7 @@ public:
     bool prepare(const QString& query);
     bool exec();
 
+    QVariant lastInsertId() const;
     QVariant handle() const;
     virtual void setForwardOnly(bool forward);