advantage 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf8b67fe44d883fae68869b14f8304d14cf1ac6cd2bf9efd94b685b8933533d
-  data.tar.gz: d90319799c8034c2e1055e5c797077136c940994de80231d62377b9741b92cfb
+  metadata.gz: 384998f9525f51b6edf754a2d4c4c4e988af28dbecf60be2f0b27ea99378f00c
+  data.tar.gz: e5ae988ce3e9a1e03220cdee7d23ee440e1bcc0bf29ac2664311a906d12efed9
 SHA512:
-  metadata.gz: dfeabef311ac48beda103957c17c43ba16612a3ab166c2624dbdfd86e2d841c1b3e98e09a4a7774370ceed96587ed686fb76644290f8dfb05d6cd430a4513521
-  data.tar.gz: afcb82f0dbb6f41e6ed3b0af9b946d67f5269176a2f09e65db4e445041029e7b593ece2b7ce3cf5de282543720ef3c2dcf93aa6d7f6da40f4a4a30df5ab22a25
+  metadata.gz: 3cfdf5c0d4b0eafcc9fcfcc77430a45fd17ac40a34c0096b7e9ced94297ed0959bec97b25efd21f8d61fe43701f577a003b3de4352713081c935ca77b86b0728
+  data.tar.gz: c9e090d0191ff557abb1cc99cb4b86730b6ac27da1fd5b94558202c84c3e5f0f4ccb8fe8811aa9c9504c95377e4f44c03fd4ca848d2572b8ac035224428914fd

data/.gitignore

@@ -0,0 +1,11 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,7 @@
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.5.8
+before_install: gem install bundler -v 1.17.3

data/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in advantage.gemspec
+gem 'test-unit'
+

data/Gemfile.lock

@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    power_assert (2.0.3)
+    test-unit (3.5.9)
+      power_assert
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  test-unit
+
+BUNDLED WITH
+   2.1.4

data/advantage.gemspec

@@ -1,53 +1,54 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-pkg_version = ""
-File.open(File.join("ext", "advantage", "advantage.c")) do |f|
+pkg_version = ''
+File.open(File.join('ext', 'advantage', 'advantage.c')) do |f|
   f.grep(/const char\s*\*\s*VERSION/) do |line|
     pkg_version = /\s*const char\s*\*\s*VERSION\s*=\s*["|']([^"']+)["|'];\s*/.match(line)[1]
   end
 end
 
 Gem::Specification.new do |spec|
-  spec.name = "advantage"
+  spec.name = 'advantage'
   spec.version = pkg_version
-  spec.authors = ["Edgar Sherman", "Jon Adams"]
-  spec.email = ["advantage@sybase.com", "t12nslookup@googlemail.com"]
+  spec.authors = ['Edgar Sherman', 'Jon Adams']
+  spec.email = ['advantage@sybase.com', 't12nslookup@googlemail.com']
 
-  spec.summary = %q{Advantage Database library for Ruby}
-  spec.description = %q{Advantage Database Driver for Ruby}
-  spec.homepage = "http://devzone.advantagedatabase.com"
-  spec.license = "Apache-2.0"
+  spec.summary = 'Advantage Database library for Ruby'
+  spec.description = 'Advantage Database Driver for Ruby'
+  spec.homepage = 'http://devzone.advantagedatabase.com'
+  spec.license = 'Apache-2.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata['homepage_uri'] = spec.homepage
     # Changed to the github project, as this is the actively maintained source, now.
-    spec.metadata["source_code_uri"] = "https://github.com/t12nslookup/advantage/"
-    spec.metadata["changelog_uri"] = "https://github.com/t12nslookup/advantage/blob/master/CHANGELOG.md"
+    spec.metadata['source_code_uri'] = 'https://github.com/t12nslookup/advantage/'
+    spec.metadata['changelog_uri'] = 'https://github.com/t12nslookup/advantage/blob/master/CHANGELOG.md'
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-          "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.files = Dir["{test,lib,ext}/**/*",
-                   "LICENSE",
-                   "Rakefile",
-                   "README",
-                   "advantage.gemspec"]
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.1"
-  spec.extensions << "ext/advantage/extconf.rb"
+  spec.files += Dir['{test,lib,ext}/**/*',
+                    'LICENSE',
+                    'Rakefile',
+                    'README',
+                    'advantage.gemspec']
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 2.2.10'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
+  spec.add_development_dependency 'rake-compiler', '~> 1.1'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+
+  spec.extensions << 'ext/advantage/extconf.rb'
 end

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "advantage"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/ext/advantage/ace.h

