tiny_tds 0.9.5.beta.2 → 0.9.5.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a8eaae34d2d27d8f5eb89f77b491eb01647a98a
-  data.tar.gz: 251c3ad015898cd3896224d32f9404e19026bef7
+  metadata.gz: 69b63ae949503a40cb1e8c12258d3ec1c446cac0
+  data.tar.gz: 2c94123af8caae780b5ab62403b38b455d209b7a
 SHA512:
-  metadata.gz: 6fe115e621164e4e1a22e92860fe8b3e5c6f66aa30c076e957645f003f90c35e27e17c8d2b1d59b64fca8a70d471a28bc119a9b87639f09b3989654a1ae62b89
-  data.tar.gz: 55a55430690db678c78922e430f361d8038f3581dbb615c854a9d87b12e6fce95829a521c4131d27728949d5725a61fa02d1c63514eb65ff41c4c52ac9d0ae84
+  metadata.gz: 84244891e399a9888786bbe98af841772150b4a5bd2b0be87c48a5d682b522df4b1f418a55f77c0d3103a9b7013c9fe3288b9a3f0fac6c73d7dde2166c011241
+  data.tar.gz: 28bccae5b4bc18487403262e013fcc7f3cb2048ae9ff53e6f6e90ee7bbfc7bb918af9e5573361a15425f55a248daad062b303f75064ca34200e74123810db0d9

data/README.md

@@ -285,6 +285,7 @@ TinyTDS takes an opinionated stance on how we handle encoding errors. First, we
 The TinyTDS gem uses binstub wrappers which mirror compiled [FreeTDS Utilities](http://www.freetds.org/userguide/usefreetds.htm) binaries. These native executables are usually installed at the system level when installing FreeTDS. However, when using MiniPortile to install TinyTDS as we do with Windows binaries, these binstubs will find and prefer local gem `exe` directory executables. These are the following binstubs we wrap.
 
 * tsql - Used to test connections and debug compile time settings.
+* defncopy - Used to dump schema structures.
 
 
 ## Using TinyTDS With Rails & The ActiveRecord SQL Server adapter.
@@ -402,3 +403,4 @@ My name is Ken Collins and I currently maintain the SQL Server adapter for Activ
 
 TinyTDS is Copyright (c) 2010-2015 Ken Collins, <ken@metaskills.net> and Will Bond (Veracross LLC) <wbond@breuer.com>. It is distributed under the MIT license. Windows binaries contain pre-compiled versions of FreeTDS <http://www.freetds.org/> which is licensed under the GNU LGPL license at <http://www.gnu.org/licenses/lgpl-2.0.html>
 
+

data/VERSION

@@ -1 +1 @@
-0.9.5.beta.2
+0.9.5.beta.3

data/bin/defncopy

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/tiny_tds/bin'
+
+bin = TinyTds::Bin.new 'defncopy'
+Kernel.system bin.path, *ARGV

data/bin/tsql

@@ -1,25 +1,6 @@
 #!/usr/bin/env ruby
 
-BIN   = 'tsql'
-ROOT  = File.expand_path(File.join File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__), '..')
-PATHS = ENV['PATH'].split(File::PATH_SEPARATOR)
-EXTS  = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-SELF  = File.join ROOT, 'bin', BIN
-EXE   = File.join ROOT, 'exe', BIN
+require_relative '../lib/tiny_tds/bin'
 
-def which(cmd)
-  PATHS.each do |path|
-    EXTS.each do |ext|
-      exe = File.expand_path File.join(path, "#{cmd}#{ext}"), ROOT
-      next unless File.executable?(exe)
-      next if exe == SELF
-      return exe
-    end
-  end
-  return nil
-end
-
-bin = File.exists?(EXE) ? EXE : which(BIN)
-puts "[TinyTds] #{BIN}: #{bin}"
-
-Kernel.system bin, *ARGV
+bin = TinyTds::Bin.new 'tsql'
+Kernel.system bin.path, *ARGV

data/ext/tiny_tds/extconf.rb

@@ -227,7 +227,7 @@ def define_freetds_recipe(host, libiconv, libssl, gnutls)
           bin_path = File.expand_path File.join(path, 'bin')
           exe_path = File.expand_path File.join(target, '..', 'exe')
           return unless File.directory?(bin_path)
-          ['tsql'].each do |bin|
+          ['tsql', 'defncopy'].each do |bin|
             ['.exe', ''].each do |ext|
               exe = File.join bin_path, "#{bin}#{ext}"
               next unless File.exists?(exe)

data/ext/tiny_tds/extconsts.rb

@@ -5,7 +5,7 @@ ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION
 OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.0.2e'
 OPENSSL_SOURCE_URI = "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.95.75"
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.95.76"
 FREETDS_VERSION_INFO = Hash.new { |h,k|
   h[k] = {files: "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.bz2"}
 }

