db manager: also add newline when adding a unique id field (fixes #19343

) (cherry picked from commit 870d078)
qgis · Jul 5, 2018 · ca2abb560ad29567427009c0d7177bb39cd99a8a · ca2abb5
1 parent 7949e9b
commit ca2abb560ad29567427009c0d7177bb39cd99a8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/plugins/db_manager/db_plugins/oracle/plugin.py b/python/plugins/db_manager/db_plugins/oracle/plugin.py
@@ -202,7 +202,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol,
         uri = self.uri()
         con = self.database().connector
 
-        uri.setDataSource(u"", u"({})".format(sql), geomCol, filter, uniqueCol.strip(u'"'))
+        uri.setDataSource(u"", u"({}\n)".format(sql), geomCol, filter, uniqueCol.strip(u'"'))
         if avoidSelectById:
             uri.disableSelectAtId(True)
         provider = self.dbplugin().providerName()
@@ -212,7 +212,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol,
         if not vlayer.isValid():
 
             wkbType, srid = con.getTableMainGeomType(
-                u"({})".format(sql), geomCol)
+                u"({}\n)".format(sql), geomCol)
             uri.setWkbType(wkbType)
             if srid:
                 uri.setSrid(str(srid))

diff --git a/python/plugins/db_manager/db_plugins/plugin.py b/python/plugins/db_manager/db_plugins/plugin.py
@@ -285,7 +285,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol, layerName="QueryLayer", layerType=
                     q = 1
                     while "_subq_%d_" % q in sql:
                         q += 1
-                    sql = "SELECT %s AS _uid_,* FROM (%s) AS _subq_%d_" % (uniqueFct, sql, q)
+                    sql = u"SELECT %s AS _uid_,* FROM (%s\n) AS _subq_%d_" % (uniqueFct, sql, q)
                     uniqueCol = "_uid_"
 
         uri = self.uri()