Skip to content
Permalink
Browse files

Merge branch 'release-2_14' of github.com:qgis/QGIS into release-2_14

  • Loading branch information
rouault committed Jun 30, 2016
2 parents c237ba7 + a3dfd9d commit 4158ea7d030c78f411b109a2dcf88165c4e074fc
Showing with 5 additions and 2 deletions.
  1. +3 −0 python/plugins/fTools/tools/doPointsInPolygon.py
  2. +2 −2 src/providers/mssql/qgsmssqlprovider.cpp
@@ -299,6 +299,9 @@ def run(self):
value = math.sqrt(value)
atMap.append(value)

else: # no intersection - store at least the zero count
atMap.append(0)

outFeat.setAttributes(atMap)
writer.addFeature(outFeat)

@@ -1851,7 +1851,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
QgsField fld = fields[i];
if ( oldToNewAttrIdxMap && fld.name() == primaryKey )
{
oldToNewAttrIdxMap->insert( fields.indexFromName( fld.name() ), 0 );
oldToNewAttrIdxMap->insert( fields.fieldNameIndex( fld.name() ), 0 );
continue;
}

@@ -1872,7 +1872,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(

flist.append( fld );
if ( oldToNewAttrIdxMap )
oldToNewAttrIdxMap->insert( fields.indexFromName( fld.name() ), offset++ );
oldToNewAttrIdxMap->insert( fields.fieldNameIndex( fld.name() ), offset++ );
}

if ( !provider->addAttributes( flist ) )

0 comments on commit 4158ea7

Please sign in to comment.
You can’t perform that action at this time.