Skip to content

Commit

Permalink
Copy provider set attribute aliases to layer so that they aren't lost…
Browse files Browse the repository at this point in the history 
… when layer properties are modified
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 30, 2021
1 parent b3ef0cc commit 1df397d
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 12 deletions.
11 changes: 9 additions & 2 deletions src/core/vector/qgsvectorlayer.cpp
View file
Expand Up @@ -188,7 +188,8 @@ QgsVectorLayer::QgsVectorLayer( const QString &vectorLayerPath,

for ( const QgsField &field : std::as_const( mFields ) )
{
mAttributeAliasMap.insert( field.name(), QString() );
if ( !mAttributeAliasMap.contains( field.name() ) )
mAttributeAliasMap.insert( field.name(), QString() );
}

if ( isValid() )
Expand Down Expand Up @@ -1802,6 +1803,10 @@ bool QgsVectorLayer::setDataProvider( QString const &provider, const QgsDataProv
{
mFieldWidgetSetups[ field.name() ] = field.editorWidgetSetup();
}
if ( !field.alias().isEmpty() && mAttributeAliasMap.value( field.name() ).isEmpty() )
{
mAttributeAliasMap[ field.name() ] = field.alias();
}
}

if ( profile )
Expand Down Expand Up @@ -2212,7 +2217,9 @@ bool QgsVectorLayer::readSymbology( const QDomNode &layerNode, QString &errorMes

if ( categories.testFlag( Fields ) )
{
mAttributeAliasMap.clear();
// IMPORTANT - we don't clear mAttributeAliasMap here, as it may contain aliases which are coming direct
// from the data provider. Instead we leave any existing aliases and only overwrite them if the style
// has a specific value for that field's alias
QDomNode aliasesNode = layerNode.namedItem( QStringLiteral( "aliases" ) );
if ( !aliasesNode.isNull() )
{
Expand Down
37 changes: 27 additions & 10 deletions tests/src/python/test_provider_ogr.py
View file
Expand Up @@ -10,13 +10,12 @@
__date__ = '2016-04-11'
__copyright__ = 'Copyright 2016, Even Rouault'

import hashlib
import os
import shutil
import sys
import tempfile
import hashlib
from datetime import datetime
import mockedwebserver

from osgeo import gdal, ogr # NOQA
from qgis.PyQt.QtCore import QVariant, QByteArray, QTemporaryDir
Expand All @@ -42,9 +41,10 @@
QgsNetworkAccessManager
)
from qgis.testing import start_app, unittest
from qgis.utils import spatialite_connect

import mockedwebserver
from utilities import unitTestDataPath
from qgis.utils import spatialite_connect

start_app()
TEST_DATA_DIR = unitTestDataPath()
Expand Down Expand Up @@ -654,7 +654,8 @@ def testIntListField(self):
['four', 4, NULL]])

# add attribute
self.assertTrue(vl.dataProvider().addAttributes([QgsField('new_list', type=QVariant.List, subType=QVariant.Int)]))
self.assertTrue(
vl.dataProvider().addAttributes([QgsField('new_list', type=QVariant.List, subType=QVariant.Int)]))
f1_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 1][0]
f3_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 3][0]
self.assertTrue(vl.dataProvider().changeAttributeValues({f1_id: {3: [111, 222]}, f3_id: {3: [121, 122, 123]}}))
Expand Down Expand Up @@ -734,10 +735,12 @@ def testDoubleListField(self):
['four', 4, NULL]])

# add attribute
self.assertTrue(vl.dataProvider().addAttributes([QgsField('new_list', type=QVariant.List, subType=QVariant.Double)]))
self.assertTrue(
vl.dataProvider().addAttributes([QgsField('new_list', type=QVariant.List, subType=QVariant.Double)]))
f1_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 1][0]
f3_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 3][0]
self.assertTrue(vl.dataProvider().changeAttributeValues({f1_id: {3: [111.1, 222.2]}, f3_id: {3: [121.1, 122.2, 123.3]}}))
self.assertTrue(
vl.dataProvider().changeAttributeValues({f1_id: {3: [111.1, 222.2]}, f3_id: {3: [121.1, 122.2, 123.3]}}))

