revert r8586 and solve issue in QgsVectorLayer (fixes #1126)

jef · jef · commit 409dcee2c65f · 2008-06-18T10:37:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8654 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsdbsourceselect.cpp b/src/app/qgsdbsourceselect.cpp
@@ -249,14 +249,6 @@ void QgsDbSourceSelect::addTables()
 {
   m_selectedTables.clear();
 
-  QString currentSchema;
-  QString sql = "select current_schema()";
-  PGresult *result = PQexec(pd, sql.toUtf8());
-  if (result && PQresultStatus(result)==PGRES_TUPLES_OK && PQntuples(result)==1 )
-  {
-    currentSchema = QString::fromUtf8(PQgetvalue(result, 0, 0));
-  }
-
   typedef QMap<int, QVector<QString> > schemaInfo;
   QMap<QString, schemaInfo> dbInfo;
 
@@ -292,7 +284,7 @@ void QgsDbSourceSelect::addTables()
   }
 
   //now traverse all the schemas and table infos
-  QString schemaName, tableName, geomColumnName;
+  QString schemaName, tableName, geomColumnName, sql;
   QString query;
 
   QMap<QString, schemaInfo>::const_iterator schema_it = dbInfo.constBegin();
@@ -335,12 +327,7 @@ void QgsDbSourceSelect::addTables()
         }
       }
 
-      if(schemaName!=currentSchema)
-      {
-	 query += "\"" + schemaName + "\".";
-      }
-
-      query += "\"" + tableName + "\" " + "(" + geomColumnName + ") sql=" + sql;
+      query += "\"" + schemaName + "\".\"" + tableName + "\" " + "(" + geomColumnName + ") sql=" + sql;
 
       m_selectedTables.push_back(query);
     }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2224,6 +2224,9 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
           lName = name();
         setLayerName(lName);
         QgsDebugMsg("Beautifying layer name " + name());
+
+        // deal with unnecessary schema qualification to make v.in.ogr happy
+        mDataSource = mDataProvider->dataSourceUri();
       }
 
       // label

Original file line number	Diff line number	Diff line change
`@@ -2224,6 +2224,9 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )`
`2224`	`2224`	`lName = name();`
`2225`	`2225`	`setLayerName(lName);`
`2226`	`2226`	`QgsDebugMsg("Beautifying layer name " + name());`
	`2227`	`+`
	`2228`	`+ // deal with unnecessary schema qualification to make v.in.ogr happy`
	`2229`	`+ mDataSource = mDataProvider->dataSourceUri();`
`2227`	`2230`	`}`
`2228`	`2231`
`2229`	`2232`	`// label`