ibm_db 5.3.2-x86-mingw32 → 5.4.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f640e5df067163b9c3a38f6022ba7b6d4c5175d4f4bba95498e30630d5b307de
-  data.tar.gz: 38dbb220869ee478f23cc2ed6a1a856d2edab22564c96b7fa6b78c0ac07cead2
+  metadata.gz: 53ebbd59f14d4e0274c0833df140ec787ebf91bf9a972a8253ca1116b8f600c9
+  data.tar.gz: 0a58578883d5ab1a48ce28adc24a50cb8cbf44928b5ef8847af571de53e7a898
 SHA512:
-  metadata.gz: 5fac8a5cdbd2120b86cee60fae53142036e39fe731715192762ba535482281d8b9d54adf6add3905883efe41dc0418dc2386b32cffdb23fab3d7fe3e47473d12
-  data.tar.gz: ceed221c76bccc86583ec4229f140b753e12517bfa00fb11b4035157012c62bd5bd70286fa459166be3a80ce04b748e8bfb3ece87157fd9e2c589c06d4a0180b
+  metadata.gz: e349b375fffd4e049ed8dc10811dfbfc1829d044d660596cbdd5f8a10fa51e7e056676c5a234c327d90cb75243f05f8f1482215c54b81543ba9f9f9567c6f947
+  data.tar.gz: 12fc93d1bc0f44c8dd641c07a7ef461a7896ecc4ba5332a4272c4e7f9cf177c60fdcb5f1b26510703e5cd4b1960ada1719a31dd1ffc3a9b9ab60b268f247beb6

data/README

@@ -1,5 +1,5 @@
 =====================================================================
-README for the IBM_DB Adapter (5.0.0) and Driver (3.0.5)
+README for the IBM_DB Adapter >= 5.0.0 and Driver >= 3.0.5
 For ActiveRecord Version >= 5.0.7 (and Rails >= 5.0.7)
 =====================================================================
 

data/debug.log

@@ -0,0 +1 @@
+# Logfile created on 2023-03-28 15:47:54 -0400 by logger.rb/v1.5.0

data/ext/Makefile

@@ -3,6 +3,7 @@ SHELL = /bin/sh
 
 # V=0 quiet, V=1 verbose.  other values don't work.
 V = 0
+V0 = $(V:0=)
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
 ECHO1 = $(V:1=@ :)
@@ -12,12 +13,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /E/Ruby30/include/ruby-3.0.0
+topdir = /C/Ruby31/include/ruby-3.1.0
 hdrdir = $(topdir)
-arch_hdrdir = E:/Ruby30/include/ruby-3.0.0/i386-mingw32
+arch_hdrdir = /C/Ruby31/include/ruby-3.1.0/i386-mingw32
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/E/Ruby30
+prefix = $(DESTDIR)/C/Ruby31
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -52,6 +53,7 @@ infodir = $(datarootdir)/info
 docdir = $(datarootdir)/doc/$(PACKAGE)
 oldincludedir = $(DESTDIR)/usr/include
 includedir = $(prefix)/include
+runstatedir = $(localstatedir)/run
 localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
 sysconfdir = $(DESTDIR)
@@ -64,8 +66,8 @@ archdir = $(rubyarchdir)
 
 
 CC_WRAPPER = 
-CC = i686-w64-mingw32-gcc
-CXX = i686-w64-mingw32-g++
+CC = gcc
+CXX = g++
 LIBRUBY = lib$(RUBY_SO_NAME).dll.a
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
@@ -78,18 +80,18 @@ CSRCFLAG = $(empty)
 RUBY_EXTCONF_H = unicode_support_version.h
 cflags   = $(optflags) $(debugflags) $(warnflags)
 cxxflags = 
-optflags = -O3 -fno-omit-frame-pointer
+optflags = -O3 -fno-omit-frame-pointer -fno-fast-math
 debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable
+warnflags = -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable -Wundef
 cppflags = 
 CCDLFLAGS = 
 CFLAGS   = $(CCDLFLAGS) -O3 -fno-fast-math -fstack-protector-strong $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = -D_FILE_OFFSET_BITS=64
 CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) -march=i686 -mtune=generic -O2 -pipe $(ARCH_FLAG)
