activerecord-sqlserver-adapter 3.0.14 → 3.0.15

data/CHANGELOG

@@ -1,5 +1,12 @@
 
-* 3.0.13 *
+* 3.0.15 *
+
+* Way better schema support! Thanks to @ianic! Fixes #61
+
+* Warn of possible permission problems if "EXEC sp_helptext..." does not work view. Fixes #73.
+
+
+* 3.0.13/3.0.14 *
 
 * Allow TinyTDS/DBLIB mode to pass down :host/:port config options.
 

data/README.rdoc

@@ -1,5 +1,5 @@
 
-== SQL Server 2005 and 2008 Adapter For ActiveRecord
+== SQL Server 2005/2008 & Azure Adapter For ActiveRecord
 
 The SQL Server adapter for ActiveRecord.
 

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'"
+            select_values "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties' AND TABLE_SCHEMA = schema_name()"
           end
         end
 
@@ -39,7 +39,7 @@ module ActiveRecord
 
         def columns(table_name, name = nil)
           return [] if table_name.blank?
-          cache_key = unqualify_table_name(table_name)
+          cache_key = columns_cache_key(table_name)
           @sqlserver_columns_cache[cache_key] ||= column_definitions(table_name).collect do |ci|
             sqlserver_options = ci.except(:name,:default_value,:type,:null).merge(:database_year=>database_year)
             SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
@@ -175,6 +175,7 @@ module ActiveRecord
         def column_definitions(table_name)
           db_name = unqualify_db_name(table_name)
           db_name_with_period = "#{db_name}." if db_name
+          table_schema = unqualify_table_schema(table_name)
           table_name = unqualify_table_name(table_name)
           sql = %{
             SELECT
@@ -198,6 +199,7 @@ module ActiveRecord
             END as is_identity
             FROM #{db_name_with_period}INFORMATION_SCHEMA.COLUMNS columns
             WHERE columns.TABLE_NAME = '#{table_name}'
+              AND columns.TABLE_SCHEMA = #{table_schema.nil? ? "schema_name() " : "'#{table_schema}' "}
             ORDER BY columns.ordinal_position
           }.gsub(/[ \t\r\n]+/,' ')
           results = info_schema_query { select(sql,nil) }
@@ -266,6 +268,10 @@ module ActiveRecord
           table_name.to_s.split('.').last.tr('[]','')
         end
 
+        def unqualify_table_schema(table_name)
+          table_name.to_s.split('.')[-2].gsub(/[\[\]]/,'') rescue nil
+        end
+
         def unqualify_db_name(table_name)
           table_names = table_name.to_s.split('.')
           table_names.length == 3 ? table_names.first.tr('[]','') : nil
@@ -306,7 +312,13 @@ 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 #{quote_table_name(table_name)}").join }
+                view_info[:VIEW_DEFINITION] = info_schema_query do
+                                                begin
+                                                  select_values("EXEC sp_helptext #{quote_table_name(table_name)}").join
+                                                rescue
+                                                  warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
+                                                end
+                                              end
               end
             end
             view_info
@@ -320,12 +332,23 @@ 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 columns_cache_key(table_name)
+          table_schema = unqualify_table_schema(table_name)
+          table_name = unqualify_table_name(table_name) 
+          if table_schema
+            "#{table_schema}.#{table_name}"  
+          else
+            table_name
+          end
+        end
+
         def remove_sqlserver_columns_cache_for(table_name)
           cache_key = unqualify_table_name(table_name)
           @sqlserver_columns_cache[cache_key] = nil

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -17,7 +17,7 @@ module ActiveRecord
   class Base
     
     def self.sqlserver_connection(config) #:nodoc:
-      config = config.dup.symbolize_keys!
+      config = config.symbolize_keys
       config.reverse_merge! :mode => :dblib, :host => 'localhost', :username => 'sa', :password => ''
       mode = config[:mode].to_s.downcase.underscore.to_sym
       case mode
@@ -164,7 +164,7 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.14'.freeze
+      VERSION                     = '3.0.15'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
       
@@ -295,7 +295,7 @@ module ActiveRecord
       end
       
       def sqlserver_azure?
-        @sqlserver_azure && @database_year == 2010
+        @sqlserver_azure
       end
       
       def version

data/lib/arel/visitors/sqlserver.rb

@@ -32,7 +32,9 @@ module Arel
     # a colleciton of them reliably as well as using their true object attributes to mutate them
     # to grouping objects for the inner sql during a select statment with an offset/rownumber. So this
     # is here till ActiveRecord & ARel does this for us instead of using SqlLiteral objects.
+    alias :order_without_sqlserver :order
     def order(*exprs)
+      return order_without_sqlserver(*exprs) unless Arel::Visitors::SQLServer === @visitor
       @ast.orders.concat(exprs.map{ |x|
         case x
         when Arel::Attributes::Attribute
@@ -281,7 +283,7 @@ module Arel
           core.projections.map do |x|
             x.dup.tap do |p|
               p.sub! 'DISTINCT', "DISTINCT #{visit(o.limit)}".strip if o.limit
-              p.sub! /\[#{tn}\]\./, '[__rnt].'
+              p.gsub! /\[?#{tn}\]?\./, '[__rnt].'
               p.strip!
             end
           end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 3.0.15
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 14
-  version: 3.0.14
 platform: ruby
-authors: 
+authors:
 - Ken Collins
 - Murray Steele
 - Shawn Balestracci
@@ -18,51 +13,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-15 00:00:00 -04:00
+date: 2011-04-27 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2171190060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: arel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2171190060
+- !ruby/object:Gem::Dependency
+  name: arel
+  requirement: &2171189440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 2.0.7
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2171189440
 description: SQL Server 2005 and 2008 Adapter For ActiveRecord
 email: ken@metaskills.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
@@ -80,37 +62,28 @@ files:
 has_rdoc: true
 homepage: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: activerecord-sqlserver-adapter
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: SQL Server 2005 and 2008 Adapter For ActiveRecord.
 test_files: []
-