thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on tzdata

Browse Source
This commit is contained in:
Alexey Milovidov 2020-06-20 15:26:44 +03:00
parent 1b9e72f9ad
commit 6eda152726
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/common/DateLUT.cpp
View File

@ -75,7 +75,7 @@ std::string determineDefaultTimeZone()
try try
{ {
tz_database_path = fs::canonical(tz_database_path); tz_database_path = fs::weakly_canonical(tz_database_path);
/// The tzdata file exists. If it is inside the tz_database_dir, /// The tzdata file exists. If it is inside the tz_database_dir,
/// then the relative path is the time zone id. /// then the relative path is the time zone id.
@ -91,7 +91,7 @@ std::string determineDefaultTimeZone()
if (!tz_file_path.is_absolute()) if (!tz_file_path.is_absolute())
tz_file_path = tz_database_path / tz_file_path; tz_file_path = tz_database_path / tz_file_path;
tz_file_path = fs::canonical(tz_file_path); tz_file_path = fs::weakly_canonical(tz_file_path);
fs::path relative_path = tz_file_path.lexically_relative(tz_database_path); fs::path relative_path = tz_file_path.lexically_relative(tz_database_path);
if (!relative_path.empty() && *relative_path.begin() != ".." && *relative_path.begin() != ".") if (!relative_path.empty() && *relative_path.begin() != ".." && *relative_path.begin() != ".")