Skip to content

Commit ca2abb5

Browse files
committed
db manager: also add newline when adding a unique id field (fixes #19343)
(cherry picked from commit 870d078)
1 parent 7949e9b commit ca2abb5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

python/plugins/db_manager/db_plugins/oracle/plugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol,
202202
uri = self.uri()
203203
con = self.database().connector
204204

205-
uri.setDataSource(u"", u"({})".format(sql), geomCol, filter, uniqueCol.strip(u'"'))
205+
uri.setDataSource(u"", u"({}\n)".format(sql), geomCol, filter, uniqueCol.strip(u'"'))
206206
if avoidSelectById:
207207
uri.disableSelectAtId(True)
208208
provider = self.dbplugin().providerName()
@@ -212,7 +212,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol,
212212
if not vlayer.isValid():
213213

214214
wkbType, srid = con.getTableMainGeomType(
215-
u"({})".format(sql), geomCol)
215+
u"({}\n)".format(sql), geomCol)
216216
uri.setWkbType(wkbType)
217217
if srid:
218218
uri.setSrid(str(srid))

python/plugins/db_manager/db_plugins/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol, layerName="QueryLayer", layerType=
285285
q = 1
286286
while "_subq_%d_" % q in sql:
287287
q += 1
288-
sql = "SELECT %s AS _uid_,* FROM (%s) AS _subq_%d_" % (uniqueFct, sql, q)
288+
sql = u"SELECT %s AS _uid_,* FROM (%s\n) AS _subq_%d_" % (uniqueFct, sql, q)
289289
uniqueCol = "_uid_"
290290

291291
uri = self.uri()

0 commit comments

Comments
 (0)