GRASS v.in.ogr.qgis postgres - set schemas option, fixes #7427

blazek · blazek · commit 8a932d294a1f · 2013-05-30T10:26:04.000+02:00
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -3401,9 +3401,11 @@ void QgsGrassModuleGdalInput::updateQgisLayers()
         QgsDataSourceURI dsUri( provider->dataSourceUri() );
         uri = "PG:" + dsUri.connectionInfo();
 
-        if ( dsUri.schema() != "" )
+        // Starting with GDAL 1.7.0, it is possible to restrict the schemas
+        // layer names are then listed without schema if only one schema is specified
+        if ( !dsUri.schema().isEmpty() )
         {
-          ogrLayer = dsUri.schema() + ".";
+          uri += " schemas=" + dsUri.schema();
         }
 
         ogrLayer += dsUri.table();

Original file line number	Diff line number	Diff line change
`@@ -3401,9 +3401,11 @@ void QgsGrassModuleGdalInput::updateQgisLayers()`
`3401`	`3401`	`QgsDataSourceURI dsUri( provider->dataSourceUri() );`
`3402`	`3402`	`uri = "PG:" + dsUri.connectionInfo();`
`3403`	`3403`
`3404`		`- if ( dsUri.schema() != "" )`
	`3404`	`+ // Starting with GDAL 1.7.0, it is possible to restrict the schemas`
	`3405`	`+ // layer names are then listed without schema if only one schema is specified`
	`3406`	`+ if ( !dsUri.schema().isEmpty() )`
`3405`	`3407`	`{`
`3406`		`- ogrLayer = dsUri.schema() + ".";`
	`3408`	`+ uri += " schemas=" + dsUri.schema();`
`3407`	`3409`	`}`
`3408`	`3410`
`3409`	`3411`	`ogrLayer += dsUri.table();`