-ldflags  = -L. -pipe -s -fstack-protector-strong
-dldflags = -pipe -s -fstack-protector-strong -Wl,--enable-auto-image-base,--enable-auto-import $(DEFFILE) 
+CXXFLAGS = $(CCDLFLAGS) -march=pentium4 -mtune=generic -O2 -pipe $(ARCH_FLAG)
+ldflags  = -L. -pipe -s -fstack-protector-strong -Wl,--no-as-needed
+dldflags = -pipe -s -fstack-protector-strong -Wl,--enable-auto-image-base,--enable-auto-import $(DEFFILE)
 ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = $(CC) -shared
@@ -98,7 +100,7 @@ AR = i686-w64-mingw32-gcc-ar
 EXEEXT = .exe
 
 RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
-RUBY_SO_NAME = msvcrt-ruby300
+RUBY_SO_NAME = msvcrt-ruby310
 RUBYW_INSTALL_NAME = $(RUBYW_BASE_NAME)
 RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
 RUBYW_BASE_NAME = rubyw
@@ -106,13 +108,13 @@ RUBY_BASE_NAME = ruby
 
 arch = i386-mingw32
 sitearch = i386-msvcrt
-ruby_version = 3.0.0
+ruby_version = 3.1.0
 ruby = $(bindir)/$(RUBY_BASE_NAME)
 RUBY = $(ruby)
 ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
 
 RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
+RM_RF = rm -fr
 RMDIRS = rmdir --ignore-fail-on-non-empty -p
 MAKEDIRS = /usr/bin/mkdir -p
 INSTALL = /usr/bin/install -c
@@ -136,7 +138,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -ldb2cli  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi  
+LIBS = $(LIBRUBYARG_SHARED) -ldb2cli  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi -lbcrypt  
 ORIG_SRCS = ibm_db.c ruby_ibm_db_cli.c
 SRCS = $(ORIG_SRCS) 
 OBJS = ibm_db.o ruby_ibm_db_cli.o
@@ -154,11 +156,11 @@ BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+HDRDIR        = $(sitehdrdir)$(target_prefix)
+ARCHHDRDIR    = $(sitearchhdrdir)$(target_prefix)
 TARGET_SO_DIR =
 TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
-CLEANLIBS     = $(TARGET_SO) 
+CLEANLIBS     = $(TARGET_SO) false
 CLEANOBJS     = *.o  *.bak
 
 all:    $(DLLIB)
@@ -171,7 +173,7 @@ clean-rb-default::
 clean-rb::
 clean-so::
 clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
+		-$(Q)$(RM_RF) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
 
 distclean-rb-default::
 distclean-rb::

data/ext/ibm_db.c

@@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "3.0.6"
+#define MODULE_RELEASE "3.1.0"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2507,8 +2507,7 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
   }
   /* Call the function where the actual logic is being run*/
   #ifdef UNICODE_SUPPORT_VERSION_H
-	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_connect_helper2, helper_args, RUBY_UBF_IO, NULL);	
-	
+    _ruby_ibm_db_connect_helper2( helper_args );
 				
     conn_res = helper_args->conn_res;
 	
@@ -6988,8 +6987,7 @@ VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self)
     bind_array->error             =  &error;
 
     #ifdef UNICODE_SUPPORT_VERSION_H
-  	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_execute_helper, bind_array,
-                            RUBY_UBF_IO, NULL );
+      _ruby_ibm_db_execute_helper( bind_array );
 	  ret_value = bind_array->return_value;
     #else
       ret_value = _ruby_ibm_db_execute_helper( bind_array );
@@ -10078,8 +10076,7 @@ VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self)
   helper_args->error       =  &error;
 
   #ifdef UNICODE_SUPPORT_VERSION_H
-	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_fetch_row_helper, helper_args,
-                        RUBY_UBF_IO, NULL );
+    _ruby_ibm_db_fetch_row_helper( helper_args );
 	ret_val = helper_args->return_value;
   #else
     ret_val = _ruby_ibm_db_fetch_row_helper( helper_args );
@@ -10247,8 +10244,7 @@ VALUE ibm_db_fetch_assoc(int argc, VALUE *argv, VALUE self) {
   helper_args->funcType   =  FETCH_ASSOC;
 
   #ifdef UNICODE_SUPPORT_VERSION_H
-  	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
-                         RUBY_UBF_IO, NULL );
+    _ruby_ibm_db_bind_fetch_helper( helper_args );
 	ret_val = helper_args->return_value;
 						
   #else