@@ -154,7 +154,7 @@ typedef loff_t SIGNED64;
 #define RUBY_EXTERN extern
 #define STATIC static
 
-#if defined(ASANT) || defined(ADS_NT) || defined(ADS_WIN9X) || (defined(x64) && !defined(ADS_LINUX))
+#if defined(ASANT) || defined(ADS_NT) || defined(ADS_WIN9X) || (defined(x64) && !defined(ADS_LINUX)) || (defined(_WIN64) && !defined(ADS_LINUX))
 #define ENTRYPOINT WINAPI
 #elif defined(ASANLM) || defined(ADS_LINUX) || defined(NLM)
 #define ENTRYPOINT

data/ext/advantage/advantage.c

@@ -21,7 +21,7 @@
 #include "ruby.h"
 #include "adscapidll.h"
 
-const char *VERSION = "0.1.2";
+const char *VERSION = "0.1.4";
 
 typedef struct imp_drh_st
 {
@@ -29,6 +29,12 @@ typedef struct imp_drh_st
    void *adscapi_context;
 } imp_drh_st;
 
+static const rb_data_type_t ads_connection_type = {
+   "a_ads_connection",
+   { 0, 0, 0 },
+   0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 // Defining the Ruby Modules
 static VALUE mAdvantage;
 static VALUE mAPI;
@@ -334,7 +340,7 @@ static_AdvantageInterface_ads_new_connection(VALUE imp_drh)
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    ptr = s_imp_drh->api.ads_new_connection();
 
-   tdata = Data_Wrap_Struct(cA_ads_connection, 0, 0, ptr);
+   tdata = TypedData_Wrap_Struct(cA_ads_connection, &ads_connection_type, ptr);
 
    return (tdata);
 }
@@ -396,7 +402,7 @@ static_AdvantageInterface_ads_connect(VALUE imp_drh, VALUE ads_conn, VALUE str)
    UNSIGNED32 result;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    s_str = StringValueCStr(str);
 
@@ -429,7 +435,7 @@ static_AdvantageInterface_ads_disconnect(VALUE imp_drh, VALUE ads_conn)
    a_ads_connection *s_ads_conn;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    s_imp_drh->api.ads_disconnect(s_ads_conn);
 
@@ -457,7 +463,7 @@ static_AdvantageInterface_ads_free_connection(VALUE imp_drh, VALUE ads_conn)
    a_ads_connection *s_ads_conn;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    s_imp_drh->api.ads_free_connection(s_ads_conn);
 
@@ -520,7 +526,7 @@ static_AdvantageInterface_ads_error(VALUE imp_drh, VALUE ads_conn)
    VALUE multi_result;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    result = s_imp_drh->api.ads_error(s_ads_conn, (UNSIGNED8 *)s_buffer, 255);
 
