Organize test file better for adapter specific BDD.

Author: metaskills

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -1,33 +1,5 @@
 require 'active_record/connection_adapters/abstract_adapter'
-
 require 'base64'
-require 'bigdecimal'
-require 'bigdecimal/util'
-
-# sqlserver_adapter.rb -- ActiveRecord adapter for Microsoft SQL Server
-#
-# Author: Joey Gibson <joey@joeygibson.com>
-# Date:   10/14/2004
-#
-# Modifications: DeLynn Berry <delynnb@megastarfinancial.com>
-# Date: 3/22/2005
-#
-# Modifications (ODBC): Mark Imbriaco <mark.imbriaco@pobox.com>
-# Date: 6/26/2005
-
-# Modifications (Migrations): Tom Ward <tom@popdog.net>
-# Date: 27/10/2005
-#
-# Modifications (Numerous fixes as maintainer): Ryan Tomayko <rtomayko@gmail.com>
-# Date: Up to July 2006
-
-# Previous maintainer: Tom Ward <tom@popdog.net>
-#
-
-
-
-
-# Current (interim/unofficial) maintainer: Shawn Balestracci <shawn@vegantech.com>
 
 module ActiveRecord
   class Base
@@ -290,7 +262,24 @@ def new_time(year, mon, mday, hour, min, sec, microsec = 0)
     # unixODBC 2.2.11, Ruby ODBC 0.996, Ruby DBI 0.0.23 and Ruby 1.8.2.
     # [Linux strongmad 2.6.11-1.1369_FC4 #1 Thu Jun 2 22:55:56 EDT 2005 i686 i686 i386 GNU/Linux]
     class SQLServerAdapter < AbstractAdapter
-
+      
+      ADAPTER_NAME = 'SQLServer'.freeze
+      
+      # NATIVE_DATABASE_TYPES = {
+      #   :primary_key => "int NOT NULL IDENTITY(1, 1) PRIMARY KEY",
+      #   :string      => { :name => "varchar", :limit => 255  },
+      #   :text        => { :name =>  txt },
+      #   :integer     => { :name => "int" },
+      #   :float       => { :name => "float", :limit => 8 },
+      #   :decimal     => { :name => "decimal" },
+      #   :datetime    => { :name => "datetime" },
+      #   :timestamp   => { :name => "datetime" },
+      #   :time        => { :name => "datetime" },
+      #   :date        => { :name => "datetime" },
+      #   :binary      => { :name =>  bin },
+      #   :boolean     => { :name => "bit"}
+      # }
+      
       def initialize(connection, logger, connection_options=nil)
         super(connection, logger)
         @connection_options = connection_options
@@ -300,7 +289,10 @@ def initialize(connection, logger, connection_options=nil)
         else
           raise "Currently, only 2000 and 2005 are supported versions"
         end
-
+      end
+      
+      def adapter_name #:nodoc:
+        ADAPTER_NAME
       end
 
       def native_database_types
@@ -324,16 +316,12 @@ def native_database_types
           :boolean     => { :name => "bit"}
         }
       end
-
-      def adapter_name
-        'SQLServer'
-      end
-
+      
       def database_version
         # returns string such as:
         # "Microsoft SQL Server  2000 - 8.00.2039 (Intel X86) \n\tMay  3 2005 23:18:38 \n\tCopyright (c) 1988-2003 Microsoft Corporation\n\tEnterprise Edition on Windows NT 5.2 (Build 3790: )\n"
         # "Microsoft SQL Server 2005 - 9.00.3215.00 (Intel X86) \n\tDec  8 2007 18:51:32 \n\tCopyright (c) 1988-2005 Microsoft Corporation\n\tStandard Edition on Windows NT 5.2 (Build 3790: Service Pack 2)\n"
-        return select_value("SELECT @@version")
+        select_value("SELECT @@version")
       end    
 
       def supports_migrations? #:nodoc:

test/cases/adapter_test_sqlserver.rb

@@ -1,180 +1,48 @@
 require 'cases/sqlserver_helper'
-require 'models/default'
-require 'models/post'
 require 'models/task'
+require 'models/topic'
 
-class SqlServerAdapterTest < ActiveRecord::TestCase
-  class TableWithRealColumn < ActiveRecord::Base; end
-
-  fixtures :posts, :tasks
-
+class AdapterTestSqlserver < ActiveRecord::TestCase
+  
   def setup
     @connection = ActiveRecord::Base.connection
   end
-
-  def teardown
-    @connection.execute("SET LANGUAGE us_english") rescue nil
+  
+    
+  def test_update_sql_statement_invalid
+    assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.update_sql("UPDATE XXX") }
   end
-
+  
   def test_real_column_has_float_type
     assert_equal :float, TableWithRealColumn.columns_hash["real_number"].type
   end
-
-  # SQL Server 2000 has a bug where some unambiguous date formats are not
-  # correctly identified if the session language is set to german
+  
   def test_date_insertion_when_language_is_german
     @connection.execute("SET LANGUAGE deutsch")
-
     assert_nothing_raised do
       Task.create(:starting => Time.utc(2000, 1, 31, 5, 42, 0), :ending => Date.new(2006, 12, 31))
     end
+  ensure
+    @connection.execute("SET LANGUAGE us_english") rescue nil
   end
-
+  
   def test_indexes_with_descending_order
-    # Make sure we have an index with descending order
     @connection.execute "CREATE INDEX idx_credit_limit ON accounts (credit_limit DESC)" rescue nil
     assert_equal ["credit_limit"], @connection.indexes('accounts').first.columns
   ensure
     @connection.execute "DROP INDEX accounts.idx_credit_limit"
   end