data/ext/mkmf.log

@@ -14,7 +14,7 @@ unicode_support_version.h is:
 
 have_library: checking for SQLConnect() in -ldb2cli... -------------------- yes
 
-"i686-w64-mingw32-gcc -o conftest.exe -IE:/Ruby30/include/ruby-3.0.0/i386-mingw32 -IE:/Ruby30/include/ruby-3.0.0/ruby/backward -IE:/Ruby30/include/ruby-3.0.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong conftest.c  -L. -LE:/Ruby30/lib -LC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/lib -L. -pipe -s -fstack-protector-strong     -lmsvcrt-ruby300  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi  "
+PATH=".;C:/Ruby31/lib;C:\Users\pnarayanappa\Python\Python310\Scripts\;C:\Users\pnarayanappa\Python\Python310\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\ibm\gsk8\lib64;C:\Program Files (x86)\ibm\gsk8\lib;C:\Program Files\Java\jre1.8.0_231\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\PuTTY\;C:\Program Files\Git\cmd;C:\Program Files\OpenSSH-Win64;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Users\pnarayanappa\AppData\Roaming\Python\Python37\Scripts\;C:\Users\pnarayanappa\eclipse-workspace-git-Dj-3_2_9_Py-3_10_5\myvenv\Lib\site-packages;C:\PROGRA~1\IBM\SQLLIB\BIN;C:\PROGRA~1\IBM\SQLLIB\FUNCTION;C:\PROGRA~1\IBM\SQLLIB\SAMPLES\REPL;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Ruby31\bin;C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;C:\Users\pnarayanappa\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\pnarayanappa\.dotnet\tools" "gcc -o conftest.exe -IC:/Ruby31/include/ruby-3.1.0/i386-mingw32 -IC:/Ruby31/include/ruby-3.1.0/ruby/backward -IC:/Ruby31/include/ruby-3.1.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong conftest.c  -L. -LC:/Ruby31/lib -LC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/lib -L. -pipe -s -fstack-protector-strong -Wl,--no-as-needed     -lmsvcrt-ruby310  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi -lbcrypt  "
 checked program was:
 /* begin */
 1: #include "ruby.h"
@@ -27,7 +27,7 @@ checked program was:
 8: }
 /* end */
 
-"i686-w64-mingw32-gcc -o conftest.exe -IE:/Ruby30/include/ruby-3.0.0/i386-mingw32 -IE:/Ruby30/include/ruby-3.0.0/ruby/backward -IE:/Ruby30/include/ruby-3.0.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong conftest.c  -L. -LE:/Ruby30/lib -LC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/lib -L. -pipe -s -fstack-protector-strong     -lmsvcrt-ruby300 -ldb2cli  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi  "
+PATH=".;C:/Ruby31/lib;C:\Users\pnarayanappa\Python\Python310\Scripts\;C:\Users\pnarayanappa\Python\Python310\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\ibm\gsk8\lib64;C:\Program Files (x86)\ibm\gsk8\lib;C:\Program Files\Java\jre1.8.0_231\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\PuTTY\;C:\Program Files\Git\cmd;C:\Program Files\OpenSSH-Win64;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Users\pnarayanappa\AppData\Roaming\Python\Python37\Scripts\;C:\Users\pnarayanappa\eclipse-workspace-git-Dj-3_2_9_Py-3_10_5\myvenv\Lib\site-packages;C:\PROGRA~1\IBM\SQLLIB\BIN;C:\PROGRA~1\IBM\SQLLIB\FUNCTION;C:\PROGRA~1\IBM\SQLLIB\SAMPLES\REPL;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Ruby31\bin;C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;C:\Users\pnarayanappa\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\pnarayanappa\.dotnet\tools" "gcc -o conftest.exe -IC:/Ruby31/include/ruby-3.1.0/i386-mingw32 -IC:/Ruby31/include/ruby-3.1.0/ruby/backward -IC:/Ruby31/include/ruby-3.1.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong conftest.c  -L. -LC:/Ruby31/lib -LC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/lib -L. -pipe -s -fstack-protector-strong -Wl,--no-as-needed     -lmsvcrt-ruby310 -ldb2cli  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi -lbcrypt  "
 conftest.c: In function 't':
 conftest.c:17:57: error: 'SQLConnect' undeclared (first use in this function); did you mean 'WSAConnect'?
  int t(void) { void ((*volatile p)()); p = (void ((*)()))SQLConnect; return !p; }
