activerecord-sqlserver-adapter 3.1.0.rc1 → 3.1.0.rc2

data/CHANGELOG

@@ -1,7 +1,14 @@
 
-* 3.1.0.rc *
+* 3.1.0 *
 
-It just works! Uses "EXEC sp_executesql ..." for just about everything now!
+* Allow complex order objects to not be molested by our visitor overrides. Fixes #99
+
+* Default unicode datatypes!
+
+* New #lowercase_schema_reflection configuration that allows you to downcase all tables and columns.
+  Good for legacy databases. Fixes #86. Thanks @dmajkic.
+
+* Rails 3.1 with prepared statement support. Uses "EXEC sp_executesql ..." for just about everything now.
 
 
 * 3.0.15 *

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010
+Copyright (c) 2008-2011
  
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -6,8 +6,10 @@ The SQL Server adapter for ActiveRecord.
 
 == What's New
 
+* Rails 3.1 prepared statement support leverages cached query plans.
+* Default unicode datatypes! Disable with #enable_default_unicode_types to false.
+* New #lowercase_schema_reflection configuration option for legacy DBs.
 * New dblib connection mode using TinyTds!
-* Rails 3 support!
 
 
 ==== Testing Rake Tasks Support
@@ -78,17 +80,29 @@ By default any :binary column created by migrations will create a 'varbinary(max
 
 ====  Setting Unicode Types As Default
 
-By default the adapter will use non-unicode safe data types for :string and :text types when defining/changing the schema. If you choose, you can set the following class attribute in a config/initializers file that will change this behavior. When set to true it has the equivalent meaning as the two lower items. These examples show detail level alternatives to achieve similar effects.
+By default the adapter will use unicode safe data types for :string and :text types when defining/changing the schema!!! This was changed in version 3.1 since it is about time we push better unicode support and since we default to TinyTDS (DBLIB) which supports unicode queries and data. If you choose, you can set the following class attribute in a config/initializers file that will disable this behavior. 
   
+  # Default
   ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types = true
-  
   ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type = 'nvarchar(max)'
   ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type = 'nvarchar'
+  
+  # Disabled
+  ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types = false
+  ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type = 'varchar(max)'
+  ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type = 'varchar'
 
 It is important to remember that unicode types in SQL Server have approximately half the storage capacity as their counter parts. So where a normal string would max out at (8000) a unicode string will top off at (4000).
 
 
-====  Schema Information Logging
+==== Force Schema To Lowercase
+
+Although it is not necessary, the Ruby convention is to use lowercase method names. If your database schema is in upper or mixed case, we can force all table and column names during the schema reflection process to be lowercase. Add this to your config/initializers file for the adapter.
+
+  ActiveRecord::ConnectionAdapters::SQLServerAdapter.lowercase_schema_reflection = true
+
+
+==== Schema Information Logging
 
 By default all queries to the INFORMATION_SCHEMA table is silenced. If you think logging these queries are useful, you can enable it by adding this like to a initializer file.
 
@@ -172,5 +186,5 @@ http://pledgie.com/campaigns/11630
 
 == License
 
-Copyright © 2008-2010. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
+Copyright © 2008-2011. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
 

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -325,13 +325,14 @@ module ActiveRecord
             qo[:as] = (options[:ar_result] || options[:fetch] == :rows) ? :array : :hash
           end
           results = handle.each(query_options)
-          options[:ar_result] ? ActiveRecord::Result.new(handle.fields, results) : results
+          columns = lowercase_schema_reflection ? handle.fields.map { |c| c.downcase } : handle.fields
+          options[:ar_result] ? ActiveRecord::Result.new(columns, results) : results
         end
         
         def handle_to_names_and_values_odbc(handle, options={})
           @connection.use_utc = ActiveRecord::Base.default_timezone == :utc
           if options[:ar_result]
-            columns = handle.columns(true).map { |c| c.name }
+            columns = lowercase_schema_reflection ? handle.columns(true).map { |c| c.name.downcase } : handle.columns(true).map { |c| c.name }
             rows = handle.fetch_all || []
             ActiveRecord::Result.new(columns, rows)
           else

data/lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -9,7 +9,7 @@ module ActiveRecord
 
         def tables(name = nil)
           info_schema_query do
-            select_values "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties' AND TABLE_SCHEMA = schema_name()"
+            select_values "SELECT #{lowercase_schema_reflection_sql('TABLE_NAME')} FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties' AND TABLE_SCHEMA = schema_name()"
           end
         end
 
@@ -118,7 +118,7 @@ module ActiveRecord
         
         def views(name = nil)
           @sqlserver_views_cache ||= 
-            info_schema_query { select_values("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME NOT IN ('sysconstraints','syssegments')") }
+            info_schema_query { select_values("SELECT #{lowercase_schema_reflection_sql('TABLE_NAME')} FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME NOT IN ('sysconstraints','syssegments')") }
         end
         
         
