[mssql] Use output instead of IDENT_CURRENT to retrieve newly added p…

…rimary keys It's safer, works with non-identity columns, and potentially allows us to optimise in future and bulk insert features instead of one by one
qgis · Oct 25, 2018 · 972250d · 972250d
1 parent 72946c3
commit 972250d
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -944,7 +944,12 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )
       }
     }
 
-    statement += ") VALUES (" + values + ')';
+    statement += QStringLiteral( ") " );
+    if ( !( flags & QgsFeatureSink::FastInsert ) )
+    {
+      statement += QStringLiteral( " OUTPUT inserted." ) + mFidColName;
+    }
+    statement += QStringLiteral( " VALUES (" ) + values + ')';
 
     // use prepared statement to prevent from sql injection
     if ( !query.prepare( statement ) )
@@ -1067,19 +1072,6 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )
 
     if ( !( flags & QgsFeatureSink::FastInsert ) )
     {
-      statement = QStringLiteral( "SELECT IDENT_CURRENT('%1.%2')" ).arg( mSchemaName, mTableName );
-
-      if ( !query.exec( statement ) )
-      {
-        QString msg = query.lastError().text();
-        QgsDebugMsg( msg );
-        if ( !mSkipFailures )
-        {
-          pushError( msg );
-          return false;
-        }
-      }
-
       if ( !query.next() )
       {
         QString msg = query.lastError().text();