@@ -55,7 +55,7 @@ checked program was:
 17: int t(void) { void ((*volatile p)()); p = (void ((*)()))SQLConnect; return !p; }
 /* end */
 
-"i686-w64-mingw32-gcc -o conftest.exe -IE:/Ruby30/include/ruby-3.0.0/i386-mingw32 -IE:/Ruby30/include/ruby-3.0.0/ruby/backward -IE:/Ruby30/include/ruby-3.0.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong conftest.c  -L. -LE:/Ruby30/lib -LC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/lib -L. -pipe -s -fstack-protector-strong     -lmsvcrt-ruby300 -ldb2cli  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi  "
+PATH=".;C:/Ruby31/lib;C:\Users\pnarayanappa\Python\Python310\Scripts\;C:\Users\pnarayanappa\Python\Python310\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\ibm\gsk8\lib64;C:\Program Files (x86)\ibm\gsk8\lib;C:\Program Files\Java\jre1.8.0_231\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\PuTTY\;C:\Program Files\Git\cmd;C:\Program Files\OpenSSH-Win64;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Users\pnarayanappa\AppData\Roaming\Python\Python37\Scripts\;C:\Users\pnarayanappa\eclipse-workspace-git-Dj-3_2_9_Py-3_10_5\myvenv\Lib\site-packages;C:\PROGRA~1\IBM\SQLLIB\BIN;C:\PROGRA~1\IBM\SQLLIB\FUNCTION;C:\PROGRA~1\IBM\SQLLIB\SAMPLES\REPL;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Ruby31\bin;C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;C:\Users\pnarayanappa\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\pnarayanappa\.dotnet\tools" "gcc -o conftest.exe -IC:/Ruby31/include/ruby-3.1.0/i386-mingw32 -IC:/Ruby31/include/ruby-3.1.0/ruby/backward -IC:/Ruby31/include/ruby-3.1.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong conftest.c  -L. -LC:/Ruby31/lib -LC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/lib -L. -pipe -s -fstack-protector-strong -Wl,--no-as-needed     -lmsvcrt-ruby310 -ldb2cli  -lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi -lbcrypt  "
 checked program was:
 /* begin */
  1: #include "ruby.h"
@@ -82,7 +82,7 @@ checked program was:
 
 have_header: checking for gil_release_version.h... -------------------- yes
 
-"i686-w64-mingw32-gcc -E -IE:/Ruby30/include/ruby-3.0.0/i386-mingw32 -IE:/Ruby30/include/ruby-3.0.0/ruby/backward -IE:/Ruby30/include/ruby-3.0.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong  conftest.c -o conftest.i"
+PATH=".;C:/Ruby31/lib;C:\Users\pnarayanappa\Python\Python310\Scripts\;C:\Users\pnarayanappa\Python\Python310\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\ibm\gsk8\lib64;C:\Program Files (x86)\ibm\gsk8\lib;C:\Program Files\Java\jre1.8.0_231\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\PuTTY\;C:\Program Files\Git\cmd;C:\Program Files\OpenSSH-Win64;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Users\pnarayanappa\AppData\Roaming\Python\Python37\Scripts\;C:\Users\pnarayanappa\eclipse-workspace-git-Dj-3_2_9_Py-3_10_5\myvenv\Lib\site-packages;C:\PROGRA~1\IBM\SQLLIB\BIN;C:\PROGRA~1\IBM\SQLLIB\FUNCTION;C:\PROGRA~1\IBM\SQLLIB\SAMPLES\REPL;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Ruby31\bin;C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;C:\Users\pnarayanappa\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\pnarayanappa\.dotnet\tools" "gcc -IC:/Ruby31/include/ruby-3.1.0/i386-mingw32 -IC:/Ruby31/include/ruby-3.1.0/ruby/backward -IC:/Ruby31/include/ruby-3.1.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong   -c conftest.c"
 checked program was:
 /* begin */
 1: #include "ruby.h"
