Skip to content

Git workflow os version #1

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

Open
wants to merge 6 commits into
base: IVORY_REL_3_STABLE
Choose a base branch
from
Open

Git workflow os version #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7b100e
Fix bug#M247:
myzhen Oct 30, 2023
ebe9cc1
add datetime ignore nls mask regression test
balinorLiang Apr 23, 2024
9af6bd1
1) bugfix for ora timestamp compatible function
balinorLiang Apr 24, 2024
2a8ac53
bugfix for macos regression failed
balinorLiang Apr 24, 2024
eea207b
bugfix for macos regression failed
balinorLiang Apr 24, 2024
c892749
bugfix for macos regression failed
balinorLiang Apr 24, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-12]

steps:
- uses: actions/checkout@v3
- name: dependancy - linux
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
sudo apt-get update
sudo apt-get update --allow-unauthenticated --allow-insecure-repositories
sudo apt-get install -y build-essential git lcov bison flex \
libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
Expand All @@ -35,7 +35,7 @@ jobs:
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
--with-icu
- name: configure - macos
if: ${{ matrix.os == 'macos-latest' }}
if: ${{ matrix.os == 'macos-12' }}
run: |
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
./configure \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contrib_regression.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- name: dependancy
run: |
sudo apt-get update
sudo apt-get update --allow-unauthenticated --allow-insecure-repositories
sudo apt-get install -y build-essential git lcov bison flex \
libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meson_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
- name: dependancy - linux
run: |
sudo apt-get update
sudo apt-get update --allow-unauthenticated --allow-insecure-repositories
sudo apt-get install -y build-essential git lcov bison flex \
libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/oracle_pg_regression.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-12]

steps:
- uses: actions/checkout@v3
- name: dependancy
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
sudo apt-get update
sudo apt-get update --allow-unauthenticated --allow-insecure-repositories
sudo apt-get install -y build-essential git lcov bison flex \
libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
Expand All @@ -39,7 +39,7 @@ jobs:
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
--with-icu
- name: configure - macos
if: ${{ matrix.os == 'macos-latest' }}
if: ${{ matrix.os == 'macos-12' }}
run: |
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
curl -L -o cpanm http://cpanmin.us && chmod +x cpanm && \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/oracle_regression.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-12]

steps:
- uses: actions/checkout@v3
- name: dependancy
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
sudo apt-get update
sudo apt-get update --allow-unauthenticated --allow-insecure-repositories
sudo apt-get install -y build-essential git lcov bison flex \
libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
Expand All @@ -39,7 +39,7 @@ jobs:
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
--with-icu
- name: configure - macos
if: ${{ matrix.os == 'macos-latest' }}
if: ${{ matrix.os == 'macos-12' }}
run: |
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
curl -L -o cpanm http://cpanmin.us && chmod +x cpanm && \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pg_regression.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-12]

steps:
- uses: actions/checkout@v3
- name: dependancy
if: ${{ matrix.os == 'ubuntu-latest' }}
run: |
sudo apt-get update
sudo apt-get update --allow-unauthenticated --allow-insecure-repositories
sudo apt-get install -y build-essential git lcov bison flex \
libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
Expand All @@ -39,7 +39,7 @@ jobs:
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
--with-icu
- name: configure - macos
if: ${{ matrix.os == 'macos-latest' }}
if: ${{ matrix.os == 'macos-12' }}
run: |
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
curl -L -o cpanm http://cpanmin.us && chmod +x cpanm && \
Expand Down
3 changes: 2 additions & 1 deletion contrib/ivorysql_ora/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ ORA_REGRESS = \
datatype_and_func_bugs \
ora_sysview \
ora_like_operator \
ora_xml_functions
ora_xml_functions \
ora_datetime_ignore_nls_mask

SHLIB_LINK += -lxml2

Expand Down
17 changes: 17 additions & 0 deletions contrib/ivorysql_ora/expected/ora_datetime.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,3 +1236,20 @@ select 25::number <= to_char('1990-01-01'::oradate, 'yyyy');
t
(1 row)

/* Begin - BUG#M0000247 */
set client_min_messages = 'error';
create table test_247(a date, b timestamp(7), c timestamp(7) with time zone, d timestamp(7) with local time zone);
set ivorysql.datetime_ignore_nls_mask = 15;
insert into test_247 values('2023-10-27 10:54:55.1234567', '2023-10-27 10:54:55.1234567', '2023-10-27 10:54:55.1234567', '2023-10-27 10:54:55.1234567');
SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';
select * from test_247;
a | b | c | d
---------------------+-------------------------------+-------------------------------+-------------------------------
2023-10-27 10:54:55 | 2023-10-27 10:54:55.123457000 | 2023-10-27 10:54:55.123457000 | 2023-10-27 10:54:55.123457000
(1 row)

drop table test_247;
reset NLS_DATE_FORMAT;
reset ivorysql.datetime_ignore_nls_mask;
reset client_min_messages;
/* End - BUG#M0000247 */
Loading