resolve review comments

resolve review comments (cherry picked from commit 99a55a4)
qgis · Jun 19, 2020 · 8983497 · 8983497
1 parent c5bde16
commit 8983497
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -1295,7 +1295,7 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
                                   "AND a.generation_type = 'ALWAYS'" ).arg( mOwnerName ).arg( mTableName );
     identitytype.prepare( sql );
 
-    if ( identitytype.exec() )
+    if ( exec( identitytype, sql, QVariantList() ) )
     {
       while ( identitytype.next() )
       {
@@ -1305,6 +1305,10 @@ bool QgsOracleProvider::addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flag
         }
       }
     }
+    else
+    {
+      throw OracleException( tr( "Could not check if table has identity field" ), identitytype );
+    }
 
     if ( mPrimaryKeyType == PktInt || mPrimaryKeyType == PktFidMap )
     {

diff --git a/tests/testdata/provider/testdata_oracle.sql b/tests/testdata/provider/testdata_oracle.sql
@@ -70,13 +70,6 @@ INSERT INTO QGIS.DATE_TIMES ("id", "date_field", "datetime_field" ) VALUES (1, D
 
 CREATE TABLE QGIS.POINT_DATA_IDENTITY ( "pk" NUMBER GENERATED ALWAYS AS IDENTITY PRIMARY KEY, GEOM SDO_GEOMETRY);
 INSERT INTO QGIS.POINT_DATA_IDENTITY (GEOM)
- SELECT SDO_GEOMETRY( 2001,4326,SDO_POINT_TYPE(1, 2, NULL), NULL, NULL) from dual
-  UNION ALL SELECT SDO_GEOMETRY( 3001,4326,SDO_POINT_TYPE(1, 2, 3), NULL, NULL) from dual
-  UNION ALL SELECT SDO_GEOMETRY( 3005,4326,NULL, sdo_elem_info_array (1,1,1, 4,1,1), sdo_ordinate_array (1,2,3, 4,5,6)) from dual
-  UNION ALL SELECT SDO_GEOMETRY( 2005,4326,NULL, sdo_elem_info_array (1,1,1, 3,1,1), sdo_ordinate_array (1,2, 3,4)) from dual
-  UNION ALL SELECT SDO_GEOMETRY( 3005,4326,NULL, sdo_elem_info_array (1,1,2), sdo_ordinate_array (1,2,3, 4,5,6)) from dual
-  UNION ALL SELECT SDO_GEOMETRY( 2001,4326,NULL, sdo_elem_info_array (1,1,1), sdo_ordinate_array (1,2)) from dual
-  UNION ALL SELECT SDO_GEOMETRY( 2001,4326, SDO_POINT_TYPE(3, 4, NULL), NULL, NULL) from dual
-  UNION ALL SELECT SDO_GEOMETRY( 2001,4326,NULL, sdo_elem_info_array (1,1,1), sdo_ordinate_array (5,6)) from dual;
+ SELECT SDO_GEOMETRY( 2001,4326,SDO_POINT_TYPE(1, 2, NULL), NULL, NULL) from dual;
 
 COMMIT;