Commit Diff

Commit:
f956ff516bfe9b7c95529f53afe66ad59e337641
From:
Sergey Bronnikov <sergeyb@tarantool.org>
Date:
Message:
datetime: introduce tz in datetime.parse() There is an option tz in `datetime.parse()`, it was added in commit 3c40366172e3 ("datetime, lua: date parsing functions"). The option is not documented, and the commit message says that option `tz` is "Not yet implemented in this commit.". The patch added tests and a doc request for this option. The behaviour of the option `tz` is the same as with option `tzoffset`: - if timezone was not set in a parsed string then it is set to a value specified by `tz` - if timezone was set in a parsed string then option `tz` is ignored ``` tarantool> date.parse("1970-01-01T01:00:00 MSK", { tz = 'Europe/Paris' }) --- - 1970-01-01T01:00:00 MSK - 23 ... tarantool> date.parse("1970-01-01T01:00:00", { tz = 'Europe/Paris' }) --- - 1970-01-01T01:00:00 Europe/Paris - 19 ... ``` Follows up #6731 Fixes #10420 @TarantoolBot document Title: Introduce option `tz` in `datetime.parse()` The option `tz` is added in a function `datetime.parse()`. The option set timezone to a passed value if it was not set in a parsed string.
Actions:
Patch | Tree
commit - 04811e032f29afe0fa6206ef2c7a0f8434861830
commit + f956ff516bfe9b7c95529f53afe66ad59e337641
blob - /dev/null
blob + 762eab4a5f9e15bd9de87bbc879cc03e24a03bca (mode 644)
--- /dev/null
+++ changelogs/unreleased/gh-10420-introduce-tz-option-in-parse.md
@@ -0,0 +1,3 @@
+## bugfix/datetime
+
+* Implemented the `tz` option in `datetime:parse()` (gh-10420).
blob - e92a400014c76fb0b5d22c61c21e4f15052cf1b8
blob + aba1ec7813de0b8a7efb62502a5b889afa5ae3a7
--- src/lua/datetime.lua
+++ src/lua/datetime.lua
@@ -920,6 +920,10 @@ local function datetime_parse_from(str, obj)
 
     if tzname ~= nil then
         check_str(tzname, 'datetime.parse()')
+    end
+
+    if tzoffset and tzname then
+        error("ambiguous timezone: both tzoffset and tz are specified")
     end
 
     local date, len
blob - 2ca31e4cad13b2cacb8287b3fe94796fb5b9f1be
blob + de18379f44dc18e3cf8649667c87b441376a0149
--- test/app-tap/datetime.test.lua
+++ test/app-tap/datetime.test.lua
@@ -45,6 +45,7 @@ local str_or_num_exp = 'tzoffset: string or number exp
 local numeric_exp = 'numeric value expected, but received '
 local expected_interval_but = 'expected interval or table, but received'
 local expected_datetime_but = 'expected datetime, interval or table, but received'
+local ambiguous_timezone = 'ambiguous timezone: both tzoffset and tz are specified'
 
 -- various error message generators
 local function exp_datetime(name, value)
@@ -424,7 +425,7 @@ test:test("Formatting limits", function(test)
 end)
 
 test:test("Simple tests for parser", function(test)
-    test:plan(14)
+    test:plan(19)
     test:ok(date.parse("1970-01-01T01:00:00Z") ==
             date.new{year=1970, mon=1, day=1, hour=1, min=0, sec=0})
     test:ok(date.parse("1970-01-01T01:00:00Z", {format = 'iso8601'}) ==
@@ -435,6 +436,8 @@ test:test("Simple tests for parser", function(test)
             date.parse("2020-01-01T01:00:00+00:00", {format = 'iso8601'}))
     test:ok(date.parse("1970-01-01T02:00:00+02:00") ==
             date.new{year=1970, mon=1, day=1, hour=2, min=0, sec=0, tzoffset=120})
+
+    -- Testcases with override timezone by setting tzoffset.
     test:ok(date.parse("1970-01-01T01:00:00", {tzoffset = 120}) ==
             date.new{year=1970, mon=1, day=1, hour=1, min=0, sec=0, tzoffset=120})
     test:ok(date.parse("1970-01-01T01:00:00", {tzoffset = '+0200'}) ==
@@ -449,7 +452,34 @@ test:test("Simple tests for parser", function(test)
             date.new({ year = 1998, month = 11, day = 25, tzoffset = 180 }))
     test:ok(date.parse('1998', { format = '%Y', tzoffset = '+03:00' }) ==
             date.new({ year = 1998, tzoffset = 180 }))
+
+    -- Testcases with override timezone by setting tz.
+    -- Timezone is not specified in a parsed string.
+    test:ok(date.parse("1970-01-01T01:00:00", {tz = "MSK"}) ==
+            date.new{year = 1970, mon = 1, day = 1,
+                     hour = 1, min = 0, sec = 0, tzoffset=180,
+                    })
+    -- Timezone is specified in a parsed string as a military timezone.
+    test:ok(date.parse("1970-01-01T01:00:00Z", {tz = "Europe/Moscow"}) ==
+            date.new{
+                year = 1970, mon = 1, day = 1,
+                hour = 1, min = 0, sec = 0, tzoffset = 0
+            })
+    -- Timezone is specified in a parsed string as an offset.
+    test:ok(date.parse("1970-01-01T01:00:00+01:00", {tz = "Asia/Omsk"}) ==
+            date.new{
+                year = 1970, mon = 1, day = 1,
+                hour = 1, min = 0, sec = 0, tzoffset = 60,
+            })
+    -- Timezone is not specified in a parsed string and format is passed.
+    test:ok(date.parse("1998-11-25", { format = "%Y-%m-%d", tz = "MSK" }) ==
+            date.new{year = 1998, month = 11, day = 25, tzoffset = 180})
 
+    -- Both tz and tzoffset are passed.
+    assert_raises(test, ambiguous_timezone, function()
+                      date.parse('1998-11-25', { tzoffset = 100, tz = 'MSK'})
+                  end)
+
     test:ok(date.parse("1970-01-01T02:00:00Z") <
             date.new{year=1970, mon=1, day=1, hour=2, min=0, sec=1})
     test:ok(date.parse("1970-01-01T02:00:00Z") <=