tiny_tds 0.5.1.rc1 → 0.5.1

data/CHANGELOG

@@ -1,7 +1,7 @@
 
 * 0.5.1 *
 
-* Change how we configure with iconv, basically it is always needed. Fixes #11 [asdavey]
+* Change how we configure with iconv, basically it is always needed. Fixes #11 & #69.
 
 
 * 0.5.0 *

data/Gemfile

@@ -2,9 +2,9 @@
 source :rubygems
 
 group :development do
-  gem 'rake', '0.8.7'
+  gem 'rake', '~> 0.9.2'
   gem 'mini_portile', '0.2.2'
-  gem 'rake-compiler', '0.7.9'
+  gem 'rake-compiler', '0.8.0'
 end
 
 group :test do

data/README.md

@@ -288,15 +288,19 @@ $ rake native gem
 $ 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).
+
 
 ## Development & Testing  
 
-We use bundler for development. Simply run `bundle install` then `rake` to build the gem and run the unit tests. The tests assume you have created a database named `tinytdstest` accessible by a database owner named `tinytds`. Before running the test rake task, you may need to define a pair of environment variables that help the client connect to your specific FreeTDS database server name and which schema (2000, 2005, 2008 or azure) to use. For example:
+We use bundler for development. Simply run `bundle install` then `rake` to build the gem and run the unit tests. The tests assume you have created a database named `tinytdstest` accessible by a database owner named `tinytds`. Before running the test rake task, you may need to define a pair of environment variables that help the client connect to your specific FreeTDS database server name and which schema (2000, 2005, 2008, Azure or Sybase ASE) to use. For example:
 
 ```
 $ rake TINYTDS_UNIT_DATASERVER=mydbserver TINYTDS_SCHEMA=sqlserver_2008
   or
 $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
+  or
+$ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_UNIT_PORT=5000 TINYTDS_SCHEMA=sybase_ase
 ```
 
 If you do not want to use MiniPortile to compile a local project version of FreeTDS and instead use your local system version, use the `TINYTDS_SKIP_PORTS` environment variable. This will ignore any port tasks and will instead build and link to your system's FreeTDS installation as a normal gem install would.
@@ -323,7 +327,7 @@ $ rake TINYTDS_SKIP_PORTS=true
 
 ## About Me
 
-My name is Ken Collins and I currently maintain the SQL Server adapter for ActiveRecord and wrote this library as my first cut into learning ruby C extensions. Hopefully it will help promote the power of ruby and the rails framework to those that have not yet discovered it. My blog is http://metaskills.net and I can be found on twitter as @metaskills. Enjoy!
+My name is Ken Collins and I currently maintain the SQL Server adapter for ActiveRecord and wrote this library as my first cut into learning ruby C extensions. Hopefully it will help promote the power of ruby and the Rails framework to those that have not yet discovered it. My blog is http://metaskills.net and I can be found on twitter as @metaskills. Enjoy!
 
 
 ## Special Thanks

data/Rakefile

@@ -60,3 +60,4 @@ task :build => [:clean, :compile]
 task :default => [:build, :test]
 
 Dir["tasks/*.rake"].sort.each { |f| load f }
+

data/ext/tiny_tds/extconf.rb

@@ -1,12 +1,19 @@
+ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
+
+# :stopdoc:
+
 require 'mkmf'
 
-FREETDS_LIBRARIES = ['iconv','sybdb']
-FREETDS_HEADERS = ['sybfront.h', 'sybdb.h']
+# Shamelessly copied from nokogiri
+#
+LIBDIR     = RbConfig::CONFIG['libdir']
+INCLUDEDIR = RbConfig::CONFIG['includedir']
 
-dir_config('iconv')
-dir_config('freetds')
+$CFLAGS  << " #{ENV["CFLAGS"]}"
+$LDFLAGS << " #{ENV["LDFLAGS"]}"
+$LIBS    << " #{ENV["LIBS"]}"
 
-def root_paths
+SEARCHABLE_PATHS = begin
   eop_regexp = /#{File::SEPARATOR}bin$/
   paths = ENV['PATH']
   paths = paths.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
@@ -15,69 +22,72 @@ def root_paths
   bin_paths.map{ |p| p.sub(eop_regexp,'') }.compact.reject{ |p| p.empty? }.uniq
 end
 
