activerecord-sqlserver-adapter 2.2.19 → 2.2.20

data/CHANGELOG

@@ -1,6 +1,25 @@
 
 MASTER
 
+* 
+
+
+* 2.2.20 * (September 10th, 2009)
+
+* Implement a new remove_default_constraint method that uses sp_helpconstraint [Ken Collins]
+
+* Use a lazy match in add_order_by_for_association_limiting! to allow sub selects to be used. Resolves 
+  ticket #11.
+
+* Add default rake task back for testing. Runs the namespaced sqlserver:test_sqlserver_odbc. 
+  Resolves ticket #10 [Ken Collins]
+
+* Default value detection in column_definitions is kinder to badly formatted, or long winded user
+  defined functions, for default values. Resolves ticket #8 [Ken Collins]
+
+* Make sure bigint SQL Server data type can be used and converted back to Bignum as expected. [Ken Collins]
+
+
 * 2.2.19 * (June 19th, 2009)
 
 * Leave quoted column names as is. Resolves ticket #36 [Vince Puzzella]

data/RUNNING_UNIT_TESTS

@@ -5,12 +5,19 @@ The default names for the test databases are "activerecord_unittest" and
 to update the connection adapter setups you want to test with in 
 test/connections/<your database>/connection.rb. 
 
+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.
+
 
 == Requirements
 
 The following gems need to be installed. Make sure you have gems.github.com as a
-source. http://github.com/blog/97-github-loves-rubygems-1-2
+source. Info here. http://gems.github.com/
+
+We use echoe for packagemanagement to rubyforge. Not needed really for the tests 
+but since we need it... you need to install it.
 
+  * gem install echoe
   * gem install thoughtbot-shoulda -s http://gems.github.com
   * gem install mocha
 
@@ -21,11 +28,8 @@ is assumed to exist:
 #{RAILS_ROOT}/vendor/plugins/adapters/sqlserver
 #{RAILS_ROOT}/vendor/rails/activerecord/test
 
-Define a user named 'rails' in SQL Server with all privileges granted. Use an empty 
-password for user 'rails', or alternatively use the OSQLPASSWORD environment variable
-which allows you to set a default password for the current session.
-
-Then run "rake create_databases".
+Define a user named 'rails' in SQL Server with all privileges granted for the 
+test databases. Use an empty password for said user.
 
 
 == Running with Rake

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'rake/testtask'
 require 'echoe'
 
-Echoe.new('activerecord-sqlserver-adapter','2.2.19') do |p|
+Echoe.new('activerecord-sqlserver-adapter','2.2.20') do |p|
   p.summary               = "SQL Server 2000, 2005 and 2008 Adapter For Rails."
   p.description           = "SQL Server 2000, 2005 and 2008 Adapter For Rails."
   p.author                = ["Ken Collins","Murray Steele","Shawn Balestracci","Joe Rafaniello","Tom Ward"]

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -183,7 +183,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.2.19'.freeze
+      VERSION                 = '2.2.20'.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'].freeze
@@ -698,7 +698,7 @@ module ActiveRecord
         # Disertation http://gist.github.com/24073
         # Information http://weblogs.sqlteam.com/jeffs/archive/2007/12/13/select-distinct-order-by-error.aspx
         return sql if options[:order].blank?
-        columns = sql.match(/SELECT\s+DISTINCT(.*)FROM/)[1].strip
+        columns = sql.match(/SELECT\s+DISTINCT(.*?)FROM/)[1].strip
         sql.sub!(/SELECT\s+DISTINCT/,'SELECT')
         sql << "GROUP BY #{columns} ORDER BY #{order_to_min_set(options[:order])}"
       end
@@ -908,9 +908,10 @@ module ActiveRecord
       end
       
       def remove_default_constraint(table_name, column_name)
-        constraints = select_values("SELECT def.name FROM sysobjects def, syscolumns col, sysobjects tab WHERE col.cdefault = def.id AND col.name = '#{quote_string(column_name)}' AND tab.name = '#{quote_string(table_name)}' AND col.id = tab.id")
-        constraints.each do |constraint|
-          do_execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{quote_column_name(constraint)}"
+        select_all("EXEC sp_helpconstraint '#{quote_string(table_name)}','nomsg'").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']}"
         end
       end
       
@@ -1081,7 +1082,8 @@ module ActiveRecord
                                when nil, '(null)', '(NULL)'
                                  nil
                                else
-                                 ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/)[1]
+                                 match_data = ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/)
+                                 match_data ? match_data[1] : nil
                                end
           ci[:null] = ci[:is_nullable].to_i == 1 ; ci.delete(:is_nullable)
           ci

data/tasks/sqlserver.rake

@@ -1,4 +1,5 @@
 
+ 
 namespace :sqlserver do
   
   ['sqlserver','sqlserver_odbc'].each do |adapter|
@@ -29,3 +30,10 @@ namespace :sqlserver do
   
 end
 
+
+desc 'Test the default ODBC mode, taks sqlserver:test_sqlserver_odbc.'
+task :test do
+  test = Rake::Task['sqlserver:test_sqlserver_odbc']
+  test.invoke
+end
+

data/test/cases/specific_schema_test_sqlserver.rb

@@ -50,7 +50,24 @@ class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
 
     end
     
+    context 'with bigint column' do
 
+      setup do
+        @b5k   = 5000
+        @bi5k  = @edge_class.create! :bigint => @b5k, :description => 'Five Thousand'
+        @bnum  = 9_000_000_000_000_000_000
+        @bimjr = @edge_class.create! :bigint => @bnum, :description => 'Close to max bignum'
+      end
+
+      should 'can find by biginit' do
+        assert_equal @bi5k,  @edge_class.find_by_bigint(@b5k)
+        assert_equal @b5k,   @edge_class.find(:first, :select => 'bigint', :conditions => {:bigint => @b5k}).bigint
+        assert_equal @bimjr, @edge_class.find_by_bigint(@bnum)
+        assert_equal @bnum,  @edge_class.find(:first, :select => 'bigint', :conditions => {:bigint => @bnum}).bigint
+      end
+
+    end
+    
   end
   
   

data/test/schema/sqlserver_specific_schema.rb

@@ -64,6 +64,7 @@ ActiveRecord::Schema.define do
   
   create_table :sql_server_edge_schemas, :force => true do |t|
     t.string :description
+    t.column :bigint, :bigint
   end
   
   execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'customers_view') DROP VIEW customers_view"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.19
+  version: 2.2.20
 platform: ruby
 authors: 
 - Ken Collins, Murray Steele, Shawn Balestracci, Joe Rafaniello, Tom Ward
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -04:00
+date: 2009-09-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,8 @@ files:
 - test/schema/sqlserver_specific_schema.rb
 has_rdoc: true
 homepage: http://github.com/rails-sqlserver
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -110,9 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: arsqlserver
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: SQL Server 2000, 2005 and 2008 Adapter For Rails.
 test_files: []