Make storage of projects in postgres opt-in for each connection

wonder-sk · wonder-sk · commit e80f604b43d0 · 2018-04-07T17:24:39.000+02:00
diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
@@ -69,6 +69,7 @@ QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString &connName
     cb_geometryColumnsOnly_clicked();
 
     cb_useEstimatedMetadata->setChecked( settings.value( key + "/estimatedMetadata", false ).toBool() );
+    cb_projectsInDatabase->setChecked( settings.value( key + "/projectsInDatabase", false ).toBool() );
 
     cbxSSLmode->setCurrentIndex( cbxSSLmode->findData( settings.enumValue( key + "/sslmode", QgsDataSourceUri::SslPrefer ) ) );
 
@@ -156,6 +157,7 @@ void QgsPgNewConnection::accept()
   settings.setValue( baseKey + "/saveUsername", mAuthSettings->storeUsernameIsChecked( ) && !hasAuthConfigID ? "true" : "false" );
   settings.setValue( baseKey + "/savePassword", mAuthSettings->storePasswordIsChecked( ) && !hasAuthConfigID ? "true" : "false" );
   settings.setValue( baseKey + "/estimatedMetadata", cb_useEstimatedMetadata->isChecked() );
+  settings.setValue( baseKey + "/projectsInDatabase", cb_projectsInDatabase->isChecked() );
 
   // remove old save setting
   settings.remove( baseKey + "/save" );
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -1815,6 +1815,12 @@ bool QgsPostgresConn::allowGeometrylessTables( const QString &connName )
   return settings.value( "/PostgreSQL/connections/" + connName + "/allowGeometrylessTables", false ).toBool();
 }
 
+bool QgsPostgresConn::allowProjectsInDatabase( const QString &connName )
+{
+  QgsSettings settings;
+  return settings.value( "/PostgreSQL/connections/" + connName + "/projectsInDatabase", false ).toBool();
+}
+
 void QgsPostgresConn::deleteConnection( const QString &connName )
 {
   QgsSettings settings;
diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
@@ -346,6 +346,7 @@ class QgsPostgresConn : public QObject
     static bool geometryColumnsOnly( const QString &connName );
     static bool dontResolveType( const QString &connName );
     static bool allowGeometrylessTables( const QString &connName );
+    static bool allowProjectsInDatabase( const QString &connName );
     static void deleteConnection( const QString &connName );
 
     //! A connection needs to be locked when it uses transactions, see QgsPostgresConn::{begin,commit,rollback}
diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -576,7 +576,8 @@ QVector<QgsDataItem *> QgsPGSchemaItem::createChildren()
 
   QgsPostgresConnPool::instance()->releaseConnection( conn );
 
-  if ( QgsProjectStorage *storage = QgsApplication::projectStorageRegistry()->projectStorageFromType( "postgresql" ) )
+  QgsProjectStorage *storage = QgsApplication::projectStorageRegistry()->projectStorageFromType( "postgresql" );
+  if ( QgsPostgresConn::allowProjectsInDatabase( mConnectionName ) && storage )
   {
     QgsPostgresProjectUri postUri;
     postUri.connInfo = uri;
diff --git a/src/providers/postgres/qgspostgresprojectstoragedialog.cpp b/src/providers/postgres/qgspostgresprojectstoragedialog.cpp
@@ -38,6 +38,8 @@ QgsPostgresProjectStorageDialog::QgsPostgresProjectStorageDialog( bool saving, Q
 
   connect( mCboConnection, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsPostgresProjectStorageDialog::populateSchemas );
 
+  mLblProjectsNotAllowed->setVisible( false );
+
   // populate connections
   mCboConnection->addItems( QgsPostgresConn::connectionList() );
 
@@ -74,6 +76,11 @@ void QgsPostgresProjectStorageDialog::populateSchemas()
   QString name = mCboConnection->currentText();
   QgsDataSourceUri uri = QgsPostgresConn::connUri( name );
 
+  bool projectsAllowed = QgsPostgresConn::allowProjectsInDatabase( name );
+  mLblProjectsNotAllowed->setVisible( !projectsAllowed );
+  if ( !projectsAllowed )
+    return;
+
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
   QgsPostgresConn *conn = QgsPostgresConnPool::instance()->acquireConnection( uri.connectionInfo( false ) );
diff --git a/src/ui/qgspgnewconnectionbase.ui b/src/ui/qgspgnewconnectionbase.ui
@@ -220,6 +220,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="cb_projectsInDatabase">
+        <property name="text">
+         <string>Allow saving/loading QGIS projects in the database</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <spacer name="verticalSpacer">
         <property name="orientation">
diff --git a/src/ui/qgspostgresprojectstoragedialog.ui b/src/ui/qgspostgresprojectstoragedialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>463</width>
-    <height>307</height>
+    <width>552</width>
+    <height>442</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -45,6 +45,19 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QLabel" name="mLblProjectsNotAllowed">
+     <property name="text">
+      <string>Storage of QGIS projects is not enabled for this database connection.</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">

Original file line number	Diff line number	Diff line change
`@@ -1815,6 +1815,12 @@ bool QgsPostgresConn::allowGeometrylessTables( const QString &connName )`
`1815`	`1815`	`return settings.value( "/PostgreSQL/connections/" + connName + "/allowGeometrylessTables", false ).toBool();`
`1816`	`1816`	`}`
`1817`	`1817`
	`1818`	`+bool QgsPostgresConn::allowProjectsInDatabase( const QString &connName )`
	`1819`	`+{`
	`1820`	`+ QgsSettings settings;`
	`1821`	`+ return settings.value( "/PostgreSQL/connections/" + connName + "/projectsInDatabase", false ).toBool();`
	`1822`	`+}`
	`1823`	`+`
`1818`	`1824`	`void QgsPostgresConn::deleteConnection( const QString &connName )`
`1819`	`1825`	`{`
`1820`	`1826`	`QgsSettings settings;`
Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,8 @@ QVector<QgsDataItem *> QgsPGSchemaItem::createChildren()`
`576`	`576`
`577`	`577`	`QgsPostgresConnPool::instance()->releaseConnection( conn );`
`578`	`578`
`579`		`- if ( QgsProjectStorage *storage = QgsApplication::projectStorageRegistry()->projectStorageFromType( "postgresql" ) )`
	`579`	`+ QgsProjectStorage *storage = QgsApplication::projectStorageRegistry()->projectStorageFromType( "postgresql" );`
	`580`	`+ if ( QgsPostgresConn::allowProjectsInDatabase( mConnectionName ) && storage )`
`580`	`581`	`{`
`581`	`582`	`QgsPostgresProjectUri postUri;`
`582`	`583`	`postUri.connInfo = uri;`