tiny_tds 2.1.0.pre3 → 2.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5566589ac540ec491cbe2d0f81179f6d714405c2
-  data.tar.gz: 8ea41365b260d809a232f8b9c57ff73a8abb7b57
+  metadata.gz: ae946f0a8582c1105d1a9927d9866e228cce17fe
+  data.tar.gz: 8763fb92c497e4cd0781be3292ad6ea1567cfead
 SHA512:
-  metadata.gz: 217443bc1c04781d1939e0f1c6cf07b1c684eec870cabe8d9d578ea76014f63b0812b5ffb88b58f2832fedb72326c723e8999df49b5db5b2e1c4b8110f2af0e7
-  data.tar.gz: bf338a99275e6592cf4a166c7dad14f38d3c6782ecae0146b3822283c593c32f82b8cb5d97b66e550266b2a60e9071dc097264cda4a58c39437779600dcdcbc8
+  metadata.gz: 3038107c41dc1aefc11dfaef02b1a9608b97bcb3b0f3ce4a243d209335bab85e00c5ffb0f982c5da145286000c9d9f0c7c931166c732d2f84192250917ed4bc1
+  data.tar.gz: 1cca1065fd05681606e5a5eb24aaa3ed02d2e3a17bcf9352255b068a9d354e36e0a6a31683c4fc1cd0bc678bc9dfa509d4694a9a33fb987882b070d9c92e091a

data/CHANGELOG.md

@@ -4,6 +4,8 @@
 * Support the FREETDS_DIR environment variable. Fixes #371.
 * Rename binstubs to tsql-ttds and defncopy-ttds
 * Support separate timeout values per connection Fixes #348.
+* Allow client proc to capture INFO messages. Fixes #352.
+* Use official HTTP mirrors instead of FTP. Fixes #384.
 
 
 ## 2.0.0

data/README.md

@@ -44,7 +44,7 @@ $ apt-get wget
 $ apt-get install build-essential
 $ apt-get install libc6-dev
 
-$ wget ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.21.tar.gz
+$ wget http://www.freetds.org/files/stable/freetds-1.00.21.tar.gz
 $ tar -xzf freetds-1.00.21.tar.gz
 $ cd freetds-1.00.21
 $ ./configure --prefix=/usr/local --with-tdsver=7.3

data/VERSION

@@ -1 +1 @@
-2.1.0.pre3
+2.1.0.pre4

data/ext/tiny_tds/client.c

@@ -3,10 +3,11 @@
 
 VALUE cTinyTdsClient;
 extern VALUE mTinyTds, cTinyTdsError;
-static ID sym_username, sym_password, sym_dataserver, sym_database, sym_appname, sym_tds_version, sym_login_timeout, sym_timeout, sym_encoding, sym_azure, sym_contained, sym_use_utf16;
+static ID sym_username, sym_password, sym_dataserver, sym_database, sym_appname, sym_tds_version, sym_login_timeout, sym_timeout, sym_encoding, sym_azure, sym_contained, sym_use_utf16, sym_message_handler;
 static ID intern_source_eql, intern_severity_eql, intern_db_error_number_eql, intern_os_error_number_eql;
-static ID intern_new, intern_dup, intern_transpose_iconv_encoding, intern_local_offset, intern_gsub;
+static ID intern_new, intern_dup, intern_transpose_iconv_encoding, intern_local_offset, intern_gsub, intern_call;
 VALUE opt_escape_regex, opt_escape_dblquote;
+VALUE message_handler;
 
 
 // Lib Macros
@@ -24,7 +25,7 @@ VALUE opt_escape_regex, opt_escape_dblquote;
 
 // Lib Backend (Helpers)
 
-VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, const char *error, const char *source, int severity, int dberr, int oserr) {
+VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int is_message, int cancel, const char *error, const char *source, int severity, int dberr, int oserr) {
   VALUE e;
   GET_CLIENT_USERDATA(dbproc);
   if (cancel && !dbdead(dbproc) && userdata && !userdata->closed) {
@@ -41,6 +42,15 @@ VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, const char *error, c
     rb_funcall(e, intern_db_error_number_eql, 1, INT2FIX(dberr));
   if (oserr)
     rb_funcall(e, intern_os_error_number_eql, 1, INT2FIX(oserr));
+
+  if (severity <= 10 && is_message) {
+    if (message_handler && message_handler != Qnil && rb_respond_to(message_handler, intern_call) != 0) {
+      rb_funcall(message_handler, intern_call, 1, e);
+    }
+
+    return Qnil;
+  }
+
   rb_exc_raise(e);
   return Qnil;
 }
@@ -109,6 +119,7 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
     generic message can be sent.
     */
     if (!userdata->nonblocking_error.is_set) {
+      userdata->nonblocking_error.is_message = 0;
       userdata->nonblocking_error.cancel = cancel;
       strncpy(userdata->nonblocking_error.error, dberrstr, ERROR_MSG_SIZE);
       strncpy(userdata->nonblocking_error.source, source, ERROR_MSG_SIZE);
@@ -119,7 +130,7 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
     }
 
   } else {
-    rb_tinytds_raise_error(dbproc, cancel, dberrstr, source, severity, dberr, oserr);
+    rb_tinytds_raise_error(dbproc, 0, cancel, dberrstr, source, severity, dberr, oserr);
   }
 
   return return_value;
