sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-08 00:06:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Dox and indentation updates

Browse Source
This commit is contained in:
Nyall Dawson 2018-06-11 11:56:19 +10:00
parent a3d6b9899b
commit ce6ea18280
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgsproject.sip.in
View File

@ -601,7 +601,7 @@ Make sure that this is only called when all layers are not in edit mode.
QgsTransactionGroup *transactionGroup( const QString &providerKey, const QString &connString ); QgsTransactionGroup *transactionGroup( const QString &providerKey, const QString &connString );
%Docstring %Docstring
Get a transaction group from a provider key and connection string. Returns the matching transaction group from a provider key and connection string.
Returns None if a matching transaction group is not available. Returns None if a matching transaction group is not available.

2
src/core/qgsproject.h
View File

@ -585,7 +585,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
QMap< QPair< QString, QString>, QgsTransactionGroup *> transactionGroups() SIP_SKIP; QMap< QPair< QString, QString>, QgsTransactionGroup *> transactionGroups() SIP_SKIP;
/** /**
* Get a transaction group from a provider key and connection string. * Returns the matching transaction group from a provider key and connection string.
* *
* Returns nullptr if a matching transaction group is not available. * Returns nullptr if a matching transaction group is not available.
* *

7
tests/src/python/test_qgspostgrestransaction.py
View File

@ -40,8 +40,10 @@ class TestQgsPostgresTransaction(unittest.TestCase):
if 'QGIS_PGTEST_DB' in os.environ: if 'QGIS_PGTEST_DB' in os.environ:
cls.dbconn = os.environ['QGIS_PGTEST_DB'] cls.dbconn = os.environ['QGIS_PGTEST_DB']
# Create test layer # Create test layer
cls.vl_b = QgsVectorLayer(cls.dbconn + ' sslmode=disable key=\'pk\' table="qgis_test"."books" sql=', 'books', 'postgres') cls.vl_b = QgsVectorLayer(cls.dbconn + ' sslmode=disable key=\'pk\' table="qgis_test"."books" sql=', 'books',
cls.vl_a = QgsVectorLayer(cls.dbconn + ' sslmode=disable key=\'pk\' table="qgis_test"."authors" sql=', 'authors', 'postgres') 'postgres')
cls.vl_a = QgsVectorLayer(cls.dbconn + ' sslmode=disable key=\'pk\' table="qgis_test"."authors" sql=',
'authors', 'postgres')
QgsProject.instance().addMapLayer(cls.vl_b) QgsProject.instance().addMapLayer(cls.vl_b)
QgsProject.instance().addMapLayer(cls.vl_a) QgsProject.instance().addMapLayer(cls.vl_a)
@ -104,5 +106,6 @@ class TestQgsPostgresTransaction(unittest.TestCase):
self.assertIsNone(noTg) self.assertIsNone(noTg)
self.rollbackTransaction() self.rollbackTransaction()
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()