vl = QgsVectorLayer(tmpfile)
self.assertTrue(vl.isValid())
Expand Down Expand Up @@ -802,7 +805,8 @@ def testInteger64ListField(self):
# change attribute values
f1_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 1][0]
f3_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 3][0]
self.assertTrue(vl.dataProvider().changeAttributeValues({f1_id: {2: NULL}, f3_id: {2: [3234567890123, 3234567890124, 3234567890125, 3234567890126]}}))
self.assertTrue(vl.dataProvider().changeAttributeValues(
{f1_id: {2: NULL}, f3_id: {2: [3234567890123, 3234567890124, 3234567890125, 3234567890126]}}))

vl = QgsVectorLayer(tmpfile)
self.assertTrue(vl.isValid())
Expand All @@ -814,18 +818,21 @@ def testInteger64ListField(self):
['four', 4, NULL]])

# add attribute
self.assertTrue(vl.dataProvider().addAttributes([QgsField('new_list', type=QVariant.List, subType=QVariant.LongLong)]))
self.assertTrue(
vl.dataProvider().addAttributes([QgsField('new_list', type=QVariant.List, subType=QVariant.LongLong)]))
f1_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 1][0]
f3_id = [f.id() for f in vl.getFeatures() if f.attributes()[1] == 3][0]
self.assertTrue(vl.dataProvider().changeAttributeValues({f1_id: {3: [4234567890123, 4234567890124]}, f3_id: {3: [5234567890123, 5234567890124, 5234567890125]}}))
self.assertTrue(vl.dataProvider().changeAttributeValues(
{f1_id: {3: [4234567890123, 4234567890124]}, f3_id: {3: [5234567890123, 5234567890124, 5234567890125]}}))

vl = QgsVectorLayer(tmpfile)
self.assertTrue(vl.isValid())

self.assertEqual([f.attributes() for f in vl.getFeatures()],
[['one', 1, NULL, [4234567890123, 4234567890124]],
['two', 2, [2234567890123, 2234567890124, 2234567890125, 2234567890126], NULL],
['three', 3, [3234567890123, 3234567890124, 3234567890125, 3234567890126], [5234567890123, 5234567890124, 5234567890125]],
['three', 3, [3234567890123, 3234567890124, 3234567890125, 3234567890126],
[5234567890123, 5234567890124, 5234567890125]],
['four', 4, NULL, NULL]])

def testBlobCreation(self):
Expand Down Expand Up @@ -1015,16 +1022,26 @@ def testFieldAliases(self):
'guid', 'SHAPE_Length', 'SHAPE_Area']
expected_alias = ['', 'My Text Field', 'My Short Int Field', 'My Long Int Field', 'My Float Field',
'My Double Field', 'My Date Field', 'My Blob Field', 'My GUID field', '', '']
expected_alias_map = {'OBJECTID': '', 'SHAPE_Area': '', 'SHAPE_Length': '', 'blob': 'My Blob Field',
'date': 'My Date Field', 'double': 'My Double Field', 'float': 'My Float Field',
'guid': 'My GUID field', 'long_int': 'My Long Int Field',
'short_int': 'My Short Int Field', 'text': 'My Text Field'}
else:
expected_fieldnames = ['OBJECTID', 'text', 'short_int', 'long_int', 'float', 'double', 'date', 'blob',
'guid', 'raster', 'SHAPE_Length', 'SHAPE_Area']
expected_alias = ['', 'My Text Field', 'My Short Int Field', 'My Long Int Field', 'My Float Field',
'My Double Field', 'My Date Field', 'My Blob Field', 'My GUID field', 'My Raster Field',
'', '']
expected_alias_map = {'OBJECTID': '', 'SHAPE_Area': '', 'SHAPE_Length': '', 'blob': 'My Blob Field',
'date': 'My Date Field', 'double': 'My Double Field', 'float': 'My Float Field',
'guid': 'My GUID field', 'long_int': 'My Long Int Field', 'raster': 'My Raster Field',
'short_int': 'My Short Int Field', 'text': 'My Text Field'}

self.assertEqual([f.name() for f in fields], expected_fieldnames)
self.assertEqual([f.alias() for f in fields], expected_alias)

self.assertEqual(vl.attributeAliases(), expected_alias_map)

def testGdbLayerMetadata(self):
"""
Test that we translate GDB metadata to QGIS layer metadata on loading a GDB source
Expand Down

0 comments on commit 1df397d

Please sign in to comment.