Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[wms] Fix handling of mbtiles in paths containing non-latin characters #56462

Merged
merged 1 commit into from
Feb 22, 2024
Merged

[wms] Fix handling of mbtiles in paths containing non-latin characters #56462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/qgsdatasourceuri.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,9 @@ void QgsDataSourceUri::setEncodedUri( const QByteArray &uri )

void QgsDataSourceUri::setEncodedUri( const QString &uri )
{
setEncodedUri( uri.toLatin1() );
QUrl url;
url.setQuery( uri );
setEncodedUri( url.query( QUrl::EncodeUnicode ).toLatin1() );
}

QString QgsDataSourceUri::quotedTablename() const
Expand Down
9 changes: 9 additions & 0 deletions tests/src/core/testqgsdatasourceuri.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class TestQgsDataSourceUri: public QObject
void checkAuthParams();
void checkParameterKeys();
void checkRemovePassword();
void checkUnicodeUri();
};

void TestQgsDataSourceUri::checkparser_data()
Expand Down Expand Up @@ -606,5 +607,13 @@ void TestQgsDataSourceUri::checkRemovePassword()
QCOMPARE( uri2, QStringLiteral( "postgresql://user@127.0.0.1:5432?dbname=test" ) );
}

void TestQgsDataSourceUri::checkUnicodeUri()
{
QgsDataSourceUri uri;
uri.setEncodedUri( QStringLiteral( "url=file:///directory/テスト.mbtiles&type=mbtiles" ) );
QCOMPARE( uri.param( QStringLiteral( "url" ) ), QStringLiteral( "file:///directory/テスト.mbtiles" ) );
}


QGSTEST_MAIN( TestQgsDataSourceUri )
#include "testqgsdatasourceuri.moc"
Loading