Skip to content

Commit c00a529

Browse files
committed
[BACKPORT] fix Query builder from layer properties when layer name in
cyrrilic (fix #2435)
1 parent 62d03ed commit c00a529

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/providers/ogr/qgsogrprovider.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ bool QgsOgrProvider::setSubsetString( QString theSQL, bool updateFeatureCount )
351351
if ( !mSubsetString.isEmpty() )
352352
{
353353
QString sql = QString( "SELECT * FROM %1 WHERE %2" )
354-
.arg( quotedIdentifier( OGR_FD_GetName( OGR_L_GetLayerDefn( ogrOrigLayer ) ) ) )
354+
.arg( quotedIdentifier( FROM8( OGR_FD_GetName( OGR_L_GetLayerDefn( ogrOrigLayer ) ) ) ) )
355355
.arg( mSubsetString );
356356
QgsDebugMsg( QString( "SQL: %1" ).arg( sql ) );
357357
ogrLayer = OGR_DS_ExecuteSQL( ogrDataSource, TO8( sql ), NULL, NULL );
@@ -2106,7 +2106,7 @@ void QgsOgrProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, int
21062106
return; //not a provider field
21072107
}
21082108

2109-
QString theLayerName = OGR_FD_GetName( OGR_L_GetLayerDefn( ogrLayer ) );
2109+
QString theLayerName = FROM8( OGR_FD_GetName( OGR_L_GetLayerDefn( ogrLayer ) ) );
21102110

21112111
QString sql = QString( "SELECT DISTINCT %1 FROM %2" )
21122112
.arg( quotedIdentifier( fld.name() ) )

0 commit comments

Comments
 (0)