sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32813 from elpaso/bugfix-gh32809-delete-pg-raster-from-browser

Browse Source 
[feature] Delete PG rasters from browser
This commit is contained in:
Alessandro Pasotti 2019-11-13 11:39:53 +01:00 committed by GitHub
commit b9a5b82653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 87 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/browser/qgsinbuiltdataitemproviders.cpp
View File

@ -434,7 +434,10 @@ void QgsLayerItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *men
bool isFile = false;
if ( layerItem )
{
isFile = layerItem->providerKey() == QStringLiteral( "ogr" ) || layerItem->providerKey() == QStringLiteral( "gdal" );
// Also check for postgres layers (rasters are handled by GDAL)
isFile = ( layerItem->providerKey() == QStringLiteral( "ogr" ) ||
layerItem->providerKey() == QStringLiteral( "gdal" ) ) &&
! layerItem->uri().startsWith( QStringLiteral( "PG:" ) );
}
else
{

95
src/gui/providers/gdal/qgsgdalguiprovider.cpp
View File

@ -25,6 +25,7 @@
#include <QMessageBox>
#include "qgsproject.h"
#include "qgsrasterlayer.h"
#include "qgssourceselectprovider.h"
#include "qgsgdalsourceselect.h"
#include "qgsapplication.h"
@ -50,12 +51,17 @@ void QgsGdalItemGuiProvider::onDeleteLayer()
QVariantMap data = s->data().toMap();
const QString uri = data[QStringLiteral( "uri" )].toString();
const QString path = data[QStringLiteral( "path" )].toString();
QPointer< QgsDataItem > parent = data[QStringLiteral( "parent" )].value<QPointer< QgsDataItem >>();
QPointer< QgsDataItem > parent = data[QStringLiteral( "parentItem" )].value<QPointer< QgsDataItem >>();
// Messages are different for files and tables
bool isPostgresRaster { uri.startsWith( QStringLiteral( "PG:" ) ) };
const QString title = isPostgresRaster ?
tr( "Delete Table" ) :
tr( "Delete File" );
const QString title = QObject::tr( "Delete File" );
// Check if the layer is in the project
const QgsMapLayer *projectLayer = nullptr;
const auto mapLayers = QgsProject::instance()->mapLayers();
const QMap<QString, QgsMapLayer *> mapLayers = QgsProject::instance()->mapLayers();
for ( auto it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it )
{
if ( it.value()->publicSource() == uri )
@ -63,30 +69,90 @@ void QgsGdalItemGuiProvider::onDeleteLayer()
projectLayer = it.value();
}
}
if ( ! projectLayer )
{
const QString confirmMessage = QObject::tr( "Are you sure you want to delete file '%1'?" ).arg( path );
const QString confirmMessage = isPostgresRaster ? tr( "Are you sure you want to delete table “%1”?" ).arg( path ) :
tr( "Are you sure you want to delete file “%1”?" ).arg( path );
if ( QMessageBox::question( nullptr, title,
confirmMessage,
QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
return;
if ( !QFile::remove( path ) )
if ( isPostgresRaster )
{
QMessageBox::warning( nullptr, title, tr( "Could not delete file." ) );
QString errorMessage;
bool deleted { false };
QgsProviderMetadata *postgresMetadata { QgsProviderRegistry::instance()->providerMetadata( QLatin1String( "postgres" ) ) };
if ( postgresMetadata )
{
std::unique_ptr<QgsAbstractDatabaseProviderConnection> connection { static_cast<QgsAbstractDatabaseProviderConnection *>( postgresMetadata->createConnection( uri, {} ) ) };
const QgsDataSourceUri dsUri { QgsDataSourceUri( uri ) };
if ( connection )
{
try
{
// Try hard to get the schema
QString schema = dsUri.schema();
if ( schema.isEmpty() )
{
schema = dsUri.param( QStringLiteral( "schema" ) );
}
if ( schema.isEmpty() )
{
schema = QStringLiteral( "public" );
}
connection->dropRasterTable( schema, dsUri.table() );
deleted = true;
}
catch ( QgsProviderConnectionException &ex )
{
errorMessage = ex.what();
}
}
else
{
errorMessage = tr( "could not create a connection to the database" );
}
}
else
{
errorMessage = tr( "could not retrieve provider metadata" );
}
if ( deleted )
{
QMessageBox::information( nullptr, title, tr( "Table deleted successfully." ) );
if ( parent )
parent->refresh();
}
else
{
QMessageBox::warning( nullptr, title, errorMessage.isEmpty() ?
tr( "Could not delete table." ) :
tr( "Could not delete table, reason: %1." ).arg( errorMessage ) );
}
}
else
{
QMessageBox::information( nullptr, title, tr( "File deleted successfully." ) );
if ( parent )
parent->refresh();
if ( !QFile::remove( path ) )
{
QMessageBox::warning( nullptr, title, tr( "Could not delete file." ) );
}
else
{
QMessageBox::information( nullptr, title, tr( "File deleted successfully." ) );
if ( parent )
parent->refresh();
}
}
}
else
{
QMessageBox::warning( nullptr, title, QObject::tr( "The layer '%1' cannot be deleted because it is in the current project as '%2',"
QMessageBox::warning( nullptr, title, QObject::tr( "The layer “%1” cannot be deleted because it is in the current project as “%2”,"
" remove it from the project and retry." ).arg( path, projectLayer->name() ) );
}
}
@ -99,11 +165,14 @@ void QgsGdalItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *menu
if ( QgsGdalLayerItem *layerItem = qobject_cast< QgsGdalLayerItem * >( item ) )
{
// Messages are different for files and tables
const QString message = QObject::tr( "Delete File “%1”…" ).arg( layerItem->name() );
bool isPostgresRaster { layerItem->uri().startsWith( QStringLiteral( "PG:" ) ) };
const QString message = isPostgresRaster ?
QObject::tr( "Delete Table “%1”…" ).arg( layerItem->name() ) :
QObject::tr( "Delete File “%1”…" ).arg( layerItem->name() );
QAction *actionDeleteLayer = new QAction( message, menu );
QVariantMap data;
data.insert( QStringLiteral( "uri" ), layerItem->uri() );
data.insert( QStringLiteral( "path" ), layerItem->path() );
data.insert( QStringLiteral( "path" ), isPostgresRaster ? layerItem->name() : layerItem->path() );
data.insert( QStringLiteral( "parentItem" ), QVariant::fromValue( QPointer< QgsDataItem >( layerItem->parent() ) ) );
actionDeleteLayer->setData( data );
connect( actionDeleteLayer, &QAction::triggered, this, &QgsGdalItemGuiProvider::onDeleteLayer );

1
src/providers/postgres/qgspostgresproviderconnection.cpp
View File

@ -48,6 +48,7 @@ void QgsPostgresProviderConnection::setDefaultCapabilities()
mCapabilities =
{
Capability::DropVectorTable,
Capability::DropRasterTable,
Capability::CreateVectorTable,
Capability::RenameSchema,
Capability::DropSchema,