From 1d818a4189f45d3a64ee5946d912f45aca1e076b Mon Sep 17 00:00:00 2001 From: speillet Date: Thu, 9 Jan 2020 17:29:44 +0100 Subject: [PATCH] resolve review comments resolve review comments --- src/providers/oracle/qgsoracleprovider.cpp | 6 +++++- tests/testdata/provider/testdata_oracle.sql | 9 +-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp index 34d3a5efcc3..f24926b92e0 100644 --- a/src/providers/oracle/qgsoracleprovider.cpp +++ b/src/providers/oracle/qgsoracleprovider.cpp @@ -1297,7 +1297,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() ) { @@ -1307,6 +1307,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 index 21033b1b75a..18980378047 100644 --- 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;