tiny_tds 0.6.2-x86-mingw32 → 0.6.3.rc2-x86-mingw32

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODRkOWM1ZWYwOGI1MTA5MmY0N2JhODhkNjBiOWFmMmMwZDg1ZDI0Nw==
-  data.tar.gz: !binary |-
-    YWJjYjc0YjI5MTVmYjVmYTI5NzAxODIwMWUzNmM0OTZiOTk1MTJhOA==
+SHA1:
+  metadata.gz: 0dd04f4683a2f898bb98e96dd11a79080a790abb
+  data.tar.gz: ceadb1c7789b7e6c25d681fa9ce1e72d17b12d58
 SHA512:
-  metadata.gz: !binary |-
-    NGRkYmNhNTBiNmYxZmY4NWVmZTFhNTI0MmM5NzQ3NTJhMGFkMjlkMDg3YzRm
-    NDk5ZGIyNTY3NTEyZjFmY2VjNmExN2ZhOGI1ODRkZjdlODUwMDIxNDRkZWFl
-    OWY1OWVjMDMwOGUzNzU1OTM1OTM4MWY2NDU0YTM3MTk2OTM0Y2Q=
-  data.tar.gz: !binary |-
-    NTA0ZjJmMGVhNDI2ZTkyNjc2ZTJhNjhiZGVkZTZhZDUwZTI0ODEwNjIzOTky
-    YmJlZGI0NjNlZTRkOWYwZTllZDBhNjEwNTNjOWI1NTYxNjUzZDMxZGMyMjZh
-    NDg0NTI1NzRjYjFjNjQ4YTA0Y2YxZWEwOWU5NjJhMDY0ZTlmNjE=
+  metadata.gz: f9caa34500b0947a8b03661cff574aa7505cca048d729df19c9be828af6b763d494358bcf00239e012922b0df09006074c770dfdc5ebba793d5eb742d6e52343
+  data.tar.gz: 55014eddd3f06ba0845cde578541423a41fac276403c77aedfbfd34be4b2e18c38289b285056965715d710548d0727a81c96403062b6656e1dc3a7be28252fbc

data/.gitignore

@@ -16,4 +16,3 @@ Gemfile.lock
 misc
 *.gem
 ports
-rake-compiler-dev-box/

data/CHANGELOG

@@ -1,4 +1,21 @@
 
+* 0.6.3.rc1 *
+
+* Ensure zero terminated strings, where C-str pointers are expected. Use StringValueCStr() Fixes #208.
+
+* Revert 999fa571 so timeouts do not kill the client. Fixes #179.
+
+* Remove `sspi_w_kerberos.diff` patch. Not needed anymore.
+
+* Tested again on Azure. Added notes to README on recommended settings.
+
+* Replace `rb_thread_blocking_region` (removed in Ruby 2.2.0) w/`rb_thread_call_without_gvl`. Fixes #182.
+
+* Remove 30 char password warning. Fixes #172.
+
+* Remove Ruby 1.8.6 support. We always use Time vs edge case DateTime.
+
+
 * 0.6.2 *
 
 * Support an optional environment variable to find FreeTDS. Fixes #128.
@@ -58,7 +75,7 @@ Use both dbsetversion() vs. dbsetlversion. Partially reverts #62.
 
 * Add CFLAGS='-fPIC' for libtool. Fix TDS version configs in our ports file. Document. Fixes #45
 
-* Update our TDS version constants to reflect changed 8.0/9.0 to 7.1/7.2 DBLIB versions in FreeTDS 
+* Update our TDS version constants to reflect changed 8.0/9.0 to 7.1/7.2 DBLIB versions in FreeTDS
   while making it backward compatible, again like FreeTDS. Even tho you can not configure FreeTDS with
   TDS version 7.2 or technically even use it, I added tests to prove that we correctly handle both
   varchar(max) and nvarchar(max) with large amounts of data.
@@ -101,7 +118,7 @@ Use both dbsetversion() vs. dbsetlversion. Partially reverts #62.
 
 * 0.4.2 *
 
