activerecord-jdbc-adapter 0.8 → 0.8.1

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -7,7 +7,7 @@ module ::JdbcSpec
       config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
       embedded_driver(config)
     end
-  end 
+  end
 
   module Derby
     def self.column_selector
@@ -17,10 +17,10 @@ module ::JdbcSpec
     def self.adapter_selector
       [/derby/i, lambda {|cfg,adapt| adapt.extend(::JdbcSpec::Derby)}]
     end
-      
+
     def self.monkey_rails
       unless @already_monkeyd
-        # Needed because Rails is broken wrt to quoting of 
+        # Needed because Rails is broken wrt to quoting of
         # some values. Most databases are nice about it,
         # but not Derby. The real issue is that you can't
         # compare a CHAR value to a NUMBER column.
@@ -32,7 +32,7 @@ module ::JdbcSpec
                                   construct_finder_sql_for_association_limiting(options, join_dependency),
                                   "#{name} Load IDs For Limited Eager Loading"
                                   ).collect { |row| connection.quote(row[primary_key], columns_hash[primary_key]) }.join(", ")
-          end           
+          end
         end
 
         @already_monkeyd = true
@@ -46,12 +46,12 @@ module ::JdbcSpec
     def self.included(*args)
       monkey_rails
     end
-    
+
     module Column
       def value_to_binary(value)
         value.scan(/[0-9A-Fa-f]{2}/).collect {|v| v.to_i(16)}.pack("C*")
       end
-      
+
       def cast_to_date_or_time(value)
         return value if value.is_a? Date
         return nil if value.blank?
@@ -71,14 +71,14 @@ module ::JdbcSpec
       end
 
       def simplified_type(field_type)
-        return :boolean if field_type =~ /smallint/i 
+        return :boolean if field_type =~ /smallint/i
         return :float if field_type =~ /real/i
         super
       end
     end
 
     include JdbcSpec::MissingFunctionalityHelper
-    
+
     def modify_types(tp)
       tp[:primary_key] = "int generated by default as identity NOT NULL PRIMARY KEY"
       tp[:integer][:limit] = nil
@@ -86,7 +86,14 @@ module ::JdbcSpec
       tp[:boolean] = {:name => "smallint"}
       tp
     end
-    
+
+    # Override default -- fix case where ActiveRecord passes :default => nil, :null => true
+    def add_column_options!(sql, options)
+      options.delete(:default) if options.has_key?(:default) && options[:default].nil?
+      options.delete(:null) if options.has_key?(:null) && (options[:null].nil? || options[:null].true?)
+      super
+    end
+
     def classes_for_table_name(table)
       ActiveRecord::Base.send(:subclasses).select {|klass| klass.table_name == table}
     end
@@ -94,9 +101,9 @@ module ::JdbcSpec
     # Set the sequence to the max value of the table's column.
     def reset_sequence!(table, column, sequence = nil)
       mpk = select_value("SELECT MAX(#{quote_column_name column}) FROM #{table}")
-      execute("ALTER TABLE #{table} ALTER COLUMN #{quote_column_name column} RESTART WITH #{mpk.to_i + 1}")      
+      execute("ALTER TABLE #{table} ALTER COLUMN #{quote_column_name column} RESTART WITH #{mpk.to_i + 1}")
     end
-      
+
     def reset_pk_sequence!(table, pk = nil, sequence = nil)
       klasses = classes_for_table_name(table)
       klass   = klasses.nil? ? nil : klasses.first
@@ -105,7 +112,7 @@ module ::JdbcSpec
         reset_sequence!(klass.table_name, pk)
       end
     end
-    
+
     def primary_key(table_name) #:nodoc:
       primary_keys(table_name).first
     end
@@ -117,7 +124,7 @@ module ::JdbcSpec
     def rename_table(name, new_name)
       execute "RENAME TABLE #{name} TO #{new_name}"
     end
