Fix build

qgis · May 20, 2021 · 9589813 · 9589813
1 parent e6bc53b
commit 9589813
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/src/providers/hana/qgshanaprovider.cpp b/src/providers/hana/qgshanaprovider.cpp
@@ -1567,7 +1567,7 @@ QgsCoordinateReferenceSystem QgsHanaProvider::crs() const
   return srs;
 }
 
-QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
+Qgis::VectorExportResult QgsHanaProvider::createEmptyLayer(
   const QString &uri,
   const QgsFields &fields,
   QgsWkbTypes::Type wkbType,
@@ -1584,7 +1584,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
   {
     if ( errorMessage )
       *errorMessage = QObject::tr( "Connection to database failed" );
-    return QgsVectorLayerExporter::ErrConnectionFailed;
+    return Qgis::VectorExportResult::ErrorConnectionFailed;
   }
 
   QString schemaName = dsUri.schema();
@@ -1594,7 +1594,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
   {
     if ( errorMessage )
       *errorMessage = QObject::tr( "Schema name cannot be empty" );
-    return QgsVectorLayerExporter::ErrCreateLayer;
+    return Qgis::VectorExportResult::ErrorCreatingLayer;
   }
 
   QString geometryColumn = dsUri.geometryColumn();
@@ -1637,7 +1637,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
       {
         if ( errorMessage )
           *errorMessage =  QgsHanaUtils::formatErrorMessage( ex.what(), true );
-        return QgsVectorLayerExporter::ErrCreateLayer;
+        return Qgis::VectorExportResult::ErrorCreatingLayer;
       }
     }
   }
@@ -1652,7 +1652,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
   {
     if ( errorMessage )
       *errorMessage = QgsHanaUtils::formatErrorMessage( ex.what(), true );
-    return QgsVectorLayerExporter::ErrCreateLayer;
+    return Qgis::VectorExportResult::ErrorCreatingLayer;
   }
 
   if ( numTables != 0 )
@@ -1662,14 +1662,14 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
       QString sql = QStringLiteral( "DROP TABLE %1.%2" )
                     .arg( QgsHanaUtils::quotedIdentifier( schemaName ), QgsHanaUtils::quotedIdentifier( tableName ) );
       if ( !conn->execute( sql, errorMessage ) )
-        return QgsVectorLayerExporter::ErrCreateLayer;
+        return Qgis::VectorExportResult::ErrorCreatingLayer;
     }
     else
     {
       if ( errorMessage )
         *errorMessage = QObject::tr( "Table %1.%2 already exists" ).arg( schemaName, tableName );
 
-      return QgsVectorLayerExporter::ErrCreateLayer;
+      return Qgis::VectorExportResult::ErrorCreatingLayer;
     }
   }
 
@@ -1686,7 +1686,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
   }
 
   if ( !conn->execute( sql, errorMessage ) )
-    return QgsVectorLayerExporter::ErrCreateLayer;
+    return Qgis::VectorExportResult::ErrorCreatingLayer;
 
   dsUri.setDataSource( dsUri.schema(), dsUri.table(), geometryColumn, dsUri.sql(), primaryKey );
   dsUri.setSrid( QString::number( srid ) );
@@ -1699,7 +1699,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
     if ( errorMessage )
       *errorMessage = QObject::tr( "Loading of the layer %1 failed" ).arg( schemaTableName );
 
-    return QgsVectorLayerExporter::ErrInvalidLayer;
+    return Qgis::VectorExportResult::ErrorInvalidLayer;
   }
 
   // add fields to the layer
@@ -1722,7 +1722,7 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
         if ( errorMessage )
           *errorMessage = QObject::tr( "Unsupported type for field %1" ).arg( fld.name() );
 
-        return QgsVectorLayerExporter::ErrAttributeTypeUnsupported;
+        return Qgis::VectorExportResult::ErrorAttributeTypeUnsupported;
       }
 
       if ( fld.name() != primaryKey )
@@ -1737,11 +1737,11 @@ QgsVectorLayerExporter::ExportError QgsHanaProvider::createEmptyLayer(
       if ( errorMessage )
         *errorMessage = QObject::tr( "Creation of fields failed" );
 
-      return QgsVectorLayerExporter::ErrAttributeCreationFailed;
+      return Qgis::VectorExportResult::ErrorAttributeCreationFailed;
     }
   }
 
-  return QgsVectorLayerExporter::NoError;
+  return Qgis::VectorExportResult::Success;
 }
 
 QgsHanaProviderMetadata::QgsHanaProviderMetadata()
@@ -1767,7 +1767,7 @@ QList< QgsDataItemProvider *> QgsHanaProviderMetadata::dataItemProviders() const
   return providers;
 }
 
-QgsVectorLayerExporter::ExportError QgsHanaProviderMetadata::createEmptyLayer(
+Qgis::VectorExportResult QgsHanaProviderMetadata::createEmptyLayer(
   const QString &uri,
   const QgsFields &fields,
   QgsWkbTypes::Type wkbType,

diff --git a/src/providers/hana/qgshanaprovider.h b/src/providers/hana/qgshanaprovider.h
@@ -94,7 +94,7 @@ class QgsHanaProvider final : public QgsVectorDataProvider
     QgsCoordinateReferenceSystem crs() const override;
 
     //! Import a vector layer into the database
-    static QgsVectorLayerExporter::ExportError createEmptyLayer(
+    static Qgis::VectorExportResult createEmptyLayer(
       const QString &uri,
       const QgsFields &fields,
       QgsWkbTypes::Type wkbType,
@@ -180,7 +180,7 @@ class QgsHanaProviderMetadata : public QgsProviderMetadata
 
     QgsHanaProvider *createProvider( const QString &uri, const QgsDataProvider::ProviderOptions &options, QgsDataProvider::ReadFlags flags = QgsDataProvider::ReadFlags() ) override;
 
-    QgsVectorLayerExporter::ExportError createEmptyLayer(
+    Qgis::VectorExportResult createEmptyLayer(
       const QString &uri,
       const QgsFields &fields,
       QgsWkbTypes::Type wkbType,

diff --git a/src/providers/oracle/qgsoracleproviderconnection.cpp b/src/providers/oracle/qgsoracleproviderconnection.cpp
@@ -20,6 +20,7 @@
 #include "qgsoracleprovider.h"
 #include "qgsexception.h"
 #include "qgsapplication.h"
+#include "qgsfeedback.h"
 
 #include <QSqlRecord>
 #include <QSqlField>
@@ -275,17 +276,17 @@ void QgsOracleProviderConnection::createVectorTable( const QString &schema,
   }
   QMap<int, int> map;
   QString errCause;
-  const QgsVectorLayerExporter::ExportError errCode = QgsOracleProvider::createEmptyLayer(
-        newUri.uri(),
-        fields,
-        wkbType,
-        srs,
-        overwrite,
-        map,
-        errCause,
-        options
-      );
-  if ( errCode != QgsVectorLayerExporter::ExportError::NoError )
+  const Qgis::VectorExportResult res = QgsOracleProvider::createEmptyLayer(
+                                         newUri.uri(),
+                                         fields,
+                                         wkbType,
+                                         srs,
+                                         overwrite,
+                                         map,
+                                         errCause,
+                                         options
+                                       );
+  if ( res != Qgis::VectorExportResult::Success )
     throw QgsProviderConnectionException( QObject::tr( "An error occurred while creating the vector layer: %1" ).arg( errCause ) );
 }