|
1
|
Index: src/providers/postgres/qgspostgresprovider.h
|
|
2
|
===================================================================
|
|
3
|
--- src/providers/postgres/qgspostgresprovider.h (revision 8307)
|
|
4
|
+++ src/providers/postgres/qgspostgresprovider.h (working copy)
|
|
5
|
@@ -388,10 +388,6 @@
|
|
6
|
*/
|
|
7
|
QString mSchemaName;
|
|
8
|
/**
|
|
9
|
- * Name of the current schema
|
|
10
|
- */
|
|
11
|
- QString mCurrentSchema;
|
|
12
|
- /**
|
|
13
|
* SQL statement used to limit the features retrieved
|
|
14
|
*/
|
|
15
|
QString sqlWhereClause;
|
|
16
|
Index: src/providers/postgres/qgspostgresprovider.cpp
|
|
17
|
===================================================================
|
|
18
|
--- src/providers/postgres/qgspostgresprovider.cpp (revision 8307)
|
|
19
|
+++ src/providers/postgres/qgspostgresprovider.cpp (working copy)
|
|
20
|
@@ -123,8 +123,7 @@
|
|
21
|
sql = QString("SELECT "
|
|
22
|
"has_table_privilege(%1,'DELETE'),"
|
|
23
|
"has_table_privilege(%1,'UPDATE'),"
|
|
24
|
- "has_table_privilege(%1,'INSERT'),"
|
|
25
|
- "current_schema()")
|
|
26
|
+ "has_table_privilege(%1,'INSERT')")
|
|
27
|
.arg( quotedValue(mSchemaTableName) );
|
|
28
|
|
|
29
|
testAccess = PQexec( connection, sql.toUtf8() );
|
|
30
|
@@ -157,13 +156,8 @@
|
|
31
|
enabledCapabilities |= QgsVectorDataProvider::AddFeatures;
|
|
32
|
}
|
|
33
|
|
|
34
|
- mCurrentSchema = QString::fromUtf8( PQgetvalue(testAccess, 0, 3) );
|
|
35
|
- if(mCurrentSchema==mSchemaName) {
|
|
36
|
- mUri.clearSchema();
|
|
37
|
- setDataSourceUri( mUri.uri() );
|
|
38
|
- }
|
|
39
|
- if(mSchemaName=="")
|
|
40
|
- mSchemaName=mCurrentSchema;
|
|
41
|
+ setDataSourceUri( mUri.uri() );
|
|
42
|
+
|
|
43
|
PQclear(testAccess);
|
|
44
|
|
|
45
|
sql = QString("SELECT 1 FROM pg_class,pg_namespace WHERE "
|