tiny_tds 2.1.4-x86-mingw32 → 2.1.6-x86-mingw32

data/ext/tiny_tds/result.c

@@ -99,12 +99,14 @@ static void nogvl_cleanup(DBPROCESS *client) {
   Now that the blocking operation is done, we can finally throw any
   exceptions based on errors from SQL Server.
   */
-  for (short int i = 0; i < userdata->nonblocking_errors_length; i++) {
+  short int i;
+  for (i = 0; i < userdata->nonblocking_errors_length; i++) {
     tinytds_errordata error = userdata->nonblocking_errors[i];
 
     // lookahead to drain any info messages ahead of raising error
     if (!error.is_message) {
-      for (short int j = i; j < userdata->nonblocking_errors_length; j++) {
+      short int j;
+      for (j = i; j < userdata->nonblocking_errors_length; j++) {
         tinytds_errordata msg_error = userdata->nonblocking_errors[j];
         if (msg_error.is_message) {
           rb_tinytds_raise_error(client, msg_error);
@@ -582,6 +584,7 @@ void init_tinytds_result() {
   cDate = rb_const_get(rb_cObject, rb_intern("Date"));
   /* Define TinyTds::Result */
   cTinyTdsResult = rb_define_class_under(mTinyTds, "Result", rb_cObject);
+  rb_undef_alloc_func(cTinyTdsResult);
   /* Define TinyTds::Result Public Methods */
   rb_define_method(cTinyTdsResult, "fields", rb_tinytds_result_fields, 0);
   rb_define_method(cTinyTdsResult, "each", rb_tinytds_result_each, -1);

data/lib/tiny_tds/gem.rb

@@ -20,12 +20,7 @@ module TinyTds
       end
 
       def ports_host
-        h = RbConfig::CONFIG['host']
-
-        # Our fat binary builds with a i686-w64-mingw32 toolchain
-        # but ruby for windows x32-mingw32 reports i686-pc-mingw32
-        # so correct the host here
-        h.gsub('i686-pc-mingw32', 'i686-w64-mingw32')
+        RbConfig::CONFIG["arch"]
       end
     end
   end

data/ports/{i686-w64-mingw32 → x86-mingw32}/freetds/1.1.24/lib/libct.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib -L/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib -L/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/openssl/1.1.1d/lib -lws2_32 -lssl -lcrypto /Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib/libiconv.la'
+dependency_libs=' -R/root/project/ports/x86-mingw32/libiconv/1.15/lib -L/root/project/ports/x86-mingw32/libiconv/1.15/lib -L/root/project/ports/x86-mingw32/openssl/1.1.1s/lib -lws2_32 -lssl -lcrypto /root/project/ports/x86-mingw32/libiconv/1.15/lib/libiconv.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/freetds/1.1.24/lib'
+libdir='/root/project/ports/x86-mingw32/freetds/1.1.24/lib'

data/ports/{i686-w64-mingw32 → x86-mingw32}/freetds/1.1.24/lib/libsybdb.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib -L/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib -L/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/openssl/1.1.1d/lib -lws2_32 -lssl -lcrypto /Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib/libiconv.la'
+dependency_libs=' -R/root/project/ports/x86-mingw32/libiconv/1.15/lib -L/root/project/ports/x86-mingw32/libiconv/1.15/lib -L/root/project/ports/x86-mingw32/openssl/1.1.1s/lib -lws2_32 -lssl -lcrypto /root/project/ports/x86-mingw32/libiconv/1.15/lib/libiconv.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/freetds/1.1.24/lib'
+libdir='/root/project/ports/x86-mingw32/freetds/1.1.24/lib'

data/ports/{i686-w64-mingw32 → x86-mingw32}/libiconv/1.15/lib/libcharset.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/openssl/1.1.1d/lib'
+dependency_libs=' -L/root/project/ports/x86-mingw32/openssl/1.1.1s/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib'
+libdir='/root/project/ports/x86-mingw32/libiconv/1.15/lib'

data/ports/{i686-w64-mingw32 → x86-mingw32}/libiconv/1.15/lib/libiconv.la

@@ -17,7 +17,7 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/openssl/1.1.1d/lib'
+dependency_libs=' -L/root/project/ports/x86-mingw32/openssl/1.1.1s/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/bvogelzang/Documents/tiny_tds/ports/i686-w64-mingw32/libiconv/1.15/lib'
+libdir='/root/project/ports/x86-mingw32/libiconv/1.15/lib'

data/ports/x86-mingw32/openssl/1.1.1s/bin/c_rehash

@@ -0,0 +1,251 @@
+#!/usr/bin/env perl
+
+# WARNING: do not edit!
+# Generated by Makefile from tools/c_rehash.in
+# Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+# Perl c_rehash script, scan all files in a directory
+# and add symbolic links to their hash values.
+
+my $dir = "/root/project/ports/x86-mingw32/openssl/1.1.1s";
+my $prefix = "/root/project/ports/x86-mingw32/openssl/1.1.1s";
+
+my $errorcount = 0;
+my $openssl = $ENV{OPENSSL} || "openssl";
+my $pwd;
+my $x509hash = "-subject_hash";
+my $crlhash = "-hash";
+my $verbose = 0;
+my $symlink_exists=eval {symlink("",""); 1};
+my $removelinks = 1;
+
+##  Parse flags.
+while ( $ARGV[0] =~ /^-/ ) {
+    my $flag = shift @ARGV;
+    last if ( $flag eq '--');
+    if ( $flag eq '-old') {
+	    $x509hash = "-subject_hash_old";
+	    $crlhash = "-hash_old";
+    } elsif ( $flag eq '-h' || $flag eq '-help' ) {
+	    help();
+    } elsif ( $flag eq '-n' ) {
+	    $removelinks = 0;
+    } elsif ( $flag eq '-v' ) {
+	    $verbose++;
+    }
+    else {
+	    print STDERR "Usage error; try -h.\n";
+	    exit 1;
+    }
+}
+
+sub help {
+	print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
+	print "   -old use old-style digest\n";
+	print "   -h or -help print this help text\n";
+	print "   -v print files removed and linked\n";
+	exit 0;
+}
+
+eval "require Cwd";
+if (defined(&Cwd::getcwd)) {
+	$pwd=Cwd::getcwd();
+} else {
+	$pwd=`pwd`;
+	chomp($pwd);
+}
+
+# DOS/Win32 or Unix delimiter?  Prefix our installdir, then search.
+my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':';
+$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
+
+if (! -x $openssl) {
+	my $found = 0;
+	foreach (split /$path_delim/, $ENV{PATH}) {
+		if (-x "$_/$openssl") {
+			$found = 1;
+			$openssl = "$_/$openssl";
+			last;
+		}	
+	}
+	if ($found == 0) {
+		print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";
+		exit 0;
+	}
+}
+
+if (@ARGV) {
+	@dirlist = @ARGV;
+} elsif ($ENV{SSL_CERT_DIR}) {
+	@dirlist = split /$path_delim/, $ENV{SSL_CERT_DIR};
+} else {
+	$dirlist[0] = "$dir/certs";
+}
+
+if (-d $dirlist[0]) {
+	chdir $dirlist[0];
+	$openssl="$pwd/$openssl" if (!-x $openssl);
+	chdir $pwd;
+}
+
+foreach (@dirlist) {
+	if (-d $_ ) {
+            if ( -w $_) {
+		hash_dir($_);
+            } else {
+                print "Skipping $_, can't write\n";
+                $errorcount++;
+            }
+	}
+}
+exit($errorcount);
+
+sub copy_file {
+    my ($src_fname, $dst_fname) = @_;
+
+    if (open(my $in, "<", $src_fname)) {
+        if (open(my $out, ">", $dst_fname)) {
+            print $out $_ while (<$in>);
+            close $out;
+        } else {
+            warn "Cannot open $dst_fname for write, $!";
+        }
+        close $in;
+    } else {
+        warn "Cannot open $src_fname for read, $!";
+    }
+}
+
+sub hash_dir {
+    my $dir = shift;
+    my %hashlist;
+
+    print "Doing $dir\n";
+
+    if (!chdir $dir) {
+        print STDERR "WARNING: Cannot chdir to '$dir', $!\n";
+        return;
+    }
+
+    opendir(DIR, ".") || print STDERR "WARNING: Cannot opendir '.', $!\n";
+    my @flist = sort readdir(DIR);
+    closedir DIR;
+    if ( $removelinks ) {
+        # Delete any existing symbolic links
+        foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
+            if (-l $_) {
+                print "unlink $_\n" if $verbose;
+                unlink $_ || warn "Can't unlink $_, $!\n";
+            }
+        }
+    }
+    FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
+        # Check to see if certificates and/or CRLs present.
+        my ($cert, $crl) = check_file($fname);
+        if (!$cert && !$crl) {
+            print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
+            next;
+        }
+        link_hash_cert($fname) if ($cert);
+        link_hash_crl($fname) if ($crl);
+    }
+
+    chdir $pwd;
+}
+
+sub check_file {
+    my ($is_cert, $is_crl) = (0,0);
+    my $fname = $_[0];
+
+    open(my $in, "<", $fname);
+    while(<$in>) {
+        if (/^-----BEGIN (.*)-----/) {
+            my $hdr = $1;
+            if ($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) {
+                $is_cert = 1;
+                last if ($is_crl);
+            } elsif ($hdr eq "X509 CRL") {
+                $is_crl = 1;
+                last if ($is_cert);
+            }
+        }
+    }
+    close $in;
+    return ($is_cert, $is_crl);
+}
+
+sub compute_hash {
+    my $fh;
+    if ( $^O eq "VMS" ) {
+        # VMS uses the open through shell
+        # The file names are safe there and list form is unsupported
+        if (!open($fh, "-|", join(' ', @_))) {
+            print STDERR "Cannot compute hash on '$fname'\n";
+            return;
+        }
+    } else {
+        if (!open($fh, "-|", @_)) {
+            print STDERR "Cannot compute hash on '$fname'\n";
+            return;
+        }
+    }
+    return (<$fh>, <$fh>);
+}
+
+# Link a certificate to its subject name hash value, each hash is of
+# the form <hash>.<n> where n is an integer. If the hash value already exists
+# then we need to up the value of n, unless its a duplicate in which
+# case we skip the link. We check for duplicates by comparing the
+# certificate fingerprints
+
+sub link_hash_cert {
+    link_hash($_[0], 'cert');
+}
+
+# Same as above except for a CRL. CRL links are of the form <hash>.r<n>
+
+sub link_hash_crl {
+    link_hash($_[0], 'crl');
+}
+
+sub link_hash {
+    my ($fname, $type) = @_;
+    my $is_cert = $type eq 'cert';
+
+    my ($hash, $fprint) = compute_hash($openssl,
+                                       $is_cert ? "x509" : "crl",
+                                       $is_cert ? $x509hash : $crlhash,
+                                       "-fingerprint", "-noout",
+                                       "-in", $fname);
+    chomp $hash;
+    chomp $fprint;
+    return if !$hash;
+    $fprint =~ s/^.*=//;
+    $fprint =~ tr/://d;
+    my $suffix = 0;
+    # Search for an unused hash filename
+    my $crlmark = $is_cert ? "" : "r";
+    while(exists $hashlist{"$hash.$crlmark$suffix"}) {
+        # Hash matches: if fingerprint matches its a duplicate cert
+        if ($hashlist{"$hash.$crlmark$suffix"} eq $fprint) {
+            my $what = $is_cert ? 'certificate' : 'CRL';
+            print STDERR "WARNING: Skipping duplicate $what $fname\n";
+            return;
+        }
+        $suffix++;
+    }
+    $hash .= ".$crlmark$suffix";
+    if ($symlink_exists) {
+        print "link $fname -> $hash\n" if $verbose;
+        symlink $fname, $hash || warn "Can't symlink, $!";
+    } else {
+        print "copy $fname -> $hash\n" if $verbose;
+        copy_file($fname, $hash);
+    }
+    $hashlist{$hash} = $fprint;
+}

data/setup_cimgruby_dev.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+# this should mirror the steps outlined in the circleci yml
+echo "Installing mssql-tools..."
+sleep 5
+sudo -E ./test/bin/install-mssqltools.sh
+
+echo "Configurating tinytds test database..."
+sleep 5
+./test/bin/setup_tinytds_db.sh
+
+echo "Building openssl library..."
+sleep 5
+sudo -E ./test/bin/install-openssl.sh
+
+echo "Building freetds library..."
+sleep 5
+sudo -E ./test/bin/install-freetds.sh
+
+echo "Installing gems..."
+sleep 5
+bundle install

data/start_dev.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+# set volume read/write permissions to work both outside and inside container
+sudo ./test/bin/setup_volume_permissions.sh
+
+docker-compose up -d
+echo "Waiting for containers to start..."
+sleep 10
+
+# setup circleci ruby container for development
+docker exec cimg_ruby bash -c './setup_cimgruby_dev.sh'
+
+# enter container
+set +x
+echo "cimg/ruby container is ready for tiny_tds development.........."
+echo "To enter container run: docker exec -it cimg_ruby /bin/bash"
+echo "To build solution run: docker exec cimg_ruby bash -c 'bundle exec rake build'"
+echo "To test solution run: docker exec cimg_ruby bash -c 'bundle exec rake test'"

data/tasks/native_gem.rake

@@ -1,14 +1,23 @@
 # encoding: UTF-8
 
-desc 'Build the windows binary gems per rake-compiler-dock'
-task 'gem:windows' => ['ports:cross'] do
+desc 'Build the native binary gems using rake-compiler-dock'
+task 'gem:native' => ['ports:cross'] do
   require 'rake_compiler_dock'
 
   # make sure to install our bundle
-  build = ['bundle']
+  sh "bundle package --all" # Avoid repeated downloads of gems by using gem files from the host.
 
-  # and finally build the native gem
-  build << 'rake cross native gem RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"'
+  GEM_PLATFORM_HOSTS.each do |plat, meta|
+    RakeCompilerDock.sh "bundle --local && RUBY_CC_VERSION=#{meta[:ruby_versions]} rake native:#{plat} gem", platform: plat
+  end
+end
+
+# assumes you are in a container provided by Rake compiler
+# if not, use the task above
+task 'gem:for_platform', [:gem_platform] do |_task, args|
+  args.with_defaults(gem_platform: RbConfig::CONFIG["arch"])
 
-  RakeCompilerDock.sh build.join(' && ')
+  sh "bundle install"
+  Rake::Task["ports:compile"].invoke(GEM_PLATFORM_HOSTS[args.gem_platform][:host], args.gem_platform)
+  sh "RUBY_CC_VERSION=#{GEM_PLATFORM_HOSTS[args.gem_platform][:ruby_versions]} rake native:#{args.gem_platform} gem"
 end

data/tasks/ports/libiconv.rb

@@ -8,25 +8,8 @@ module Ports
       set_patches
     end
 
-    def cook
-      chdir_for_build do
-        super
-      end
-      self
-    end
-
     private
 
-    # When using rake-compiler-dock on Windows, the underlying Virtualbox shared
-    # folders don't support symlinks, but libiconv expects it for a build on
-    # Linux. We work around this limitation by using the temp dir for cooking.
-    def chdir_for_build
-      build_dir = ENV['RCD_HOST_RUBY_PLATFORM'].to_s =~ /mingw|mswin|cygwin/ ? '/tmp' : '.'
-      Dir.chdir(build_dir) do
-        yield
-      end
-    end
-
     def configure_defaults
       [
         "--host=#{@host}",

data/tasks/ports/recipe.rb

@@ -5,17 +5,30 @@ require 'rbconfig'
 
 module Ports
   class Recipe < MiniPortile
+    attr_writer :gem_platform
+
     def cook
-      checkpoint = "ports/#{name}-#{version}-#{host}.installed"
+      checkpoint = "ports/checkpoints/#{name}-#{version}-#{gem_platform}.installed"
 
       unless File.exist? checkpoint
         super
+        FileUtils.mkdir_p("ports/checkpoints")
         FileUtils.touch checkpoint
       end
     end
 
     private
 
+    attr_reader :gem_platform
+
+    def port_path
+      "#{@target}/#{gem_platform}/#{@name}/#{@version}"
+    end
+
+    def tmp_path
+      "tmp/#{gem_platform}/ports/#{@name}/#{@version}"
+    end
+
     def configure_defaults
       [
         "--host=#{@host}",
@@ -38,9 +51,9 @@ module Ports
 
     def get_patches(libname, version)
       patches = []
-  
+
       patch_path = File.expand_path(
-        File.join('..','..','..','patches',libname,version), 
+        File.join('..','..','..','patches',libname,version),
         __FILE__
       )
 
@@ -49,4 +62,3 @@ module Ports
     end
   end
 end
-