-def have_freetds_libraries?(*libraries)
-  libraries.all? { |l| have_library(l) }
+def searchable_paths_with_directories(*directories)
+  SEARCHABLE_PATHS.map do |path|
+    directories.map do |paths|
+      dir = File.join path, *paths
+      File.directory?(dir) ? dir : nil
+    end.flatten.compact
+  end.flatten.compact
 end
 
-def find_freetds_libraries_path
-  root_paths.detect do |path|
-    [['lib'],['lib','freetds']].detect do |lpaths|
-      dir = File.join path, *lpaths
-      message = "looking for library directory #{dir} ..."
-      if File.directory?(dir)
-        puts "#{message} yes"
-        if with_ldflags("#{$LDFLAGS} -L#{dir}".strip) { have_freetds_libraries?(*FREETDS_LIBRARIES) }
-          $LDFLAGS = "-L#{dir} #{$LDFLAGS}".strip
-          true
-        else
-          false
-        end
-      else
-        puts "#{message} no"
-        false
-      end
-    end
-  end
+if RbConfig::CONFIG['target_os'] =~ /mswin32|mingw32/
+  lib_prefix = 'lib' unless RbConfig::CONFIG['target_os'] =~ /mingw32/
+  # There's no default include/lib dir on Windows. Let's just add the Ruby ones
+  # and resort on the search path specified by INCLUDE and LIB environment
+  # variables
+  HEADER_DIRS = [INCLUDEDIR]
+  LIB_DIRS = [LIBDIR]
+else
+  lib_prefix = ''
+  HEADER_DIRS = [
+    # First search /opt/local for macports
+    '/opt/local/include',
+    # Then search /usr/local for people that installed from source
+    '/usr/local/include',
+    # Check the ruby install locations
+    INCLUDEDIR,
+    # Finally fall back to /usr
+    '/usr/include'
+  ].reject{ |dir| !File.directory?(dir) }
+  LIB_DIRS = [
+    # First search /opt/local for macports
+    '/opt/local/lib',
+    # Then search /usr/local for people that installed from source
+    '/usr/local/lib',
+    # Check the ruby install locations
+    LIBDIR,
+    # Finally fall back to /usr
+    '/usr/lib',
+  ].reject{ |dir| !File.directory?(dir) }
 end
 
-def have_freetds_headers?(*headers)
-  headers.all? { |h| have_header(h) }
-end
+FREETDS_HEADER_DIRS = (searchable_paths_with_directories(['include'],['include','freetds']) + HEADER_DIRS).uniq
+FREETDS_LIB_DIRS = (searchable_paths_with_directories(['lib'],['lib','freetds']) + LIB_DIRS).uniq
 
-def find_freetds_include_path
-  root_paths.detect do |path|
-    [['include'],['include','freetds']].detect do |ipaths|
-      dir = File.join path, *ipaths
-      message = "looking for include directory #{dir} ..."
-      if File.directory?(dir)
-        puts "#{message} yes"
-        if with_cppflags("#{$CPPFLAGS} -I#{dir}".strip) { have_freetds_headers?(*FREETDS_HEADERS) }
-          $CPPFLAGS = "-I#{dir} #{$CPPFLAGS}".strip
-          true
-        else
-          false
-        end
-      else
-        puts "#{message} no"
-        false
-      end
-    end
-  end
-end
+# lookup over searchable paths is great for native compilation, however, when
+# cross compiling we need to specify our own paths.
+if enable_config("lookup", true)
+  dir_config('iconv',   FREETDS_HEADER_DIRS, FREETDS_LIB_DIRS)
+  dir_config('freetds', FREETDS_HEADER_DIRS, FREETDS_LIB_DIRS)
+else
+  dir_config('iconv')
+  dir_config('freetds')
 
-def have_freetds?
-  find_freetds_libraries_path && find_freetds_include_path
+  # remove LDFLAGS
+  $LDFLAGS = ENV.fetch("LDFLAGS", "")
 end
 
