Skip to content

Commit 44698d4

Browse files
committed
[processing] don't quote geometry column name (fix #16122)
1 parent bb4c8c0 commit 44698d4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

python/plugins/processing/algs/gdal/ogr2ogrdissolve.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def getConsoleCommands(self):
110110
arguments.append('sqlite')
111111
arguments.append('-sql')
112112

113-
sql = "SELECT ST_Union('{}')".format(geometry)
113+
sql = "SELECT ST_Union({})".format(geometry)
114114

115115
sqlOpts = ''
116116
if fields:
@@ -119,13 +119,13 @@ def getConsoleCommands(self):
119119
sqlOpts += ',{}'.format(field)
120120

121121
if count:
122-
sqlOpts += ", COUNT('{}') AS count".format(geometry)
122+
sqlOpts += ", COUNT({}) AS count".format(geometry)
123123

124124
if stats:
125-
sqlOpts += ", SUM('{0}') AS sum_diss, MIN('{0}') AS min_diss, MAX('{0}') AS max_diss, AVG('{0}') AS avg_diss".format(statsatt)
125+
sqlOpts += ", SUM({0}) AS sum_diss, MIN({0}) AS min_diss, MAX({0}) AS max_diss, AVG({0}) AS avg_diss".format(statsatt)
126126

127127
if area:
128-
sqlOpts += ", SUM(ST_Area('{0}')) AS area_diss, ST_Perimeter(ST_Union('{0}')) AS peri_diss".format(geometry)
128+
sqlOpts += ", SUM(ST_Area({0})) AS area_diss, ST_Perimeter(ST_Union({0})) AS peri_diss".format(geometry)
129129

130130
sql = '{}{} FROM {} GROUP BY {}'.format(sql, sqlOpts, layername, field)
131131

python/plugins/processing/algs/qgis/MeanCoords.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def processAlgorithm(self, feedback):
113113
weight = 1.00
114114

115115
if weight < 0:
116-
raise GeoAlgorithmExecutionException(self.tr('Negative weight value found. Please fix you data and try again.'))
116+
raise GeoAlgorithmExecutionException(self.tr('Negative weight value found. Please fix your data and try again.'))
117117

118118
if clazz not in means:
119119
means[clazz] = (0, 0, 0)

0 commit comments

Comments
 (0)