tiny_tds 0.5.2.rc1-x86-mingw32 → 0.5.2.rc2-x86-mingw32

data/CHANGELOG

@@ -1,6 +1,12 @@
 
 * 0.5.2 *
 
+* Compile windows with `--enable-sspi`.
+
+* Allow MiniPortile to build any FreeTDS version we need. Fixes #76.
+
+* Always convert password option to string. Fixes #92.
+
 * Move test system to real MiniTest::Spec. All tests pass on Azure too.
 
 * Raise and handle encoding errors on DB writes. Fixes #89.

data/README.md

@@ -11,13 +11,6 @@ The API is simple and consists of these classes:
 * TinyTds::Error - A wrapper for all FreeTDS exceptions.
 
 
-## New & Noteworthy
-
-* Works with FreeTDS 0.91
-* Tested on Windows using MiniPortile & RailsInstaller.
-* New :host/:port connection options. Removes need for freetds.conf file.
-
-
 ## Install
 
 Installing with rubygems should just work. TinyTDS is tested on ruby version 1.8.6, 1.8.7, 1.9.1, 1.9.2, 1.9.3 as well as REE & JRuby.
@@ -31,7 +24,7 @@ Although we search for FreeTDS's libraries and headers, you may have to specify
 
 ## FreeTDS Compatibility & Configuration
 
-TinyTDS is developed against FreeTDS 0.82 & 0.91, the latest is recommended. It is tested with SQL Server 2000, 2005, 2008 and Azure. Below are a few QA style notes about installing FreeTDS.
+TinyTDS is developed against FreeTDS 0.82 & 0.91, and 0.92 currents, the latest is recommended. It is tested with SQL Server 2000, 2005, 2008 and Azure. Below are a few QA style notes about installing FreeTDS.
 
 * **Do I need to install FreeTDS?** Yes! Somehow, someway, you are going to need FreeTDS for TinyTDS to compile against. You can avoid installing FreeTDS on your system by using our projects usage of rake-compiler and mini_portile to compile and package a native gem just for you. See the "Using MiniPortile" section below.
 
@@ -296,6 +289,18 @@ $ gem install pkg/tiny_tds-X.X.X-#{platform}.gem
 
 **Important:** You must use rubygems version 1.7.2 or higher. You will almost certainly hit a *Don't know how to build task...* error when running the `rake native gem` command if you do not. Please update rubygems! Here is a link on [how to upgrade or downgrade rubygems](http://rubygems.rubyforge.org/rubygems-update/UPGRADING_rdoc.html).
 