@@ -158,24 +158,24 @@ module ActiveRecord
           table_name = unqualify_table_name(table_name)
           sql = %{
             SELECT
-            columns.TABLE_NAME as table_name,
-            columns.COLUMN_NAME as name,
-            columns.DATA_TYPE as type,
-            columns.COLUMN_DEFAULT as default_value,
-            columns.NUMERIC_SCALE as numeric_scale,
-            columns.NUMERIC_PRECISION as numeric_precision,
+            #{lowercase_schema_reflection_sql('columns.TABLE_NAME')} AS table_name,
+            #{lowercase_schema_reflection_sql('columns.COLUMN_NAME')} AS name,
+            columns.DATA_TYPE AS type,
+            columns.COLUMN_DEFAULT AS default_value,
+            columns.NUMERIC_SCALE AS numeric_scale,
+            columns.NUMERIC_PRECISION AS numeric_precision,
             CASE
               WHEN columns.DATA_TYPE IN ('nchar','nvarchar') THEN columns.CHARACTER_MAXIMUM_LENGTH
               ELSE COL_LENGTH(columns.TABLE_SCHEMA+'.'+columns.TABLE_NAME, columns.COLUMN_NAME)
-            END as length,
+            END AS length,
             CASE
               WHEN columns.IS_NULLABLE = 'YES' THEN 1
               ELSE NULL
-            END as is_nullable,
+            END AS is_nullable,
             CASE
               WHEN COLUMNPROPERTY(OBJECT_ID(columns.TABLE_SCHEMA+'.'+columns.TABLE_NAME), columns.COLUMN_NAME, 'IsIdentity') = 0 THEN NULL
               ELSE 1
-            END as is_identity
+            END AS is_identity
             FROM #{db_name_with_period}INFORMATION_SCHEMA.COLUMNS columns
             WHERE columns.TABLE_NAME = @0
               AND columns.TABLE_SCHEMA = #{table_schema.blank? ? "schema_name()" : "@1"}
@@ -279,6 +279,10 @@ module ActiveRecord
           column
         end
         
+        def lowercase_schema_reflection_sql(node)
+          lowercase_schema_reflection ? "LOWER(#{node})" : node
+        end
+        
         # === SQLServer Specific (View Reflection) ====================== #
         
         def view_table_name(table_name)
@@ -313,14 +317,13 @@ module ActiveRecord
         
         def views_real_column_name(table_name,column_name)
           view_definition = view_information(table_name)[:VIEW_DEFINITION]
-          
           match_data = view_definition.match(/([\w-]*)\s+as\s+#{column_name}/im)
           match_data ? match_data[1] : column_name
         end
         
         # === SQLServer Specific (Column/View Caches) =================== #
 
-        def initialize_sqlserver_caches(reset_columns=true)
+        def initialize_sqlserver_caches
           @sqlserver_views_cache = nil
           @sqlserver_view_information_cache = {}
           @sqlserver_quoted_column_and_table_names = {}

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -161,16 +161,18 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.1.0.rc1'.freeze
+      VERSION                     = '3.1.0.rc2'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
       
-      attr_reader :database_version, :database_year,
-                  :connection_supports_native_types
+      attr_reader :database_version, :database_year
       
       cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
                      :log_info_schema_queries, :enable_default_unicode_types, :auto_connect,
-                     :cs_equality_operator
+                     :cs_equality_operator, :lowercase_schema_reflection
+      
+      self.enable_default_unicode_types = true
+      
       
       def initialize(logger,config)
         @connection_options = config
@@ -263,8 +265,7 @@ module ActiveRecord
       end
       
       def clear_cache!
-        # This requires db admin perms and I'm not even sure it is a good idea.
-        # raw_connection_do "DBCC FREEPROCCACHE WITH NO_INFOMSGS" rescue nil
+        initialize_sqlserver_caches
       end
       
       # === Abstract Adapter (Misc Support) =========================== #

data/lib/arel/visitors/sqlserver.rb

@@ -35,6 +35,8 @@ module Arel
           table = Arel::Table.new(x.relation.table_alias || x.relation.name)
           expr = table[x.name]
           Arel::Nodes::Ordering.new expr
+        when Arel::Nodes::Ordering
+          x
         when String
           x.split(',').map do |s|
             expr, direction = s.split

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 15424103
+  hash: 15424097
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 1
-  version: 3.1.0.rc1
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - Ken Collins
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-22 00:00:00 -04:00
+date: 2011-05-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,12 +32,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15424103
         segments: 
         - 3
         - 1
         - 0
-        version: 3.1.0
+        - rc
+        - 1
+        version: 3.1.0.rc1
   type: :runtime
   version_requirements: *id001
 description: SQL Server 2005 and 2008 Adapter For ActiveRecord