Update HANA provider to latest changes in master

qgis · Dec 7, 2020 · 3885fe6 · 3885fe6
1 parent f9f316c
commit 3885fe6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/src/providers/hana/qgshanaprovider.cpp b/src/providers/hana/qgshanaprovider.cpp
@@ -241,8 +241,8 @@ const QString QgsHanaProvider::HANA_DESCRIPTION = QStringLiteral( "HANA spatial
 
 QgsHanaProvider::QgsHanaProvider(
   const QString &uri,
-  const ProviderOptions &options )
-  : QgsVectorDataProvider( uri, options )
+  const ProviderOptions &options, QgsDataProvider::ReadFlags flags )
+  : QgsVectorDataProvider( uri, options, flags )
   , mUri( uri )
   , mFeaturesCount( -1 )
 {
@@ -1601,9 +1601,9 @@ void QgsHanaProviderMetadata::cleanupProvider()
 }
 
 QgsHanaProvider *QgsHanaProviderMetadata::createProvider(
-  const QString &uri, const QgsDataProvider::ProviderOptions &options )
+  const QString &uri, const QgsDataProvider::ProviderOptions &options, QgsDataProvider::ReadFlags flags )
 {
-  return new QgsHanaProvider( uri, options );
+  return new QgsHanaProvider( uri, options, flags );
 }
 
 QList< QgsDataItemProvider *> QgsHanaProviderMetadata::dataItemProviders() const

diff --git a/src/providers/hana/qgshanaprovider.h b/src/providers/hana/qgshanaprovider.h
@@ -55,7 +55,8 @@ class QgsHanaProvider final : public QgsVectorDataProvider
     static const QString HANA_KEY;
     static const QString HANA_DESCRIPTION;
 
-    QgsHanaProvider( const QString &uri, const QgsDataProvider::ProviderOptions &options );
+    QgsHanaProvider( const QString &uri, const QgsDataProvider::ProviderOptions &options,
+                     QgsDataProvider::ReadFlags flags = QgsDataProvider::ReadFlags() );
     ~QgsHanaProvider() override;
 
     /* Functions inherited from QgsVectorDataProvider */
@@ -181,7 +182,7 @@ class QgsHanaProviderMetadata : public QgsProviderMetadata
 
     void cleanupProvider() override;
 
-    QgsHanaProvider *createProvider( const QString &uri, const QgsDataProvider::ProviderOptions &options ) override;
+    QgsHanaProvider *createProvider( const QString &uri, const QgsDataProvider::ProviderOptions &options, QgsDataProvider::ReadFlags flags = QgsDataProvider::ReadFlags() ) override;
 
     QgsVectorLayerExporter::ExportError createEmptyLayer(
       const QString &uri,

diff --git a/src/providers/hana/qgshanaproviderconnection.cpp b/src/providers/hana/qgshanaproviderconnection.cpp
@@ -203,15 +203,22 @@ void QgsHanaProviderConnection::renameSchema( const QString &name, const QString
                        .arg( QgsHanaUtils::quotedIdentifier( name ), QgsHanaUtils::quotedIdentifier( newName ) ) );
 }
 
-QList<QVariantList> QgsHanaProviderConnection::executeSql( const QString &sql ) const
+QList<QVariantList> QgsHanaProviderConnection::executeSql( const QString &sql, QgsFeedback *feedback ) const
 {
   checkCapability( Capability::ExecuteSql );
 
+  // Check feedback first!
+  if ( feedback && feedback->isCanceled() )
+    return QList<QVariantList>();
+
   const QgsDataSourceUri dsUri { uri() };
   QgsHanaConnectionRef conn( dsUri );
   if ( conn.isNull() )
     throw QgsProviderConnectionException( QObject::tr( "Connection failed: %1" ).arg( uri() ) );
 
+  if ( feedback && feedback->isCanceled() )
+    return QList<QVariantList>();
+
   bool isQuery = false;
 
   try
@@ -225,15 +232,15 @@ QList<QVariantList> QgsHanaProviderConnection::executeSql( const QString &sql )
   }
 
   if ( isQuery )
-    return executeSqlQuery( *conn, sql );
+    return executeSqlQuery( *conn, sql, feedback );
   else
   {
-    executeSqlStatement( sql );
+    executeSqlStatement( *conn, sql );
     return QList<QVariantList>();
   }
 }
 
-QList<QVariantList> QgsHanaProviderConnection::executeSqlQuery( QgsHanaConnection &conn, const QString &sql ) const
+QList<QVariantList> QgsHanaProviderConnection::executeSqlQuery( QgsHanaConnection &conn, const QString &sql, QgsFeedback *feedback ) const
 {
   QList<QVariantList> results;
 
@@ -243,6 +250,9 @@ QList<QVariantList> QgsHanaProviderConnection::executeSqlQuery( QgsHanaConnectio
     const unsigned short nColumns = resultSet->getMetadata().getColumnCount();
     while ( resultSet->next() )
     {
+      if ( feedback && feedback->isCanceled() )
+        break;
+
       QVariantList row;
       for ( unsigned short i = 1; i <= nColumns; ++i )
         row.push_back( resultSet->getValue( i ) );

diff --git a/src/providers/hana/qgshanaproviderconnection.h b/src/providers/hana/qgshanaproviderconnection.h
@@ -40,7 +40,7 @@ class QgsHanaProviderConnection : public QgsAbstractDatabaseProviderConnection
     void createSchema( const QString &name ) const override;
     void dropSchema( const QString &name, bool force = false ) const override;
     void renameSchema( const QString &name, const QString &newName ) const override;
-    QList<QVariantList> executeSql( const QString &sql ) const override;
+    QList<QVariantList> executeSql( const QString &sql, QgsFeedback *feedback = nullptr ) const override;
     QList<QgsAbstractDatabaseProviderConnection::TableProperty> tables( const QString &schema,
         const TableFlags &flags = nullptr ) const override;
     QStringList schemas( ) const override;
@@ -50,7 +50,7 @@ class QgsHanaProviderConnection : public QgsAbstractDatabaseProviderConnection
     QList<QgsVectorDataProvider::NativeType> nativeTypes() const override;
 
   private:
-    QList<QVariantList> executeSqlQuery( QgsHanaConnection &conn, const QString &sql ) const;
+    QList<QVariantList> executeSqlQuery( QgsHanaConnection &conn, const QString &sql, QgsFeedback *feedback = nullptr ) const;
     void executeSqlStatement( QgsHanaConnection &conn, const QString &sql ) const;
     void executeSqlStatement( const QString &sql ) const;
     void setCapabilities();

diff --git a/tests/src/python/test_qgsproviderconnection_base.py b/tests/src/python/test_qgsproviderconnection_base.py
@@ -414,7 +414,7 @@ def test_native_types(self):
         native_types = conn.nativeTypes()
         names = [nt.mTypeName.lower() for nt in native_types]
         self.assertTrue('integer' in names or 'decimal' in names, names)
-        self.assertTrue('string' in names or 'text' in names, names)
+        self.assertTrue('string' in names or 'text' in names or 'nvarchar' in names, names)
 
     def testExecuteSqlCancel(self):
         """Test that feedback can cancel an executeSql query"""