Merge pull request #49 from hymkor/push-tzvyrnonquwn

Fix Oracle DATE/TIMESTAMP timezone handling regressions

Author: hymkor

CHANGELOG.md

@@ -6,6 +6,8 @@ Changelog (English)
   The version string is now updated via make bump during the release process. (#46)
 - Rename release note files to CHANGELOG.md and CHANGELOG\_ja.md. (#47)
 - Update dependencies to the last versions compatible with Go 1.20.14 (#48)
+- Fixed an issue where updates to Oracle tables could affect zero rows because datetime values retrieved without timezone information failed to match in WHERE clauses. (#49)
+- go-ora v2.9.0 changed DATE/TIMESTAMP timezone handling, which broke datetime comparisons used by SQL-Bless updates. The Oracle driver version has been pinned to v2.8.22 for compatibility. (#49)
 
 v0.27.4
 -------

CHANGELOG_ja.md

@@ -6,6 +6,8 @@ Changelog (Japanese)
   今後、バージョンアップ時に make bump を実行する (#46)
 - リリースノートのファイルを CHANGELOG.md と CHANGELOG\_ja.md へリネーム (#47)
 - Go 1.20.14 でビルド可能な最後のバージョンへ依存ライブラリを更新 (#48)
+- edit文で、Oracle のテーブルを更新しようとした時、timezone 情報が空で取得される日時カラムの照合失敗が原因で、更新が０件になってしまう不具合を修正 (#49)
+- go-ora v2.9.0 で DATE/TIMESTAMP の timezone の扱いが変更され、SQL-Bless で使われている日時の比較が壊れてしまった。そのため、Oracle ドライバーのバージョンを v2.8.22 へ固定した。 (#49)
 
 v0.27.4
 -------

dialect/main.go

@@ -99,7 +99,7 @@ func ParseAnyDateTime(s string) (time.Time, error) {
 			fmt.Sprintf("%s %s%02s:%02s", m[1], m[2], m[3], m[4]))
 	}
 	if m := rxDateTime.FindStringSubmatch(s); m != nil {
-		return time.Parse(DateTimeLayout, m[1])
+		return time.ParseInLocation(DateTimeLayout, m[1], time.Local)
 	}
 	if m := rxDateOnly.FindStringSubmatch(s); m != nil {
 		return time.Parse(DateOnlyLayout, m[1])
@@ -108,7 +108,7 @@ func ParseAnyDateTime(s string) (time.Time, error) {
 		return time.Parse(TimeTzLayout, m[1])
 	}
 	if m := rxTimeOnly.FindStringSubmatch(s); m != nil {
-		return time.Parse(TimeOnlyLayout, m[1])
+		return time.ParseInLocation(TimeOnlyLayout, m[1], time.Local)
 	}
 	if m := rxRawLayout.FindStringSubmatch(s); m != nil {
 		return time.Parse(RawTimeLayout, m[1])
@@ -202,7 +202,7 @@ type PlaceHolderName struct {
 }
 
 func (ph *PlaceHolderName) Make(v any) string {
-	ph.values = append(ph.values, v)
+	ph.values = append(ph.values, repair(v))
 	return fmt.Sprintf("%s%s%d", ph.Prefix, ph.Format, len(ph.values))
 }
 
@@ -213,3 +213,20 @@ func (ph *PlaceHolderName) Values() (result []any) {
 	ph.values = ph.values[:0]
 	return
 }
+
+func repair(v any) any {
+	if t, ok := v.(time.Time); ok {
+		if loc := t.Location(); loc != nil && loc.String() == "" {
+			return time.Date(
+				t.Year(),
+				t.Month(),
+				t.Day(),
+				t.Hour(),
+				t.Minute(),
+				t.Second(),
+				t.Nanosecond(),
+				time.Local)
+		}
+	}
+	return v
+}

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/nyaosorg/go-box/v3 v3.1.1
 	github.com/nyaosorg/go-readline-ny v1.15.1
 	github.com/nyaosorg/go-ttyadapter v0.7.0
-	github.com/sijms/go-ora/v2 v2.9.0
+	github.com/sijms/go-ora/v2 v2.8.22
 )
 
 require (

go.sum

@@ -64,8 +64,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
-github.com/sijms/go-ora/v2 v2.9.0/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
+github.com/sijms/go-ora/v2 v2.8.22 h1:3ABgRzVKxS439cEgSLjFKutIwOyhnyi4oOSBywEdOlU=
+github.com/sijms/go-ora/v2 v2.8.22/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
 golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=

test/test-oracle.ps1

@@ -19,7 +19,7 @@ $script = `
     " TO_TIMESTAMP('2024-07-08 17:18:19.8787','YYYY-MM-DD HH24:MI:SS.FF')) ||" +
     "COMMIT||" +
     "EDIT TESTTBL||" +
-    "/10|lr2015-06-07 20:21:22|lr2024-08-09 10:11:12.7878 +09:00|cyy" +
+    "/10|lr2015-06-07 20:21:22|lr2024-08-09 10:11:12.7878 +09:00|qyy" +
     "SPOOL $testLst||" +
     "SELECT * FROM TESTTBL||" +
     "SPOOL OFF ||" +