Skip to content

Commit 870d078

Browse files
committed
db manager: also add newline when adding a unique id field (fixes #19343)
1 parent a0b6dc2 commit 870d078

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol,
197197
uri = self.uri()
198198
con = self.database().connector
199199

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

209209
wkbType, srid = con.getTableMainGeomType(
210-
u"({})".format(sql), geomCol)
210+
u"({}\n)".format(sql), geomCol)
211211
uri.setWkbType(wkbType)
212212
if srid:
213213
uri.setSrid(unicode(srid))

python/plugins/db_manager/db_plugins/plugin.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def toSqlLayer(self, sql, geomCol, uniqueCol, layerName="QueryLayer", layerType=
274274
q = 1
275275
while "_subq_%d_" % q in sql:
276276
q += 1
277-
sql = "SELECT %s AS _uid_,* FROM (%s) AS _subq_%d_" % (uniqueFct, sql, q)
277+
sql = u"SELECT %s AS _uid_,* FROM (%s\n) AS _subq_%d_" % (uniqueFct, sql, q)
278278
uniqueCol = "_uid_"
279279

280280
uri = self.uri()
@@ -293,7 +293,7 @@ def registerAllActions(self, mainWindow):
293293
def registerSubPluginActions(self, mainWindow):
294294
# load plugins!
295295
try:
296-
exec (u"from .%s.plugins import load" % self.dbplugin().typeName(), globals())
296+
exec(u"from .%s.plugins import load" % self.dbplugin().typeName(), globals())
297297
except ImportError:
298298
pass
299299
else:

0 commit comments

Comments
 (0)