-if enable_config("lookup", true)
-  unless have_freetds?
-    abort "-----\nCan not find FreeTDS's db-lib or include directory.\n-----"
-  end
-else
-  $LDFLAGS = ENV.fetch("LDFLAGS")
-  unless have_freetds_libraries?(*FREETDS_LIBRARIES) && have_freetds_headers?(*FREETDS_HEADERS)
-    abort "-----\nCan not find FreeTDS's db-lib or include directory.\n-----"
-  end
+def asplode(lib)
+  abort "-----\n#{lib} is missing.\n-----"
 end
 
+asplode 'libiconv' unless have_func('iconv_open', 'iconv.h') || have_library('iconv', 'iconv_open', 'iconv.h')
+asplode 'freetds'  unless have_header('sybfront.h') && have_header('sybdb.h')
+
+asplode 'freetds'  unless find_library("#{lib_prefix}sybdb", 'tdsdbopen')
+asplode 'freetds'  unless find_library("#{lib_prefix}ct",    'ct_bind')
+
 create_makefile('tiny_tds/tiny_tds')
+
+# :startdoc:

data/lib/tiny_tds/client.rb

@@ -54,6 +54,7 @@ module TinyTds
 
 
     def initialize(opts={})
+      warn 'FreeTDS may have issues with passwords longer than 30 characters!' if opts[:password].to_s.length > 30
       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.1.rc1'
+  VERSION = '0.5.1'
 end

data/test/client_test.rb

@@ -7,7 +7,7 @@ class ClientTest < TinyTds::TestCase
     setup do
       @client = new_connection
     end
-    
+
     should 'not be closed' do
       assert !@client.closed?
       assert @client.active?
@@ -46,7 +46,7 @@ class ClientTest < TinyTds::TestCase
     end
     
     should 'be able to use :host/:port connection' do
-      client = new_connection :dataserver => nil, :host => ENV['TINYTDS_UNIT_HOST'], :port => 1433
+      client = new_connection :dataserver => nil, :host => ENV['TINYTDS_UNIT_HOST'], :port => ENV['TINYTDS_UNIT_PORT'] || 1433
     end unless sqlserver_azure?
   
   end
@@ -136,7 +136,7 @@ class ClientTest < TinyTds::TestCase
         if sqlserver_azure?
           assert_match %r{server name cannot be determined}i, e.message, 'ignore if non-english test run'
         else
-          assert_equal 18456, e.db_error_number
+          assert_equal sybase_ase? ? 4002 : 18456, e.db_error_number
           assert_equal 14, e.severity
           assert_match %r{login failed}i, e.message, 'ignore if non-english test run'
         end

data/test/result_test.rb

@@ -369,14 +369,22 @@ class ResultTest < TinyTds::TestCase
       end
       
       should 'from a stored procedure' do
-        results1, results2 = @client.execute("EXEC sp_helpconstraint '[datatypes]'").each
-        assert_equal [{"Object Name"=>"[datatypes]"}], results1
-        constraint_info = results2.first
-        assert constraint_info.key?("constraint_keys")
-        assert constraint_info.key?("constraint_type")
-        assert constraint_info.key?("constraint_name")
+        if sqlserver?
+          results1, results2 = @client.execute("EXEC sp_helpconstraint '[datatypes]'").each
+          assert_equal [{"Object Name"=>"[datatypes]"}], results1
+          constraint_info = results2.first
+          assert constraint_info.key?("constraint_keys")
+          assert constraint_info.key?("constraint_type")
+          assert constraint_info.key?("constraint_name")
+        elsif sybase_ase?
+          results1, results2 = @client.execute("EXEC sp_helpconstraint 'datatypes'").each
+          assert results1['name']      =~ /^datatypes_bit/
+          assert results1['defintion'] == 'DEFAULT  0'
+          assert results2['name']      =~ /^datatypes_id/
+          assert results2['defintion'] =~ /^PRIMARY KEY/
+        end
       end
-      
+
       context 'using :empty_sets TRUE' do
         
         setup do
@@ -565,7 +573,7 @@ class ResultTest < TinyTds::TestCase
           insert_and_select_datatype :nvarchar_max
         end
 
-      end unless sqlserver_2000?
+      end unless sqlserver_2000? || sybase_ase?
 
     end
     
@@ -576,20 +584,36 @@ class ResultTest < TinyTds::TestCase
         assert_equal [], @client.execute('').each
       end
       
