Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
249d681
commit 7b77243
Showing
8 changed files
with
360 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| /*************************************************************************** | ||
| qgsOracleproviderconnection.cpp - QgsOracleProviderConnection | ||
| --------------------- | ||
| begin : 28.12.2020 | ||
| copyright : (C) 2020 by Julien Cabieces | ||
| email : julien dot cabieces at oslandia dot com | ||
| *************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
| #include "qgsoracleproviderconnection.h" | ||
| #include "qgsoracleconn.h" | ||
| #include "qgsoracleconnpool.h" | ||
| #include "qgssettings.h" | ||
| #include "qgsoracleprovider.h" | ||
| #include "qgsexception.h" | ||
| #include "qgsapplication.h" | ||
|
|
||
| QgsOracleProviderConnection::QgsOracleProviderConnection( const QString &name ) | ||
| : QgsAbstractDatabaseProviderConnection( name ) | ||
| { | ||
| mProviderKey = QStringLiteral( "oracle" ); | ||
| // Remove the sql and table empty parts | ||
| const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=""\s*)raw" }; | ||
| setUri( QgsOracleConn::connUri( name ).uri().replace( removePartsRe, QString() ) ); | ||
| setDefaultCapabilities(); | ||
| } | ||
|
|
||
| QgsOracleProviderConnection::QgsOracleProviderConnection( const QString &uri, const QVariantMap &configuration ): | ||
| QgsAbstractDatabaseProviderConnection( QgsDataSourceUri( uri ).connectionInfo( false ), configuration ) | ||
| { | ||
| mProviderKey = QStringLiteral( "oracle" ); | ||
| setDefaultCapabilities(); | ||
| } | ||
|
|
||
| void QgsOracleProviderConnection::setDefaultCapabilities() | ||
| { | ||
| // TODO: we might check at this point if the user actually has the privileges and return | ||
| // properly filtered capabilities instead of all of them | ||
| mCapabilities = | ||
| { | ||
| Capability::DropVectorTable, | ||
| Capability::DropRasterTable, | ||
| Capability::CreateVectorTable, | ||
| Capability::RenameSchema, | ||
| Capability::DropSchema, | ||
| Capability::CreateSchema, | ||
| Capability::RenameVectorTable, | ||
| Capability::RenameRasterTable, | ||
| Capability::Vacuum, | ||
| Capability::ExecuteSql, | ||
| Capability::SqlLayers, | ||
| //Capability::Transaction, | ||
| Capability::Tables, | ||
| Capability::Schemas, | ||
| Capability::Spatial, | ||
| Capability::TableExists, | ||
| Capability::CreateSpatialIndex, | ||
| Capability::SpatialIndexExists, | ||
| Capability::DeleteSpatialIndex, | ||
| Capability::DeleteField, | ||
| Capability::DeleteFieldCascade, | ||
| Capability::AddField | ||
| }; | ||
| mGeometryColumnCapabilities = | ||
| { | ||
| GeometryColumnCapability::Z, | ||
| GeometryColumnCapability::M, | ||
| GeometryColumnCapability::SinglePart, | ||
| GeometryColumnCapability::Curves | ||
| }; | ||
| } | ||
|
|
||
| void QgsOracleProviderConnection::store( const QString &name ) const | ||
| { | ||
| QString baseKey = QStringLiteral( "/Oracle/connections/" ); | ||
| // delete the original entry first | ||
| remove( name ); | ||
|
|
||
| QgsSettings settings; | ||
| settings.beginGroup( baseKey ); | ||
| settings.beginGroup( name ); | ||
|
|
||
| // From URI | ||
| const QgsDataSourceUri dsUri { uri() }; | ||
| settings.setValue( "authcfg", dsUri.authConfigId() ); | ||
| settings.setValue( "database", dsUri.database() ); | ||
| settings.setValue( "username", dsUri.username() ); | ||
| settings.setValue( "password", dsUri.password() ); | ||
| settings.setValue( "dbworkspace", dsUri.param( "dbworkspace" ) ); | ||
| settings.setValue( "estimatedMetadata", dsUri.useEstimatedMetadata() ); | ||
| settings.setValue( "host", dsUri.host() ); | ||
| settings.setValue( "includeGeoAttributes", dsUri.param( "includegeoattributes" ) ); | ||
| settings.setValue( "port", dsUri.port() ); | ||
| settings.setValue( "schema", dsUri.schema() ); | ||
| settings.setValue( "dboptions", dsUri.param( "dboptions" ) ); | ||
|
|
||
| // From configuration | ||
| static const QStringList configurationParameters | ||
| { | ||
| QStringLiteral( "allowGeometrylessTables" ), | ||
| QStringLiteral( "geometryColumnsOnly" ), | ||
| QStringLiteral( "onlyExistingTypes" ), | ||
| QStringLiteral( "savePassword" ), | ||
| QStringLiteral( "saveUsername" ), | ||
| QStringLiteral( "userTablesOnly" ), | ||
| }; | ||
| for ( const auto &p : configurationParameters ) | ||
| { | ||
| if ( configuration().contains( p ) ) | ||
| { | ||
| settings.setValue( p, configuration().value( p ) ); | ||
| } | ||
| } | ||
| settings.endGroup(); | ||
| settings.endGroup(); | ||
| } | ||
|
|
||
| void QgsOracleProviderConnection::remove( const QString &name ) const | ||
| { | ||
| QgsOracleConn::deleteConnection( name ); | ||
| } | ||
|
|
||
| QList<QgsVectorDataProvider::NativeType> QgsOracleProviderConnection::nativeTypes() const | ||
| { | ||
| QList<QgsVectorDataProvider::NativeType> types; | ||
| QgsOracleConn *conn = QgsOracleConnPool::instance()->acquireConnection( QgsDataSourceUri{ uri() }.connectionInfo( false ) ); | ||
| if ( conn ) | ||
| { | ||
| types = conn->nativeTypes(); | ||
| QgsOracleConnPool::instance()->releaseConnection( conn ); | ||
| } | ||
| if ( types.isEmpty() ) | ||
| { | ||
| throw QgsProviderConnectionException( QObject::tr( "Error retrieving native types for connection %1" ).arg( uri() ) ); | ||
| } | ||
| return types; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /*************************************************************************** | ||
| qgsOracleproviderconnection.h - QgsOracleProviderConnection | ||
| --------------------- | ||
| begin : 28.12.2020 | ||
| copyright : (C) 2020 by Julien Cabieces | ||
| email : julien dot cabieces at oslandia dot com | ||
| *************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
| #ifndef QGSORACLEPROVIDERCONNECTION_H | ||
| #define QGSORACLEPROVIDERCONNECTION_H | ||
| #include "qgsabstractdatabaseproviderconnection.h" | ||
|
|
||
|
|
||
| class QgsOracleProviderConnection : public QgsAbstractDatabaseProviderConnection | ||
|
|
||
| { | ||
| public: | ||
|
|
||
| QgsOracleProviderConnection( const QString &name ); | ||
| QgsOracleProviderConnection( const QString &uri, const QVariantMap &configuration ); | ||
|
|
||
| // QgsAbstractProviderConnection interface | ||
|
|
||
| void store( const QString &name ) const override; | ||
| void remove( const QString &name ) const override; | ||
| QList<QgsVectorDataProvider::NativeType> nativeTypes() const override; | ||
|
|
||
| private: | ||
|
|
||
| void setDefaultCapabilities(); | ||
| }; | ||
|
|
||
|
|
||
| #endif // QGSORACLEPROVIDERCONNECTION_H |
Oops, something went wrong.