@@ -96,7 +96,7 @@ checked program was:
 
 have_header: checking for unicode_support_version.h... -------------------- yes
 
-"i686-w64-mingw32-gcc -E -IE:/Ruby30/include/ruby-3.0.0/i386-mingw32 -IE:/Ruby30/include/ruby-3.0.0/ruby/backward -IE:/Ruby30/include/ruby-3.0.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong  conftest.c -o conftest.i"
+PATH=".;C:/Ruby31/lib;C:\Users\pnarayanappa\Python\Python310\Scripts\;C:\Users\pnarayanappa\Python\Python310\;C:\Program Files\Python37\Scripts\;C:\Program Files\Python37\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\ibm\gsk8\lib64;C:\Program Files (x86)\ibm\gsk8\lib;C:\Program Files\Java\jre1.8.0_231\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\PuTTY\;C:\Program Files\Git\cmd;C:\Program Files\OpenSSH-Win64;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Users\pnarayanappa\AppData\Roaming\Python\Python37\Scripts\;C:\Users\pnarayanappa\eclipse-workspace-git-Dj-3_2_9_Py-3_10_5\myvenv\Lib\site-packages;C:\PROGRA~1\IBM\SQLLIB\BIN;C:\PROGRA~1\IBM\SQLLIB\FUNCTION;C:\PROGRA~1\IBM\SQLLIB\SAMPLES\REPL;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Ruby31\bin;C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;C:\Users\pnarayanappa\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\pnarayanappa\.dotnet\tools" "gcc -IC:/Ruby31/include/ruby-3.1.0/i386-mingw32 -IC:/Ruby31/include/ruby-3.1.0/ruby/backward -IC:/Ruby31/include/ruby-3.1.0 -I. -IC:/Users/pnarayanappa/ruby-ibmdb/IBM_DB_Adapter/ibm_db/ext/../lib/clidriver/include -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 -D_WIN32_WINNT=0x0600 -D__MINGW_USE_VC2005_COMPAT -D_FILE_OFFSET_BITS=64  -O3 -fno-fast-math -fstack-protector-strong   -c conftest.c"
 checked program was:
 /* begin */
 1: #include "ruby.h"

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -51,6 +51,12 @@ module ActiveRecord
   module ConnectionAdapters
     class SchemaDumper
       private