-      should 'not raise an error when severity is 10 or less' do
-        (1..10).to_a.each do |severity|
-          @client.execute("RAISERROR(N'Test #{severity} severity', #{severity}, 1)").do
+      if sybase_ase?
+
+        should 'not raise an error when severity is 10 or less' do
+          (1..10).to_a.each do |severity|
+            @client.execute("RAISERROR(N'Test #{severity} severity', #{severity}, 1)").do
+          end
         end
-      end
-      
-      should 'raise an error when severity is greater than 10' do
-        action = lambda { @client.execute("RAISERROR(N'Test 11 severity', 11, 1)").do }
-        assert_raise_tinytds_error(action) do |e|
-          assert_equal "Test 11 severity", e.message
-          assert_equal 11, e.severity
-          assert_equal 50000, e.db_error_number
+
+        should 'raise an error when severity is greater than 10' do
+          action = lambda { @client.execute("RAISERROR(N'Test 11 severity', 11, 1)").do }
+          assert_raise_tinytds_error(action) do |e|
+            assert_equal "Test 11 severity", e.message
+            assert_equal 11, e.severity
+            assert_equal 50000, e.db_error_number
+          end
         end
+
+      else
+
+        should 'raise an error' do
+          action = lambda { @client.execute("RAISERROR 99999 'Hello World'").do }
+          assert_raise_tinytds_error(action) do |e|
+            assert_equal "Hello World", e.message
+            assert_equal 16, e.severity # predefined on ASE
+            assert_equal 99999, e.db_error_number
+          end
+        end
+
       end
+
       
       should 'throw an error when you execute another query with other results pending' do
         result1 = @client.execute(@query1)

data/test/schema/sybase_ase.sql

