save spatialite as: create integer column from qlonglong if it fits (fixes #12325; followup b736317)

jef-n · jef-n · commit 6e55fbe1495e · 2015-06-14T20:55:37.000+02:00
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1866,6 +1866,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
   }
 
   QGis::WkbType wkbType = layer->wkbType();
+  QgsFields fields = skipAttributeCreation ? QgsFields() : layer->pendingFields();
 
   if ( layer->providerType() == "ogr" && layer->dataProvider() )
   {
@@ -1898,9 +1899,24 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
       }
     }
   }
+  else if ( layer->providerType() == "spatialite" )
+  {
+    for ( int i = 0; i < fields.size(); i++ )
+    {
+      if ( fields[i].type() == QVariant::LongLong )
+      {
+        QVariant min = layer->minimumValue( i );
+        QVariant max = layer->maximumValue( i );
+        if ( qMax( qAbs( min.toLongLong() ), qAbs( max.toLongLong() ) ) < INT_MAX )
+        {
+          fields[i].setType( QVariant::Int );
+        }
+      }
+    }
+  }
 
   QgsVectorFileWriter* writer =
-    new QgsVectorFileWriter( fileName, fileEncoding, skipAttributeCreation ? QgsFields() : layer->pendingFields(), wkbType, outputCRS, driverName, datasourceOptions, layerOptions, newFilename, symbologyExport );
+    new QgsVectorFileWriter( fileName, fileEncoding, fields, wkbType, outputCRS, driverName, datasourceOptions, layerOptions, newFilename, symbologyExport );
   writer->setSymbologyScaleDenominator( symbologyScale );
 
   if ( newFilename )

Original file line number	Diff line number	Diff line change
`@@ -1866,6 +1866,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe`
`1866`	`1866`	`}`
`1867`	`1867`
`1868`	`1868`	`QGis::WkbType wkbType = layer->wkbType();`
	`1869`	`+ QgsFields fields = skipAttributeCreation ? QgsFields() : layer->pendingFields();`
`1869`	`1870`
`1870`	`1871`	`if ( layer->providerType() == "ogr" && layer->dataProvider() )`
`1871`	`1872`	`{`
`@@ -1898,9 +1899,24 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe`
`1898`	`1899`	`}`
`1899`	`1900`	`}`
`1900`	`1901`	`}`
	`1902`	`+ else if ( layer->providerType() == "spatialite" )`
	`1903`	`+ {`
	`1904`	`+ for ( int i = 0; i < fields.size(); i++ )`
	`1905`	`+ {`
	`1906`	`+ if ( fields[i].type() == QVariant::LongLong )`
	`1907`	`+ {`
	`1908`	`+ QVariant min = layer->minimumValue( i );`
	`1909`	`+ QVariant max = layer->maximumValue( i );`
	`1910`	`+ if ( qMax( qAbs( min.toLongLong() ), qAbs( max.toLongLong() ) ) < INT_MAX )`
	`1911`	`+ {`
	`1912`	`+ fields[i].setType( QVariant::Int );`
	`1913`	`+ }`
	`1914`	`+ }`
	`1915`	`+ }`
	`1916`	`+ }`
`1901`	`1917`
`1902`	`1918`	`QgsVectorFileWriter* writer =`
`1903`		`- new QgsVectorFileWriter( fileName, fileEncoding, skipAttributeCreation ? QgsFields() : layer->pendingFields(), wkbType, outputCRS, driverName, datasourceOptions, layerOptions, newFilename, symbologyExport );`
	`1919`	`+ new QgsVectorFileWriter( fileName, fileEncoding, fields, wkbType, outputCRS, driverName, datasourceOptions, layerOptions, newFilename, symbologyExport );`
`1904`	`1920`	`writer->setSymbologyScaleDenominator( symbologyScale );`
`1905`	`1921`
`1906`	`1922`	`if ( newFilename )`