-
-  def test_execute_without_block_closes_statement
-    assert_all_statements_used_are_closed do
-      @connection.execute("SELECT 1")
-    end
-  end
-
-  def test_execute_with_block_closes_statement
-    assert_all_statements_used_are_closed do
-      @connection.execute("SELECT 1") do |sth|
-        assert !sth.finished?, "Statement should still be alive within block"
-      end
-    end
-  end
-
-  def test_insert_with_identity_closes_statement
-    assert_all_statements_used_are_closed do
-      @connection.insert("INSERT INTO accounts ([id], [firm_id],[credit_limit]) values (999, 1, 50)")
-    end
-  end
-
-  def test_insert_without_identity_closes_statement
-    assert_all_statements_used_are_closed do
-      @connection.insert("INSERT INTO accounts ([firm_id],[credit_limit]) values (1, 50)")
-    end
-  end
-
-  def test_active_closes_statement
-    assert_all_statements_used_are_closed do
-      @connection.active?
-    end
-  end
-
-  def assert_all_statements_used_are_closed(&block)
-    existing_handles = []
-    ObjectSpace.each_object(DBI::StatementHandle) {|handle| existing_handles << handle}
-    GC.disable
-
-    yield
-
-    used_handles = []
-    ObjectSpace.each_object(DBI::StatementHandle) {|handle| used_handles << handle unless existing_handles.include? handle}
-
-    assert_block "No statements were used within given block" do
-      used_handles.size > 0
-    end
-
-    ObjectSpace.each_object(DBI::StatementHandle) do |handle|
-      assert_block "Statement should have been closed within given block" do
-        handle.finished?
-      end
-    end
+  
+  def test_escaped_table_name
+    old_table_name, new_table_name = Topic.table_name, '[topics]'
+    Topic.table_name = new_table_name
+    assert_nothing_raised { ActiveRecord::Base.connection.select_all "SELECT * FROM #{new_table_name}" }
+    assert_equal new_table_name, Topic.table_name
+    assert_equal 12, Topic.columns.length
   ensure
-    GC.enable
-  end
-end
-
-class TypeToSqlForIntegersTest < ActiveRecord::TestCase
-
-  def setup
-    @connection = ActiveRecord::Base.connection
-  end
-
-  # TODO - ugh these tests are pretty literal...
-  def test_should_create_integers_when_no_limit_supplied
-    assert_equal 'integer', @connection.type_to_sql(:integer)
-  end
-
-  def test_should_create_integers_when_limit_is_4
-    assert_equal 'integer', @connection.type_to_sql(:integer, 4)
-  end
-
-  def test_should_create_integers_when_limit_is_3
-    assert_equal 'integer', @connection.type_to_sql(:integer, 3)
-  end
-
-  def test_should_create_smallints_when_limit_is_less_than_3
-    assert_equal 'smallint', @connection.type_to_sql(:integer, 2)
-    assert_equal 'smallint', @connection.type_to_sql(:integer, 1)
-  end
-
-  def test_should_create_bigints_when_limit_is_greateer_than_4
-    assert_equal 'bigint', @connection.type_to_sql(:integer, 5)
-    assert_equal 'bigint', @connection.type_to_sql(:integer, 6)
-    assert_equal 'bigint', @connection.type_to_sql(:integer, 7)
-    assert_equal 'bigint', @connection.type_to_sql(:integer, 8)
-  end
-
-end
-
-# NOTE: The existing schema_dumper_test doesn't test the limits of <4 limit things
-# for adapaters that aren't mysql, sqlite or postgres.  We should.
-# It also only tests non-standard id dumping for mysql.  We'll do that too.
-class SchemaDumperForSqlServerTest < ActiveRecord::TestCase
-  def standard_dump(ignore_tables = [])
-    stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = [*ignore_tables]
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-    stream.string
+    Topic.table_name = old_table_name
   end
 
-  def test_schema_dump_includes_limit_constraint_for_integer_columns
-    output = standard_dump(/^(?!integer_limits)/)
-    assert_match %r{c_int_1.*:limit => 2}, output
-    assert_match %r{c_int_2.*:limit => 2}, output
-    assert_match %r{c_int_3.*}, output
-    assert_match %r{c_int_4.*}, output
-    assert_no_match %r{c_int_3.*:limit}, output
-    assert_no_match %r{c_int_4.*:limit}, output
-  end
 
-  def test_sqlserver_schema_dump_should_honor_nonstandard_primary_keys
-    output = standard_dump
-    match = output.match(%r{create_table "movies"(.*)do})
-    assert_not_nil(match, "nonstandardpk table not found")
-    assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
-  end
 end
 
-class StringDefaultsTest < ActiveRecord::TestCase
-  class StringDefaults < ActiveRecord::Base; end;
-
-  def test_sqlserver_default_strings_before_save
-    default = StringDefaults.new
-    assert_equal nil, default.string_with_null_default
-    assert_equal 'null', default.string_with_pretend_null_one
-    assert_equal '(null)', default.string_with_pretend_null_two
-    assert_equal 'NULL', default.string_with_pretend_null_three
-    assert_equal '(NULL)', default.string_with_pretend_null_four
-  end
-
-  def test_sqlserver_default_strings_after_save
-    default = StringDefaults.create
-    assert_equal nil, default.string_with_null_default
-    assert_equal 'null', default.string_with_pretend_null_one
-    assert_equal '(null)', default.string_with_pretend_null_two
-    assert_equal 'NULL', default.string_with_pretend_null_three
-    assert_equal '(NULL)', default.string_with_pretend_null_four
-  end
-
-end