@@ -0,0 +1,138 @@
+
+/*
+
+  * Binary Data - Our test binary data is a 1 pixel gif. The basic (raw) data is below. Quoting this data 
+    would involve this (encode) method and be (encoded) with the 0x prefix for raw SQL. In other clients the 
+    (raw_db) value without the 0x prefix would need to be (packed) again yield the original (raw) value.
+  
+    (raw)     - "GIF89a\001\000\001\000\221\000\000\377\377\377\377\377\377\376\001\002\000\000\000!\371\004\004\024\000\377\000,\000\000\000\000\001\000\001\000\000\002\002D\001\000;"
+    (encode)  - "0x#{raw.unpack("H*")[0]}"
+    (encoded) - "0x47494638396101000100910000fffffffffffffe010200000021f904041400ff002c00000000010001000002024401003b"
+    (raw_db)  - "47494638396101000100910000fffffffffffffe010200000021f904041400ff002c00000000010001000002024401003b"
+    (packed)  - [raw_db].pack('H*')
+    
+*/
+
+CREATE TABLE [datatypes] (
+  [id] [int] IDENTITY NOT NULL PRIMARY KEY,
+  [bigint] [bigint] NULL,
+  [binary_50] [binary](50) NULL,
+  [bit] [bit] DEFAULT 0,
+  [char_10] [char](10) NULL,
+  [date] [date] NULL,
+  [datetime] [datetime] NULL,
+  -- [datetime2_7] [datetime2](7) NULL,
+  -- [datetimeoffset_2] [datetimeoffset](2) NULL,
+  -- [datetimeoffset_7] [datetimeoffset](7) NULL,
+  [decimal_9_2] [decimal](9, 2) NULL,
+  [decimal_16_4] [decimal](16, 4) NULL,
+  [float] [float] NULL,
+  -- [geography] [geography] NULL,
+  -- [geometry] [geometry] NULL,
+  -- [hierarchyid] [hierarchyid] NULL,
+  [image] [image] NULL,
+  [int] [int] NULL,
+  [money] [money] NULL,
+  [nchar_10] [nchar](10) NULL,
+  -- [ntext] [ntext] NULL,
+  [numeric_18_0] [numeric](18, 0) NULL,
+  [numeric_36_2] [numeric](36, 2) NULL,
+  [nvarchar_50] [nvarchar](50) NULL,
+  -- [nvarchar_max] [nvarchar](max) NULL,
+  [real] [real] NULL,
+  [smalldatetime] [smalldatetime] NULL,
+  [smallint] [smallint] NULL,
+  [smallmoney] [smallmoney] NULL,
+  [text] [text] NULL,
+  -- [time_2] [time](2) NULL,
+  -- [time_7] [time](7) NULL,
+  [timestamp] [timestamp] NULL,
+  [tinyint] [tinyint] NULL,
+  -- [uniqueidentifier] [uniqueidentifier] NULL,
+  [varbinary_50] [varbinary](50) NULL,
+  -- [varbinary_max] [varbinary](max) NULL,
+  [varchar_50] [varchar](50) NULL
+  -- [varchar_max] [varchar](max) NULL,
+  -- [xml] [xml] NULL
+)
+
+SET IDENTITY_INSERT [dbo].[datatypes] ON
+
+INSERT INTO [datatypes] ([id], [bigint])            VALUES ( 11, -9223372036854775807 )
+INSERT INTO [datatypes] ([id], [bigint])            VALUES ( 12, 9223372036854775806 )
+INSERT INTO [datatypes] ([id], [binary_50])         VALUES ( 21, 0x47494638396101000100910000fffffffffffffe010200000021f904041400ff002c00000000010001000002024401003b )
+INSERT INTO [datatypes] ([id], [bit])               VALUES ( 31, 1 )
+INSERT INTO [datatypes] ([id], [bit])               VALUES ( 32, 0 )
+INSERT INTO [datatypes] ([id], [char_10])           VALUES ( 41, '1234567890' )
+INSERT INTO [datatypes] ([id], [char_10])           VALUES ( 42, '12345678' )
+INSERT INTO [datatypes] ([id], [date])              VALUES ( 51, '0001-01-01' )
+INSERT INTO [datatypes] ([id], [date])              VALUES ( 52, '9999-12-31' )
+INSERT INTO [datatypes] ([id], [datetime])          VALUES ( 61, '1753-01-01T00:00:00.000' )
+INSERT INTO [datatypes] ([id], [datetime])          VALUES ( 62, '9999-12-31T23:59:59.997' )
+INSERT INTO [datatypes] ([id], [datetime])          VALUES ( 63, '2010-01-01T12:34:56.123' )
+-- INSERT INTO [datatypes] ([id], [datetime2_7])       VALUES ( 71, '0001-01-01T00:00:00.0000000Z' )
+-- INSERT INTO [datatypes] ([id], [datetime2_7])       VALUES ( 72, '1984-01-24T04:20:00.0000000-08:00' )
+-- INSERT INTO [datatypes] ([id], [datetime2_7])       VALUES ( 73, '9999-12-31T23:59:59.9999999Z' )
+-- INSERT INTO [datatypes] ([id], [datetimeoffset_2])  VALUES ( 81, '1984-01-24T04:20:00.0000000-08:00' ) -- 1984-01-24 04:20:00.00 -08:00
+-- INSERT INTO [datatypes] ([id], [datetimeoffset_2])  VALUES ( 82, '1984-01-24T04:20:00.0000000Z' )      -- 1984-01-24 04:20:00.00 +00:00
+-- INSERT INTO [datatypes] ([id], [datetimeoffset_2])  VALUES ( 83, '9999-12-31T23:59:59.9999999Z' )      -- 9999-12-31 23:59:59.99 +00:00
+-- INSERT INTO [datatypes] ([id], [datetimeoffset_7])  VALUES ( 84, '1984-01-24T04:20:00.0000000-08:00' ) -- 1984-01-24 04:20:00.0000000 -08:00
+-- INSERT INTO [datatypes] ([id], [datetimeoffset_7])  VALUES ( 85, '1984-01-24T04:20:00.0000000Z' )      -- 1984-01-24 04:20:00.0000000 +00:00
+-- INSERT INTO [datatypes] ([id], [datetimeoffset_7])  VALUES ( 86, '9999-12-31T23:59:59.9999999Z' )      -- 9999-12-31 23:59:59.9999999 +00:00
+INSERT INTO [datatypes] ([id], [decimal_9_2])       VALUES ( 91, 12345.01 )
+INSERT INTO [datatypes] ([id], [decimal_9_2])       VALUES ( 92, 1234567.89 )
+INSERT INTO [datatypes] ([id], [decimal_16_4])      VALUES ( 93, 0.0 )
+INSERT INTO [datatypes] ([id], [decimal_16_4])      VALUES ( 94, 123456789012.3456 )
+INSERT INTO [datatypes] ([id], [float])             VALUES ( 101, 123.00000001 )
+INSERT INTO [datatypes] ([id], [float])             VALUES ( 102, 0.0 )
+INSERT INTO [datatypes] ([id], [float])             VALUES ( 103, 123.45 )
+-- INSERT INTO [datatypes] ([id], [geography])         VALUES ( 111, geography::STGeomFromText('LINESTRING(-122.360 47.656, -122.343 47.656)', 4326) ) -- 0xE610000001148716D9CEF7D34740D7A3703D0A975EC08716D9CEF7D34740CBA145B6F3955EC0
+-- INSERT INTO [datatypes] ([id], [geometry])          VALUES ( 121, geometry::STGeomFromText('LINESTRING (100 100, 20 180, 180 180)', 0) ) -- 0x0000000001040300000000000000000059400000000000005940000000000000344000000000008066400000000000806640000000000080664001000000010000000001000000FFFFFFFF0000000002
+-- INSERT INTO [datatypes] ([id], [hierarchyid])       VALUES ( 131, CAST('/1/' AS hierarchyid) ) -- 0x58
+-- INSERT INTO [datatypes] ([id], [hierarchyid])       VALUES ( 132, CAST('/2/' AS hierarchyid) ) -- 0x68
+INSERT INTO [datatypes] ([id], [image])             VALUES ( 141, 0x47494638396101000100910000fffffffffffffe010200000021f904041400ff002c00000000010001000002024401003b )
+INSERT INTO [datatypes] ([id], [int])               VALUES ( 151, -2147483647 )
+INSERT INTO [datatypes] ([id], [int])               VALUES ( 152, 2147483646 )
+INSERT INTO [datatypes] ([id], [money])             VALUES ( 161, 4.20 )
+INSERT INTO [datatypes] ([id], [money])             VALUES ( 162, -922337203685477.5807 )
+INSERT INTO [datatypes] ([id], [money])             VALUES ( 163, 922337203685477.5806 )
+INSERT INTO [datatypes] ([id], [nchar_10])          VALUES ( 171, N'1234567890' )
+INSERT INTO [datatypes] ([id], [nchar_10])          VALUES ( 172, N'123456åå' )
+INSERT INTO [datatypes] ([id], [nchar_10])          VALUES ( 173, N'abc123' )
+-- INSERT INTO [datatypes] ([id], [ntext])             VALUES ( 181, N'test ntext' )
+-- INSERT INTO [datatypes] ([id], [ntext])             VALUES ( 182, N'test ntext åå' )
+INSERT INTO [datatypes] ([id], [numeric_18_0])      VALUES ( 191, 191 )
+INSERT INTO [datatypes] ([id], [numeric_18_0])      VALUES ( 192, 123456789012345678 )
+INSERT INTO [datatypes] ([id], [numeric_36_2])      VALUES ( 193, 12345678901234567890.01 )
+INSERT INTO [datatypes] ([id], [numeric_36_2])      VALUES ( 194, 123.46 )
+INSERT INTO [datatypes] ([id], [nvarchar_50])       VALUES ( 201, N'test nvarchar_50' )
+INSERT INTO [datatypes] ([id], [nvarchar_50])       VALUES ( 202, N'test nvarchar_50 åå' )
+-- INSERT INTO [datatypes] ([id], [nvarchar_max])      VALUES ( 211, N'test nvarchar_max' )
+-- INSERT INTO [datatypes] ([id], [nvarchar_max])      VALUES ( 212, N'test nvarchar_max åå' )
+INSERT INTO [datatypes] ([id], [real])              VALUES ( 221, 123.45 )
+INSERT INTO [datatypes] ([id], [real])              VALUES ( 222, 0.0 )
+INSERT INTO [datatypes] ([id], [real])              VALUES ( 223, 0.00001 )
+INSERT INTO [datatypes] ([id], [smalldatetime])     VALUES ( 231, '1901-01-01T15:45:00.000' ) -- 1901-01-01 15:45:00
+INSERT INTO [datatypes] ([id], [smalldatetime])     VALUES ( 232, '2078-06-05T04:20:00.000' ) -- 2078-06-05 04:20:00
+INSERT INTO [datatypes] ([id], [smallint])          VALUES ( 241, -32767 )
+INSERT INTO [datatypes] ([id], [smallint])          VALUES ( 242, 32766 )
+INSERT INTO [datatypes] ([id], [smallmoney])        VALUES ( 251, 4.20 )
+INSERT INTO [datatypes] ([id], [smallmoney])        VALUES ( 252, -214748.3647 )
+INSERT INTO [datatypes] ([id], [smallmoney])        VALUES ( 253, 214748.3646 )
+INSERT INTO [datatypes] ([id], [text])              VALUES ( 271, 'test text' )
+-- INSERT INTO [datatypes] ([id], [time_2])            VALUES ( 281, '1901-01-01T15:45:00.0100001Z' )      -- 15:45:00.01
+-- INSERT INTO [datatypes] ([id], [time_2])            VALUES ( 282, '1984-01-24T04:20:00.0000001-08:00' ) -- 04:20:00.00
+-- INSERT INTO [datatypes] ([id], [time_7])            VALUES ( 283, '1901-01-01T15:45:00.0100001Z' )      -- 15:45:00.0100001
+-- INSERT INTO [datatypes] ([id], [time_7])            VALUES ( 284, '1984-01-24T04:20:00.0000001-08:00' ) -- 04:20:00.0000001
+INSERT INTO [datatypes] ([id], [tinyint])           VALUES ( 301, 0 )
+INSERT INTO [datatypes] ([id], [tinyint])           VALUES ( 302, 255 )
+-- INSERT INTO [datatypes] ([id], [uniqueidentifier])  VALUES ( 311, NEWID() )
+INSERT INTO [datatypes] ([id], [varbinary_50])      VALUES ( 321, 0x47494638396101000100910000fffffffffffffe010200000021f904041400ff002c00000000010001000002024401003b )
+-- INSERT INTO [datatypes] ([id], [varbinary_max])     VALUES ( 331, 0x47494638396101000100910000fffffffffffffe010200000021f904041400ff002c00000000010001000002024401003b )
+INSERT INTO [datatypes] ([id], [varchar_50])        VALUES ( 341, 'test varchar_50' )
+-- INSERT INTO [datatypes] ([id], [varchar_max])       VALUES ( 351, 'test varchar_max' )
+-- INSERT INTO [datatypes] ([id], [xml])               VALUES ( 361, '<foo><bar>batz</bar></foo>' )
+
+SET IDENTITY_INSERT [datatypes] OFF
+
+

