[mssql] Fix inserting features into tables with an after insert trigg…

…er attached Fixes #20592 (cherry picked from commit 69f6ea5)
qgis · Jan 7, 2019 · c710e0b · c710e0b
1 parent 8cc96e6
commit c710e0b
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -872,7 +872,15 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )
 
     QString statement;
     QString values;
-    statement = QStringLiteral( "INSERT INTO [%1].[%2] (" ).arg( mSchemaName, mTableName );
+    if ( !( flags & QgsFeatureSink::FastInsert ) )
+    {
+      statement += QStringLiteral( "DECLARE @px TABLE (id INT); " );
+      statement += QStringLiteral( "INSERT INTO [%1].[%2] (" ).arg( mSchemaName, mTableName );
+    }
+    else
+    {
+      statement += QStringLiteral( "INSERT INTO [%1].[%2] (" ).arg( mSchemaName, mTableName );
+    }
 
     bool first = true;
     QSqlQuery query = createQuery();
@@ -947,10 +955,14 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )
     statement += QStringLiteral( ") " );
     if ( !( flags & QgsFeatureSink::FastInsert ) )
     {
-      statement += QStringLiteral( " OUTPUT inserted." ) + mFidColName;
+      statement += QStringLiteral( " OUTPUT inserted." ) + mFidColName + QStringLiteral( " INTO @px " );
     }
     statement += QStringLiteral( " VALUES (" ) + values + ')';
 
+    if ( !( flags & QgsFeatureSink::FastInsert ) )
+    {
+      statement += QStringLiteral( "; SELECT id FROM @px;" );
+    }
     // use prepared statement to prevent from sql injection
     if ( !query.prepare( statement ) )
     {