Skip to content
Permalink
Browse files

Fix loss of attributes for OGR provider (followup 72c9830)

  • Loading branch information
nyalldawson committed Jun 29, 2015
1 parent 1b6395e commit cc13c574a092348dba70d17a8d95e808cab5f627
Showing with 9 additions and 7 deletions.
  1. +9 −7 src/providers/ogr/qgsogrprovider.cpp
@@ -1284,6 +1284,7 @@ bool QgsOgrProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_
{
pushError( tr( "OGR error syncing to disk: %1" ).arg( CPLGetLastErrorMsg() ) );
}
QgsOgrConnPool::instance()->invalidateConnections( filePath() );
return true;
}

@@ -1348,6 +1349,7 @@ bool QgsOgrProvider::changeGeometryValues( QgsGeometryMap & geometry_map )

OGR_F_Destroy( theOGRFeature );
}
QgsOgrConnPool::instance()->invalidateConnections( filePath() );
return syncToDisc();
}

@@ -1607,17 +1609,17 @@ static QString createFileFilter_( QString const &longName, QString const &glob )

QString createFilters( QString type )
{
/**Database drivers available*/
/** Database drivers available*/
static QString myDatabaseDrivers;
/**Protocol drivers available*/
/** Protocol drivers available*/
static QString myProtocolDrivers;
/**File filters*/
/** File filters*/
static QString myFileFilters;
/**Directory drivers*/
/** Directory drivers*/
static QString myDirectoryDrivers;
/**Extensions*/
/** Extensions*/
static QStringList myExtensions;
/**Wildcards*/
/** Wildcards*/
static QStringList myWildcards;

// if we've already built the supported vector string, just return what
@@ -2014,7 +2016,7 @@ QGISEXTERN bool isProvider()
return true;
}

/**Creates an empty data source
/** Creates an empty data source
@param uri location to store the file(s)
@param format data format (e.g. "ESRI Shapefile"
@param vectortype point/line/polygon or multitypes

7 comments on commit cc13c57

@nyalldawson

This comment has been minimized.

Copy link
Collaborator Author

@nyalldawson nyalldawson replied Jun 29, 2015

@jef-n Not sure how this escaped our testing, but this is a nasty one. Any chance of stopping 2.10 and including this in a 2.10.1 release? There's more discussion over at 72c9830

@gioman

This comment has been minimized.

Copy link
Contributor

@gioman gioman replied Jun 29, 2015

Does this affects also Linux? I use master on a regularly basis on Linux and I haven't seen this bug in the past days. Just noticed today on Windows/2.10.

@jef-n

This comment has been minimized.

Copy link
Member

@jef-n jef-n replied Jun 30, 2015

@nyalldawson where's the backport?

Of course this must popup right after the release, again before the announcement and all packages being built. Although it's were just the LTR builds that were still running - but it's wasn't final-2_8_2 state anyway, but latest on the branch - ie. with your load of 2.10 backports and I just committed mine...
So there should probably be a 2.8.3 soon too.

Should we wait some more for feedback on 2.10? People probably won't try qgis-ltr-dev / debian-nightly-ltr / ubuntugis-nightly-ltr either. :(

@jef-n

This comment has been minimized.

Copy link
Member

@jef-n jef-n replied Jun 30, 2015

Looks like there even was a ticket for it.

@nyalldawson

This comment has been minimized.

Copy link
Collaborator Author

@nyalldawson nyalldawson replied Jun 30, 2015

@jef-n I don't think the original issue in that ticket is directly related - it refers to an issue in 2.8, and as far as I'm aware the offending commit wasn't backported to 2.8. But dash WAS reporting failures to us. It's just unfortunate that they got drowned in the noise of other failing OSX tests. I'm working on resolving that now...

@jef-n

This comment has been minimized.

Copy link
Member

@jef-n jef-n replied Jun 30, 2015

@nyalldawson if that was actually intended. 2.8.2 was the default for new tickets. I removed the default and now it appears with Please select...

@nyalldawson

This comment has been minimized.

Copy link
Collaborator Author

@nyalldawson nyalldawson replied Jun 30, 2015

@jef-n I've backported in 3738c91

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