data/test/schema_test.rb

@@ -7,7 +7,7 @@ class SchemaTest < TinyTds::TestCase
   
     setup do
       @@current_schema_loaded ||= load_current_schema
-      @client ||= new_connection
+      @client = new_connection
       @gif1px = ruby19? ? File.read('test/schema/1px.gif',:mode=>"rb:BINARY") : File.read('test/schema/1px.gif')
     end
   
@@ -159,7 +159,7 @@ class SchemaTest < TinyTds::TestCase
         large_value = "x" * 5000
         large_value_id = @client.execute("INSERT INTO [datatypes] ([ntext]) VALUES (N'#{large_value}')").insert
         assert_equal large_value, find_value(large_value_id, :ntext)
-      end
+      end unless sybase_ase?
       
       should 'cast numeric' do
         assert_instance_of BigDecimal, find_value(191, :numeric_18_0)
@@ -257,7 +257,7 @@ class SchemaTest < TinyTds::TestCase
       should 'cast uniqueidentifier' do
         assert_match %r|\w{8}-\w{4}-\w{4}-\w{4}-\w{12}|, find_value(311, :uniqueidentifier)
         assert_utf8_encoding find_value(311, :uniqueidentifier)
-      end
+      end unless sybase_ase?
       
       should 'cast varbinary' do
         value = find_value(321, :varbinary_50)