+It is also possible to build a specific version of FreeTDS for your own gem or development and testing using the `TINYTDS_FREETDS_VERSION` environment variable. Here are some exampbles of possible values.
+
+```
+$ rake TINYTDS_FREETDS_VERSION="0.82"
+$ rake TINYTDS_FREETDS_VERSION="0.91"
+$ rake TINYTDS_FREETDS_VERSION="0.91.49"
+$ rake TINYTDS_FREETDS_VERSION="0.92.405"
+$ rake TINYTDS_FREETDS_VERSION="current"
+```
+
+To find out more about the FreeTDS release system [visit this thread](http://lists.ibiblio.org/pipermail/freetds/2012q1/027756.html) on their mailing list. You can also browse thier FTP server [ftp://ftp.astron.com/pub/freetds/](ftp://ftp.astron.com/pub/freetds/) for version number strings.
+
 
 ## Development & Testing  
 

data/Rakefile

@@ -1,21 +1,23 @@
 # encoding: UTF-8
 require 'rake'
-require "rake/clean"
+require 'rake/clean'
 require 'rbconfig'
 require 'rake/testtask'
 require 'rake/extensiontask'
-require "rubygems/package_task"
+require 'rubygems/package_task'
 
 # My notes for cross compile native Windows gem.
 # 
 # $ rake-compiler cross-ruby VERSION=1.8.7-p352
 # $ rake-compiler cross-ruby VERSION=1.9.2-p290
 # 
+# $ rbenv shell 1.8.7
 # $ git clean -x -d -f
 # $ bundle install
-# $ ~/.rbenv/shims/rake compile
-# $ ~/.rbenv/shims/rake cross compile RUBY_CC_VERSION=1.8.7:1.9.2
-# $ ~/.rbenv/shims/rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2
+# $ unalias rake-compiler && unalias rake
+# $ rake compile
+# $ rake cross compile RUBY_CC_VERSION=1.8.7:1.9.3
+# $ rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3
 
 def test_libs
   ['lib','test']

data/ext/patch/sspi_w_kerberos.diff

@@ -0,0 +1,52 @@
+commit cdf93abe5492ec706bca0db762be41526f343e92
+Author: Frediano Ziglio <freddy77@gmail.com>
+Date:   Sun Nov 4 10:17:34 2012 +0000
+
+    Fix sspi if Kerberos is used
+    
+    Authentication require more roud trips for Kerberos.
+
+diff --git a/src/tds/sspi.c b/src/tds/sspi.c
+index 680717a..077d58b 100644
+--- a/src/tds/sspi.c
++++ b/src/tds/sspi.c
+@@ -172,8 +172,19 @@ tds_sspi_handle_next(TDSSOCKET * tds, struct tds_authentication * tds_auth, size
+ 
+ 	free(auth_buf);
+ 
+-	if (status != SEC_E_OK)
++	switch (status) {
++	case SEC_I_COMPLETE_AND_CONTINUE:
++		sec_fn->CompleteAuthToken(&auth->cred_ctx, &out_desc);
++		break;
++
++	case SEC_I_CONTINUE_NEEDED:
++	case SEC_E_OK:
++		break;
++
++	default:
+ 		return TDS_FAIL;
++	}
++
+ 	if (out_buf.cbBuffer == 0)
+ 		return TDS_SUCCEED;
+ 
+@@ -275,9 +286,16 @@ tds_sspi_get_auth(TDSSOCKET * tds)
+ 		&auth->cred_ctx, &desc,
+ 		&attrs, &ts);
+ 
+-	if (status == SEC_I_COMPLETE_AND_CONTINUE || status == SEC_I_CONTINUE_NEEDED) {
++	switch (status) {
++	case SEC_I_COMPLETE_AND_CONTINUE:
+ 		sec_fn->CompleteAuthToken(&auth->cred_ctx, &desc);
+-	} else if(status != SEC_E_OK) {
++		break;
++
++	case SEC_I_CONTINUE_NEEDED:
++	case SEC_E_OK:
++		break;
++
++	default:
+ 		free(auth->sname);
+ 		free(auth->tds_auth.packet);
+ 		sec_fn->FreeCredentialsHandle(&auth->cred);

data/lib/tiny_tds/client.rb

@@ -54,7 +54,10 @@ module TinyTds
 
 
     def initialize(opts={})
-      warn 'FreeTDS may have issues with passwords longer than 30 characters!' if opts[:password].to_s.length > 30
+      if opts[:password] && opts[:password].to_s.strip != ''
+        opts[:password].to_s!
+        warn 'FreeTDS may have issues with passwords longer than 30 characters!' if opts[:password].length > 30
+      end
       raise ArgumentError, 'missing :username option' if opts[:username].to_s.empty?
       raise ArgumentError, 'missing :host option if no :dataserver given' if opts[:dataserver].to_s.empty? && opts[:host].to_s.empty?
       @query_options = @@default_query_options.dup

data/lib/tiny_tds/version.rb

@@ -1,3 +1,3 @@
 module TinyTds
-  VERSION = '0.5.2.rc1'
+  VERSION = '0.5.2.rc2'
 end

data/tasks/ports.rake

@@ -1,16 +1,19 @@
-require "mini_portile"
-require "rake/extensioncompiler"
+require 'mini_portile'
+require 'rake/extensioncompiler'
 
 namespace :ports do
   
   # If your using 0.82, you may have to make a conf file to get it to work. For example:
   # $ export FREETDSCONF='/opt/local/etc/freetds/freetds.conf'
   ICONV_VERSION = "1.13.1"
-  FREETDS_VERSION = ENV['TINYTDS_FREETDS_082'] ? "0.82" : "0.91"
-  FREETDS_VERSION_INFO = {
-    "0.82" => {:files => "http://mirrors.ibiblio.org/freetds/old/0.82/freetds-0.82.tar.gz"},
-    # "0.82" => {:files => "http://mirrors.ibiblio.org/freetds/old/0.82/freetds-patched.tgz"},
-    "0.91" => {:files => "http://mirrors.ibiblio.org/freetds/stable/freetds-0.91.tar.gz"} }
+  FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.91"
+  FREETDS_VERSION_INFO = Hash.new { |h,k|
+    h[k] = {:files => "ftp://ftp.astron.com/pub/freetds/stable/freetds-#{k}.tar.gz"}
+  }.merge({
+    "0.82" => {:files => "ftp://ftp.astron.com/pub/freetds/old/0.82/freetds-0.82.tar.gz"},
+    "0.91" => {:files => "ftp://ftp.astron.com/pub/freetds/stable/freetds-0.91.tar.gz"},
+    "current" => {:files => "ftp://ftp.astron.com/pub/freetds/current/freetds-current.tgz"}
+  })
 
   directory "ports"
 
@@ -20,6 +23,7 @@ namespace :ports do
 
   $recipes[:freetds] = MiniPortile.new "freetds", FREETDS_VERSION
   $recipes[:freetds].files << FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
+  $recipes[:freetds].patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'sspi_w_kerberos.diff'), __FILE__) if $recipes[:freetds].respond_to?(:patch_files)
 
   desc "Compile libiconv support library"
   task :libiconv => ["ports"] do
@@ -38,13 +42,12 @@ namespace :ports do
     recipe = $recipes[:freetds]
     checkpoint = "ports/.#{recipe.name}.#{recipe.version}.#{recipe.host}.timestamp"
     unless File.exist?(checkpoint)
-      recipe.configure_options << '--sysconfdir="C:/Sites"' if recipe.host =~ /mswin|mingw/i
+      with_tdsver = ENV['TINYTDS_FREETDS_VERSION'] =~ /0\.8/ ? "--with-tdsver=8.0" : "--with-tdsver=7.1"
+      for_windows = recipe.host =~ /mswin|mingw/i
+      recipe.configure_options << '--sysconfdir="C:/Sites"' if for_windows
+      recipe.configure_options << '--enable-sspi' if for_windows
       recipe.configure_options << "--disable-odbc"
-      if ENV['TINYTDS_FREETDS_082']
-        recipe.configure_options << "--with-tdsver=8.0"
-      else
-        recipe.configure_options << "--with-tdsver=7.1"
-      end
+      recipe.configure_options << with_tdsver
       recipe.configure_options << "CFLAGS='-fPIC'"
       recipe.cook
       touch checkpoint

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_tds
 version: !ruby/object:Gem::Version 
-  hash: 1037666241
+  hash: 3269045753
   prerelease: 6
   segments: 
   - 0
   - 5
   - 2
   - rc
-  - 1
-  version: 0.5.2.rc1
+  - 2
+  version: 0.5.2.rc2
 platform: x86-mingw32
 authors: 
 - Ken Collins
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-23 00:00:00 -04:00
+date: 2012-11-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,14 +43,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
-        - 3
+        - 4
         - 0
-        version: 0.3.0
+        version: 0.4.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,7 @@ files:
 - NOTES
 - README.md
 - Rakefile
+- ext/patch/sspi_w_kerberos.diff
 - ext/tiny_tds/client.c
 - ext/tiny_tds/client.h
 - ext/tiny_tds/extconf.rb