sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong field length in file writer

Browse Source 
fixes #21714
This commit is contained in:
Alessandro Pasotti 2019-03-31 20:47:49 +02:00
parent ca80fb6052
commit 013bdf9405
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsvectorfilewriter.cpp
View File

@ -542,7 +542,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
}
case QVariant::String:
ogrType = OFTString;
if ( ogrWidth <= 0 || ogrWidth > 255 )
if ( ( ogrWidth <= 0 || ogrWidth > 255 ) && mOgrDriverName == QLatin1String( "ESRI Shapefile" ) )
ogrWidth = 255;
break;

38
tests/src/core/testqgsvectorfilewriter.cpp
View File

@ -82,6 +82,8 @@ class TestQgsVectorFileWriter: public QObject
void regression1141();
//! Test prepareWriteAsVectorFormat
void prepareWriteAsVectorFormat();
//! Test regression #21714 (Exported GeoPackages have wrong field definitions)
void testTextFieldLength();
private:
// a little util fn used by all tests
@ -491,5 +493,41 @@ void TestQgsVectorFileWriter::prepareWriteAsVectorFormat()
QCOMPARE( details.providerUriParams.value( "path" ).toString(), fileName );
}
void TestQgsVectorFileWriter::testTextFieldLength()
{
QTemporaryFile tmpFile( QDir::tempPath() + "/test_qgsvectorfilewriter2_XXXXXX.gpkg" );
tmpFile.open();
QString fileName( tmpFile.fileName( ) );
QgsVectorLayer vl( "Point?field=firstfield:string(1024)", "test", "memory" );
QCOMPARE( vl.fields().at( 0 ).length(), 1024 );
QgsVectorFileWriter w( fileName,
QStringLiteral( "UTF-8" ),
vl.fields(),
QgsWkbTypes::Point,
vl.crs() );
QgsFeature f { vl.fields() };
f.setAttribute( 0, QString( 1024, 'x' ) );
f.setGeometry( QgsGeometry::fromWkt( QStringLiteral( "point(9 45)" ) ) );
QVERIFY( vl.startEditing() );
QVERIFY( vl.addFeature( f ) );
QgsVectorFileWriter::SaveVectorOptions options;
options.driverName = "GPKG";
options.layerName = "test";
QString errorMessage;
QgsVectorFileWriter::WriterError error( QgsVectorFileWriter::writeAsVectorFormat(
&vl,
fileName,
options,
&errorMessage ) );
QCOMPARE( error, QgsVectorFileWriter::WriterError::NoError );
QCOMPARE( errorMessage, fileName );
QgsVectorLayer vl2( QStringLiteral( "%1|layername=test" ).arg( fileName ), "src_test", "ogr" );
QVERIFY( vl2.isValid() );
QCOMPARE( vl2.featureCount(), 1 );
QCOMPARE( vl2.fields().at( 1 ).length(), 1024 );
QCOMPARE( vl2.getFeature( 1 ).attribute( 1 ).toString(), QString( 1024, 'x' ) );
}
QGSTEST_MAIN( TestQgsVectorFileWriter )
#include "testqgsvectorfilewriter.moc"