activerecord-sqlserver-adapter 3.1.0.0 → 3.1.1

data/CHANGELOG

@@ -1,4 +1,12 @@
 
+* 3.1.1 *
+
+* Provide a method to override for the quoted string prefix. Not a config because trumping this method will 
+  have drastically bad results. Fixes #124
+
+* Allow :limit/:offset to be used with fully qualified table and column in :select.
+
+
 * 3.1.0 *
 
 * Add support/test around handling of float/real column types [Lucas Maxwell]

data/README.rdoc

@@ -7,6 +7,8 @@ The SQL Server adapter for ActiveRecord. If you need the adapter for SQL Server
 == What's New
 
 * Rails 3.1 prepared statement support leverages cached query plans.
+  If you use DBLIB/TinyTDS, you must use FreeTDS 0.91 !!!!!
+  https://github.com/rails-sqlserver/tiny_tds/issues/41
 * We now support your native language date/time formats automatically!
 * Default unicode datatypes! Disable with #enable_default_unicode_types to false.
 * New #lowercase_schema_reflection configuration option for legacy DBs.

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

@@ -4,6 +4,7 @@ module ActiveRecord
       module Quoting
         
         QUOTED_TRUE, QUOTED_FALSE = '1', '0'
+        QUOTED_STRING_PREFIX = 'N'
         
         def quote(value, column = nil)
           case value
@@ -13,7 +14,7 @@ module ActiveRecord
             elsif column && column.type == :binary
               column.class.string_to_binary(value)
             elsif value.is_utf8? || (column && column.type == :string)
-              "N'#{quote_string(value)}'"
+              "#{quoted_string_prefix}'#{quote_string(value)}'"
             else
               super
             end
@@ -31,7 +32,11 @@ module ActiveRecord
             super
           end
         end
-
+        
+        def quoted_string_prefix
+          QUOTED_STRING_PREFIX
+        end
+        
         def quote_string(string)
           string.to_s.gsub(/\'/, "''")
         end

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

@@ -0,0 +1,11 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Sqlserver
+      module Version
+        
+        VERSION = '3.1.1'.freeze
+        
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -7,6 +7,7 @@ require 'active_record/connection_adapters/sqlserver/database_statements'
 require 'active_record/connection_adapters/sqlserver/errors'
 require 'active_record/connection_adapters/sqlserver/schema_statements'
 require 'active_record/connection_adapters/sqlserver/quoting'
+require 'active_record/connection_adapters/sqlserver/version'
 require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/string'
 require 'base64'
@@ -165,9 +166,9 @@ module ActiveRecord
       include Sqlserver::SchemaStatements
       include Sqlserver::DatabaseLimits
       include Sqlserver::Errors
+      include Sqlserver::Version
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.1.0'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
       

data/lib/arel/visitors/sqlserver.rb

@@ -329,20 +329,10 @@ module Arel
           core.projections.map do |x|
             Arel.sql visit(x).split(',').map{ |y| y.split(' AS ').last.strip }.join(', ')
           end
-        elsif function_select_statement?(o)
-          [Arel.star]
         elsif select_primary_key_sql?(o)
           [Arel.sql("[__rnt].#{quote_column_name(core.projections.first.name)}")]
         else
-          core.projections.map do |x|
-            if x.respond_to?(:relation)
-              x = x.dup
-              x.relation = x.relation.dup
-              x.relation.instance_variable_set :@table_alias, Arel.sql('[__rnt].*')
-            else
-              x
-            end
-          end
+          [Arel.sql('[__rnt].*')]
         end
       end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 119
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  - 0
-  version: 3.1.0.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Ken Collins
@@ -20,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -04:00
+date: 2011-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +57,7 @@ files:
 - lib/active_record/connection_adapters/sqlserver/errors.rb
 - lib/active_record/connection_adapters/sqlserver/quoting.rb
 - lib/active_record/connection_adapters/sqlserver/schema_statements.rb
+- lib/active_record/connection_adapters/sqlserver/version.rb
 - lib/active_record/connection_adapters/sqlserver_adapter.rb
 - lib/activerecord-sqlserver-adapter.rb
 - lib/arel/visitors/sqlserver.rb