data/ext/tiny_tds/result.c

@@ -489,7 +489,7 @@ static VALUE rb_tinytds_result_cancel(VALUE self) {
   GET_RESULT_WRAPPER(self);
   userdata = (tinytds_client_userdata *)dbgetuserdata(rwrap->client);
   if (rwrap->client && !userdata->dbcancel_sent) {
-    RETCODE dbsqlok_rc = rb_tinytds_result_ok_helper(rwrap->client);
+    rb_tinytds_result_ok_helper(rwrap->client);
     dbcancel(rwrap->client);
     userdata->dbcancel_sent = 1;
     userdata->dbsql_sent = 0;

data/lib/tiny_tds/bin.rb

@@ -0,0 +1,57 @@
+require_relative './version'
+
+module TinyTds
+  class Bin
+
+    ROOT  = File.expand_path '../..', __FILE__
+    PATHS = ENV['PATH'].split File::PATH_SEPARATOR
+    EXTS  = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+
+    attr_reader :name
+
+    def initialize(name, options = {})
+      @name = name
+      @binstub = File.join ROOT, 'bin', @name
+      @exefile = File.join ROOT, 'exe', @name
+      puts info unless options[:silent]
+    end
+
+    def path
+      return @path if defined?(@path)
+      @path = File.exists?(@exefile) ? @exefile : which
+    end
+
+    def info
+      "[TinyTds][v#{TinyTds::VERSION}][#{name}]: #{path}"
+    end
+
+
+    private
+
+    def which
+      PATHS.each do |path|
+        EXTS.each do |ext|
+          exe = File.expand_path File.join(path, "#{name}#{ext}"), ROOT
+          next if exe == @binstub
+          next if !File.executable?(exe)
+          next if !binary?(exe)
+          return exe
+        end
+      end
+      return nil
+    end
+
+    # Implementation directly copied from ptools.
+    # https://github.com/djberg96/ptools
+    # https://opensource.org/licenses/Artistic-2.0
+    #
+    def binary?(file)
+      bytes = File.stat(file).blksize
+      bytes = 4096 if bytes > 4096
+      s = (File.read(file, bytes) || "")
+      s = s.encode('US-ASCII', :undef => :replace).split(//)
+      ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
+    end
+
+  end
+end

data/test/result_test.rb

@@ -313,7 +313,7 @@ class ResultTest < TinyTds::TestCase
     it 'has properly encoded column names with symbol keys' do
       col_name = "öäüß"
       @client.execute("DROP TABLE [test_encoding]").do rescue nil
-      @client.execute("CREATE TABLE [dbo].[test_encoding] ( [#{col_name}] [nvarchar](10) NOT NULL )").do
+      @client.execute("CREATE TABLE [dbo].[test_encoding] ( [id] int NOT NULL IDENTITY(1,1) PRIMARY KEY, [#{col_name}] [nvarchar](10) NOT NULL )").do
       @client.execute("INSERT INTO [test_encoding] ([#{col_name}]) VALUES (N'#{col_name}')").do
       result = @client.execute("SELECT [#{col_name}] FROM [test_encoding]")
       row = result.each(:as => :hash, :symbolize_keys => true).first
@@ -321,7 +321,7 @@ class ResultTest < TinyTds::TestCase
       assert_equal col_name.to_sym, result.fields.first
       assert_instance_of Symbol, row.keys.first
       assert_equal col_name.to_sym, row.keys.first
-    end unless sqlserver_azure?
+    end
 
     it 'allows #return_code to work with stored procedures and reset per sql batch' do
       assert_nil @client.return_code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 0.9.5.beta.2
+  version: 0.9.5.beta.3
 platform: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -102,6 +102,7 @@ email:
 - ken@metaskills.net
 - will@wbond.net
 executables:
+- defncopy
 - tsql
 extensions:
 - ext/tiny_tds/extconf.rb
@@ -116,6 +117,7 @@ files:
 - Rakefile
 - VERSION
 - appveyor.yml
+- bin/defncopy
 - bin/tsql
 - exe/.keep
 - ext/tiny_tds/client.c
@@ -127,13 +129,14 @@ files:
 - ext/tiny_tds/tiny_tds_ext.c
 - ext/tiny_tds/tiny_tds_ext.h
 - lib/tiny_tds.rb
+- lib/tiny_tds/bin.rb
 - lib/tiny_tds/client.rb
 - lib/tiny_tds/error.rb
 - lib/tiny_tds/result.rb
 - lib/tiny_tds/version.rb
 - ports/patches/freetds/0.91.112/Makefile.in.diff
 - ports/patches/freetds/0.91.112/dblib-30-char-username.diff
-- ports/patches/freetds/0.95.75/0001-mingw_missing_inet_pton.diff
+- ports/patches/freetds/0.95.76/0001-mingw_missing_inet_pton.diff
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
 - test/benchmark/query.rb