-* Iconv is a dep only when compiling locally. However, left in the ability to configure 
+* Iconv is a dep only when compiling locally. However, left in the ability to configure
   it for native gem installation but you must use
   --enable-iconv before using --with-iconv-dir=/some/dir
 
@@ -121,8 +138,8 @@ Use both dbsetversion() vs. dbsetlversion. Partially reverts #62.
 
 * Allow Result#fields to be called before iterating over the results.
 
-* Two new client helper methods, #sqlsent? and #canceled?. Possible to use these to determine current 
-  state of the client and the need to use Result#cancel to stop processing active results. It is also 
+* Two new client helper methods, #sqlsent? and #canceled?. Possible to use these to determine current
+  state of the client and the need to use Result#cancel to stop processing active results. It is also
   safe to call Result#cancel over and over again.
 
 * Look for the syb headers only.
@@ -154,7 +171,7 @@ Use both dbsetversion() vs. dbsetlversion. Partially reverts #62.
 
 * 0.2.2 *
 
-* Fixed failing test in Ruby 1.8.6. DateTime doesn't support fractional seconds greater than 59. 
+* Fixed failing test in Ruby 1.8.6. DateTime doesn't support fractional seconds greater than 59.
   See: http://redmine.ruby-lang.org/issues/show/1490 [Erik Bryn]
 
 

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,31 @@
+Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all
+people who contribute through reporting issues, posting feature requests,
+updating documentation, submitting pull requests or patches, and other
+activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual
+language or imagery, derogatory comments or personal attacks, trolling, public
+or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct. Project maintainers who do not
+follow the Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting one or more of the project
+maintainers.
+
+This Code of Conduct is adapted from the Contributor Covenant
+(http://contributor-covenant.org), version 1.1.0, available at
+http://contributor-covenant.org/version/1/1/0/

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-
 gemspec

data/README.md

@@ -24,7 +24,7 @@ Although we search for FreeTDS's libraries and headers, you may have to specify
 
 ## FreeTDS Compatibility & Configuration
 
-TinyTDS is developed against FreeTDS 0.82 & 0.91, and 0.92 currents, the latest is recommended. It is tested with SQL Server 2000, 2005, 2008 and Azure. Below are a few QA style notes about installing FreeTDS.
+TinyTDS is developed against FreeTDS 0.82 & 0.91, and 0.92 currents, the latest is recommended. It is tested with SQL Server 2000, 2005, 2008, 2014, and Azure. Below are a few QA style notes about installing FreeTDS.
 
 * **Do I need to install FreeTDS?** Yes! Somehow, someway, you are going to need FreeTDS for TinyTDS to compile against. You can avoid installing FreeTDS on your system by using our projects usage of rake-compiler and mini_portile to compile and package a native gem just for you. See the "Using MiniPortile" section below.
 
@@ -41,7 +41,7 @@ TinyTDS is developed against FreeTDS 0.82 & 0.91, and 0.92 currents, the latest
 
 Our goal is to support every SQL Server data type and covert it to a logical ruby object. When dates or times are returned, they are instantiated to either `:utc` or `:local` time depending on the query options. Under ruby 1.9, all strings are encoded to the connection's encoding and all binary data types are associated to ruby's `ASCII-8BIT/BINARY` encoding.
 
-Below is a list of the data types we plan to support using future versions of FreeTDS. They are associated with SQL Server 2008. All unsupported data types are returned as properly encoded strings.
+Below is a list of the data types we plan to support using future versions of FreeTDS. They are associated with SQL Server 2008 and up. All unsupported data types are returned as properly encoded strings.
 
 * [date]
 * [datetime2]
@@ -54,7 +54,7 @@ Below is a list of the data types we plan to support using future versions of Fr
 Connect to a database.
 
 ```ruby
-client = TinyTds::Client.new(:username => 'sa', :password => 'secret', :host => 'mydb.host.net')
+client = TinyTds::Client.new username: 'sa', password: 'secret', host: 'mydb.host.net'
 ```
 
 Creating a new client takes a hash of options. For valid iconv encoding options, see the output of `iconv -l`. Only a few have been tested and highly recommended to leave blank for the UTF-8 default.
@@ -267,9 +267,23 @@ As of version 2.3.11 & 3.0.3 of the adapter, you can specify a `:dblib` mode in
 
 ## Using TinyTDS with Azure
 
-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.
+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!
+**IMPORTANT**: Do not use `username@server.database.windows.net` for the username connection option! You must use the shorter `username@server` instead!
+
+We recommend the following settings when using TinyTDS with Azure. These are the same settings used in the ActiveRecord SQL Server adapter.
+
+```sql
+SET ANSI_NULLS ON
+SET CURSOR_CLOSE_ON_COMMIT OFF
+SET ANSI_NULL_DFLT_ON ON
+SET IMPLICIT_TRANSACTIONS OFF
+SET ANSI_PADDING ON
+SET QUOTED_IDENTIFIER ON
+SET ANSI_WARNINGS ON
+```
+
+Also, please read the [Azure SQL Database General Guidelines and Limitations](https://msdn.microsoft.com/en-us/library/ee336245.aspx) MSDN article to understand the differences. Specifically, the connection constraints section!
 
 
 ## Using MiniPortile
@@ -304,34 +318,24 @@ To find out more about the FreeTDS release system [visit this thread](http://lis
 
 ## Compiling Gems for Windows
 
-For the convenience of Windows users, TinyTDS ships pre-compiled for Ruby 1.9.3, 2.0 and 2.1 on Windows. In order to generate these gems, [rake-compiler-dev-box](https://github.com/tjschuck/rake-compiler-dev-box) is used. This project provides a [Vagrant](http://www.vagrantup.com/) box with rvm, cross-compilers and a number of different versions of ruby.
-
-There are a handful of rake tasks that are part of TinyTDS that make cross-compiling simple. Ensure that you have VirtualBox, Vagrant and git installed, and then run the following to download the box and perform initial setup:
-
-```
-$ rake cross-compile:setup
-```
+For the convenience of Windows users, TinyTDS ships pre-compiled for Ruby 1.9.3, 2.0, 2.1 and 2.2 on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides a [Docker image](https://registry.hub.docker.com/u/larskanis/rake-compiler-dock/) with rvm, cross-compilers and a number of different target versions of ruby.
 
-Once the setup is complete, run the following rake task to compile the gem for Windows. The first time this will take a while since the `rake-compiler` gem will need to compile a few different versions of ruby:
+Run the following rake task to compile the gem for Windows. This will check the availability of [Docker](https://www.docker.com/) (and boot2docker on Windows or OS-X) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
 
 ```
-$ rake cross-compile
+$ rake gem:windows
 ```
 
-The compiled gems will exist in `./rake-compile-dev-box/tiny_tds/pkg/`.
-
-If you want to clean up the dependent ports, temp files and resulting gems, run:
-
-```
-$ rake cross-compile:clean
-```
+The compiled gems will exist in `./pkg/`.
 
 
 ## 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, Azure or Sybase ASE) 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, 2014, Azure or Sybase ASE) to use. For example:
 
 ```
+$ rake TINYTDS_UNIT_DATASERVER=mydbserver
+  or
 $ rake TINYTDS_UNIT_DATASERVER=mydbserver TINYTDS_SCHEMA=sqlserver_2008
   or
 $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
@@ -342,7 +346,7 @@ $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_UNIT_PORT=5000 TINYTDS_SCHEMA=syb
 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.
 
 ```
-$ rake TINYTDS_SKIP_PORTS=true
+$ rake TINYTDS_SKIP_PORTS=1
 ```
 
 
@@ -356,14 +360,13 @@ $ rake TINYTDS_SKIP_PORTS=true
 
 ## TODO List
 
-* Include OpenSSL with Windows binaries for SQL Azure.
 * Install an interrupt handler.
 * Allow #escape to accept all ruby primitives.
 
 
 ## 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 [metaskills.net](http://metaskills.net/) and I can be found on twitter as @metaskills. Enjoy!
 
 
 ## Special Thanks
@@ -374,12 +377,7 @@ 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-2014 Ken Collins, <ken@metaskills.net> and Will Bond (Veracross LLC) <wbond@breuer.com>. It 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>
+TinyTDS is Copyright (c) 2010-2015 Ken Collins, <ken@metaskills.net> and Will Bond (Veracross LLC) <wbond@breuer.com>. It is distributed under the MIT license. Windows binaries contain 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/Rakefile

@@ -11,9 +11,27 @@ def test_libs
 end
 
 def test_files
-  Dir.glob("test/**/*_test.rb").sort
+  if ENV['TEST_FILES']
+    ENV['TEST_FILES'].split(',').map{ |f| f.strip }.sort
+  else
+    Dir.glob("test/**/*_test.rb").sort
+  end
+end
+
+def add_file_to_gem(spec, relative_path)
+  target_path = File.join gem_build_path(spec), relative_path
+  target_dir = File.dirname(target_path)
+  mkdir_p target_dir
+  rm_f target_path
+  safe_ln relative_path, target_path
+  spec.files += [relative_path]
 end
 
+def gem_build_path(spec)
+  File.join 'pkg', spec.full_name
+end
+
+
 gemspec = Gem::Specification::load(File.expand_path('../tiny_tds.gemspec', __FILE__))
 
 Rake::TestTask.new do |t|
@@ -27,7 +45,7 @@ Gem::PackageTask.new(gemspec) do |pkg|
   pkg.need_zip = false
 end
 
-task :compile => ["ports:freetds"] unless ENV['TINYTDS_SKIP_PORTS']
+task :compile
 
 task :build => [:clean, :compile]
 
@@ -37,78 +55,50 @@ Dir["tasks/*.rake"].sort.each { |f| load f }
 
 Rake::ExtensionTask.new('tiny_tds', gemspec) do |ext|
   ext.lib_dir = 'lib/tiny_tds'
-  if RUBY_PLATFORM =~ /mswin|mingw/ then
-    # Define target for extension (supporting fat binaries).
-    RUBY_VERSION =~ /(\d+\.\d+)/
-    ext.lib_dir = "lib/tiny_tds/#{$1}"
-  else
-    ext.cross_compile = true
-    ext.cross_platform = []
-    ext.cross_config_options << "--disable-lookup"
-    config_opts = {}
+  ext.cross_compile = true
+  ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
+  ext.cross_config_options += %w[ --disable-lookup --enable-cross-build ]
 
+  # Add dependent DLLs to the cross gems
+  ext.cross_compiling do |spec|
     platform_host_map =  {
-      'x86-mingw32' => 'i586-mingw32msvc',
+      'x86-mingw32' => 'i686-w64-mingw32',
       'x64-mingw32' => 'x86_64-w64-mingw32'
     }
 
-    # This section ensures we setup up rake dependencies and that libiconv
-    # and freetds are compiled using the cross-compiler and then passed to
-    # extconf.rb in such a way that library detection works.
-    platform_host_map.each do |plat, host|
-      ext.cross_platform << plat
-
-      libiconv = define_libiconv_recipe(plat, host)
-      freetds  = define_freetds_recipe(plat, host, libiconv)
-      task "native:#{plat}" => ["ports:freetds:#{plat}"] unless ENV['TINYTDS_SKIP_PORTS']
-
-      # For some reason --with-freetds-dir and --with-iconv-dir would not work.
-      # It seems the default params that extconf.rb constructs include
-      # --without-freetds-include, --without-freetds-lib, --without-iconv-lib
-      # and --without-iconv-include. Thus we must explicitly override them.
-      config_opts[plat] = " --with-freetds-include=#{freetds.path}/include"
-      config_opts[plat] += " --with-freetds-lib=#{freetds.path}/lib"
-      config_opts[plat] += " --with-iconv-include=#{libiconv.path}/include"
-      config_opts[plat] += " --with-iconv-lib=#{libiconv.path}/lib"
-    end
+    gemplat = spec.platform.to_s
+    host = platform_host_map[gemplat]
 
-    ext.cross_config_options << config_opts
-  end
-end
+    dlls = [
+      "libeay32-1.0.2d-#{host}.dll",
+      "ssleay32-1.0.2d-#{host}.dll",
+      "libiconv-2.dll",
+      "libsybdb-5.dll",
+    ]
 
-desc "Checks out rake-compiler-dev-box and sets up the cross-compiling box. This can take a long time."
-task 'cross-compile:setup' do
-  # Make sure we have the command-line programs we need
-  sh 'git', '--version'
-  sh 'vagrant', '-v'
+    # We don't need the sources in a fat binary gem
+    spec.files = spec.files.reject{|f| f=~/^ports\/archives/ }
+    spec.files += dlls.map{|dll| "ports/#{host}/bin/#{File.basename(dll)}" }
 
-  if Dir.exists? 'rake-compiler-dev-box'
-    Dir.chdir 'rake-compiler-dev-box'
-  else
-    sh 'git', 'clone', 'https://github.com/tjschuck/rake-compiler-dev-box.git'
-    Dir.chdir 'rake-compiler-dev-box'
-    sh 'patch -p1 < ../compile/rake-compiler-dev-box.patch'
+    dlls.each do |dll|
+      file "ports/#{host}/bin/#{dll}" do |t|
+        sh "x86_64-w64-mingw32-strip", t.name
+      end
+    end
   end
 
-  sh 'vagrant', 'up'
 end
 
-desc "Invokes the cross-compiler to generate gems for windows"
-task 'cross-compile' do
-  build_dir = './rake-compiler-dev-box/tiny_tds/'
-  if not Dir.exists?(build_dir)
-    Dir.mkdir build_dir
-  end
-  # Copy the current version of tiny_tds into the box directory
-  Dir.entries('./').each do |entry|
-    next if ['.', '..', 'rake-compiler-dev-box'].include?(entry)
-    cp_r entry, build_dir, :remove_destination => true
-  end
-  Dir.chdir './rake-compiler-dev-box'
-  sh 'vagrant ssh -c "package_win32_fat_binary tiny_tds"'
+# Bundle the freetds sources to avoid download while gem install
+task gem_build_path(gemspec) do
+  add_file_to_gem(gemspec, "ports/archives/freetds-0.91.112.tar.gz")
 end
 
-desc "Cleans up all of the compiled ports, gems and tmp files from cross-compile"
-task 'cross-compile:clean' do
-  rm_r './rake-compiler-dev-box/tiny_tds'
+desc "Build the windows binary gems per rake-compiler-dock"
+task 'gem:windows' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh <<-EOT
+#    bundle install &&
+    rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.6:2.2.2
+  EOT
 end

data/appveyor.yml

@@ -0,0 +1,48 @@
+services:
+  - mssql2014
+
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - SET TINYTDS_UNIT_DATASERVER=localhost\SQL2014
+  - SET TINYTDS_UNIT_DATABASE=master
+  - SET TINYTDS_UNIT_USER=sa
+  - SET TINYTDS_UNIT_PASS=Password12!
+  - ruby --version
+  - gem --version
+  - bundle install
+  - ps: |
+        [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null
+        [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null
+
+        $serverName = $env:COMPUTERNAME
+        $instanceName = 'SQL2014'
+        $smo = 'Microsoft.SqlServer.Management.Smo.'
+        $wmi = new-object ($smo + 'Wmi.ManagedComputer')
+
+        # Enable TCP/IP
+        $uri = "ManagedComputer[@Name='$serverName']/ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Tcp']"
+        $Tcp = $wmi.GetSmoObject($uri)
+        $Tcp.IsEnabled = $true
+        $TCP.alter()
+
+        # Start services
+        Set-Service SQLBrowser -StartupType Manual
+        Start-Service SQLBrowser
+        Start-Service "MSSQL`$$instanceName"
+
+build: off
+
+test_script:
+  - bundle exec rake
+
+environment:
+  matrix:
+    - ruby_version: "193"
+    #- ruby_version: "200"
+    #- ruby_version: "200-x64"
+    #- ruby_version: "21"
+    #- ruby_version: "21-x64"
+    #- ruby_version: "22"
+    - ruby_version: "22-x64"