Merge pull request #34290 from elpaso/bugfix-gh33585-bigint-categoriz…

…ed-3_10 Fix spatialite uniquevalues with bigint
qgis · Feb 7, 2020 · 68ad59b · 68ad59b
2 parents aca059a + a818107
commit 68ad59b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -3869,7 +3869,7 @@ QSet<QVariant> QgsSpatiaLiteProvider::uniqueValues( int index, int limit ) const
         switch ( sqlite3_column_type( stmt, 0 ) )
         {
           case SQLITE_INTEGER:
-            uniqueValues.insert( QVariant( sqlite3_column_int( stmt, 0 ) ) );
+            uniqueValues.insert( QVariant( sqlite3_column_int64( stmt, 0 ) ) );
             break;
           case SQLITE_FLOAT:
             uniqueValues.insert( QVariant( sqlite3_column_double( stmt, 0 ) ) );

diff --git a/tests/src/python/test_provider_spatialite.py b/tests/src/python/test_provider_spatialite.py
@@ -228,6 +228,18 @@ def setUpClass(cls):
         sql += "VALUES (8, 'int', GeomFromText('POINT(2 1)', 4326))"
         cur.execute(sql)
 
+        # bigint table
+        sql = "CREATE TABLE test_bigint (id BIGINT, value INT)"
+        cur.execute(sql)
+        sql = "SELECT AddGeometryColumn('test_bigint', 'position', 4326, 'LINESTRING', 'XYM')"
+        cur.execute(sql)
+        sql = """
+        INSERT INTO test_bigint (id, value, position) VALUES
+        (987654321012345, 1, ST_GeomFromtext('LINESTRINGM(10.416255 55.3786316 1577093516, 10.516255 55.4786316 157709)', 4326) ),
+        (987654321012346, 2, ST_GeomFromtext('LINESTRINGM(10.316255 55.3786316 1577093516, 11.216255 56.3786316 157709)', 4326) )"""
+
+        cur.execute(sql)
+
         cur.execute("COMMIT")
         con.close()