Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 13 additions & 8 deletions .github/workflows/source-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ jobs:
include:
- os: windows
ruby: "head"
PGVERSION: 17.0-1-windows-x64
PGVER: "17"
PGVERSION: 18.0-1-windows-x64
PGVER: "18"
- os: windows
ruby: "3.2"
PGVERSION: 10.20-1-windows-x64
PGVER: "10"
- os: windows
ruby: "mswin"
PGVERSION: 17.0-1-windows-x64
PGVER: "17"
PGVERSION: 18.0-1-windows-x64
PGVER: "18"
- os: ubuntu
ruby: "head"
PGVER: "17"
PGVER: "18"
- os: ubuntu
ruby: "3.2"
PGVER: "12"
Expand All @@ -69,11 +69,11 @@ jobs:
PGVER: "14"
- os: ubuntu
ruby: "truffleruby-head"
PGVER: "17"
PGVER: "18"
- os: macos
ruby: "head"
PGVERSION: 17.0-1-osx
PGVER: "17"
PGVERSION: 18.0-2-osx
PGVER: "18"

runs-on: ${{ matrix.os }}-${{ matrix.os_ver || 'latest' }}
env:
Expand Down Expand Up @@ -162,3 +162,8 @@ jobs:
run: |
ridk exec cat c:/rubyinstaller-head-*/lib/ruby/gems/*/extensions/*/*/*/mkmf.log || ridk exec cat d:/rubyinstaller-head-*/lib/ruby/gems/*/extensions/*/*/*/mkmf.log
ridk exec gcc -v

- name: Print mkmf logs if job failed on Macos-head
if: ${{ failure() && matrix.os == 'macos' && matrix.ruby == 'head' }}
run: |
cat /Users/runner/.rubies/ruby-head/lib/ruby/gems/*/extensions/*/*/*/mkmf.log
3 changes: 2 additions & 1 deletion ext/errorcodes.def
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@
register_error_class( "0Z002", klass );
}
{
VALUE klass = define_error_class( "InvalidArgumentForXquery", "10" );
VALUE klass = define_error_class( "InvalidArgumentForXquery", NULL );
register_error_class( "10608", klass );
register_error_class( "10", klass );
}
{
VALUE klass = define_error_class( "CaseNotFound", NULL );
Expand Down
2 changes: 1 addition & 1 deletion ext/errorcodes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def camelize(lower_case_and_underscored_word)
sqlstate, ews, errcode_macro_name = $1, $2, $3
next unless ews=='E'

is_sqlclass = sqlstate[2..-1] == '000'
is_sqlclass = sqlstate[2..-1] == '000' || sqlstate == '10608'
class_code = sqlstate[0,2]
baseclass_code = is_sqlclass ? 'NULL' : class_code.inspect
class_name = camelize(errcode_macro_name.sub('ERRCODE_', '').downcase)
Expand Down
Loading