HANA: improve error message by unknown types

mrylov · nyalldawson · commit b07e37390ecd · 2021-10-28T10:23:43.000+11:00
diff --git a/external/odbccpp/src/odbc/Types.h b/external/odbccpp/src/odbc/Types.h
@@ -175,6 +175,8 @@ class SQLDataTypes
     static constexpr int TypeTime = 92;
     /// Year, month, day, hour, minute, and second fields.
     static constexpr int TypeTimestamp = 93;
+    /// Unknown data type.
+    static constexpr int Unknown = 0;
     /// Variable length binary data.
     static constexpr int VarBinary = -3;
     /// Variable-length character string.
diff --git a/src/providers/hana/qgshanaconnection.cpp b/src/providers/hana/qgshanaconnection.cpp
@@ -826,6 +826,8 @@ void QgsHanaConnection::readTableFields( const QString &schemaName, const QStrin
       field.name = rsColumns->getString( 4/*COLUMN_NAME*/ );
       field.type = rsColumns->getShort( 5/*DATA_TYPE*/ );
       field.typeName =  rsColumns->getString( 6/*TYPE_NAME*/ );
+      if ( field.type == SQLDataTypes::Unknown )
+        throw QgsHanaException( QString( "Type of the column '%1' is unknown" ).arg( field.name ) );
       field.size = rsColumns->getInt( 7/*COLUMN_SIZE*/ );
       field.precision = static_cast<int>( rsColumns->getShort( 9/*DECIMAL_DIGITS*/ ) );
       field.isSigned = field.type == SQLDataTypes::SmallInt || field.type == SQLDataTypes::Integer ||
diff --git a/src/providers/hana/qgshanaproviderconnection.cpp b/src/providers/hana/qgshanaproviderconnection.cpp
@@ -439,7 +439,7 @@ QgsFields QgsHanaProviderConnection::fields( const QString &schema, const QStrin
   }
   catch ( const QgsHanaException &ex )
   {
-    throw QgsProviderConnectionException( QObject::tr( "Could not retrieve fields: %1, %2" ).arg( uri(), ex.what() ) );
+    throw QgsProviderConnectionException( QObject::tr( "Could not retrieve fields: %1" ).arg( ex.what() ) );
   }
 }
 
@@ -475,19 +475,6 @@ QList<QgsVectorDataProvider::NativeType> QgsHanaProviderConnection::nativeTypes(
   return types;
 }
 
-QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions QgsHanaProviderConnection::sqlOptions( const QString &layerSource )
-{
-  SqlVectorLayerOptions options;
-  const QgsDataSourceUri uri( layerSource );
-  options.primaryKeyColumns = uri.keyColumn().split( ',' );
-  options.disableSelectAtId = uri.selectAtIdDisabled();
-  options.geometryColumn = uri.geometryColumn();
-  options.filter = uri.sql();
-  const QString trimmedTable { uri.table().trimmed() };
-  options.sql = trimmedTable.startsWith( '(' ) ? trimmedTable.mid( 1 ).chopped( 1 ) : QStringLiteral( "SELECT * FROM %1" ).arg( uri.quotedTablename() );
-  return options;
-}
-
 QVariantList QgsHanaEmptyProviderResultIterator::nextRowPrivate()
 {
   return QVariantList();
diff --git a/src/providers/hana/qgshanaproviderconnection.h b/src/providers/hana/qgshanaproviderconnection.h
@@ -78,9 +78,6 @@ class QgsHanaProviderConnection : public QgsAbstractDatabaseProviderConnection
     void remove( const QString &name ) const override;
     QIcon icon() const override;
     QList<QgsVectorDataProvider::NativeType> nativeTypes() const override;
-    //QgsVectorLayer *createSqlVectorLayer( const SqlVectorLayerOptions &options ) const override;
-    //QMultiMap<Qgis::SqlKeywordCategory, QStringList> sqlDictionary() override;
-    SqlVectorLayerOptions sqlOptions( const QString &layerSource ) override;
 
   private:
     QgsHanaConnectionRef createConnection() const;

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ QgsFields QgsHanaProviderConnection::fields( const QString &schema, const QStrin`
`439`	`439`	`}`
`440`	`440`	`catch ( const QgsHanaException &ex )`
`441`	`441`	`{`
`442`		`- throw QgsProviderConnectionException( QObject::tr( "Could not retrieve fields: %1, %2" ).arg( uri(), ex.what() ) );`
	`442`	`+ throw QgsProviderConnectionException( QObject::tr( "Could not retrieve fields: %1" ).arg( ex.what() ) );`
`443`	`443`	`}`
`444`	`444`	`}`
`445`	`445`
`@@ -475,19 +475,6 @@ QList<QgsVectorDataProvider::NativeType> QgsHanaProviderConnection::nativeTypes(`
`475`	`475`	`return types;`
`476`	`476`	`}`
`477`	`477`
`478`		`-QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions QgsHanaProviderConnection::sqlOptions( const QString &layerSource )`
`479`		`-{`
`480`		`- SqlVectorLayerOptions options;`
`481`		`- const QgsDataSourceUri uri( layerSource );`
`482`		`- options.primaryKeyColumns = uri.keyColumn().split( ',' );`
`483`		`- options.disableSelectAtId = uri.selectAtIdDisabled();`
`484`		`- options.geometryColumn = uri.geometryColumn();`
`485`		`- options.filter = uri.sql();`
`486`		`- const QString trimmedTable { uri.table().trimmed() };`
`487`		`- options.sql = trimmedTable.startsWith( '(' ) ? trimmedTable.mid( 1 ).chopped( 1 ) : QStringLiteral( "SELECT * FROM %1" ).arg( uri.quotedTablename() );`
`488`		`- return options;`
`489`		`-}`
`490`		`-`
`491`	`478`	`QVariantList QgsHanaEmptyProviderResultIterator::nextRowPrivate()`
`492`	`479`	`{`
`493`	`480`	`return QVariantList();`