Commit 35ebb70
Configure ORA_TZFILE to match Oracle 11g server in CI
Both 11g workflows (test_11g.yml, test_11g_ojdbc11.yml) set
DATABASE_SERVER_AND_CLIENT_VERSION_DO_NOT_MATCH=true to skip tests that
failed because Oracle 11g XE ships timezone file DSTv14 while Instant
Client 21.15 embeds v35, producing ORA-01805 on DATE/TIMESTAMP fetches.
The same flag was later reused to skip two JDBC network-encryption
tests in connection_spec.rb because 11g XE lacks native network
encryption -- an unrelated limitation.
Adopt the approach from rsim/ruby-plsql#239: copy the v14 timezone
data files out of the running gvenzl/oracle-xe:11 container into the
Instant Client's oracore/zoneinfo directory and point the client at
them via ORA_TZFILE. Set ORA_TZFILE to the basename (timezlrg_14.dat)
so Oracle Instant Client resolves it relative to
ORACLE_HOME/oracore/zoneinfo/; the absolute-path form produces
ORA-01804 in sqlplus. With that in place the ORA-01805 error
disappears and the opaque DATABASE_SERVER_AND_CLIENT_VERSION_DO_NOT_MATCH
flag can be removed everywhere.
The two network-encryption skips are rewired onto DATABASE_VERSION ==
'11.2.0.2', which is the honest condition -- the limitation is a
property of the 11g server, not of any server/client version mismatch.
Also drop the stale ORACLE_HOME == '/usr/lib/oracle/21/client64'
fallback in timestamp_spec.rb; current workflows use
/opt/oracle/instantclient_21_15, so it never matched.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent ca63f21 commit 35ebb70
4 files changed
Lines changed: 28 additions & 8 deletions
File tree
- .github/workflows
- spec/active_record
- connection_adapters/oracle_enhanced
- oracle_enhanced/type
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | 39 | | |
41 | 40 | | |
42 | 41 | | |
| |||
76 | 75 | | |
77 | 76 | | |
78 | 77 | | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
79 | 91 | | |
80 | 92 | | |
81 | 93 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
36 | 35 | | |
37 | 36 | | |
38 | 37 | | |
| |||
71 | 70 | | |
72 | 71 | | |
73 | 72 | | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
74 | 86 | | |
75 | 87 | | |
76 | 88 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
| 77 | + | |
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | 7 | | |
12 | 8 | | |
13 | 9 | | |
| |||
0 commit comments