Merge branch 'master' of git://github.com/h-lame/rails-sqlserver-adapter

Author: cjheath

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -21,7 +21,10 @@
 # Modifications (Numerous fixes as maintainer): Ryan Tomayko <rtomayko@gmail.com>
 # Date: Up to July 2006
 
-# Current maintainer: Tom Ward <tom@popdog.net>
+# Previous maintainer: Tom Ward <tom@popdog.net>
+#
+
+# Current maintainer: Shawn Balestracci <shawn@vegantech.com>
 
 module ActiveRecord
   class Base
@@ -166,13 +169,13 @@ def cast_to_datetime(value)
 
         def cast_to_time(value)
           return value if value.is_a?(Time)
-          time_hash = Date._parse(string)
+          time_hash = Date._parse(value)
           time_hash[:sec_fraction] = 0 # REVISIT: microseconds(time_hash)
           new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction)) rescue nil
         end
 
         # TODO: Find less hack way to convert DateTime objects into Times
-        def self.string_to_time(value)
+        def string_to_time(value)
           if value.is_a?(DateTime)
             return new_time(value.year, value.mon, value.day, value.hour, value.min, value.sec)
           else
@@ -182,11 +185,11 @@ def self.string_to_time(value)
 
         # These methods will only allow the adapter to insert binary data with a length of 7K or less
         # because of a SQL Server statement length policy.
-        def self.string_to_binary(value)
+        def string_to_binary(value)
           Base64.encode64(value)
         end
 
-        def self.binary_to_string(value)
+        def binary_to_string(value)
           Base64.decode64(value)
         end
 
@@ -196,8 +199,8 @@ def new_time(year, mon, mday, hour, min, sec, microsec = 0)
           return nil if year.nil? || year == 0
           Time.time_with_datetime_fallback(Base.default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
         end
-      end
-    end
+      end #class << self
+    end #SQLServerColumn
 
     # In ADO mode, this adapter will ONLY work on Windows systems,
     # since it relies on Win32OLE, which, to my knowledge, is only
@@ -333,8 +336,10 @@ def select_rows(sql, name = nil)
 
       def columns(table_name, name = nil)
         return [] if table_name.blank?
-        table_name = table_name.to_s.split('.')[-1]
+        table_names = table_name.to_s.split('.')
+        table_name = table_names[-1]
         table_name = table_name.gsub(/[\[\]]/, '')
+        db_name = "#{table_names[0]}." if table_names.length==3
         sql = %{
           SELECT
           columns.COLUMN_NAME as name,
@@ -358,7 +363,7 @@ def columns(table_name, name = nil)
             WHEN COLUMNPROPERTY(OBJECT_ID(columns.TABLE_NAME), columns.COLUMN_NAME, 'IsIdentity') = 0 THEN NULL
             ELSE 1
           END is_identity
-          FROM INFORMATION_SCHEMA.COLUMNS columns
+          FROM #{db_name}INFORMATION_SCHEMA.COLUMNS columns
           LEFT OUTER JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS primary_key_constraints ON (
             primary_key_constraints.table_name = columns.table_name
             AND primary_key_constraints.constraint_type = 'PRIMARY KEY'
@@ -370,7 +375,6 @@ def columns(table_name, name = nil)
           WHERE columns.TABLE_NAME = '#{table_name}'
           ORDER BY columns.COLUMN_NAME
         }
-        # ORDER BY columns.ordinal_position
         result = select(sql, name, true)
         result.collect do |column_info|
           # Remove brackets and outer quotes (if quoted) of default value returned by db, i.e:
@@ -463,6 +467,16 @@ def quote_string(string)
         string.gsub(/\'/, "''")
       end
 
+      def quote_table_name(name)
+        name_split_on_dots = name.to_s.split('.')
+        if name_split_on_dots.length == 3
+          "[#{name_split_on_dots[0]}].[#{name_split_on_dots[1]}].[#{name_split_on_dots[2]}]"
+        else
+          super(name)
+        end
+
+      end
+
       def quote_column_name(name)
         "[#{name}]"
       end
@@ -774,7 +788,7 @@ def repair_special_columns(sql)
 
         def get_utf8_columns(table_name)
           utf8 = []
-          @table_columns ||= []
+          @table_columns ||= {}
           @table_columns[table_name] ||= columns(table_name)
           @table_columns[table_name].each do |col|
             utf8 << col.name if col.is_utf8
@@ -791,7 +805,7 @@ def set_utf8_values!(sql)
           elsif sql =~ /^\s*INSERT/i
             # TODO This code should be simplified
             # Get columns and values, split them into arrays, and store the original_values for when we need to replace them
-            columns_and_values = sql.scan(/\((.*?)\)/).flatten
+            columns_and_values = sql.scan(/\((.*?)\)/m).flatten
             columns = columns_and_values.first.split(',')
             values =  columns_and_values[1].split(',')
             original_values = values.dup
@@ -809,3 +823,4 @@ def set_utf8_values!(sql)
     end #class SQLServerAdapter < AbstractAdapter
   end #module ConnectionAdapters
 end #module ActiveRecord
+

rails-sqlserver-adapter.gemspec

@@ -1,19 +1,19 @@
 Gem::Specification.new do |s|
   s.name = %q{activerecord-sqlserver-adapter}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Ward"]
-  s.date = %q{2008-06-03}
-  s.email = %q{tom@popdog.net}
+  s.authors = ["Shawn Balestracci"]
+  s.date = %q{2008-09-27}
+  s.email = %q{shawn@vegantech.com}
   s.files = ["lib/active_record/connection_adapters/sqlserver_adapter.rb"]
-  s.homepage = %q{http://wiki.rubyonrails.org/rails/pages/SQL+Server}
+  s.homepage = %q{http://vegantech.lighthouseapp.com/projects/17542-activerecord-sqlserver-adapter}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{activerecord}
   s.rubygems_version = %q{1.1.1}
   s.summary = %q{SQL Server adapter for Active Record}
 
   s.add_dependency(%q<activerecord>, [">= 1.15.5.7843"])
-end
+end