Layout and SQL

elpaso · elpaso · commit a3368d416c46 · 2019-04-26T10:26:04.000+02:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1579,7 +1579,7 @@ bool QgsVectorLayer::setDataProvider( QString const &provider, const QgsDataProv
   // so it has to be set before initializing the provider,
   // this manipulation is necessary to preserve default behavior when
   // "trust layer metadata" project level option is set and checkPrimaryKeyUnicity
-  // was not explicitely passed in the uri
+  // was not explicitly passed in the uri
   if ( provider.compare( QLatin1String( "postgres" ) ) == 0 )
   {
     const QString checkUnicityKey { QStringLiteral( "checkPrimaryKeyUnicity" ) };
diff --git a/tests/testdata/provider/testdata_pg.sql b/tests/testdata/provider/testdata_pg.sql
@@ -543,7 +543,7 @@ INSERT INTO qgis_test.check_constraints VALUES (
 --
 
 
-DROP TABLE IF EXISTS qgis_test.b21839_pk_unicity CASCADE;
+DROP TABLE IF EXISTS qgis_test.b21839_pk_unicity;
 CREATE TABLE qgis_test.b21839_pk_unicity
 (
   pk serial NOT NULL,

Original file line number	Diff line number	Diff line change
`@@ -1579,7 +1579,7 @@ bool QgsVectorLayer::setDataProvider( QString const &provider, const QgsDataProv`
`1579`	`1579`	`// so it has to be set before initializing the provider,`
`1580`	`1580`	`// this manipulation is necessary to preserve default behavior when`
`1581`	`1581`	`// "trust layer metadata" project level option is set and checkPrimaryKeyUnicity`
`1582`		`- // was not explicitely passed in the uri`
	`1582`	`+ // was not explicitly passed in the uri`
`1583`	`1583`	`if ( provider.compare( QLatin1String( "postgres" ) ) == 0 )`
`1584`	`1584`	`{`
`1585`	`1585`	`const QString checkUnicityKey { QStringLiteral( "checkPrimaryKeyUnicity" ) };`
Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ INSERT INTO qgis_test.check_constraints VALUES (`
`543`	`543`	`--`
`544`	`544`
`545`	`545`
`546`		`-DROP TABLE IF EXISTS qgis_test.b21839_pk_unicity CASCADE;`
	`546`	`+DROP TABLE IF EXISTS qgis_test.b21839_pk_unicity;`
`547`	`547`	`CREATE TABLE qgis_test.b21839_pk_unicity`
`548`	`548`	`(`
`549`	`549`	`pk serial NOT NULL,`