@@ -562,7 +568,7 @@ static_AdvantageInterface_ads_execute_immediate(VALUE imp_drh, VALUE ads_conn, V
    s_sql = StringValueCStr(sql);
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    result = s_imp_drh->api.ads_execute_immediate(s_ads_conn, (UNSIGNED8 *)s_sql);
 
@@ -604,13 +610,13 @@ static_AdvantageInterface_ads_execute_direct(VALUE imp_drh, VALUE ads_conn, VALU
    s_sql = StringValueCStr(sql);
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    resultset = s_imp_drh->api.ads_execute_direct(s_ads_conn, (UNSIGNED8 *)s_sql);
 
    if (resultset)
    {
-      tdata = INT2FIX(resultset);
+      tdata = ULL2NUM((unsigned long long)resultset);
    }
    else
    {
@@ -643,7 +649,7 @@ static_AdvantageInterface_ads_num_cols(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    result = s_imp_drh->api.ads_num_cols(s_stmt);
 
@@ -673,7 +679,7 @@ static_AdvantageInterface_ads_num_rows(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    result = s_imp_drh->api.ads_num_rows(s_stmt);
 
@@ -707,7 +713,7 @@ static_AdvantageInterface_ads_get_column(VALUE imp_drh, VALUE ads_stmt, VALUE co
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
    s_col_num = NUM2INT(col_num);
 
    result = s_imp_drh->api.ads_get_column(s_stmt, s_col_num, &value);
@@ -763,7 +769,7 @@ static_AdvantageInterface_ads_fetch_next(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    result = s_imp_drh->api.ads_fetch_next(s_stmt);
 
@@ -811,7 +817,7 @@ static_AdvantageInterface_ads_get_column_info(VALUE imp_drh, VALUE ads_stmt, VAL
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
    s_col_num = NUM2INT(col_num);
 
    result = s_imp_drh->api.ads_get_column_info(s_stmt, s_col_num, &info);
@@ -852,7 +858,7 @@ static_AdvantageInterface_AdsBeginTransaction(VALUE imp_drh, VALUE ads_conn)
    UNSIGNED32 result;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    result = s_imp_drh->api.AdsBeginTransaction(s_ads_conn->hConnect);
    if (result == 0)
@@ -883,7 +889,7 @@ static_AdvantageInterface_ads_commit(VALUE imp_drh, VALUE ads_conn)
    UNSIGNED32 result;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    result = s_imp_drh->api.ads_commit(s_ads_conn);
 
@@ -912,7 +918,7 @@ static_AdvantageInterface_ads_rollback(VALUE imp_drh, VALUE ads_conn)
    UNSIGNED32 result;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    result = s_imp_drh->api.ads_rollback(s_ads_conn);
 
@@ -951,14 +957,14 @@ static_AdvantageInterface_ads_prepare(VALUE imp_drh, VALUE ads_conn, VALUE sql)
    s_sql = StringValueCStr(sql);
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    //EJS Passing FALSE for isUnicode
    s_stmt = s_imp_drh->api.ads_prepare(s_ads_conn, (UNSIGNED8 *)s_sql, '\0');
 
    if (s_stmt)
    {
-      tdata = INT2FIX(s_stmt);
+      tdata = ULL2NUM((unsigned long long)s_stmt);
    }
    else
    {
@@ -996,7 +1002,7 @@ static_AdvantageInterface_ads_free_stmt(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    number_of_params = s_imp_drh->api.ads_num_params(s_stmt);
 
@@ -1062,7 +1068,7 @@ static_AdvantageInterface_ads_reset(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    result = s_imp_drh->api.ads_reset(s_stmt);
 
@@ -1092,7 +1098,7 @@ static_AdvantageInterface_ads_execute(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    //printf(  "CEXT s_ads_stmt: %d \n", s_stmt );
    result = s_imp_drh->api.ads_execute(s_stmt);
@@ -1127,7 +1133,7 @@ static_AdvantageInterface_ads_affected_rows(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    result = s_imp_drh->api.ads_affected_rows(s_stmt);
 
@@ -1171,7 +1177,7 @@ static_AdvantageInterface_ads_describe_bind_param(VALUE imp_drh, VALUE ads_stmt,
    memset(s_ads_bind_param, 0, sizeof(a_ads_bind_param));
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
    s_index = NUM2INT(index);
 
    result = s_imp_drh->api.ads_describe_bind_param(s_stmt, s_index, s_ads_bind_param);
@@ -1215,7 +1221,7 @@ static_AdvantageInterface_ads_bind_param(VALUE imp_drh, VALUE ads_stmt, VALUE in
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
    Data_Get_Struct(ads_bind_param, a_ads_bind_param, s_ads_bind_param);
    s_index = NUM2INT(index);
 
@@ -1255,7 +1261,7 @@ static_AdvantageInterface_ads_get_bind_param_info(VALUE imp_drh, VALUE ads_stmt,
    VALUE multi_result;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
    s_index = NUM2INT(index);
 
    result = s_imp_drh->api.ads_get_bind_param_info(s_stmt, s_index, &s_ads_bind_param_info);
@@ -1299,7 +1305,7 @@ static_AdvantageInterface_ads_num_params(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    result = s_imp_drh->api.ads_num_params(s_stmt);
 
@@ -1333,7 +1339,7 @@ static_AdvantageInterface_ads_get_next_result(VALUE imp_drh, VALUE ads_stmt)
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
 
    result = s_imp_drh->api.ads_get_next_result(s_stmt);
 
@@ -1368,7 +1374,7 @@ static_AdvantageInterface_ads_fetch_absolute(VALUE imp_drh, VALUE ads_stmt, VALU
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
    //Data_Get_Struct( ads_stmt, ADSHANDLE, s_ads_stmt );
-   s_stmt = NUM2ULONG(ads_stmt);
+   s_stmt = (ADSHANDLE)NUM2ULL(ads_stmt);
    s_offset = NUM2INT(offset);
    result = s_imp_drh->api.ads_fetch_absolute(s_stmt, s_offset);
 
@@ -1398,7 +1404,7 @@ static_AdvantageInterface_ads_sqlstate(VALUE imp_drh, VALUE ads_conn)
    char s_buffer[255];
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    result = s_imp_drh->api.ads_sqlstate(s_ads_conn, (UNSIGNED8 *)s_buffer, sizeof(s_buffer));
 
@@ -1429,7 +1435,7 @@ static_AdvantageInterface_ads_clear_error(VALUE imp_drh, VALUE ads_conn)
    a_ads_connection *s_ads_conn;
 
    Data_Get_Struct(imp_drh, imp_drh_st, s_imp_drh);
-   Data_Get_Struct(ads_conn, a_ads_connection, s_ads_conn);
+   TypedData_Get_Struct(ads_conn, a_ads_connection, &ads_connection_type, s_ads_conn);
 
    s_imp_drh->api.ads_clear_error(s_ads_conn);
 

data/ext/advantage/extconf.rb

@@ -24,6 +24,20 @@ require 'mkmf'
 CONFIG["debugflags"] = "-ggdb3"
 CONFIG["optflags"] = "-O0"
 
+if RUBY_PLATFORM =~ /x64/
+  $defs << "-Dx64"
+elsif RUBY_PLATFORM =~ /mingw|mswin/
+  # On 32-bit MinGW, ADS_WIN32 is defined but ENTRYPOINT falls through to
+  # _declspec(dllexport) which MinGW doesn't support (needs __declspec).
+  # Defining ADS_NT routes ENTRYPOINT to plain WINAPI instead.
+  $defs << "-DADS_NT"
+end
+
+# GCC 14+ (used by newer MinGW) promotes -Wincompatible-pointer-types to an
+# error by default. The rb_define_method calls use the old VALUE(*)(ANYARGS)
+# pattern which triggers this — downgrade back to a warning.
+$CFLAGS << " -Wno-incompatible-pointer-types"
+
 dir_config('ADS')
 
 create_makefile("advantage")

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advantage
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Edgar Sherman
 - Jon Adams
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
 description: Advantage Database Driver for Ruby
 email:
 - advantage@sybase.com
@@ -76,10 +75,17 @@ extensions:
 - ext/advantage/extconf.rb
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README
 - Rakefile
 - advantage.gemspec
+- bin/console
+- bin/setup
 - ext/advantage/ace.h
 - ext/advantage/adscapidll.c
 - ext/advantage/adscapidll.h
@@ -89,9 +95,6 @@ files:
 - ext/advantage/extconf.rb
 - test/advantage/advantage_test.rb
 - test/advantage/test.sql
-- test/mytest.rb
-- test/mytest2.rb
-- test/mytest3.rb
 homepage: http://devzone.advantagedatabase.com
 licenses:
 - Apache-2.0
@@ -100,7 +103,6 @@ metadata:
   homepage_uri: http://devzone.advantagedatabase.com
   source_code_uri: https://github.com/t12nslookup/advantage/
   changelog_uri: https://github.com/t12nslookup/advantage/blob/master/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Advantage Database library for Ruby
 test_files: []

data/test/mytest.rb

@@ -1,63 +0,0 @@
-begin
-  require "rubygems"
-  require "advantage"
-  unless defined? Advantage
-    # require 'advantage'
-    if RUBY_VERSION >= "1.9"
-      require_relative "../lib/advantage/advantage.so"
-    else
-      require File.join(File.dirname(__FILE__), "../lib/advantage/advantage.so")
-    end
-  end
-end
-
-# create an interface
-api = Advantage::AdvantageInterface.new()
-#
-# initialize the interface (loads the DLL/SO)
-Advantage::API.ads_initialize_interface(api)
-#
-# initialize our api object
-api.ads_init()
-
-# create a connection
-conn = api.ads_new_connection()
-
-# establish a connection
-conn_str = "data source=//172.27.144.1:6262/c\$/ads/db/mydb.add;user id=adssys;DateFormat=YYYY-MM-DD;CommType=TCP_IP;Compression=INTERNET"
-# conn_str = "data source=//10.0.0.4:6262/aislims/db/;user id=adssys;DateFormat=YYYY-MM-DD;CommType=TCP_IP;"
-val = api.ads_connect(conn, conn_str)
-puts "VAL: #{val.inspect}"
-
-# execute a query without a result set
-# puts api.ads_execute_immediate(conn, "select 'Successful Ruby Connection' from system.iota;").inspect
-# sql = "select 'Successful Ruby Connection' from system.iota;"
-# sql = "select * from discount;"
-sql = "EXECUTE PROCEDURE sp_GetTables( NULL, NULL, NULL, 'TABLE' );"
-rs = api.ads_execute_direct(conn, sql)
-puts "RS: #{rs.inspect}"
-loop do
-  fetch = api.ads_fetch_next(rs)
-  break if fetch == 0
-  puts "FETCH: #{fetch.inspect}"
-  res, ret_id = api.ads_get_column(rs, 0)
-  puts "RES: #{res.inspect}, id: #{ret_id.inspect}"
-end
-
-puts "RS: #{rs.inspect}"
-puts "fetch: #{fetch.inspect}"
-puts "RES: #{res.inspect}, id: #{id.inspect}"
-
-# disconnect from the database
-puts api.ads_disconnect(conn).inspect
-
-# free the connection resources
-api.ads_free_connection(conn)
-
-# free resources the api object uses
-api.ads_fini()
-
-# close the interface
-Advantage::API.ads_finalize_interface(api)
-
-puts "finished"

data/test/mytest2.rb

@@ -1,67 +0,0 @@
-begin
-  require "rubygems"
-  require "advantage"
-  unless defined? Advantage
-    # require 'advantage'
-    if RUBY_VERSION >= "1.9"
-      require_relative "../lib/advantage/advantage.so"
-    else
-      require File.join(File.dirname(__FILE__), "../lib/advantage/advantage.so")
-    end
-  end
-end
-
-# create an interface
-api = Advantage::AdvantageInterface.new()
-#
-# initialize the interface (loads the DLL/SO)
-Advantage::API.ads_initialize_interface(api)
-#
-# initialize our api object
-api.ads_init()
-
-# create a connection
-conn = api.ads_new_connection()
-
-# establish a connection
-conn_str = "data source=//172.27.144.1:6262/c\$/ads/db/mydb.add;user id=adssys;DateFormat=YYYY-MM-DD;CommType=TCP_IP;Compression=INTERNET"
-# conn_str = "data source=//10.0.0.4:6262/aislims/db/;user id=adssys;DateFormat=YYYY-MM-DD;CommType=TCP_IP;"
-val = api.ads_connect(conn, conn_str)
-puts "VAL: #{val.inspect}"
-
-# execute a query without a result set
-# puts api.ads_execute_immediate(conn, "select 'Successful Ruby Connection' from system.iota;").inspect
-#sql = "select 'Successful Ruby Connection' from system.iota;"
-sql = "select * from discount;"
-rs = api.ads_execute_direct(conn, sql)
-puts "RS: #{rs.inspect}"
-
-record = []
-if (api.ads_num_cols(rs) > 0)
-  while api.ads_fetch_next(rs) == 1
-    max_cols = api.ads_num_cols(rs)
-    result = Hash.new()
-    max_cols.times do |cols|
-      result[api.ads_get_column_info(rs, cols)[2]] = api.ads_get_column(rs, cols)[1]
-    end
-    record << result
-  end
-  @affected_rows = 0
-else
-  @affected_rows = api.ads_affected_rows(rs)
-end
-puts "RECORD: #{record.inspect}"
-
-# disconnect from the database
-puts api.ads_disconnect(conn).inspect
-
-# free the connection resources
-api.ads_free_connection(conn)
-
-# free resources the api object uses
-api.ads_fini()
-
-# close the interface
-Advantage::API.ads_finalize_interface(api)
-
-puts "finished"

data/test/mytest3.rb

@@ -1,84 +0,0 @@
-begin
-  require "rubygems"
-  require "advantage"
-  unless defined? Advantage
-    # require 'advantage'
-    if RUBY_VERSION >= "1.9"
-      require_relative "../lib/advantage/advantage.so"
-    else
-      require File.join(File.dirname(__FILE__), "../lib/advantage/advantage.so")
-    end
-  end
-end
-
-# create an interface
-api = Advantage::AdvantageInterface.new()
-#
-# initialize the interface (loads the DLL/SO)
-Advantage::API.ads_initialize_interface(api)
-#
-# initialize our api object
-api.ads_init()
-
-# create a connection
-conn = api.ads_new_connection()
-
-# establish a connection
-conn_str = "data source=//172.27.144.1:6262/c\$/ads/db/;user id=adssys;DateFormat=YYYY-MM-DD;CommType=TCP_IP;Compression=INTERNET"
-# conn_str = "data source=//10.0.0.4:6262/aislims/db/;user id=adssys;DateFormat=YYYY-MM-DD;CommType=TCP_IP;"
-val = api.ads_connect(conn, conn_str)
-puts "VAL: #{val.inspect}"
-
-# execute a query without a result set
-# puts api.ads_execute_immediate(conn, "select 'Successful Ruby Connection' from system.iota;").inspect
-#sql = "select 'Successful Ruby Connection' from system.iota;"
-#sql = "EXECUTE PROCEDURE sp_GetTables( NULL, NULL, NULL, 'TABLE' );"
-sql = 'SELECT COUNT(*) FROM "DISCOUNT";'
-rs = api.ads_execute_direct(conn, sql)
-puts "RS: #{rs.inspect}"
-
-row_record = []
-cols = []
-acols = api.ads_num_cols(rs)
-puts "ACOLS: #{acols.inspect}"
-
-#if( api.ads_num_cols(rs) > 0)
-puts "HOORAY!"
-loop do
-  fetch = api.ads_fetch_next(rs)
-  puts "FETCH: #{fetch.inspect}"
-  break if fetch == 0
-  max_cols = api.ads_num_cols(rs)
-  puts "MAX_COLS: #{max_cols.inspect}"
-  max_cols = api.ads_num_cols(rs)
-  row = []
-  max_cols.times do |cols|
-    # result[api.ads_get_column_info(rs, cols)[2]] = api.ads_get_column(rs, cols)[1]
-    cinfo = api.ads_get_column_info(rs, cols)
-    cols << cinfo[2].to_s
-    cvalue = api.ads_get_column(rs, cols)[1]
-    cvalue = "0.0" if cinfo[3] == 13 and cvalue.rstrip == ""
-    cvalue.rstrip! if cinfo[3] == 2 and cvalue
-    row << cvalue
-  end
-  row_record << row
-  #end
-  #else
-  #puts "BOO!"
-end
-api.ads_free_stmt(rs)
-puts "RECORD: #{record.inspect}"
-
-# disconnect from the database
-puts api.ads_disconnect(conn).inspect
-
-# free the connection resources
-api.ads_free_connection(conn)
-
-# free resources the api object uses
-api.ads_fini()
-
-# close the interface
-Advantage::API.ads_finalize_interface(api)
-
-puts "finished"