@@ -128,25 +139,28 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
 int tinytds_msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severity, char *msgtext, char *srvname, char *procname, int line) {
   static const char *source = "message";
   GET_CLIENT_USERDATA(dbproc);
-  if (severity > 10) {
-    // See tinytds_err_handler() for info about why we do this
-    if (userdata && userdata->nonblocking) {
-      if (!userdata->nonblocking_error.is_set) {
-        userdata->nonblocking_error.cancel = 1;
-        strncpy(userdata->nonblocking_error.error, msgtext, ERROR_MSG_SIZE);
-        strncpy(userdata->nonblocking_error.source, source, ERROR_MSG_SIZE);
-        userdata->nonblocking_error.severity = severity;
-        userdata->nonblocking_error.dberr = msgno;
-        userdata->nonblocking_error.oserr = msgstate;
-        userdata->nonblocking_error.is_set = 1;
-      }
-      if (!dbdead(dbproc) && !userdata->closed) {
-        dbcancel(dbproc);
-        userdata->dbcancel_sent = 1;
-      }
-    } else {
-      rb_tinytds_raise_error(dbproc, 1, msgtext, source, severity, msgno, msgstate);
+
+  int is_message_an_error = severity > 10 ? 1 : 0;
+
+  // See tinytds_err_handler() for info about why we do this
+  if (userdata && userdata->nonblocking) {
+    if (!userdata->nonblocking_error.is_set) {
+      userdata->nonblocking_error.is_message = !is_message_an_error;
+      userdata->nonblocking_error.cancel = is_message_an_error;
+      strncpy(userdata->nonblocking_error.error, msgtext, ERROR_MSG_SIZE);
+      strncpy(userdata->nonblocking_error.source, source, ERROR_MSG_SIZE);
+      userdata->nonblocking_error.severity = severity;
+      userdata->nonblocking_error.dberr = msgno;
+      userdata->nonblocking_error.oserr = msgstate;
+      userdata->nonblocking_error.is_set = 1;
     }
+
+    if (is_message_an_error && !dbdead(dbproc) && !userdata->closed) {
+      dbcancel(dbproc);
+      userdata->dbcancel_sent = 1;
+    }
+  } else {
+    rb_tinytds_raise_error(dbproc, !is_message_an_error, is_message_an_error, msgtext, source, severity, msgno, msgstate);
   }
   return 0;
 }
@@ -308,6 +322,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   azure = rb_hash_aref(opts, sym_azure);
   contained = rb_hash_aref(opts, sym_contained);
   use_utf16 = rb_hash_aref(opts, sym_use_utf16);
+  message_handler = rb_hash_aref(opts, sym_message_handler);
   /* Dealing with options. */
   if (dbinit() == FAIL) {
     rb_raise(cTinyTdsError, "failed dbinit() function");
@@ -350,6 +365,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
       rb_warn("TinyTds: :use_utf16 option not supported in this version of FreeTDS.\n");
     }
   #endif
+
   cwrap->client = dbopen(cwrap->login, StringValueCStr(dataserver));
   if (cwrap->client) {
     VALUE transposed_encoding, timeout_string;
@@ -414,6 +430,7 @@ void init_tinytds_client() {
   sym_azure = ID2SYM(rb_intern("azure"));
   sym_contained = ID2SYM(rb_intern("contained"));
   sym_use_utf16 = ID2SYM(rb_intern("use_utf16"));
+  sym_message_handler = ID2SYM(rb_intern("message_handler"));
   /* Intern TinyTds::Error Accessors */
   intern_source_eql = rb_intern("source=");
   intern_severity_eql = rb_intern("severity=");
@@ -425,6 +442,7 @@ void init_tinytds_client() {
   intern_transpose_iconv_encoding = rb_intern("transpose_iconv_encoding");
   intern_local_offset = rb_intern("local_offset");
   intern_gsub = rb_intern("gsub");
+  intern_call = rb_intern("call");
   /* Escape Regexp Global */
   opt_escape_regex = rb_funcall(rb_cRegexp, intern_new, 1, rb_str_new2("\\\'"));
   opt_escape_dblquote = rb_str_new2("''");

data/ext/tiny_tds/client.h

@@ -8,6 +8,7 @@ void init_tinytds_client();
 
 typedef struct {
   short int is_set;
+  int is_message;
   int cancel;
   char error[ERROR_MSG_SIZE];
   char source[ERROR_MSG_SIZE];
@@ -38,7 +39,7 @@ typedef struct {
   rb_encoding *encoding;
 } tinytds_client_wrapper;
 
-VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, const char *error, const char *source, int severity, int dberr, int oserr);
+VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int is_message, int cancel, const char *error, const char *source, int severity, int dberr, int oserr);
 
 // Lib Macros
 

data/ext/tiny_tds/extconsts.rb

@@ -7,9 +7,9 @@ OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.
 
 FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.27"
 FREETDS_VERSION_INFO = Hash.new { |h,k|
-  h[k] = {files: "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.bz2"}
+  h[k] = {files: "http://www.freetds.org/files/stable/freetds-#{k}.tar.bz2"}
 }
-FREETDS_VERSION_INFO['1.00'] = {files: 'ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.tar.bz2'}
-FREETDS_VERSION_INFO['0.99'] = {files: 'ftp://ftp.freetds.org/pub/freetds/current/freetds-dev.0.99.678.tar.gz'}
-FREETDS_VERSION_INFO['0.95'] = {files: 'ftp://ftp.freetds.org/pub/freetds/stable/freetds-0.95.92.tar.gz'}
+FREETDS_VERSION_INFO['1.00'] = {files: 'http://www.freetds.org/files/stable/freetds-1.00.tar.bz2'}
+FREETDS_VERSION_INFO['0.99'] = {files: 'http://www.freetds.org/files/current/freetds-dev.0.99.678.tar.gz'}
+FREETDS_VERSION_INFO['0.95'] = {files: 'http://www.freetds.org/files/stable/freetds-0.95.92.tar.gz'}
 FREETDS_SOURCE_URI = FREETDS_VERSION_INFO[FREETDS_VERSION][:files]

data/ext/tiny_tds/result.c

@@ -98,6 +98,7 @@ static void nogvl_cleanup(DBPROCESS *client) {
   if (userdata->nonblocking_error.is_set) {
     userdata->nonblocking_error.is_set = 0;
     rb_tinytds_raise_error(client,
+      userdata->nonblocking_error.is_message,
       userdata->nonblocking_error.cancel,
       userdata->nonblocking_error.error,
       userdata->nonblocking_error.source,

data/lib/tiny_tds/client.rb

@@ -10,6 +10,7 @@ module TinyTds
     }
 
     attr_reader :query_options
+    attr_reader :message_handler
 
     class << self
 
@@ -37,6 +38,12 @@ module TinyTds
       if opts[:dataserver].to_s.empty? && opts[:host].to_s.empty?
         raise ArgumentError, 'missing :host option if no :dataserver given'
       end
+
+      @message_handler = opts[:message_handler]
+      if @message_handler && !@message_handler.respond_to?(:call)
+        raise ArgumentError, ':message_handler must implement `call` (eg, a Proc or a Method)'
+      end
+
       opts[:username] = parse_username(opts)
       @query_options = self.class.default_query_options.dup
       opts[:password] = opts[:password].to_s if opts[:password] && opts[:password].to_s.strip != ''

data/test/bin/install-freetds.sh

@@ -7,7 +7,7 @@ if [ -z "$FREETDS_VERSION" ]; then
   FREETDS_VERSION=$(ruby -r "./ext/tiny_tds/extconsts.rb" -e "puts FREETDS_VERSION")
 fi
 
-wget ftp://ftp.freetds.org/pub/freetds/stable/freetds-$FREETDS_VERSION.tar.gz
+wget http://www.freetds.org/files/stable/freetds-$FREETDS_VERSION.tar.gz
 tar -xzf freetds-$FREETDS_VERSION.tar.gz
 cd freetds-$FREETDS_VERSION
 ./configure --prefix=/opt/local \

data/test/client_test.rb

@@ -59,7 +59,7 @@ class ClientTest < TinyTds::TestCase
     end
 
     it 'must be able to use :host/:port connection' do
-      host = ENV['TINYTDS_UNIT_HOST_TEST'] || ENV['TINYTDS_UNIT_HOST']
+      host = ENV['TINYTDS_UNIT_HOST_TEST'] || ENV['TINYTDS_UNIT_HOST'] || 'localhost'
       port = ENV['TINYTDS_UNIT_PORT_TEST'] || ENV['TINYTDS_UNIT_PORT'] || 1433
       begin
         client = new_connection dataserver: nil, host: host, port: port

data/test/result_test.rb

@@ -614,6 +614,46 @@ class ResultTest < TinyTds::TestCase
 
       if sqlserver?
 
+        describe 'using :message_handler option' do
+          let(:messages) { Array.new }
+
+          before do
+            close_client
+            @client = new_connection message_handler: Proc.new { |m| messages << m }
+          end
+
+          after do
+            messages.clear
+          end
+
+          it 'has a message handler that responds to call' do
+            assert @client.message_handler.respond_to?(:call)
+          end
+
+          it 'calls the provided message handler when severity is 10 or less' do
+            (1..10).to_a.each do |severity|
+              messages.clear
+              msg = "Test #{severity} severity"
+              state = rand(1..255)
+              @client.execute("RAISERROR(N'#{msg}', #{severity}, #{state})").do
+              m = messages.first
+              assert_equal 1, messages.length, 'there should be one message after one raiserror'
+              assert_equal msg, m.message, 'message text'
+              assert_equal severity, m.severity, 'message severity' unless severity == 10 && m.severity.to_i == 0
+              assert_equal state, m.os_error_number, 'message state'
+            end
+          end
+
+          it 'calls the provided message handler for `print` messages' do
+            messages.clear
+            msg = 'hello'
+            @client.execute("PRINT '#{msg}'").do
+            m = messages.first
+            assert_equal 1, messages.length, 'there should be one message after one print statement'
+            assert_equal msg, m.message, 'message text'
+          end
+        end
+
         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

data/test/test_helper.rb

@@ -75,8 +75,8 @@ module TinyTds
       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    => sqlserver_azure? ? nil : ENV['TINYTDS_UNIT_DATASERVER'],
-        :host          => ENV['TINYTDS_UNIT_HOST'],
-        :port          => ENV['TINYTDS_UNIT_PORT'],
+        :host          => ENV['TINYTDS_UNIT_HOST'] || 'localhost',
+        :port          => ENV['TINYTDS_UNIT_PORT'] || '1433',
         :tds_version   => ENV['TINYTDS_UNIT_VERSION'],
         :username      => username,
         :password      => password,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre3
+  version: 2.1.0.pre4
 platform: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2