data/test/test_helper.rb

@@ -16,7 +16,7 @@ class DateTime
   end
 end
 
-TINYTDS_SCHEMAS = ['sqlserver_2000', 'sqlserver_2005', 'sqlserver_2008', 'sqlserver_azure'].freeze
+TINYTDS_SCHEMAS = ['sqlserver_2000', 'sqlserver_2005', 'sqlserver_2008', 'sqlserver_azure', 'sybase_ase'].freeze
 
 module TinyTds
   class TestCase < MiniTest::Spec
@@ -33,8 +33,15 @@ module TinyTds
         end
       end
       
+      def sqlserver?
+        current_schema =~ /sqlserver/
+      end
+      
     end
     
+    teardown do
+      @client.close if @client.is_a?(TinyTds::Client)
+    end
     
     protected
     
@@ -48,9 +55,15 @@ module TinyTds
       self.class.current_schema
     end
     
+    def sqlserver?
+      self.class.sqlserver?
+    end
+    
     def new_connection(options={})
       client = TinyTds::Client.new(connection_options(options))
-      unless sqlserver_azure?
+      if sybase_ase?
+        client.execute("SET ANSINULL ON").do
+      elsif !sqlserver_azure?
         client.execute("SET ANSI_DEFAULTS ON").do
         client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
         client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
