Remove DB2 Provider

This provider has been marked deprecated and hidden from the UI for a number of QGIS releases. No maintainers have stepped up to take over maintainance of this provider, and accordingly it is now subject for removal.
agiudiceandrea · Feb 23, 2022 · e33336b · e33336b
1 parent d9ea5d5
commit e33336b
Show file tree

Hide file tree

Showing 34 changed files with 0 additions and 6,236 deletions.
diff --git a/debian/qgis-providers.install b/debian/qgis-providers.install
@@ -9,7 +9,6 @@ usr/lib/qgis/plugins/libauthmethod_apiheader.so
 usr/lib/qgis/plugins/libauthmethod_maptilerhmacsha256.so
 usr/lib/qgis/plugins/libprovider_arcgisfeatureserver.so
 usr/lib/qgis/plugins/libprovider_arcgismapserver.so
-usr/lib/qgis/plugins/libprovider_db2.so
 usr/lib/qgis/plugins/libprovider_delimitedtext.so
 usr/lib/qgis/plugins/libprovider_geonode.so
 usr/lib/qgis/plugins/libprovider_gpx.so

diff --git a/images/images.qrc b/images/images.qrc
@@ -230,7 +230,6 @@
         <file>themes/default/mActionAddLegend.svg</file>
         <file>themes/default/mActionAddMap.svg</file>
         <file>themes/default/mActionAddMssqlLayer.svg</file>
-        <file>themes/default/mActionAddDb2Layer.svg</file>
         <file>themes/default/mActionAddOgrLayer.svg</file>
         <file>themes/default/mActionAddOracleLayer.svg</file>
         <file>themes/default/mActionAddPostgisLayer.svg</file>
@@ -489,7 +488,6 @@
         <file>themes/default/mIconDataDefineExpression.svg</file>
         <file>themes/default/mIconDataDefineExpressionError.svg</file>
         <file>themes/default/mIconDataDefineExpressionOn.svg</file>
-        <file>themes/default/mIconDb2.svg</file>
         <file>themes/default/mIconDbSchema.svg</file>
         <file>themes/default/mIconDelete.svg</file>
         <file>themes/default/mIconDeselected.svg</file>

