activerecord-sqlserver-adapter 2.3.13 → 2.3.15

data/CHANGELOG

@@ -1,6 +1,16 @@
 
-* 2-3-stable *
+* 2.3.15 *
 
+* Version bump due to bad 2.3.14 release.
+
+
+* 2.3.14 *
+
+* Flatten sp_helpconstraint when looking for constraints just in case fks are present. Issue #64.
+
+* Properly quote table names when reflecting on views.
+
+* Add "dead or not enabled" to :dblib's lost connection messages.
 
 
 * 2.3.13 *

data/RUNNING_UNIT_TESTS

@@ -3,25 +3,29 @@
 The default names for the test databases are "activerecord_unittest" and 
 "activerecord_unittest2". If you want to use another database name then be sure 
 to update the connection adapter setups you want to test with in 
-test/connections/<your database>/connection.rb. 
+test/connections/<your database>/connection.rb. Define a user named 'rails' 
+in SQL Server with all privileges granted for the test databases. Use an empty 
+password for said user.
 
 The connection files make certain assumptions. For instance, the ODBC connection 
 assumes you have a DSN setup that matches the name of the default database names.
+Review the test/connections/native_sqlserver_#{mode} file you are testing for details.
 
 
 == Requirements
 
-  * gem install shoulda
-  * gem install mocha
+Get the development dependencies.
 
-The tests of this adapter depend on the existence of rails checkout. Make sure 
-to checkout remotes/origin/2-3-stable, then make sure to export RAILS_SOURCE to 
-the full path of that repo.
-
-Define a user named 'rails' in SQL Server with all privileges granted for the 
-test databases. Use an empty password for said user.
+  $ bundle install
 
+The tests of this adapter depend on the existence of rails checkout. Make sure 
+to checkout remotes/origin/2-3-stable, I suggest using the git_remote_branch to 
+create a personal tracking branch. Then make a local topic branch off of that like
+2-3-stable_sqlserver and commit this patch https://gist.github.com/761508 or you 
+will have around 90 some errors like this.
 
+  "Conversion failed when converting the nvarchar value 'Godfather' to data 
+   type int.: INSERT INTO [items] ([name], [id]) VALUES (N'Godfather', 1)
 
 
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -147,7 +147,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.13'.freeze
+      VERSION                     = '2.3.15'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2000,2005,2008].freeze
       LIMITABLE_TYPES             = ['string','integer','float','char','nchar','varchar','nvarchar'].to_set.freeze
@@ -158,7 +158,7 @@ module ActiveRecord
         :adonet => ['TypeError','System::Data::SqlClient::SqlException']
       }
       LOST_CONNECTION_MESSAGES    = {
-        :dblib  => [/closed connection/],
+        :dblib  => [/closed connection/, /dead or not enabled/],
         :odbc   => [/link failure/, /server failed/, /connection was already closed/, /invalid handle/i],
         :adonet => [/current state is closed/, /network-related/]
       }
@@ -593,7 +593,7 @@ module ActiveRecord
           if view_info
             view_info = view_info.with_indifferent_access
             if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000
-              view_info[:VIEW_DEFINITION] = info_schema_query { select_values("EXEC sp_helptext #{table_name}").join }
+              view_info[:VIEW_DEFINITION] = info_schema_query { select_values("EXEC sp_helptext #{quote_table_name(table_name)}").join }
             end
           end
           view_info
@@ -1140,7 +1140,7 @@ module ActiveRecord
       end
       
       def remove_default_constraint(table_name, column_name)
-        select_all("EXEC sp_helpconstraint '#{quote_string(table_name)}','nomsg'").select do |row|
+        select_all("EXEC sp_helpconstraint '#{quote_string(table_name)}','nomsg'").flatten.select do |row|
           row['constraint_type'] == "DEFAULT on column #{column_name}"
         end.each do |row|
           do_execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{row['constraint_name']}"

data/test/cases/specific_schema_test_sqlserver.rb

@@ -13,6 +13,15 @@ end
 
 class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
   
+  should 'quote table names properly even when they are views' do
+    obj = SqlServerQuotedTable.create!
+    assert_nothing_raised { SqlServerQuotedTable.first }
+    obj = SqlServerQuotedView1.create!
+    assert_nothing_raised { SqlServerQuotedView1.first }
+    obj = SqlServerQuotedView2.create!
+    assert_nothing_raised { SqlServerQuotedView2.first }
+  end
+  
   should 'cope with multi line defaults' do
     default = StringDefault.new
     assert_equal "Some long default with a\nnew line.", default.string_with_multiline_default

data/test/cases/sqlserver_helper.rb

@@ -33,6 +33,9 @@ class NumericData < ActiveRecord::Base ; self.table_name = 'numeric_data' ; end
 class CustomersView < ActiveRecord::Base ; self.table_name = 'customers_view' ; end
 class StringDefaultsView < ActiveRecord::Base ; self.table_name = 'string_defaults_view' ; end
 class StringDefaultsBigView < ActiveRecord::Base ; self.table_name = 'string_defaults_big_view' ; end
+class SqlServerQuotedTable < ActiveRecord::Base ; self.table_name = 'quoted-table' ; end
+class SqlServerQuotedView1 < ActiveRecord::Base ; self.table_name = 'quoted-view1' ; end
+class SqlServerQuotedView2 < ActiveRecord::Base ; self.table_name = 'quoted-view2' ; end
 class SqlServerUnicode < ActiveRecord::Base ; end
 class SqlServerString < ActiveRecord::Base ; end
 class SqlServerChronic < ActiveRecord::Base

data/test/schema/sqlserver_specific_schema.rb

@@ -73,6 +73,13 @@ ActiveRecord::Schema.define do
   execute %|ALTER TABLE [sql_server_edge_schemas] ADD [guid_newid] uniqueidentifier DEFAULT NEWID();|
   execute %|ALTER TABLE [sql_server_edge_schemas] ADD [guid_newseqid] uniqueidentifier DEFAULT NEWSEQUENTIALID();| unless ActiveRecord::Base.connection.sqlserver_2000?
   
+  create_table 'quoted-table', :force => true do |t|
+  end
+  execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'quoted-view1') DROP VIEW [quoted-view1]"
+  execute "CREATE VIEW [quoted-view1] AS SELECT * FROM [quoted-table]"
+  execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'quoted-view2') DROP VIEW [quoted-view2]"
+  execute "CREATE VIEW [quoted-view2] AS \n /*#{'x'*4000}}*/ \n SELECT * FROM [quoted-table]"
+  
   execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'customers_view') DROP VIEW customers_view"
   execute <<-CUSTOMERSVIEW
     CREATE VIEW customers_view AS

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 2
   - 3
-  - 13
-  version: 2.3.13
+  - 15
+  version: 2.3.15
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -04:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: SQL Server 2000, 2005 and 2008 Adapter For Rails.