sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] don't quote geometry column name (fix #16122)

Browse Source
This commit is contained in:
Alexander Bruy 2017-02-07 16:57:07 +02:00
parent bb4c8c065f
commit 44698d4576
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
View File

@ -110,7 +110,7 @@ class Ogr2OgrDissolve(GdalAlgorithm):
arguments.append('sqlite')
arguments.append('-sql')
sql = "SELECT ST_Union('{}')".format(geometry)
sql = "SELECT ST_Union({})".format(geometry)
sqlOpts = ''
if fields:
@ -119,13 +119,13 @@ class Ogr2OgrDissolve(GdalAlgorithm):
sqlOpts += ',{}'.format(field)
if count:
sqlOpts += ", COUNT('{}') AS count".format(geometry)
sqlOpts += ", COUNT({}) AS count".format(geometry)
if stats:
sqlOpts += ", SUM('{0}') AS sum_diss, MIN('{0}') AS min_diss, MAX('{0}') AS max_diss, AVG('{0}') AS avg_diss".format(statsatt)
sqlOpts += ", SUM({0}) AS sum_diss, MIN({0}) AS min_diss, MAX({0}) AS max_diss, AVG({0}) AS avg_diss".format(statsatt)
if area:
sqlOpts += ", SUM(ST_Area('{0}')) AS area_diss, ST_Perimeter(ST_Union('{0}')) AS peri_diss".format(geometry)
sqlOpts += ", SUM(ST_Area({0})) AS area_diss, ST_Perimeter(ST_Union({0})) AS peri_diss".format(geometry)
sql = '{}{} FROM {} GROUP BY {}'.format(sql, sqlOpts, layername, field)

2
python/plugins/processing/algs/qgis/MeanCoords.py
View File

@ -113,7 +113,7 @@ class MeanCoords(GeoAlgorithm):
weight = 1.00
if weight < 0:
raise GeoAlgorithmExecutionException(self.tr('Negative weight value found. Please fix you data and try again.'))
raise GeoAlgorithmExecutionException(self.tr('Negative weight value found. Please fix your data and try again.'))
if clazz not in means:
means[clazz] = (0, 0, 0)