+        def header(stream)
+          stream.puts <<~HEADER          
+            ActiveRecord::Schema[#{ActiveRecord::Migration.current_version}].define(#{define_params}) do
+          HEADER
+        end
+
         def default_primary_key?(column)
           schema_type(column) == :integer
         end
@@ -75,11 +81,11 @@ module ActiveRecord
           end
 
           if supports_foreign_keys?
-            statements.concat(o.foreign_keys.map { |to_table, options| foreign_key_in_create(o.name, to_table, options) })
+            statements.concat(o.foreign_keys.map { |fk| accept fk })
           end
 
           if supports_check_constraints?
-            statements.concat(o.check_constraints.map { |expression, options| check_constraint_in_create(o.name, expression, options) })
+            statements.concat(o.check_constraints.map { |chk| accept chk })
           end
 
           create_sql << "(#{statements.join(', ')})" if statements.present?
@@ -423,7 +429,7 @@ module ActiveRecord
       end
 		
       def drop_table(table_name, options={})
-        puts_log "drop_table"
+        puts_log "drop_table - #{table_name}"
         if options[:if_exists]
           execute("DROP TABLE IF EXISTS #{quote_table_name(table_name)}")
         else
@@ -833,7 +839,9 @@ module ActiveRecord
 
       def prepared_statements?
         puts_log "prepared_statements?"
-        @prepared_statements && !prepared_statements_disabled_cache.include?(object_id)
+        prepare = @prepared_statements && !prepared_statements_disabled_cache.include?(object_id)
+        puts_log "prepare = #{prepare}"
+        prepare
       end
       alias :prepared_statements :prepared_statements?
 
@@ -1112,8 +1120,10 @@ module ActiveRecord
         end
       end
 
-      def select(sql, name = nil, binds = [])
+      def select(sql, name = nil, binds = [], prepare: false, async: false)
         puts_log "select #{sql}"
+        puts_log "prepare = #{prepare}"
+
         # Replaces {"= NULL" with " IS NULL"} OR {"IN (NULL)" with " IS NULL"
         begin
           sql.gsub( /(=\s*NULL|IN\s*\(NULL\))/i, " IS NULL" )
@@ -1121,12 +1131,32 @@ module ActiveRecord
           # ...
         end
 
+        if async && async_enabled?
+          if current_transaction.joinable?
+            raise AsynchronousQueryInsideTransactionError, "Asynchronous queries are not allowed inside transactions"
+          end
+
+          future_result = async.new(
+            pool,
+            sql,
+            name,
+            binds,
+            prepare: prepare,
+          )
+          if supports_concurrent_connections? && current_transaction.closed?
+            future_result.schedule!(ActiveRecord::Base.asynchronous_queries_session)
+          else
+            future_result.execute!(self)
+          end
+          return future_result
+        end
+
         results = []
 
         if(binds.nil? || binds.empty?)
           stmt = execute(sql, name)
         else
-          stmt = exec_query_ret_stmt(sql, name, binds, prepare = false)
+          stmt = exec_query_ret_stmt(sql, name, binds, prepare)
         end
 
         cols = IBM_DB.resultCols(stmt)
@@ -1452,7 +1482,8 @@ module ActiveRecord
       # the executed +sql+ statement.
       # Here prepare argument is not used, by default this method creates prepared statment and execute.
       def exec_query_ret_stmt(sql, name = 'SQL', binds = [], prepare = false)
-        puts_log "exec_query_ret_stmt"
+        puts_log "exec_query_ret_stmt #{sql}"
+        sql = transform_query(sql)
         check_if_write_query(sql)
         materialize_transactions
         mark_transaction_written_if_write(sql)
@@ -1461,6 +1492,8 @@ module ActiveRecord
           puts_log "Binds = #{binds}"
           param_array = type_casted_binds(binds)
           puts_log "Param array = #{param_array}"
+          puts_log "Prepare flag = #{prepare}"
+          puts_log "#{caller}"
 
           stmt = @servertype.prepare(sql, name)
           if prepare 
@@ -1526,6 +1559,7 @@ module ActiveRecord
 	    #sql='INSERT INTO ar_internal_metadata (key, value, created_at, updated_at) VALUES ('10', '10', '10', '10')
         puts_log "execute"
         puts_log "#{sql}"
+        sql = transform_query(sql)
         check_if_write_query(sql)
         materialize_transactions
         mark_transaction_written_if_write(sql)
@@ -1725,6 +1759,9 @@ module ActiveRecord
 
       def quote_table_name(name)
         puts_log "quote_table_name"
+        if name.start_with?'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+          name = "\"#{name}\""
+        end
         name
         #@servertype.check_reserved_words(name).gsub('"', '').gsub("'",'')
       end
@@ -2378,7 +2415,9 @@ module ActiveRecord
               column_nullable = (col["nullable"] == 1) ? true : false
               # Make sure the hidden column (db2_generated_rowid_for_lobs) in DB2 z/OS isn't added to the list
               if !(column_name.match(/db2_generated_rowid_for_lobs/i))
+                puts_log "Column type = #{column_type}"
 				ruby_type = simplified_type(column_type)
+                puts_log "Ruby type after = #{ruby_type}"
 				precision = extract_precision(ruby_type)
 
                 if column_type.match(/timestamp|integer|bigint|date|time|blob/i)
@@ -2429,7 +2468,7 @@ module ActiveRecord
             else
               error_msg = "An unexpected error occurred during retrieval of column metadata"
               error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
-              raise error_msg
+#             raise error_msg
             end
           ensure  # Free resources associated with the statement
             IBM_DB.free_stmt(stmt) if stmt
@@ -2447,6 +2486,10 @@ module ActiveRecord
         return columns
       end
 	 
+      def extract_precision(sql_type)
+        $1.to_i if sql_type =~ /\((\d+)(,\d+)?\)/
+      end
+
       def extract_default_function(default_value, default)
         default if has_default_function?(default_value, default)
       end
@@ -2491,7 +2534,7 @@ module ActiveRecord
             else
               error_msg = "An unexpected error occurred during retrieval of foreign key metadata"
               error_msg = error_msg + ": #{fetch_error.message}" if !fetch_error.message.empty?
-              raise error_msg
+#             raise error_msg
             end
           ensure  # Free resources associated with the statement
             IBM_DB.free_stmt(stmt) if stmt
@@ -2578,6 +2621,7 @@ module ActiveRecord
         puts_log "add_column"
         clear_cache!
         puts_log "add_column info #{table_name}, #{column_name}, #{type}, #{options}"
+        puts_log caller
         if (!type.nil? && type.to_s == "primary_key") or (options.key?(:primary_key) and options[:primary_key] == true)
           if !type.nil? and type.to_s != "primary_key"
             execute "ALTER TABLE #{table_name} ADD COLUMN #{column_name} #{type} NOT NULL DEFAULT 0"
@@ -2685,6 +2729,15 @@ module ActiveRecord
         end
       end
 
+      def remove_columns(table_name, *column_names, type: nil, **options)
+        if column_names.empty?
+          raise ArgumentError.new("You must specify at least one column name. Example: remove_columns(:people, :first_name)")
+        end
+
+        remove_column_fragments = remove_columns_for_alter(table_name, *column_names, type: type, **options)
+        execute "ALTER TABLE #{quote_table_name(table_name)} #{remove_column_fragments.join(' ')}"
+      end
+
       # Renames a table.
       # ==== Example
       # rename_table('octopuses', 'octopi')
@@ -2782,7 +2835,7 @@ module ActiveRecord
         puts_log "add_foreign_keyList = #{table_name}, #{column_name}, #{fkey_list}"
         fkey_list.each do |fkey|
           if fkey.options[:column] == column_name
-            add_foreign_key(table_name, fkey.to_table, column: new_column_name)
+            add_foreign_key(table_name, strip_table_name_prefix_and_suffix(fkey.to_table), column: new_column_name)
           end
         end
       end
@@ -2917,6 +2970,7 @@ module ActiveRecord
 
       class SchemaDumper < ConnectionAdapters::SchemaDumper
         def dump(stream)    # Like in abstract class, we no need to call header() & trailer().
+          header(stream)
           extensions(stream)
           tables(stream)
           stream
@@ -3724,7 +3778,7 @@ module Arel
           row.each_with_index do |value, k|
           collector << ", " unless k == 0
           case value
-            when Nodes::SqlLiteral, Nodes::BindParam
+            when Nodes::SqlLiteral, Nodes::BindParam, ActiveModel::Attribute
               collector = visit(value, collector)
               #collector << quote(value).to_s
             else

data/lib/mswin32/ibm_db.rb

@@ -87,8 +87,10 @@ machine_bits = ['ibm'].pack('p').size * 8
 if machine_bits == 64		
 	raise NotImplementedError, "ibm_db with Ruby 64-bit on Windows platform is not supported. Refer to README for more details"
 else
-	if (RUBY_VERSION =~ /3/)
+	if (RUBY_VERSION =~ /3.0/)
 		require 'rb3x/i386/ruby30/ibm_db.so'
+	elsif (RUBY_VERSION =~ /3.1/)
+		require 'rb3x/i386/ruby31/ibm_db.so'
 	elsif (RUBY_VERSION =~ /2.7/)
 		require 'rb2x/i386/ruby27/ibm_db.so'
 	elsif (RUBY_VERSION =~ /2.6/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_db
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.4.0
 platform: x86-mingw32
 authors:
 - IBM
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - MANIFEST
 - ParameterizedQueries README
 - README
+- debug.log
 - ext/Makefile
 - ext/Makefile.nt32
 - ext/Makefile.nt32.191
@@ -94,6 +95,7 @@ files:
 - lib/mswin32/rb2x/i386/ruby26/ibm_db.so
 - lib/mswin32/rb2x/i386/ruby27/ibm_db.so
 - lib/mswin32/rb3x/i386/ruby30/ibm_db.so
+- lib/mswin32/rb3x/i386/ruby31/ibm_db.so
 - test/active_record/connection_adapters/fake_adapter.rb
 - test/activejob/destroy_association_async_test.rb
 - test/activejob/destroy_async_job_not_present_test.rb
@@ -847,8 +849,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ActiveRecord, at least 6.1
-rubygems_version: 3.2.3
+- ActiveRecord, at least 7.0
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows,