tiny_tds 0.5.1 → 0.5.2.rc1

data/CHANGELOG

@@ -1,4 +1,11 @@
 
+* 0.5.2 *
+
+* Move test system to real MiniTest::Spec. All tests pass on Azure too.
+
+* Raise and handle encoding errors on DB writes. Fixes #89.
+
+
 * 0.5.1 *
 
 * Change how we configure with iconv, basically it is always needed. Fixes #11 & #69.

data/Gemfile

@@ -1,14 +1,6 @@
-
 source :rubygems
 
-group :development do
-  gem 'rake', '~> 0.9.2'
-  gem 'mini_portile', '0.2.2'
-  gem 'rake-compiler', '0.8.0'
-end
+gemspec
+
+gem 'm', :platform => :ruby_19
 
-group :test do
-  gem 'mini_shoulda', '0.3.0'
-  gem 'activesupport', '2.3.5'
-  gem 'bench_press', '0.3.1'
-end

data/README.md

@@ -33,7 +33,7 @@ Although we search for FreeTDS's libraries and headers, you may have to specify
 
 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.
 
-* **Do I need to install FreeTDS?** Yes! Somehow, someway, your 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.
+* **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.
 
 * **OK, I am installing FreeTDS, how do I configure it?** Contrary to what most people think, you do not need to specially configure FreeTDS in any way for client libraries like TinyTDS to use it. About the only requirement is that you compile it with libiconv for proper encoding support. FreeTDS must also be compiled with OpenSSL (or the like) to use it with Azure. See the "Using TinyTDS with Azure" section below for more info.
 
@@ -68,7 +68,7 @@ Creating a new client takes a hash of options. For valid iconv encoding options,
 
 * :username - The database server user.
 * :password - The user password.
-* :dataserver - Many options. Can be the name for your data server as defined in freetds.conf. Raw host name or IP will work here too. You can also used a named instance like 'localhost\SQLEXPRESS' too.
+* :dataserver - Can be the name for your data server as defined in freetds.conf. Raw hostname or hostname:port will work here too. FreeTDS says that named instance like 'localhost\SQLEXPRESS' work too, but I highly suggest that you use the :host and :port options below. [Google how to find your host port if you are using named instances](http://bit.ly/xAf2jm) or [go here](http://msdn.microsoft.com/en-us/library/ms181087.aspx).
 * :host - Used if :dataserver blank. Can be an host name or IP.
 * :port - Defaults to 1433. Only used if :host is used.
 * :database - The default database to use.
@@ -259,6 +259,10 @@ result.each(:first => true) # => [{'id' => 24}]
 By default row caching is turned on because the SQL Server adapter for ActiveRecord would not work without it. I hope to find some time to create some performance patches for ActiveRecord that would allow it to take advantages of lazily created yielded rows from result objects. Currently only TinyTDS and the Mysql2 gem allow such a performance gain.
 
 
+## Encoding Error Handling
+
+TinyTDS takes an opinionated stance on how we handle encoding errors. First, we treat errors differently on reads vs. writes. Our opinion is that if you are reading bad data due to your client's encoding option, you would rather just find `?`'marks in your strings vs being blocked with exceptions. This is how things wold work via ODBC or SMS. On the other hand, writes will raise an exception. In this case we raise the SYBEICONVO/2402 error message which has a description of `Error converting characters into server's character set. Some character(s) could not be converted.`. Even though the severity of this message is only a `4` and TinyTDS will automatically strip/ignore unknown characters, we feel you should know that you are inserting bad encodings. In this way, a transaction can be rolled back, etc. Remember, any database write that has bad characters due to the client encoding will still be written to the database, but it is up to you rollback said write if needed. Most ORMs like ActiveRecord handle this scenario just fine.
+
 
 ## Using TinyTDS With Rails & The ActiveRecord SQL Server adapter.
 
@@ -272,6 +276,8 @@ As of version 2.3.11 & 3.0.3 of the adapter, you can specify a `:dblib` mode in
 
 TinyTDS is fully tested with the Azure platform. You must set the `:azure => true` connection option when connecting. This is needed to specify the default database name in the login packet since Azure has no notion of `USE [database]`. You must use the latest FreeTDS 0.91. FreeTDS must be compiled with OpenSSL too.
 
+IMPORTANT: Do not use `username@server.database.windows.net` for the username connection option! You must use the shorter `username@server` instead!
+
 
 ## Using MiniPortile
 
@@ -338,6 +344,11 @@ My name is Ken Collins and I currently maintain the SQL Server adapter for Activ
 * Josh Clayton of Thoughtbot for writing about ruby C extensions. - http://robots.thoughtbot.com/post/1037240922/get-your-c-on
 
 
+## Donators
+
+I am trying to save up for a Happy Hacking pro keyboard. Help me out via GitTip! https://www.gittip.com/metaskills/
+
+
 ## License
 
 TinyTDS is Copyright (c) 2010-2011 Ken Collins, <ken@metaskills.net> and is distributed under the MIT license. Windows binaries contain precompiled 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/ext/tiny_tds/client.c

@@ -58,6 +58,9 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
      return INT_CANCEL;
    case SYBESMSG:
      return return_value;
+   case SYBEICONVO:
+     dbfreebuf(dbproc);
+     break;
    case SYBEICONVI:
      return INT_CANCEL;
    case SYBEFCON:

data/lib/tiny_tds/version.rb

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

data/tasks/ports.rake

@@ -8,9 +8,9 @@ namespace :ports do
   ICONV_VERSION = "1.13.1"
   FREETDS_VERSION = ENV['TINYTDS_FREETDS_082'] ? "0.82" : "0.91"
   FREETDS_VERSION_INFO = {
-    "0.82" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/old/0.82/freetds-0.82.tar.gz"},
-    # "0.82" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/old/0.82/freetds-patched.tgz"},
-    "0.91" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.91.tar.gz"} }
+    "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"} }
 
   directory "ports"
 

data/test/client_test.rb

@@ -1,19 +1,20 @@
+# encoding: utf-8
 require 'test_helper'
 
 class ClientTest < TinyTds::TestCase
   
-  context 'With valid credentials' do
+  describe 'With valid credentials' do
     
-    setup do
+    before do
       @client = new_connection
     end
 
-    should 'not be closed' do
+    it 'must not be closed' do
       assert !@client.closed?
       assert @client.active?
     end
     
-    should 'allow client connection to be closed' do
+    it 'allows client connection to be closed' do
       assert @client.close
       assert @client.closed?
       assert !@client.active?
@@ -23,21 +24,21 @@ class ClientTest < TinyTds::TestCase
       end
     end
     
-    should 'have a getters for the tds version information (brittle since conf takes precedence)' do
+    it 'has getters for the tds version information (brittle since conf takes precedence)' do
       assert_equal 9, @client.tds_version
       assert_equal 'DBTDS_7_1 - Microsoft SQL Server 2000', @client.tds_version_info
     end
     
-    should 'use UTF-8 client charset/encoding by default' do
+    it 'uses UTF-8 client charset/encoding by default' do
       assert_equal 'UTF-8', @client.charset
       assert_equal Encoding.find('UTF-8'), @client.encoding if ruby19?
     end
     
-    should 'have a #escape method used for quote strings' do
+    it 'has a #escape method used for quote strings' do
       assert_equal "''hello''", @client.escape("'hello'")
     end
     
-    should 'allow valid iconv character set' do
+    it 'allows valid iconv character set' do
       ['CP850', 'CP1252', 'ISO-8859-1'].each do |encoding|
         client = new_connection(:encoding => encoding)
         assert_equal encoding, client.charset
@@ -45,23 +46,23 @@ class ClientTest < TinyTds::TestCase
       end
     end
     
-    should 'be able to use :host/:port connection' do
+    it 'must be able to use :host/:port connection' do
       client = new_connection :dataserver => nil, :host => ENV['TINYTDS_UNIT_HOST'], :port => ENV['TINYTDS_UNIT_PORT'] || 1433
     end unless sqlserver_azure?
   
   end
   
-  context 'With in-valid options' do
+  describe 'With in-valid options' do
     
-    should 'raise an argument error when no :host given and :dataserver is blank' do
+    it 'raises an argument error when no :host given and :dataserver is blank' do
       assert_raises(ArgumentError) { new_connection :dataserver => nil, :host => nil }
     end
     
-    should 'raise an argument error when no :username is supplied' do
+    it 'raises an argument error when no :username is supplied' do
       assert_raises(ArgumentError) { TinyTds::Client.new :username => nil }
     end
     
-    should 'raise TinyTds exception with undefined :dataserver' do
+    it 'raises TinyTds exception with undefined :dataserver' do
       options = connection_options :login_timeout => 1, :dataserver => '127.0.0.2'
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|
@@ -72,7 +73,7 @@ class ClientTest < TinyTds::TestCase
       assert_new_connections_work
     end
     
-    should 'raise TinyTds exception with long query past :timeout option' do
+    it 'raises TinyTds exception with long query past :timeout option' do
       client = new_connection :timeout => 1
       action = lambda { client.execute("WaitFor Delay '00:00:02'").do }
       assert_raise_tinytds_error(action) do |e|
@@ -84,14 +85,14 @@ class ClientTest < TinyTds::TestCase
       assert_new_connections_work
     end
     
-    should 'not timeout per sql batch when not under transaction' do
+    it 'must not timeout per sql batch when not under transaction' do
       client = new_connection :timeout => 2
       client.execute("WaitFor Delay '00:00:01'").do
       client.execute("WaitFor Delay '00:00:01'").do
       client.execute("WaitFor Delay '00:00:01'").do
     end
     
-    should 'not timeout per sql batch when under transaction' do
+    it 'must not timeout per sql batch when under transaction' do
       client = new_connection :timeout => 2
       begin
         client.execute("BEGIN TRANSACTION").do
@@ -103,7 +104,8 @@ class ClientTest < TinyTds::TestCase
       end
     end
     
-    should_eventually 'run this test to prove we account for dropped connections' do
+    it 'must run this test to prove we account for dropped connections' do
+      skip
       begin
         client = new_connection :login_timeout => 2, :timeout => 2
         assert_client_works(client)
@@ -129,7 +131,7 @@ class ClientTest < TinyTds::TestCase
       end
     end
     
-    should 'raise TinyTds exception with wrong :username' do
+    it 'raises TinyTds exception with wrong :username' do
       options = connection_options :username => 'willnotwork'
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|
@@ -144,7 +146,7 @@ class ClientTest < TinyTds::TestCase
       assert_new_connections_work
     end
     
-    should 'fail miserably with unknown encoding option' do
+    it 'fails miserably with unknown encoding option' do
       options = connection_options :encoding => 'ISO-WTF'
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|

data/test/result_test.rb

@@ -3,24 +3,24 @@ require 'test_helper'
 
 class ResultTest < TinyTds::TestCase
   
-  context 'Basic query and result' do
+  describe 'Basic query and result' do
   
-    setup do
+    before do
       @@current_schema_loaded ||= load_current_schema
       @client = new_connection
       @query1 = 'SELECT 1 AS [one]'
     end
     
-    should 'have included Enumerable' do
+    it 'has included Enumerable' do
       assert TinyTds::Result.ancestors.include?(Enumerable)
     end
     
-    should 'respond to #each' do
+    it 'responds to #each' do
       result = @client.execute(@query1)
       assert result.respond_to?(:each)
     end
     
-    should 'return all results for #each with no block' do
+    it 'returns all results for #each with no block' do
       result = @client.execute(@query1)
       data = result.each
       row = data.first
@@ -29,7 +29,7 @@ class ResultTest < TinyTds::TestCase
       assert_instance_of Hash, row, 'hash is the default query option'
     end
     
-    should 'return all results for #each with a block yielding a row at a time' do
+    it 'returns all results for #each with a block yielding a row at a time' do
       result = @client.execute(@query1)
       data = result.each do |row|
         assert_instance_of Hash, row, 'hash is the default query option'
@@ -37,7 +37,7 @@ class ResultTest < TinyTds::TestCase
       assert_instance_of Array, data
     end
     
-    should 'allow successive calls to each returning the same data' do
+    it 'allows successive calls to each returning the same data' do
       result = @client.execute(@query1)
       data = result.each
       result.each
@@ -45,7 +45,7 @@ class ResultTest < TinyTds::TestCase
       assert_equal data.first.object_id, result.each.first.object_id
     end
     
-    should 'return hashes with string keys' do
+    it 'returns hashes with string keys' do
       result = @client.execute(@query1)
       row = result.each(:as => :hash, :symbolize_keys => false).first
       assert_instance_of Hash, row
@@ -53,7 +53,7 @@ class ResultTest < TinyTds::TestCase
       assert_equal ['one'], result.fields
     end
     
-    should 'return hashes with symbol keys' do
+    it 'returns hashes with symbol keys' do
       result = @client.execute(@query1)
       row = result.each(:as => :hash, :symbolize_keys => true).first
       assert_instance_of Hash, row
@@ -61,21 +61,21 @@ class ResultTest < TinyTds::TestCase
       assert_equal [:one], result.fields
     end
     
-    should 'return arrays with string fields' do
+    it 'returns arrays with string fields' do
       result = @client.execute(@query1)
       row = result.each(:as => :array, :symbolize_keys => false).first
       assert_instance_of Array, row
       assert_equal ['one'], result.fields
     end
     
-    should 'return arrays with symbol fields' do
+    it 'returns arrays with symbol fields' do
       result = @client.execute(@query1)
       row = result.each(:as => :array, :symbolize_keys => true).first
       assert_instance_of Array, row
       assert_equal [:one], result.fields
     end
     
-    should 'be able to turn :cache_rows option off' do
+    it 'must be able to turn :cache_rows option off' do
       result = @client.execute(@query1)
       local = []
       result.each(:cache_rows => false) do |row|
@@ -86,7 +86,7 @@ class ResultTest < TinyTds::TestCase
       assert_equal ['one'], result.fields, 'should still cache field names'
     end
     
-    should 'be able to get the first result row only' do
+    it 'must be able to get the first result row only' do
       load_current_schema
       big_query = "SELECT [id] FROM [datatypes]"
       one = @client.execute(big_query).each(:first => true)
@@ -95,12 +95,12 @@ class ResultTest < TinyTds::TestCase
       assert one.size == 1
     end
     
-    should 'cope with no results when using first option' do
+    it 'copes with no results when using first option' do
       data = @client.execute("SELECT [id] FROM [datatypes] WHERE [id] = -1").each(:first => true)
       assert_equal [], data
     end
     
-    should 'delete, insert and find data' do
+    it 'must delete, insert and find data' do
       rollback_transaction(@client) do
         text = 'test insert and delete'
         @client.execute("DELETE FROM [datatypes] WHERE [varchar_50] IS NOT NULL").do
@@ -111,7 +111,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
         
-    should 'insert and find unicode data' do
+    it 'must insert and find unicode data' do
       rollback_transaction(@client) do
         text = '✓'
         @client.execute("DELETE FROM [datatypes] WHERE [nvarchar_50] IS NOT NULL").do
@@ -121,7 +121,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
     
-    should 'delete and update with affected rows support and insert with identity support in native sql' do
+    it 'must delete and update with affected rows support and insert with identity support in native sql' do
       rollback_transaction(@client) do
         text = 'test affected rows sql'
         @client.execute("DELETE FROM [datatypes]").do
@@ -131,7 +131,7 @@ class ResultTest < TinyTds::TestCase
         pk1 = @client.execute("SELECT SCOPE_IDENTITY() AS Ident").each.first['Ident']
         assert_instance_of BigDecimal, pk1, 'native is numeric(38,0) for SCOPE_IDENTITY() function'
         pk2 = @client.execute("SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident").each.first['Ident']
-        assert_instance_of Fixnum, pk2, 'we should be able to CAST to bigint'
+        assert_instance_of Fixnum, pk2, 'we it be able to CAST to bigint'
         assert_equal pk2, pk1.to_i, 'just making sure the 2 line up'
         @client.execute("UPDATE [datatypes] SET [varchar_50] = NULL WHERE [varchar_50] = '#{text}'").do
         afrows = @client.execute("SELECT @@ROWCOUNT AS AffectedRows").each.first['AffectedRows']
@@ -139,7 +139,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
     
-    should 'have a #do method that cancels result rows and returns affected rows natively' do
+    it 'has a #do method that cancels result rows and returns affected rows natively' do
       rollback_transaction(@client) do
         text = 'test affected rows native'
         count = @client.execute("SELECT COUNT(*) AS [count] FROM [datatypes]").each.first['count']
@@ -152,7 +152,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
     
-    should 'allow native affected rows using #do to work under transaction' do
+    it 'allows native affected rows using #do to work under transaction' do
       rollback_transaction(@client) do
         text = 'test affected rows native in transaction'
         @client.execute("BEGIN TRANSACTION").do
@@ -164,7 +164,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
     
-    should 'have an #insert method that cancels result rows and returns the SCOPE_IDENTITY() natively' do
+    it 'has an #insert method that cancels result rows and returns the SCOPE_IDENTITY() natively' do
       rollback_transaction(@client) do
         text = 'test scope identity rows native'
         @client.execute("DELETE FROM [datatypes] WHERE [varchar_50] = '#{text}'").do
@@ -175,7 +175,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
   
-    should 'return bigint for #insert when needed' do
+    it 'returns bigint for #insert when needed' do
       return if sqlserver_azure? # We can not alter clustered index like this test does.
       rollback_transaction(@client) do
         seed = 9223372036854775805
@@ -190,7 +190,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
     
-    should 'be able to begin/commit transactions with raw sql' do
+    it 'must be able to begin/commit transactions with raw sql' do
       rollback_transaction(@client) do
         @client.execute("BEGIN TRANSACTION").do
         @client.execute("DELETE FROM [datatypes]").do
@@ -200,7 +200,7 @@ class ResultTest < TinyTds::TestCase
       end
     end
     
-    should 'be able to begin/rollback transactions with raw sql' do
+    it 'must be able to begin/rollback transactions with raw sql' do
       load_current_schema
       @client.execute("BEGIN TRANSACTION").do
       @client.execute("DELETE FROM [datatypes]").do
@@ -209,21 +209,21 @@ class ResultTest < TinyTds::TestCase
       0.wont_equal count
     end
     
-    should 'have a #fields accessor with logic default and valid outcome' do
+    it 'has a #fields accessor with logic default and valid outcome' do
       result = @client.execute(@query1)
       result.fields.must_equal ['one']
       result.each
       result.fields.must_equal ['one']
     end
     
-    should 'always return an array for fields for all sql' do
+    it 'always returns an array for fields for all sql' do
       result = @client.execute("USE [tinytdstest]")
       result.fields.must_equal []
       result.do
       result.fields.must_equal []
     end
     
-    should 'return fields even when no results are found' do
+    it 'returns fields even when no results are found' do
       no_results_query = "SELECT [id], [varchar_50] FROM [datatypes] WHERE [varchar_50] = 'NOTFOUND'"
       # Fields before each.
       result = @client.execute(no_results_query)
@@ -236,13 +236,13 @@ class ResultTest < TinyTds::TestCase
       result.fields.must_equal ['id','varchar_50']
     end
     
-    should 'allow the result to be canceled before reading' do
+    it 'allows the result to be canceled before reading' do
       result = @client.execute(@query1)
       result.cancel
       @client.execute(@query1).each
     end
     
-    should 'work in tandem with the client when needing to find out if client has sql sent and result is canceled or not' do
+    it 'works in tandem with the client when needing to find out if client has sql sent and result is canceled or not' do
       # Default state.
       @client = TinyTds::Client.new(connection_options)
       @client.sqlsent?.must_equal false
@@ -296,12 +296,12 @@ class ResultTest < TinyTds::TestCase
       @client.canceled?.must_equal true
     end
     
-    should 'use same string object for hash keys' do
+    it 'use same string object for hash keys' do
       data = @client.execute("SELECT [id], [bigint] FROM [datatypes]").each
       assert_equal data.first.keys.map{ |r| r.object_id }, data.last.keys.map{ |r| r.object_id }
     end
     
-    should 'have properly encoded column names with symbol keys' do
+    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
@@ -314,7 +314,7 @@ class ResultTest < TinyTds::TestCase
       assert_equal col_name.to_sym, row.keys.first
     end unless sqlserver_azure?
     
-    should 'allow #return_code to work with stored procedures and reset per sql batch' do
+    it 'allows #return_code to work with stored procedures and reset per sql batch' do
       assert_nil @client.return_code
       result = @client.execute("EXEC tinytds_TestReturnCodes")
       assert_equal [{"one"=>1}], result.each
@@ -326,9 +326,9 @@ class ResultTest < TinyTds::TestCase
       assert_nil result.return_code
     end
     
-    context 'with multiple result sets' do
+    describe 'with multiple result sets' do
   
-      setup do
+      before do
         @empty_select  = "SELECT 1 AS [rs1] WHERE 1 = 0"
         @double_select = "SELECT 1 AS [rs1]
                           SELECT 2 AS [rs2]" 
@@ -343,7 +343,7 @@ class ResultTest < TinyTds::TestCase
                                     SELECT 3 AS [rs3] WHERE 1 = 0"
       end
       
-      should 'handle a command buffer with double selects' do
+      it 'handles a command buffer with double selects' do
         result = @client.execute(@double_select)
         result_sets = result.each
         assert_equal 2, result_sets.size
@@ -361,14 +361,14 @@ class ResultTest < TinyTds::TestCase
         assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
       end
       
-      should 'yield each row for each result set' do
+      it 'yields each row for each result set' do
         data = []
         result_sets = @client.execute(@double_select).each { |row| data << row }
         assert_equal data.first, result_sets.first[0]
         assert_equal data.last, result_sets.last[0]
       end
       
-      should 'from a stored procedure' do
+      it 'works from a stored procedure' do
         if sqlserver?
           results1, results2 = @client.execute("EXEC sp_helpconstraint '[datatypes]'").each
           assert_equal [{"Object Name"=>"[datatypes]"}], results1
@@ -385,25 +385,25 @@ class ResultTest < TinyTds::TestCase
         end
       end
 
-      context 'using :empty_sets TRUE' do
+      describe 'using :empty_sets TRUE' do
         
-        setup do
+        before do
           @old_query_option_value = TinyTds::Client.default_query_options[:empty_sets]
           TinyTds::Client.default_query_options[:empty_sets] = true
           @client = new_connection
         end
         
-        teardown do
+        after do
           TinyTds::Client.default_query_options[:empty_sets] = @old_query_option_value
         end
         
-        should 'handle a basic empty result set' do
+        it 'handles a basic empty result set' do
           result = @client.execute(@empty_select)
           assert_equal [], result.each
           assert_equal ['rs1'], result.fields
         end
   
-        should 'include empty result sets by default - using 1st empty buffer' do
+        it 'includes empty result sets by default - using 1st empty buffer' do
           result = @client.execute(@triple_select_1st_empty)
           result_sets = result.each
           assert_equal 3, result_sets.size
@@ -423,7 +423,7 @@ class ResultTest < TinyTds::TestCase
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
         end
   
-        should 'include empty result sets by default - using 2nd empty buffer' do
+        it 'includes empty result sets by default - using 2nd empty buffer' do
           result = @client.execute(@triple_select_2nd_empty)
           result_sets = result.each
           assert_equal 3, result_sets.size
@@ -443,7 +443,7 @@ class ResultTest < TinyTds::TestCase
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
         end
   
-        should 'include empty result sets by default - using 3rd empty buffer' do
+        it 'includes empty result sets by default - using 3rd empty buffer' do
           result = @client.execute(@triple_select_3rd_empty)
           result_sets = result.each
           assert_equal 3, result_sets.size
@@ -465,25 +465,25 @@ class ResultTest < TinyTds::TestCase
   
       end
       
-      context 'using :empty_sets FALSE' do
+      describe 'using :empty_sets FALSE' do
         
-        setup do
+        before do
           @old_query_option_value = TinyTds::Client.default_query_options[:empty_sets]
           TinyTds::Client.default_query_options[:empty_sets] = false
           @client = new_connection
         end
         
-        teardown do
+        after do
           TinyTds::Client.default_query_options[:empty_sets] = @old_query_option_value
         end
         
-        should 'handle a basic empty result set' do
+        it 'handles a basic empty result set' do
           result = @client.execute(@empty_select)
           assert_equal [], result.each
           assert_equal ['rs1'], result.fields
         end
         
-        should 'not include empty result sets by default - using 1st empty buffer' do
+        it 'must not include empty result sets by default - using 1st empty buffer' do
           result = @client.execute(@triple_select_1st_empty)
           result_sets = result.each
           assert_equal 2, result_sets.size
@@ -501,7 +501,7 @@ class ResultTest < TinyTds::TestCase
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
         end
         
-        should 'not include empty result sets by default - using 2nd empty buffer' do
+        it 'must not include empty result sets by default - using 2nd empty buffer' do
           result = @client.execute(@triple_select_2nd_empty)
           result_sets = result.each
           assert_equal 2, result_sets.size
@@ -519,7 +519,7 @@ class ResultTest < TinyTds::TestCase
           assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
         end
   
-        should 'not include empty result sets by default - using 3rd empty buffer' do
+        it 'must not include empty result sets by default - using 3rd empty buffer' do
           result = @client.execute(@triple_select_3rd_empty)
           result_sets = result.each
           assert_equal 2, result_sets.size
@@ -541,35 +541,35 @@ class ResultTest < TinyTds::TestCase
       
     end
     
-    context 'when casting to native ruby values' do
+    describe 'when casting to native ruby values' do
     
-      should 'return fixnum for 1' do
+      it 'returns fixnum for 1' do
         value = @client.execute('SELECT 1 AS [fixnum]').each.first['fixnum']
         assert_equal 1, value
       end
       
-      should 'return nil for NULL' do
+      it 'returns nil for NULL' do
         value = @client.execute('SELECT NULL AS [null]').each.first['null']
         assert_equal nil, value
       end
     
     end
     
-    context 'with data type' do
+    describe 'with data type' do
 
-      context 'char max' do
+      describe 'char max' do
 
-        setup do
+        before do
           @big_text = 'x' * 2_000_000
           @old_textsize = @client.execute("SELECT @@TEXTSIZE AS [textsize]").each.first['textsize'].inspect
           @client.execute("SET TEXTSIZE #{(@big_text.length*2)+1}").do
         end
 
-        should 'insert and select large varchar_max' do
+        it 'must insert and select large varchar_max' do
           insert_and_select_datatype :varchar_max
         end
 
-        should 'insert and select large nvarchar_max' do
+        it 'must insert and select large nvarchar_max' do
           insert_and_select_datatype :nvarchar_max
         end
 
@@ -577,22 +577,22 @@ class ResultTest < TinyTds::TestCase
 
     end
     
-    context 'when shit happens' do
+    describe 'when shit happens' do
       
-      should 'cope with nil or empty buffer' do
+      it 'copes with nil or empty buffer' do
         assert_raises(TypeError) { @client.execute(nil) } 
         assert_equal [], @client.execute('').each
       end
       
       if sybase_ase?
 
-        should 'not raise an error when severity is 10 or less' do
+        it 'must 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
 
-        should 'raise an error when severity is greater than 10' do
+        it 'raises 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
@@ -603,19 +603,19 @@ class ResultTest < TinyTds::TestCase
 
       else
 
