tiny_tds 0.9.5.beta.11 → 0.9.5.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ab446bd5f9bdd26723b0b4dc1823942cc09df05
-  data.tar.gz: c88a5e8f6ba5371a208ac7f21ebabbc4ab3cc391
+  metadata.gz: 79746c3f540bfbad77a5f421e3ff631f656bb32c
+  data.tar.gz: 68524740d1819031d66d6c4b27ab472a70a85347
 SHA512:
-  metadata.gz: 2d1c66462db430a601f3d14ce90f237e7b756404caac005625e610f195621923f45d155cdffe7dce634128d5b2593754f8492f676918ac0b2f174901f29ddc6e
-  data.tar.gz: 88d6d450c29b30f933b64e84225d1e84989e38af60eb1854ed053367ac40f6c6067b3d12602b825eab3a2e1866f1f658403d82eb4cf64000f9228d7660cd0007
+  metadata.gz: 57c8ee45faab8c25557f776176e30fb8fe1e6d9c5a6f9fab10b5387334586bd8cd87a0b6b1d55767c5040f69906d202e789f2793b652446ee4d3769409f0dfd5
+  data.tar.gz: 0be32280889a9255a5ad39e20c331fba82db3ed1d72397df2b7479538658e969094ffe66aa2b5f64a3722727a3337fd2683f8ef7cb10a0fcf49cec5a3873440c

data/VERSION

@@ -1 +1 @@
-0.9.5.beta.11
+0.9.5.beta.12

data/appveyor.yml

@@ -40,11 +40,11 @@ test_script:
   - bundle exec rake TINYTDS_UNIT_HOST_TEST=%CI_AZURE_HOST% TINYTDS_UNIT_HOST=%CI_AZURE_HOST% TINYTDS_SCHEMA=sqlserver_azure TDSVER=7.3
 environment:
   CI_AZURE_HOST:
-    secure: b7kG0e0O6hPi/7niF3YTGih1WtdO/dmuyg0k+Le+zEE=
+    secure: Qkf6IJGISn6/WK9Feu71wLLQx7g0RMNfjj/YwNE+zJE=
   TINYTDS_UNIT_AZURE_USER:
-    secure: Clk9RCYMZ0vz0IfMMnOtJW/ufcCKW3nQC3BgCipdM+c=
+    secure: a/9Rph59mNJMObcpJ7mrimqZ+pOth8NLY9iiroFUob4=
   TINYTDS_UNIT_AZURE_PASS:
-    secure: D3vsNNzv/Th+RqMNrm3WJw==
+    secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk=
   matrix:
     - ruby_version: "200"
     - ruby_version: "22"

data/lib/tiny_tds/client.rb

@@ -64,9 +64,12 @@ module TinyTds
     end
 
     def parse_username(opts)
+      host = opts[:host]
       username = opts[:username]
-      return username if username.nil? || !opts[:azure] || !username.include?("@")
+      return username if username.nil? || !opts[:azure]
+      return username if username.include?("@") && !username.include?("database.windows.net")
       user, domain = username.split("@")
+      domain ||= host
       "#{user}@#{domain.split('.').first}"
     end
 

data/test/client_test.rb

@@ -151,15 +151,9 @@ class ClientTest < TinyTds::TestCase
       options = connection_options :username => 'willnotwork'
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|
-        if sqlserver_azure?
-          assert_equal 40532, e.db_error_number
-          assert_equal 20, e.severity
-          assert_match %r{login failed}i, e.message, 'ignore if non-english test run'
-        else
-          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
+        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
       assert_new_connections_work
     end
@@ -171,18 +165,48 @@ class ClientTest < TinyTds::TestCase
     let(:client) { @client = new_connection }
 
     it '#parse_username returns username if azure is not true' do
-      username = 'user@long.domain.name.com'
+      username = 'user@abc123.database.windows.net'
       client.send(:parse_username, username: username).must_equal username
     end
 
     it '#parse_username returns short username if azure is true' do
-      username = 'user@long.domain.name.com'
-      client.send(:parse_username, username: username, azure: true).must_equal 'user@long'
+      client.send(:parse_username,
+        username: 'user@abc123.database.windows.net',
+        host: 'abc123.database.windows.net',
+        azure: true
+      ).must_equal 'user@abc123'
+    end
+
+    it '#parse_username returns full username if azure is false' do
+      client.send(:parse_username,
+        username: 'user@abc123.database.windows.net',
+        host: 'abc123.database.windows.net',
+        azure: false
+      ).must_equal 'user@abc123.database.windows.net'
     end
 
     it '#parse_username returns short username if passed and azure is true' do
-      username = 'user@short'
-      client.send(:parse_username, username: username, azure: true).must_equal 'user@short'
+      client.send(:parse_username,
+        username: 'user@abc123',
+        host: 'abc123.database.windows.net',
+        azure: true
+      ).must_equal 'user@abc123'
+    end
+
+    it '#parse_username returns username with servername if passed and azure is true' do
+      client.send(:parse_username,
+        username: 'user',
+        host: 'abc123.database.windows.net',
+        azure: true
+      ).must_equal 'user@abc123'
+    end
+
+    it '#parse_username returns username with servername if passed and azure is false' do
+      client.send(:parse_username,
+        username: 'user',
+        host: 'abc123.database.windows.net',
+        azure: false
+      ).must_equal 'user'
     end
 
   end

data/test/thread_test.rb

@@ -41,6 +41,7 @@ class ThreadTest < TinyTds::TestCase
     end
 
     it 'should not crash on error in parallel' do
+      skip if sqlserver_azure?
       threads = []
       @numthreads.times do |i|
         threads << Thread.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 0.9.5.beta.11
+  version: 0.9.5.beta.12
 platform: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2