@@ -59,10 +72,11 @@ module TinyTds
     end
     
     def connection_options(options={})
-      username = sqlserver_azure? ? ENV['TINYTDS_UNIT_AZURE_USER'] : 'tinytds'
-      password = sqlserver_azure? ? ENV['TINYTDS_UNIT_AZURE_PASS'] : ''
+      username = sqlserver_azure? ? ENV['TINYTDS_UNIT_AZURE_USER'] : ENV['TINYTDS_UNIT_USER'] || 'tinytds'
+      password = sqlserver_azure? ? ENV['TINYTDS_UNIT_AZURE_PASS'] : ENV['TINYTDS_UNIT_PASS'] || ''
       { :dataserver    => ENV['TINYTDS_UNIT_DATASERVER'],
         :host          => ENV['TINYTDS_UNIT_HOST'],
+        :port          => ENV['TINYTDS_UNIT_PORT'],
         :username      => username,
         :password      => password,
         :database      => 'tinytdstest',
@@ -139,6 +153,7 @@ module TinyTds
       loader = new_connection
       schema_file = File.expand_path File.join(File.dirname(__FILE__), 'schema', "#{current_schema}.sql")
       schema_sql = ruby18? ? File.read(schema_file) : File.open(schema_file,"rb:UTF-8") { |f|f.read }
+
       loader.execute(drop_sql).each
       loader.execute(schema_sql).cancel
       loader.execute(sp_sql).cancel
@@ -147,6 +162,19 @@ module TinyTds
     end
 
     def drop_sql
+      sybase_ase? ? drop_sql_sybase : drop_sql_microsoft
+    end
+
+    def drop_sql_sybase
+      %|IF EXISTS(
+          SELECT 1 FROM sysobjects WHERE type = 'U' AND name = 'datatypes'
+        ) DROP TABLE datatypes
+        IF EXISTS(
+          SELECT 1 FROM sysobjects WHERE type = 'P' AND name = 'tinytds_TestReturnCodes'
+        ) DROP PROCEDURE tinytds_TestReturnCodes|
+    end
+
+    def drop_sql_microsoft
       %|IF EXISTS (
           SELECT TABLE_NAME
           FROM INFORMATION_SCHEMA.TABLES 

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_tds
 version: !ruby/object:Gem::Version 
-  hash: 15424079
-  prerelease: 6
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 5
   - 1
-  - rc
-  - 1
-  version: 0.5.1.rc1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ken Collins
@@ -18,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-12 00:00:00 -05:00
-default_executable: 
+date: 2012-01-23 00:00:00 Z
 dependencies: []
 
 description: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library. Developed for the ActiveRecord SQL Server adapter.
@@ -62,9 +59,9 @@ files:
 - test/schema/sqlserver_2005.sql
 - test/schema/sqlserver_2008.sql
 - test/schema/sqlserver_azure.sql
+- test/schema/sybase_ase.sql
 - test/schema_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/rails-sqlserver/tiny_tds
 licenses: []
 
@@ -85,18 +82,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
@@ -111,5 +106,6 @@ test_files:
 - test/schema/sqlserver_2005.sql
 - test/schema/sqlserver_2008.sql
 - test/schema/sqlserver_azure.sql
+- test/schema/sybase_ase.sql
 - test/schema_test.rb
 - test/test_helper.rb