-        should 'raise an error' do
-          action = lambda { @client.execute("RAISERROR 99999 'Hello World'").do }
+        it 'raises an error' do
+          action = lambda { @client.execute("RAISERROR (N'Hello World', 16, 1)").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
+            assert_equal 50000, e.db_error_number
           end
+          assert_followup_query
         end
 
       end
-
       
-      should 'throw an error when you execute another query with other results pending' do
+      it 'throws an error when you execute another query with other results pending' do
         result1 = @client.execute(@query1)
         action = lambda { @client.execute(@query1) }
         assert_raise_tinytds_error(action) do |e|
@@ -625,7 +625,7 @@ class ResultTest < TinyTds::TestCase
         end
       end
           
-      should 'error gracefully with bad table name' do
+      it 'must error gracefully with bad table name' do
         action = lambda { @client.execute('SELECT * FROM [foobar]').each }
         assert_raise_tinytds_error(action) do |e|
           assert_match %r|invalid object name.*foobar|i, e.message
@@ -635,7 +635,7 @@ class ResultTest < TinyTds::TestCase
         assert_followup_query
       end
       
-      should 'error gracefully with incorrect syntax' do
+      it 'must error gracefully with incorrect syntax' do
         action = lambda { @client.execute('this will not work').each }
         assert_raise_tinytds_error(action) do |e|
           assert_match %r|incorrect syntax|i, e.message
@@ -644,8 +644,30 @@ class ResultTest < TinyTds::TestCase
         end
         assert_followup_query
       end
-      
-      should 'error gracefully with incorrect syntax in sp_executesql' do
+
+      it 'must not error at all from reading non-convertable charcters and just use ? marks' do
+        @client = new_connection :encoding => 'ASCII'
+        @client.charset.must_equal 'ASCII'
+        find_value(202, :nvarchar_50).must_equal 'test nvarchar_50 ??'
+      end
+
+      it 'must error gracefully from writing non-convertable characters' do
+        @client = new_connection :encoding => 'ASCII'
+        @client.charset.must_equal 'ASCII'
+        rollback_transaction(@client) do
+          text = 'Test ✓'
+          @client.execute("DELETE FROM [datatypes] WHERE [nvarchar_50] IS NOT NULL").do
+          action = lambda { @client.execute("INSERT INTO [datatypes] ([nvarchar_50]) VALUES ('#{text}')").do }
+          assert_raise_tinytds_error(action) do |e|
+            e.message.must_match %r{Error converting characters into server's character set}i
+            e.severity.must_equal 4
+            e.db_error_number.must_equal 2402
+          end
+          assert_followup_query
+        end
+      end
+
+      it 'errors gracefully with incorrect syntax in sp_executesql' do
         if @client.freetds_091_or_higer?
           action = lambda { @client.execute("EXEC sp_executesql N'this will not work'").each }
           assert_raise_tinytds_error(action) do |e|

data/test/schema_test.rb

@@ -3,42 +3,42 @@ require 'test_helper'
 
 class SchemaTest < TinyTds::TestCase
   
-  context 'Casting SQL Server schema' do
+  describe 'Casting SQL Server schema' do
   
-    setup do
+    before do
       @@current_schema_loaded ||= load_current_schema
       @client = new_connection
       @gif1px = ruby19? ? File.read('test/schema/1px.gif',:mode=>"rb:BINARY") : File.read('test/schema/1px.gif')
     end
   
-    context 'for shared types' do
+    describe 'for shared types' do
       
-      should 'cast bigint' do
+      it 'casts bigint' do
         assert_equal -9223372036854775807, find_value(11, :bigint)
         assert_equal 9223372036854775806, find_value(12, :bigint)
       end
       
-      should 'cast binary' do
+      it 'casts binary' do
         binary_value = sqlserver_azure? ? @gif1px : @gif1px+"\000"
         value = find_value(21, :binary_50)
         assert_equal binary_value, value
         assert_binary_encoding(value)
       end
       
-      should 'cast bit' do
+      it 'casts bit' do
         assert_equal true, find_value(31, :bit)
         assert_equal false, find_value(32, :bit)
         assert_equal nil, find_value(21, :bit)
       end
       
-      should 'cast char' do
+      it 'casts char' do
         partial_char = sqlserver_azure? ? '12345678' : '12345678  '
         assert_equal '1234567890', find_value(41, :char_10)
         assert_equal partial_char, find_value(42, :char_10)
         assert_utf8_encoding find_value(42, :char_10)
       end
       
-      should 'cast datetime' do
+      it 'casts datetime' do
         if ruby18? && ruby32bit?
           # 1753-01-01T00:00:00.000
           v = find_value 61, :datetime
@@ -112,7 +112,7 @@ class SchemaTest < TinyTds::TestCase
         end
       end
       
-      should 'cast decimal' do
+      it 'casts decimal' do
         assert_instance_of BigDecimal, find_value(91, :decimal_9_2)
         assert_equal BigDecimal.new('12345.01'), find_value(91, :decimal_9_2)
         assert_equal BigDecimal.new('1234567.89'), find_value(92, :decimal_9_2)
@@ -120,38 +120,38 @@ class SchemaTest < TinyTds::TestCase
         assert_equal BigDecimal.new('123456789012.3456'), find_value(94, :decimal_16_4)
       end
       
-      should 'cast float' do
+      it 'casts float' do
         assert_equal 123.00000001, find_value(101,:float)
         assert_equal 0.0, find_value(102,:float)
         assert_equal find_value(102,:float).object_id, find_value(102,:float).object_id, 'use global zero float'
         assert_equal 123.45, find_value(103,:float)
       end
       
-      should 'cast image' do
+      it 'casts image' do
         value = find_value(141,:image)
         assert_equal @gif1px, value
         assert_binary_encoding(value)
       end
       
-      should 'cast int' do
+      it 'casts int' do
         assert_equal -2147483647, find_value(151, :int)
         assert_equal 2147483646, find_value(152, :int)
       end
       
-      should 'cast money' do
+      it 'casts money' do
         assert_instance_of BigDecimal, find_value(161, :money)
         assert_equal BigDecimal.new('4.20'), find_value(161, :money)
         assert_equal BigDecimal.new('922337203685477.5806'), find_value(163 ,:money)
         assert_equal BigDecimal.new('-922337203685477.5807'), find_value(162 ,:money)
       end
       
-      should 'cast nchar' do
+      it 'casts nchar' do
         assert_equal '1234567890', find_value(171, :nchar_10)
         assert_equal '123456åå  ', find_value(172, :nchar_10)
         assert_equal 'abc123    ', find_value(173, :nchar_10)
       end
       
-      should 'cast ntext' do
+      it 'casts ntext' do
         assert_equal 'test ntext', find_value(181, :ntext)
         assert_equal 'test ntext åå', find_value(182, :ntext)
         assert_utf8_encoding find_value(182, :ntext)
@@ -161,7 +161,7 @@ class SchemaTest < TinyTds::TestCase
         assert_equal large_value, find_value(large_value_id, :ntext)
       end unless sybase_ase?
       
-      should 'cast numeric' do
+      it 'casts numeric' do
         assert_instance_of BigDecimal, find_value(191, :numeric_18_0)
         assert_equal BigDecimal('191'), find_value(191, :numeric_18_0)
         assert_equal BigDecimal('123456789012345678'), find_value(192, :numeric_18_0)
@@ -169,20 +169,20 @@ class SchemaTest < TinyTds::TestCase
         assert_equal BigDecimal('123.46'), find_value(194, :numeric_36_2)
       end
       
-      should 'cast nvarchar' do
+      it 'casts nvarchar' do
         assert_equal 'test nvarchar_50', find_value(201, :nvarchar_50)
         assert_equal 'test nvarchar_50 åå', find_value(202, :nvarchar_50)
         assert_utf8_encoding find_value(202, :nvarchar_50)
       end
       
-      should 'cast real' do
+      it 'casts real' do
         assert_in_delta 123.45, find_value(221, :real), 0.01
         assert_equal 0.0, find_value(222, :real)
         assert_equal find_value(222, :real).object_id, find_value(222, :real).object_id, 'use global zero float'
         assert_in_delta 0.00001, find_value(223, :real), 0.000001
       end
       
-      should 'cast smalldatetime' do
+      it 'casts smalldatetime' do
         if ruby18? && ruby32bit?
           # 1901-01-01 15:45:00
           v = find_value 231, :smalldatetime
@@ -232,40 +232,40 @@ class SchemaTest < TinyTds::TestCase
         end
       end
       
-      should 'cast smallint' do
+      it 'casts smallint' do
         assert_equal -32767, find_value(241, :smallint)
         assert_equal 32766, find_value(242, :smallint)
       end
       
-      should 'cast smallmoney' do
+      it 'casts smallmoney' do
         assert_instance_of BigDecimal, find_value(251, :smallmoney)
         assert_equal BigDecimal.new("4.20"), find_value(251, :smallmoney)
         assert_equal BigDecimal.new("-214748.3647"), find_value(252, :smallmoney)
         assert_equal BigDecimal.new("214748.3646"), find_value(253, :smallmoney)
       end
       
-      should 'cast text' do
+      it 'casts text' do
         assert_equal 'test text', find_value(271, :text)
         assert_utf8_encoding find_value(271, :text)
       end
       
-      should 'cast tinyint' do
+      it 'casts tinyint' do
         assert_equal 0, find_value(301, :tinyint)
         assert_equal 255, find_value(302, :tinyint)
       end
       
-      should 'cast uniqueidentifier' do
+      it 'casts 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 unless sybase_ase?
       
-      should 'cast varbinary' do
+      it 'casts varbinary' do
         value = find_value(321, :varbinary_50)
         assert_equal @gif1px, value
         assert_binary_encoding(value)
       end
       
-      should 'cast varchar' do
+      it 'casts varchar' do
         assert_equal 'test varchar_50', find_value(341, :varchar_50)
         assert_utf8_encoding find_value(341, :varchar_50)
       end
@@ -273,27 +273,27 @@ class SchemaTest < TinyTds::TestCase
     end
     
     
-    context 'for 2005 and up' do
+    describe 'for 2005 and up' do
       
-      should 'cast nvarchar(max)' do
+      it 'casts nvarchar(max)' do
         assert_equal 'test nvarchar_max', find_value(211, :nvarchar_max)
         assert_equal 'test nvarchar_max åå', find_value(212, :nvarchar_max)
         assert_utf8_encoding find_value(212, :nvarchar_max)
       end
       
-      should 'cast varbinary(max)' do
+      it 'casts varbinary(max)' do
         value = find_value(331, :varbinary_max)
         assert_equal @gif1px, value
         assert_binary_encoding(value)
       end
       
-      should 'cast varchar(max)' do
+      it 'casts varchar(max)' do
         value = find_value(351, :varchar_max)
         assert_equal 'test varchar_max', value
         assert_utf8_encoding(value)
       end
       
-      should 'cast xml' do
+      it 'casts xml' do
         value = find_value(361, :xml)
         assert_equal '<foo><bar>batz</bar></foo>', value
         assert_utf8_encoding(value)
@@ -302,7 +302,7 @@ class SchemaTest < TinyTds::TestCase
     end if sqlserver_2005? || sqlserver_2008? || sqlserver_azure?
     
     
-    context 'for 2008 and up' do
+    describe 'for 2008 and up' do
       
       # These data types always come back as SYBTEXT and there is no way I can 
       # find out the column's human readable name. 
@@ -318,37 +318,37 @@ class SchemaTest < TinyTds::TestCase
       #   rb_warn("SYBTEXT: dbcolutype: %s", dbcolutype(rwrap->client, col));
       #   rb_warn("SYBTEXT: dbcolutype: %ld", dbcolutype(rwrap->client, col));
       
-      # should 'cast date' do
+      # it 'casts date' do
       #   value = find_value 51, :date
       #   assert_equal '', value
       # end
       # 
-      # should 'cast datetime2' do
+      # it 'casts datetime2' do
       #   value = find_value 72, :datetime2_7
       #   assert_equal '', value
       # end
       # 
-      # should 'cast datetimeoffset' do
+      # it 'casts datetimeoffset' do
       #   value = find_value 81, :datetimeoffset_2
       #   assert_equal '', value
       # end
       # 
-      # should 'cast geography' do
+      # it 'casts geography' do
       #   value = find_value 111, :geography
       #   assert_equal '', value
       # end
       # 
-      # should 'cast geometry' do
+      # it 'casts geometry' do
       #   value = find_value 121, :geometry
       #   assert_equal '', value
       # end
       # 
-      # should 'cast hierarchyid' do
+      # it 'casts hierarchyid' do
       #   value = find_value 131, :hierarchyid
       #   assert_equal '', value
       # end
       # 
-      # should 'cast time' do
+      # it 'casts time' do
       #   value = find_value 283, :time_7
       #   assert_equal '', value
       # end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 require 'tiny_tds'
-require 'mini_shoulda'
+require 'minitest/spec'
 require 'minitest/autorun'
 
 class DateTime
@@ -39,7 +39,7 @@ module TinyTds
       
     end
     
-    teardown do
+    after do
       @client.close if @client.is_a?(TinyTds::Client)
     end
     
@@ -88,7 +88,7 @@ module TinyTds
     end
     
     def assert_client_works(client)
-      client.execute("SELECT 'client_works' as [client_works]").each
+      client.execute("SELECT 'client_works' as [client_works]").each.must_equal [{'client_works' => 'client_works'}]
     end
     
     def assert_new_connections_work

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_tds
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 1037666241
+  prerelease: 6
   segments: 
   - 0
   - 5
+  - 2
+  - rc
   - 1
-  version: 0.5.1
+  version: 0.5.2.rc1
 platform: ruby
 authors: 
 - Ken Collins
@@ -16,9 +18,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 Z
-dependencies: []
-
+date: 2012-09-23 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mini_portile
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library. Developed for the ActiveRecord SQL Server adapter.
 email: 
 - ken@metaskills.net
@@ -62,6 +141,7 @@ files:
 - 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: []
 
@@ -82,16 +162,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.