-    
+
     COLUMN_INFO_STMT = "SELECT C.COLUMNNAME, C.REFERENCEID, C.COLUMNNUMBER FROM SYS.SYSCOLUMNS C, SYS.SYSTABLES T WHERE T.TABLEID = '%s' AND T.TABLEID = C.REFERENCEID ORDER BY C.COLUMNNUMBER"
 
     COLUMN_TYPE_STMT = "SELECT COLUMNDATATYPE, COLUMNDEFAULT FROM SYS.SYSCOLUMNS WHERE REFERENCEID = '%s' AND COLUMNNAME = '%s'"
@@ -129,7 +136,7 @@ module ::JdbcSpec
       return name unless name
       %Q{"#{name}"}
     end
-    
+
     def strip_quotes(str)
       return str unless str
       return str unless /^(["']).*\1$/ =~ str
@@ -140,7 +147,7 @@ module ::JdbcSpec
       return name unless name && name['"']
       name.gsub(/"/,'""')
     end
-    
+
     def reinstate_auto_increment(name, refid, coldef)
       stmt = AUTO_INC_STMT % [refid, strip_quotes(name)]
       data = execute(stmt).first
@@ -224,9 +231,9 @@ module ::JdbcSpec
       end
       coldef
     end
-    
+
     SIZEABLE = %w(VARCHAR CLOB BLOB)
-    
+
     def structure_dump #:nodoc:
       definition=""
       rs = @connection.connection.meta_data.getTables(nil,nil,nil,["TABLE"].to_java(:string))
@@ -244,14 +251,14 @@ module ::JdbcSpec
           elsif d1
             default = " DEFAULT #{d1}"
           end
-          
+
           type = rs2.getString(6)
           col_size = rs2.getString(7)
           nulling = (rs2.getString(18) == 'NO' ? " NOT NULL" : "")
-          create_col_string = add_quotes(expand_double_quotes(strip_quotes(col_name))) + 
-            " " + 
+          create_col_string = add_quotes(expand_double_quotes(strip_quotes(col_name))) +
+            " " +
             type +
-            (SIZEABLE.include?(type) ? "(#{col_size})" : "") + 
+            (SIZEABLE.include?(type) ? "(#{col_size})" : "") +
             nulling +
             default
           if !first_col
@@ -259,23 +266,23 @@ module ::JdbcSpec
           else
             create_col_string = " #{create_col_string}"
           end
-          
+
           definition << create_col_string
-          
+
           first_col = false
         end
         definition << ");\n\n"
       end
       definition
     end
-    
+
     # Support for removing columns added via derby bug issue:
     # https://issues.apache.org/jira/browse/DERBY-1489
     #
     # This feature has not made it into a formal release and is not in Java 6.
     # If the normal strategy fails we fall back on a strategy by creating a new
     # table without the new column and there after moving the data to the new
-    # 
+    #
     def remove_column(table_name, column_name)
       begin
         execute "ALTER TABLE #{table_name} DROP COLUMN #{column_name} RESTRICT"
@@ -285,7 +292,7 @@ module ::JdbcSpec
         end
       end
     end
-    
+
     # Notes about changing in Derby:
     #    http://db.apache.org/derby/docs/10.2/ref/rrefsqlj81859.html#rrefsqlj81859__rrefsqlj37860)
     #
@@ -338,7 +345,7 @@ module ::JdbcSpec
         alter_table(table_name, :rename => {column_name => new_column_name})
       end
     end
-    
+
     def primary_keys(table_name)
       @connection.primary_keys table_name.to_s.upcase
     end
@@ -364,7 +371,7 @@ module ::JdbcSpec
         name
       end
     end
-    
+
     def quoted_true
       '1'
     end

data/lib/jdbc_adapter/jdbc_mssql.rb

@@ -1,3 +1,5 @@
+require 'jdbc_adapter/tsql_helper'
+
 module ::ActiveRecord
   class Base
     # After setting large objects to empty, write data back with a helper method
@@ -19,6 +21,8 @@ end
 
 module JdbcSpec
   module MsSQL
+    include TSqlMethods
+
     def self.column_selector
       [/sqlserver|tds/i, lambda {|cfg,col| col.extend(::JdbcSpec::MsSQL::Column)}]
     end
@@ -26,14 +30,15 @@ module JdbcSpec
     def self.adapter_selector
       [/sqlserver|tds/i, lambda {|cfg,adapt| adapt.extend(::JdbcSpec::MsSQL)}]
     end
-    
+
     module Column
       attr_accessor :identity, :is_special
-      
+
       def simplified_type(field_type)
         case field_type
           when /int|bigint|smallint|tinyint/i                        then :integer
-          when /float|double|decimal|money|numeric|real|smallmoney/i then @scale == 0 ? :integer : :decimal
+          when /numeric/i                                            then (@scale.nil? || @scale == 0) ? :integer : :decimal
+          when /float|double|decimal|money|real|smallmoney/i         then :decimal
           when /datetime|smalldatetime/i                             then :datetime
           when /timestamp/i                                          then :timestamp
           when /time/i                                               then :time
@@ -46,9 +51,9 @@ module JdbcSpec
       end
 
       def type_cast(value)
-        return nil if value.nil? || value == "(NULL)"
+        return nil if value.nil? || value == "(null)" || value == "(NULL)"
         case type
-        when :string then unquote value
+        when :string then unquote_string value
         when :integer then unquote(value).to_i rescue value ? 1 : 0
         when :primary_key then value == true || value == false ? value == true ? 1 : 0 : value.to_i
         when :decimal   then self.class.value_to_decimal(unquote(value))
@@ -61,11 +66,16 @@ module JdbcSpec
         else value
         end
       end
-      
+
+      # JRUBY-2011: Match balanced quotes and parenthesis - 'text',('text') or (text)
+      def unquote_string(value)
+        value.sub(/^\((.*)\)$/,'\1').sub(/^'(.*)'$/,'\1')
+      end
+
       def unquote(value)
         value.to_s.sub(/\A\([\(\']?/, "").sub(/[\'\)]?\)\Z/, "")
       end
-      
+
       def cast_to_time(value)
         return value if value.is_a?(Time)
         time_array = ParseDate.parsedate(value)
@@ -93,15 +103,7 @@ module JdbcSpec
         ''
       end
     end
-    
-    def modify_types(tp)
-      tp[:primary_key] = "int NOT NULL IDENTITY(1, 1) PRIMARY KEY"
-      tp[:integer][:limit] = nil
-      tp[:boolean] = {:name => "bit"}
-      tp[:binary] = { :name => "image"}
-      tp
-    end
-    
+
     def quote(value, column = nil)
       return value.quoted_id if value.respond_to?(:quoted_id)
 
@@ -116,72 +118,41 @@ module JdbcSpec
         else
           "'#{quote_string(value)}'" # ' (for ruby-mode)
         end
-        when TrueClass             then '1'
-        when FalseClass            then '0'
-        when Time, DateTime        then "'#{value.strftime("%Y%m%d %H:%M:%S")}'"
-        when Date                  then "'#{value.strftime("%Y%m%d")}'"
-        else                       super
+      when TrueClass             then '1'
+      when FalseClass            then '0'
+      when Time, DateTime        then "'#{value.strftime("%Y%m%d %H:%M:%S")}'"
+      when Date                  then "'#{value.strftime("%Y%m%d")}'"
+      else                       super
       end
     end
 
-      def quote_string(string)
-        string.gsub(/\'/, "''")
-      end
+    def quote_string(string)
+      string.gsub(/\'/, "''")
+    end
 
-      def quote_column_name(name)
-        "[#{name}]"
-      end
-      
-        def add_limit_offset!(sql, options)
-          if options[:limit] and options[:offset]
-            total_rows = select_all("SELECT count(*) as TotalRows from (#{sql.gsub(/\bSELECT(\s+DISTINCT)?\b/i, "SELECT\\1 TOP 1000000000")}) tally")[0]["TotalRows"].to_i
-            if (options[:limit] + options[:offset]) >= total_rows
-              options[:limit] = (total_rows - options[:offset] >= 0) ? (total_rows - options[:offset]) : 0
-            end
-            sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i, "SELECT * FROM (SELECT TOP #{options[:limit]} * FROM (SELECT\\1 TOP #{options[:limit] + options[:offset]} ")
-            sql << ") AS tmp1"
-            if options[:order]
-              options[:order] = options[:order].split(',').map do |field|
-                parts = field.split(" ")
-                tc = parts[0]
-                if sql =~ /\.\[/ and tc =~ /\./ # if column quoting used in query
-                  tc.gsub!(/\./, '\\.\\[')
-                  tc << '\\]'
-                end
-                if sql =~ /#{tc} AS (t\d_r\d\d?)/
-                  parts[0] = $1
-                elsif parts[0] =~ /\w+\.(\w+)/
-                  parts[0] = $1
-                end
-                parts.join(' ')
-              end.join(', ')
-              sql << " ORDER BY #{change_order_direction(options[:order])}) AS tmp2 ORDER BY #{options[:order]}"
-            else
-              sql << " ) AS tmp2"
-            end
-          elsif sql !~ /^\s*SELECT (@@|COUNT\()/i
-            sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i) do
-              "SELECT#{$1} TOP #{options[:limit]}"
-            end unless options[:limit].nil?
-          end
+    def quote_table_name(name)
+      name
+    end
+
+    def quote_column_name(name)
+      "[#{name}]"
+    end
+
+    def change_order_direction(order)
+      order.split(",").collect {|fragment|
+        case fragment
+        when  /\bDESC\b/i     then fragment.gsub(/\bDESC\b/i, "ASC")
+        when  /\bASC\b/i      then fragment.gsub(/\bASC\b/i, "DESC")
+        else                  String.new(fragment).split(',').join(' DESC,') + ' DESC'
         end
-    
-      
-      def change_order_direction(order)
-        order.split(",").collect {|fragment|
-          case fragment
-          when  /\bDESC\b/i     then fragment.gsub(/\bDESC\b/i, "ASC")
-          when  /\bASC\b/i      then fragment.gsub(/\bASC\b/i, "DESC")
-          else                  String.new(fragment).split(',').join(' DESC,') + ' DESC'
-          end
-        }.join(",")
-      end
-      
+      }.join(",")
+    end
+
     def recreate_database(name)
       drop_database(name)
       create_database(name)
     end
-    
+
     def drop_database(name)
       execute "DROP DATABASE #{name}"
     end
@@ -193,35 +164,21 @@ module JdbcSpec
       def rename_table(name, new_name)
         execute "EXEC sp_rename '#{name}', '#{new_name}'"
       end
-      
+
       # Adds a new column to the named table.
       # See TableDefinition#column for details of the options you can use.
       def add_column(table_name, column_name, type, options = {})
         add_column_sql = "ALTER TABLE #{table_name} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
         add_column_options!(add_column_sql, options)
         # TODO: Add support to mimic date columns, using constraints to mark them as such in the database
-        # add_column_sql << " CONSTRAINT ck__#{table_name}__#{column_name}__date_only CHECK ( CONVERT(CHAR(12), #{quote_column_name(column_name)}, 14)='00:00:00:000' )" if type == :date       
+        # add_column_sql << " CONSTRAINT ck__#{table_name}__#{column_name}__date_only CHECK ( CONVERT(CHAR(12), #{quote_column_name(column_name)}, 14)='00:00:00:000' )" if type == :date
         execute(add_column_sql)
       end
 
       def rename_column(table, column, new_column_name)
         execute "EXEC sp_rename '#{table}.#{column}', '#{new_column_name}'"
       end
-       
-      def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
-          return super unless type.to_s == 'integer'
-          
-        if limit.nil? || limit == 4
-          'int'
-        elsif limit == 2
-          'smallint'
-        elsif limit ==1
-          'tinyint'
-        else
-          'bigint'
-        end
-       end
-        
+
       def change_column(table_name, column_name, type, options = {}) #:nodoc:
         sql_commands = ["ALTER TABLE #{table_name} ALTER COLUMN #{column_name} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"]
         if options_include_default?(options)
@@ -233,6 +190,7 @@ module JdbcSpec
         }
       end
       def change_column_default(table_name, column_name, default) #:nodoc:
+        remove_default_constraint(table_name, column_name)
         execute "ALTER TABLE #{table_name} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote(default, column_name)} FOR #{column_name}"
       end
       def remove_column(table_name, column_name)
@@ -240,7 +198,7 @@ module JdbcSpec
         remove_default_constraint(table_name, column_name)
         execute "ALTER TABLE #{table_name} DROP COLUMN [#{column_name}]"
       end
-      
+
       def remove_default_constraint(table_name, column_name)
         defaults = select "select def.name from sysobjects def, syscolumns col, sysobjects tab where col.cdefault = def.id and col.name = '#{column_name}' and tab.name = '#{table_name}' and col.id = tab.id"
         defaults.each {|constraint|
@@ -255,13 +213,14 @@ module JdbcSpec
           execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint["CONSTRAINT_NAME"]}"
         end
       end
-      
+
       def remove_index(table_name, options = {})
         execute "DROP INDEX #{table_name}.#{index_name(table_name, options)}"
       end
-      
+
 
       def columns(table_name, name = nil)
+        return [] if table_name =~ /^information_schema\./i
         cc = super
         cc.each do |col|
           col.identity = true if col.sql_type =~ /identity/i
@@ -269,12 +228,12 @@ module JdbcSpec
         end
         cc
       end
-      
+
       def _execute(sql, name = nil)
         if sql.lstrip =~ /^insert/i
           if query_requires_identity_insert?(sql)
             table_name = get_table_name(sql)
-            with_identity_insert_enabled(table_name) do 
+            with_identity_insert_enabled(table_name) do
               id = @connection.execute_insert(sql)
             end
           else
@@ -287,8 +246,8 @@ module JdbcSpec
           @connection.execute_update(sql)
         end
       end
-      
-      
+
+
       private
       # Turns IDENTITY_INSERT ON for table during execution of the block
       # N.B. This sets the state of IDENTITY_INSERT to OFF after the
@@ -298,19 +257,19 @@ module JdbcSpec
         set_identity_insert(table_name, true)
         yield
       ensure
-        set_identity_insert(table_name, false)  
+        set_identity_insert(table_name, false)
       end
-      
+
       def set_identity_insert(table_name, enable = true)
         execute "SET IDENTITY_INSERT #{table_name} #{enable ? 'ON' : 'OFF'}"
       rescue Exception => e
-        raise ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"  
+        raise ActiveRecord::ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
       end
 
       def get_table_name(sql)
-        if sql =~ /^\s*insert\s+into\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i
+        if sql =~ /^\s*insert\s+into\s+([^\(\s,]+)\s*|^\s*update\s+([^\(\s,]+)\s*/i
           $1
-        elsif sql =~ /from\s+([^\(\s]+)\s*/i
+        elsif sql =~ /from\s+([^\(\s,]+)\s*/i
           $1
         else
           nil
@@ -332,7 +291,7 @@ module JdbcSpec
         id_column = identity_column(table_name)
         sql =~ /\[#{id_column}\]/ ? table_name : nil
       end
-      
+
       def get_special_columns(table_name)
         special = []
         @table_columns ||= {}