diff --git a/images/themes/default/mActionAddDb2Layer.svg b/images/themes/default/mActionAddDb2Layer.svg
diff --git a/images/themes/default/mIconDb2.svg b/images/themes/default/mIconDb2.svg
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -298,7 +298,6 @@ for %%i in (%packages%) do (
   "apps/%PACKAGENAME%/plugins/provider_gpx.dll" ^
   "apps/%PACKAGENAME%/plugins/authmethod_identcert.dll" ^
   "apps/%PACKAGENAME%/plugins/provider_mssql.dll" ^
-  "apps/%PACKAGENAME%/plugins/provider_db2.dll" ^
   "apps/%PACKAGENAME%/plugins/authmethod_pkcs12.dll" ^
   "apps/%PACKAGENAME%/plugins/authmethod_pkipaths.dll" ^
   "apps/%PACKAGENAME%/plugins/provider_postgres.dll" ^

diff --git a/python/gui/auto_generated/qgsmanageconnectionsdialog.sip.in b/python/gui/auto_generated/qgsmanageconnectionsdialog.sip.in
@@ -28,7 +28,6 @@ class QgsManageConnectionsDialog : QDialog
       PostGIS,
       WFS,
       MSSQL,
-      DB2,
       WCS,
       Oracle,
       HANA,

diff --git a/src/auth/basic/core/qgsauthbasicmethod.cpp b/src/auth/basic/core/qgsauthbasicmethod.cpp
@@ -43,7 +43,6 @@ QgsAuthBasicMethod::QgsAuthBasicMethod()
   setDataProviders( QStringList()
                     << QStringLiteral( "postgres" )
                     << QStringLiteral( "oracle" )
-                    << QStringLiteral( "db2" )
                     << QStringLiteral( "ows" )
                     << QStringLiteral( "wfs" )  // convert to lowercase
                     << QStringLiteral( "wcs" )

diff --git a/src/gui/qgsmanageconnectionsdialog.cpp b/src/gui/qgsmanageconnectionsdialog.cpp
@@ -127,9 +127,6 @@ void QgsManageConnectionsDialog::doExportImport()
       case Oracle:
         doc = saveOracleConnections( items );
         break;
-      case DB2:
-        doc = saveDb2Connections( items );
-        break;
       case HANA:
         doc = saveHanaConnections( items );
         break;
@@ -210,9 +207,6 @@ void QgsManageConnectionsDialog::doExportImport()
       case Oracle:
         loadOracleConnections( doc, items );
         break;
-      case DB2:
-        loadDb2Connections( doc, items );
-        break;
       case HANA:
         loadHanaConnections( doc, items );
         break;
@@ -266,9 +260,6 @@ bool QgsManageConnectionsDialog::populateConnections()
       case Oracle:
         settings.beginGroup( QStringLiteral( "/Oracle/connections" ) );
         break;
-      case DB2:
-        settings.beginGroup( QStringLiteral( "/DB2/connections" ) );
-        break;
       case HANA:
         settings.beginGroup( QStringLiteral( "/HANA/connections" ) );
         break;
@@ -382,14 +373,6 @@ bool QgsManageConnectionsDialog::populateConnections()
           return false;
         }
         break;
-      case DB2:
-        if ( root.tagName() != QLatin1String( "qgsDb2Connections" ) )
-        {
-          QMessageBox::information( this, tr( "Loading Connections" ),
-                                    tr( "The file is not a DB2 connections exchange file." ) );
-          return false;
-        }
-        break;
       case HANA:
         if ( root.tagName() != QLatin1String( "qgsHanaConnections" ) )
         {
@@ -648,47 +631,6 @@ QDomDocument QgsManageConnectionsDialog::saveOracleConnections( const QStringLis
   return doc;
 }
 
-QDomDocument QgsManageConnectionsDialog::saveDb2Connections( const QStringList &connections )
-{
-  QDomDocument doc( QStringLiteral( "connections" ) );
-  QDomElement root = doc.createElement( QStringLiteral( "qgsDb2Connections" ) );
-  root.setAttribute( QStringLiteral( "version" ), QStringLiteral( "1.0" ) );
-  doc.appendChild( root );
-
-  const QgsSettings settings;
-  QString path;
-  for ( int i = 0; i < connections.count(); ++i )
-  {
-    path = "/DB2/connections/" + connections[ i ];
-    QDomElement el = doc.createElement( QStringLiteral( "db2" ) );
-    el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
-    el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host" ).toString() );
-    el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port" ).toString() );
-    el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database" ).toString() );
-    el.setAttribute( QStringLiteral( "service" ), settings.value( path + "/service" ).toString() );
-    el.setAttribute( QStringLiteral( "sslmode" ), settings.value( path + "/sslmode", "1" ).toString() );
-    el.setAttribute( QStringLiteral( "estimatedMetadata" ), settings.value( path + "/estimatedMetadata", "0" ).toString() );
-
-    el.setAttribute( QStringLiteral( "saveUsername" ), settings.value( path + "/saveUsername", "false" ).toString() );
-
-    if ( settings.value( path + "/saveUsername", "false" ).toString() == QLatin1String( "true" ) )
-    {
-      el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username" ).toString() );
-    }
-
-    el.setAttribute( QStringLiteral( "savePassword" ), settings.value( path + "/savePassword", "false" ).toString() );
-
-    if ( settings.value( path + "/savePassword", "false" ).toString() == QLatin1String( "true" ) )
-    {
-      el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password" ).toString() );
-    }
-
-    root.appendChild( el );
-  }
-
-  return doc;
-}
-
 QDomDocument QgsManageConnectionsDialog::saveHanaConnections( const QStringList &connections )
 {
   QDomDocument doc( QStringLiteral( "connections" ) );
@@ -1328,103 +1270,6 @@ void QgsManageConnectionsDialog::loadOracleConnections( const QDomDocument &doc,
   }
 }
 
-void QgsManageConnectionsDialog::loadDb2Connections( const QDomDocument &doc, const QStringList &items )
-{
-  const QDomElement root = doc.documentElement();
-  if ( root.tagName() != QLatin1String( "qgsDb2Connections" ) )
-  {
-    QMessageBox::information( this,
-                              tr( "Loading Connections" ),
-                              tr( "The file is not a DB2 connections exchange file." ) );
-    return;
-  }
-
-  QString connectionName;
-  QgsSettings settings;
-  settings.beginGroup( QStringLiteral( "/DB2/connections" ) );
-  QStringList keys = settings.childGroups();
-  settings.endGroup();
-  QDomElement child = root.firstChildElement();
-  bool prompt = true;
-  bool overwrite = true;
-
-  while ( !child.isNull() )
-  {
-    connectionName = child.attribute( QStringLiteral( "name" ) );
-    if ( !items.contains( connectionName ) )
-    {
-      child = child.nextSiblingElement();
-      continue;
-    }
-
-    // check for duplicates
-    if ( keys.contains( connectionName ) && prompt )
-    {
-      const int res = QMessageBox::warning( this,
-                                            tr( "Loading Connections" ),
-                                            tr( "Connection with name '%1' already exists. Overwrite?" )
-                                            .arg( connectionName ),
-                                            QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll | QMessageBox::Cancel );
-      switch ( res )
-      {
-        case QMessageBox::Cancel:
-          return;
-        case QMessageBox::No:
-          child = child.nextSiblingElement();
-          continue;
-        case QMessageBox::Yes:
-          overwrite = true;
-          break;
-        case QMessageBox::YesToAll:
-          prompt = false;
-          overwrite = true;
-          break;
-        case QMessageBox::NoToAll:
-          prompt = false;
-          overwrite = false;
-          break;
-      }
-    }
-
-    if ( keys.contains( connectionName ) )
-    {
-      if ( !overwrite )
-      {
-        child = child.nextSiblingElement();
-        continue;
-      }
-    }
-    else
-    {
-      keys << connectionName;
-    }
-
-    //no dups detected or overwrite is allowed
-    settings.beginGroup( "/DB2/connections/" + connectionName );
-
-    settings.setValue( QStringLiteral( "/host" ), child.attribute( QStringLiteral( "host" ) ) );
-    settings.setValue( QStringLiteral( "/port" ), child.attribute( QStringLiteral( "port" ) ) );
-    settings.setValue( QStringLiteral( "/database" ), child.attribute( QStringLiteral( "database" ) ) );
-    if ( child.hasAttribute( QStringLiteral( "service" ) ) )
-    {
-      settings.setValue( QStringLiteral( "/service" ), child.attribute( QStringLiteral( "service" ) ) );
-    }
-    else
-    {
-      settings.setValue( QStringLiteral( "/service" ), "" );
-    }
-    settings.setValue( QStringLiteral( "/sslmode" ), child.attribute( QStringLiteral( "sslmode" ) ) );
-    settings.setValue( QStringLiteral( "/estimatedMetadata" ), child.attribute( QStringLiteral( "estimatedMetadata" ) ) );
-    settings.setValue( QStringLiteral( "/saveUsername" ), child.attribute( QStringLiteral( "saveUsername" ) ) );
-    settings.setValue( QStringLiteral( "/username" ), child.attribute( QStringLiteral( "username" ) ) );
-    settings.setValue( QStringLiteral( "/savePassword" ), child.attribute( QStringLiteral( "savePassword" ) ) );
-    settings.setValue( QStringLiteral( "/password" ), child.attribute( QStringLiteral( "password" ) ) );
-    settings.endGroup();
-
-    child = child.nextSiblingElement();
-  }
-}
-
 void QgsManageConnectionsDialog::loadHanaConnections( const QDomDocument &doc, const QStringList &items )
 {
   QDomElement root = doc.documentElement();

diff --git a/src/gui/qgsmanageconnectionsdialog.h b/src/gui/qgsmanageconnectionsdialog.h
@@ -45,7 +45,6 @@ class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsMan
       PostGIS,
       WFS,
       MSSQL,
-      DB2,
       WCS,
       Oracle,
       HANA,
@@ -75,7 +74,6 @@ class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsMan
     QDomDocument savePgConnections( const QStringList &connections );
     QDomDocument saveMssqlConnections( const QStringList &connections );
     QDomDocument saveOracleConnections( const QStringList &connections );
-    QDomDocument saveDb2Connections( const QStringList &connections );
     QDomDocument saveHanaConnections( const QStringList &connections );
     QDomDocument saveGeonodeConnections( const QStringList &connections );
     QDomDocument saveXyzTilesConnections( const QStringList &connections );
@@ -87,7 +85,6 @@ class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsMan
     void loadPgConnections( const QDomDocument &doc, const QStringList &items );
     void loadMssqlConnections( const QDomDocument &doc, const QStringList &items );
     void loadOracleConnections( const QDomDocument &doc, const QStringList &items );
-    void loadDb2Connections( const QDomDocument &doc, const QStringList &items );
     void loadHanaConnections( const QDomDocument &doc, const QStringList &items );
     void loadGeonodeConnections( const QDomDocument &doc, const QStringList &items );
     void loadXyzTilesConnections( const QDomDocument &doc, const QStringList &items );

diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt
@@ -22,7 +22,6 @@ if (NOT FORCE_STATIC_LIBS)
   add_subdirectory(geonode)
   add_subdirectory(mssql)
   add_subdirectory(gpx)
-  add_subdirectory(db2)
   add_subdirectory(mdal)
   if (WITH_ANALYSIS)
     add_subdirectory(virtualraster)

diff --git a/src/providers/db2/CMakeLists.txt b/src/providers/db2/CMakeLists.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ class QgsManageConnectionsDialog : QDialog @@
           PostGIS,
           WFS,
           MSSQL,
-          DB2,
           WCS,
           Oracle,
           HANA,
@@ Expand Down @@