Skip to content

Commit 77667eb

Browse files
authored
Merge pull request ged#678 from larskanis/ci-update
CI: Update PostgreSQL
2 parents 2c9c33a + 6e52ce5 commit 77667eb

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

.github/workflows/source-gem.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ jobs:
4444
include:
4545
- os: windows
4646
ruby: "head"
47-
PGVERSION: 17.0-1-windows-x64
48-
PGVER: "17"
47+
PGVERSION: 18.0-1-windows-x64
48+
PGVER: "18"
4949
- os: windows
5050
ruby: "3.2"
5151
PGVERSION: 10.20-1-windows-x64
5252
PGVER: "10"
5353
- os: windows
5454
ruby: "mswin"
55-
PGVERSION: 17.0-1-windows-x64
56-
PGVER: "17"
55+
PGVERSION: 18.0-1-windows-x64
56+
PGVER: "18"
5757
- os: ubuntu
5858
ruby: "head"
59-
PGVER: "17"
59+
PGVER: "18"
6060
- os: ubuntu
6161
ruby: "3.2"
6262
PGVER: "12"
@@ -69,11 +69,11 @@ jobs:
6969
PGVER: "14"
7070
- os: ubuntu
7171
ruby: "truffleruby-head"
72-
PGVER: "17"
72+
PGVER: "18"
7373
- os: macos
7474
ruby: "head"
75-
PGVERSION: 17.0-1-osx
76-
PGVER: "17"
75+
PGVERSION: 18.0-2-osx
76+
PGVER: "18"
7777

7878
runs-on: ${{ matrix.os }}-${{ matrix.os_ver || 'latest' }}
7979
env:
@@ -162,3 +162,8 @@ jobs:
162162
run: |
163163
ridk exec cat c:/rubyinstaller-head-*/lib/ruby/gems/*/extensions/*/*/*/mkmf.log || ridk exec cat d:/rubyinstaller-head-*/lib/ruby/gems/*/extensions/*/*/*/mkmf.log
164164
ridk exec gcc -v
165+
166+
- name: Print mkmf logs if job failed on Macos-head
167+
if: ${{ failure() && matrix.os == 'macos' && matrix.ruby == 'head' }}
168+
run: |
169+
cat /Users/runner/.rubies/ruby-head/lib/ruby/gems/*/extensions/*/*/*/mkmf.log

ext/errorcodes.def

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@
8888
register_error_class( "0Z002", klass );
8989
}
9090
{
91-
VALUE klass = define_error_class( "InvalidArgumentForXquery", "10" );
91+
VALUE klass = define_error_class( "InvalidArgumentForXquery", NULL );
9292
register_error_class( "10608", klass );
93+
register_error_class( "10", klass );
9394
}
9495
{
9596
VALUE klass = define_error_class( "CaseNotFound", NULL );

ext/errorcodes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def camelize(lower_case_and_underscored_word)
2828
sqlstate, ews, errcode_macro_name = $1, $2, $3
2929
next unless ews=='E'
3030

31-
is_sqlclass = sqlstate[2..-1] == '000'
31+
is_sqlclass = sqlstate[2..-1] == '000' || sqlstate == '10608'
3232
class_code = sqlstate[0,2]
3333
baseclass_code = is_sqlclass ? 'NULL' : class_code.inspect
3434
class_name = camelize(errcode_macro_name.sub('ERRCODE_', '').downcase)

0 commit comments

Comments
 (0)