activerecord 1.11.1 → 1.12.1

data/lib/active_record/connection_adapters/db2_adapter.rb

@@ -11,7 +11,7 @@ begin
       # Establishes a connection to the database that's used by
       # all Active Record objects
       def self.db2_connection(config) # :nodoc:
-        symbolize_strings_in_hash(config)
+        config = config.symbolize_keys
         usr = config[:username]
         pwd = config[:password]
 
@@ -28,7 +28,7 @@ begin
     end
 
     module ConnectionAdapters
-      # The DB2 adapter works with the C-based CLI driver (http://raa.ruby-lang.org/project/ruby-db2/).
+      # The DB2 adapter works with the C-based CLI driver (http://rubyforge.org/projects/ruby-dbi/)
       #
       # Options:
       #
@@ -44,7 +44,7 @@ begin
           select(sql, name).first
         end
 
-        def insert(sql, name = nil, pk = nil, id_value = nil)
+        def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
           execute(sql, name = nil)
           id_value || last_insert_id
         end
@@ -91,12 +91,26 @@ begin
           string.gsub(/'/, "''") # ' (for ruby-mode)
         end
 
-        def add_limit_with_offset!(sql, limit, offset)
-          raise ArgumentError, 'add_limit_with_offset! not implemented'
-        end
-
-        def add_limit_without_offset!(sql, limit)
-          sql << " FETCH FIRST #{limit} ROWS ONLY"
+        def add_limit_offset!(sql, options)
+          if options[:limit] and !options[:limit].nil?
+            # "FETCH FIRST 0 ROWS ONLY" is not allowed, so we have
+            # to use a cheap trick.
+            if options[:limit] == 0
+              if sql =~ /WHERE/i
+                sql.sub!(/WHERE/i, 'WHERE 1 = 2 AND ')
+              elsif
+                sql =~ /ORDER\s+BY/i
+                sql.sub!(/ORDER\s+BY/i, 'WHERE 1 = 2 ORDER BY')
+              else
+                sql << 'WHERE 1 = 2'
+              end
+            else
+              sql << " FETCH FIRST #{options[:limit]} ROWS ONLY" 
+            end
+          end
+          if options[:offset] and !options[:offset].nil?
+            raise ArgumentError, ':offset option is not yet supported!'
+          end
         end
 
         def columns(table_name, name = nil)
@@ -115,6 +129,22 @@ begin
           result
         end
 
+        def native_database_types
+          {
+            :primary_key => "int generated by default as identity primary key",
+            :string      => { :name => "varchar", :limit => 255 },
+            :text        => { :name => "clob", :limit => 32768 },
+            :integer     => { :name => "int" },
+            :float       => { :name => "float" },
+            :datetime    => { :name => "timestamp" },
+            :timestamp   => { :name => "timestamp" },
+            :time        => { :name => "time" },
+            :date        => { :name => "date" },
+            :binary      => { :name => "blob", :limit => 32768 },
+            :boolean     => { :name => "decimal", :limit => 1 }
+          }
+        end
+
         private
 
         def last_insert_id
@@ -128,7 +158,7 @@ begin
           stmt = nil
           log(sql, name) do
             stmt = DB2::Statement.new(@connection)
-            stmt.exec_direct("#{sql} with ur")
+            stmt.exec_direct("#{sql.gsub(/=\s*null/i, 'IS NULL')} with ur")
           end
 
           rows = []

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -1,27 +1,30 @@
 require 'active_record/connection_adapters/abstract_adapter'
-require 'parsedate'
 
 module ActiveRecord
   class Base
     # Establishes a connection to the database that's used by all Active Record objects.
     def self.mysql_connection(config) # :nodoc:
+      # Only include the MySQL driver if one hasn't already been loaded
       unless self.class.const_defined?(:Mysql)
         begin
-          # Only include the MySQL driver if one hasn't already been loaded
           require_library_or_gem 'mysql'
+          # The C version of mysql returns null fields in each_hash if Mysql::VERSION is defined
+          ConnectionAdapters::MysqlAdapter.null_values_in_each_hash = Mysql.const_defined?(:VERSION)
         rescue LoadError => cannot_require_mysql
           # Only use the supplied backup Ruby/MySQL driver if no driver is already in place
           begin
             require 'active_record/vendor/mysql'
             require 'active_record/vendor/mysql411'
+            # The ruby version of mysql returns null fields in each_hash
+            ConnectionAdapters::MysqlAdapter.null_values_in_each_hash = true
           rescue LoadError
             raise cannot_require_mysql
           end
         end
       end
+      
 
-      symbolize_strings_in_hash(config)
-
+      config = config.symbolize_keys
       host     = config[:host]
       port     = config[:port]
       socket   = config[:socket]
@@ -41,6 +44,14 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
+    class MysqlColumn < Column #:nodoc:
+      private
+        def simplified_type(field_type)
+          return :boolean if MysqlAdapter.emulate_booleans && field_type.downcase == "tinyint(1)"
+          super
+        end
+    end
+
     # The MySQL adapter will work with both Ruby/MySQL, which is a Ruby-based MySQL adapter that comes bundled with Active Record, and with
     # the faster C-based MySQL/Ruby adapter (available both as a gem and from http://www.tmtm.org/en/mysql/ruby/).
     #
@@ -56,19 +67,41 @@ module ActiveRecord
     # * <tt>:sslcert</tt> -- Necessary to use MySQL with an SSL connection
     # * <tt>:sslcapath</tt> -- Necessary to use MySQL with an SSL connection
     # * <tt>:sslcipher</tt> -- Necessary to use MySQL with an SSL connection
+    #
+    # By default, the MysqlAdapter will consider all columns of type tinyint(1)
+    # as boolean. If you wish to disable this emulation (which was the default
+    # behavior in versions 0.13.1 and earlier) you can add the following line
+    # to your environment.rb file:
+    #
+    #   ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans = false
     class MysqlAdapter < AbstractAdapter
+      @@emulate_booleans = true
+      cattr_accessor :emulate_booleans
+
+      cattr_accessor :null_values_in_each_hash
+      @@null_values_in_each_hash = false
+
       LOST_CONNECTION_ERROR_MESSAGES = [
         "Server shutdown in progress",
         "Broken pipe",
         "Lost connection to MySQL server during query",
         "MySQL server has gone away"
       ]
-      
-      def supports_migrations?
+
+      def initialize(connection, logger, connection_options=nil)
+        super(connection, logger)
+        @connection_options = connection_options
+      end
+
+      def adapter_name #:nodoc:
+        'MySQL'
+      end
+
+      def supports_migrations? #:nodoc:
         true
       end
 
-      def native_database_types
+      def native_database_types #:nodoc
         {
           :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY",
           :string      => { :name => "varchar", :limit => 255 },
@@ -84,37 +117,38 @@ module ActiveRecord
         }
       end
 
-      def initialize(connection, logger, connection_options=nil)
-        super(connection, logger)
-        @connection_options = connection_options
-      end
 
-      def adapter_name
-        'MySQL'
+      # QUOTING ==================================================
+
+      def quote_column_name(name) #:nodoc:
+        "`#{name}`"
       end
 
-      def select_all(sql, name = nil)
-        select(sql, name)
+      def quote_string(string) #:nodoc:
+        Mysql::quote(string)
       end
 
-      def select_one(sql, name = nil)
-        result = select(sql, name)
-        result.nil? ? nil : result.first
+      def quoted_true
+        "1"
+      end
+      
+      def quoted_false
+        "0"
       end
 
-      def columns(table_name, name = nil)
-        sql = "SHOW FIELDS FROM #{table_name}"
-        columns = []
-        execute(sql, name).each { |field| columns << Column.new(field[0], field[4], field[1]) }
-        columns
+
+      # DATABASE STATEMENTS ======================================
+
+      def select_all(sql, name = nil) #:nodoc:
+        select(sql, name)
       end
 
-      def insert(sql, name = nil, pk = nil, id_value = nil)
-        execute(sql, name = nil)
-        id_value || @connection.insert_id
+      def select_one(sql, name = nil) #:nodoc:
+        result = select(sql, name)
+        result.nil? ? nil : result.first
       end
 
-      def execute(sql, name = nil, retries = 2)
+      def execute(sql, name = nil, retries = 2) #:nodoc:
         unless @logger
           @connection.query(sql)
         else
@@ -136,78 +170,114 @@ module ActiveRecord
         end
       end
 
-      def update(sql, name = nil)
+      def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+        execute(sql, name = nil)
+        id_value || @connection.insert_id
+      end
+
+      def update(sql, name = nil) #:nodoc:
         execute(sql, name)
         @connection.affected_rows
       end
 
-      alias_method :delete, :update
+      alias_method :delete, :update #:nodoc:
 
 
-      def begin_db_transaction
+      def begin_db_transaction #:nodoc:
         execute "BEGIN"
       rescue Exception
         # Transactions aren't supported
       end
 
-      def commit_db_transaction
+      def commit_db_transaction #:nodoc:
         execute "COMMIT"
       rescue Exception
         # Transactions aren't supported
       end
 
-      def rollback_db_transaction
+      def rollback_db_transaction #:nodoc:
         execute "ROLLBACK"
       rescue Exception
         # Transactions aren't supported
       end
 
 
-      def quote_column_name(name)
-        "`#{name}`"
+      def add_limit_offset!(sql, options) #:nodoc
+        if limit = options[:limit]
+          unless offset = options[:offset]
+            sql << " LIMIT #{limit}"
+          else
+            sql << " LIMIT #{offset}, #{limit}"
+          end
+        end
       end
 
-      def quote_string(string)
-        Mysql::quote(string)
-      end
 
+      # SCHEMA STATEMENTS ========================================
 
-      def structure_dump
+      def structure_dump #:nodoc:
         select_all("SHOW TABLES").inject("") do |structure, table|
           structure += select_one("SHOW CREATE TABLE #{table.to_a.first.last}")["Create Table"] + ";\n\n"
         end
       end
 
-      def add_limit_offset!(sql, options)
-        if options[:limit]
-          if options[:offset].blank?
-            sql << " LIMIT #{options[:limit]}"
-          else
-            sql << " LIMIT #{options[:offset]}, #{options[:limit]}"
-          end
-        end
-      end
-
-      def recreate_database(name)
+      def recreate_database(name) #:nodoc:
         drop_database(name)
         create_database(name)
       end
 
-      def drop_database(name)
+      def create_database(name) #:nodoc:
+        execute "CREATE DATABASE #{name}"
+      end
+      
+      def drop_database(name) #:nodoc:
         execute "DROP DATABASE IF EXISTS #{name}"
       end
 
-      def create_database(name)
-        execute "CREATE DATABASE #{name}"
+
+      def tables(name = nil) #:nodoc:
+        tables = []
+        execute("SHOW TABLES", name).each { |field| tables << field[0] }
+        tables
+      end
+
+      def indexes(table_name, name = nil)#:nodoc:
+        indexes = []
+        current_index = nil
+        execute("SHOW KEYS FROM #{table_name}", name).each do |row|
+          if current_index != row[2]
+            next if row[2] == "PRIMARY" # skip the primary key
+            current_index = row[2]
+            indexes << IndexDefinition.new(row[0], row[2], row[1] == "0", [])
+          end
+
+          indexes.last.columns << row[4]
+        end
+        indexes
+      end
+
+      def columns(table_name, name = nil)#:nodoc:
+        sql = "SHOW FIELDS FROM #{table_name}"
+        columns = []
+        execute(sql, name).each { |field| columns << MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") }
+        columns
+      end
+
+      def create_table(name, options = {}) #:nodoc:
+        super(name, {:options => "ENGINE=InnoDB"}.merge(options))
       end
       
-      def change_column_default(table_name, column_name, default)
+      def rename_table(name, new_name)
+        execute "RENAME TABLE #{name} TO #{new_name}"
+      end  
+
+      def change_column_default(table_name, column_name, default) #:nodoc:
         current_type = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Type"]
 
         change_column(table_name, column_name, current_type, { :default => default })
       end
 
-      def change_column(table_name, column_name, type, options = {})
+      def change_column(table_name, column_name, type, options = {}) #:nodoc:
         options[:default] ||= select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
         
         change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit])}"
@@ -215,22 +285,23 @@ module ActiveRecord
         execute(change_column_sql)
       end
 
-      def rename_column(table_name, column_name, new_column_name)
+      def rename_column(table_name, column_name, new_column_name) #:nodoc:
         current_type = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Type"]
         execute "ALTER TABLE #{table_name} CHANGE #{column_name} #{new_column_name} #{current_type}"
       end
 
-      def create_table(name, options = {})
-        super(name, {:options => "ENGINE=InnoDB"}.merge(options))
-      end
 
       private
         def select(sql, name = nil)
           @connection.query_with_result = true
           result = execute(sql, name)
           rows = []
-          all_fields_initialized = result.fetch_fields.inject({}) { |all_fields, f| all_fields[f.name] = nil; all_fields }
-          result.each_hash { |row| rows << all_fields_initialized.dup.update(row) }
+          if @@null_values_in_each_hash
+            result.each_hash { |row| rows << row }
+          else
+            all_fields = result.fetch_fields.inject({}) { |fields, f| fields[f.name] = nil; fields }
+            result.each_hash { |row| rows << all_fields.dup.update(row) }
+          end
           result.free
           rows
         end

data/lib/active_record/connection_adapters/oci_adapter.rb

@@ -15,7 +15,7 @@
 # Do what you want with this code, at your own peril, but if any significant portion of my code
 # remains then please acknowledge my contribution.
 # Copyright 2005 Graham Jenkins
-# $Revision: 1.2 $
+
 require 'active_record/connection_adapters/abstract_adapter'
 
 begin
@@ -77,8 +77,8 @@ begin
       # It has also been tested against a 9i database.
       #
       # Usage notes:
-      # * Key generation uses a sequence "rails_sequence" for all tables. (I couldn't find a simple
-      #   and safe way of passing table-specific sequence information to the adapter.)
+      # * Key generation assumes a "${table_name}_seq" sequence is available for all tables; the
+      #   sequence name can be changed using ActiveRecord::Base.set_sequence_name
       # * Oracle uses DATE or TIMESTAMP datatypes for both dates and times. Consequently I have had to
       #   resort to some hacks to get data converted to Date or Time in Ruby.
       #   If the column_name ends in _time it's created as a Ruby Time. Else if the
@@ -99,6 +99,10 @@ begin
       # * <tt>:password</tt> -- Defaults to nothing
       # * <tt>:host</tt> -- Defaults to localhost
       class OCIAdapter < AbstractAdapter
+        def default_sequence_name(table, column)
+          "#{table}_seq"
+        end
+
         def quote_string(string)
           string.gsub(/'/, "''")
         end
@@ -106,31 +110,82 @@ begin
         def quote(value, column = nil)
           if column and column.type == :binary then %Q{empty_#{ column.sql_type }()}
           else case value
-            when String     then %Q{'#{quote_string(value)}'}
+            when String       then %Q{'#{quote_string(value)}'}
             when NilClass     then 'null'
             when TrueClass    then '1'
             when FalseClass   then '0'
-            when Numeric    then value.to_s
+            when Numeric      then value.to_s
             when Date, Time   then %Q{'#{value.strftime("%Y-%m-%d %H:%M:%S")}'}
-            else           %Q{'#{quote_string(value.to_yaml)}'}
+            else                   %Q{'#{quote_string(value.to_yaml)}'}
             end
           end
         end
 
+        # camelCase column names need to be quoted; not that anyone using Oracle
+        # would really do this, but handling this case means we pass the test...
+        def quote_column_name(name)
+          name =~ /[A-Z]/ ? "\"#{name}\"" : name
+        end
+
+        def structure_dump
+          s = select_all("select sequence_name from user_sequences").inject("") do |structure, seq|
+            structure << "create sequence #{seq.to_a.first.last};\n\n"
+          end
+
+          select_all("select table_name from user_tables").inject(s) do |structure, table|
+            ddl = "create table #{table.to_a.first.last} (\n "  
+            cols = select_all(%Q{
+              select column_name, data_type, data_length, data_precision, data_scale, data_default, nullable
+              from user_tab_columns
+              where table_name = '#{table.to_a.first.last}'
+              order by column_id
+            }).map do |row|              
+              col = "#{row['column_name'].downcase} #{row['data_type'].downcase}"      
+              if row['data_type'] =='NUMBER' and !row['data_precision'].nil?
+                col << "(#{row['data_precision'].to_i}"
+                col << ",#{row['data_scale'].to_i}" if !row['data_scale'].nil?
+                col << ')'
+              elsif row['data_type'].include?('CHAR')
+                col << "(#{row['data_length'].to_i})"  
+              end
+              col << " default #{row['data_default']}" if !row['data_default'].nil?
+              col << ' not null' if row['nullable'] == 'N'
+              col
+            end
+            ddl << cols.join(",\n ")
+            ddl << ");\n\n"
+            structure << ddl
+          end
+        end
+
+        def structure_drop
+          s = select_all("select sequence_name from user_sequences").inject("") do |drop, seq|
+            drop << "drop sequence #{seq.to_a.first.last};\n\n"
+          end
+
+          select_all("select table_name from user_tables").inject(s) do |drop, table|
+            drop << "drop table #{table.to_a.first.last} cascade constraints;\n\n"
+          end
+        end
+
         def select_all(sql, name = nil)
           offset = sql =~ /OFFSET (\d+)$/ ? $1.to_i : 0
           sql, limit = $1, $2.to_i if sql =~ /(.*)(?: LIMIT[= ](\d+))(\s*OFFSET \d+)?$/
+          
           if limit
             sql = "select * from (select raw_sql_.*, rownum raw_rnum_ from (#{sql}) raw_sql_ where rownum <= #{offset+limit}) where raw_rnum_ > #{offset}"
           elsif offset > 0
             sql = "select * from (select raw_sql_.*, rownum raw_rnum_ from (#{sql}) raw_sql_) where raw_rnum_ > #{offset}"
           end
+          
           cursor = log(sql, name) { @connection.exec sql }
-          cols = cursor.get_col_names.map { |x| x.downcase }
+          cols = cursor.get_col_names.map { |x| oci_downcase(x) }
           rows = []
+          
           while row = cursor.fetch
             hash = Hash.new
-            cols.each_with_index { |col, i|
+
+            cols.each_with_index do |col, i|
               hash[col] = case row[i]
                 when OCI8::LOB
                   name == 'Writable Large Object' ? row[i]: row[i].read
@@ -139,9 +194,11 @@ begin
                     row[i].to_date : row[i].to_time
                 else row[i]
                 end unless col == 'raw_rnum_'
-            }
+            end
+
             rows << hash
           end
+
           rows
         ensure
           cursor.close if cursor
@@ -153,25 +210,34 @@ begin
         end
 
         def columns(table_name, name = nil)
-          cols = select_all(%Q{
+          select_all(%Q{
               select column_name, data_type, data_default, data_length, data_scale
-              from user_tab_columns where table_name = '#{table_name.upcase}'}
-          ).map { |row|
-            OCIColumn.new row['column_name'].downcase, row['data_default'],
-              row['data_length'], row['data_type'], row['data_scale']
-          }
-          cols
+              from user_catalog cat, user_synonyms syn, all_tab_columns col
+              where cat.table_name = '#{table_name.upcase}'
+              and syn.synonym_name (+)= cat.table_name
+              and col.owner = nvl(syn.table_owner, user)
+              and col.table_name = nvl(syn.table_name, cat.table_name)}
+          ).map do |row|
+            OCIColumn.new(
+              oci_downcase(row['column_name']), 
+              row['data_default'],
+              row['data_length'], 
+              row['data_type'], 
+              row['data_scale']
+            )
+          end
         end
 
-        def insert(sql, name = nil, pk = nil, id_value = nil)
+        def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
           if pk.nil? # Who called us? What does the sql look like? No idea!
             execute sql, name
           elsif id_value # Pre-assigned id
             log(sql, name) { @connection.exec sql }
           else # Assume the sql contains a bind-variable for the id
-            id_value = select_one("select rails_sequence.nextval id from dual")['id']
+            id_value = select_one("select #{sequence_name}.nextval id from dual")['id']
             log(sql, name) { @connection.exec sql, id_value }
           end
+
           id_value
         end
 
@@ -201,18 +267,31 @@ begin
         def adapter_name()
           'OCI'
         end
+        
+        private
+          # Oracle column names by default are case-insensitive, but treated as upcase;
+          # for neatness, we'll downcase within Rails. EXCEPT that folks CAN quote
+          # their column names when creating Oracle tables, which makes then case-sensitive.
+          # I don't know anybody who does this, but we'll handle the theoretical case of a
+          # camelCase column name. I imagine other dbs handle this different, since there's a
+          # unit test that's currently failing test_oci.
+          def oci_downcase(column_name)
+            column_name =~ /[a-z]/ ? column_name : column_name.downcase
+          end
       end
     end
   end
 
   module ActiveRecord
     class Base
-      def self.oci_connection(config) #:nodoc:
-        conn = OCI8.new config[:username], config[:password], config[:host]
-        conn.exec %q{alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'}
-        conn.exec %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'}
-        conn.autocommit = true
-        ConnectionAdapters::OCIAdapter.new conn, logger
+      class << self
+        def oci_connection(config) #:nodoc:
+          conn = OCI8.new config[:username], config[:password], config[:host]
+          conn.exec %q{alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'}
+          conn.exec %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'}
+          conn.autocommit = true
+          ConnectionAdapters::OCIAdapter.new conn, logger
+        end
       end
 
       alias :attributes_with_quotes_pre_oci :attributes_with_quotes #:nodoc:
@@ -231,9 +310,10 @@ begin
 
       # After setting large objects to empty, select the OCI8::LOB and write back the data
       def write_lobs() #:nodoc:
-        if connection.class == ConnectionAdapters::OCIAdapter
+        if connection.is_a?(ConnectionAdapters::OCIAdapter)
           self.class.columns.select { |c| c.type == :binary }.each { |c|
-            break unless value = self[c.name]
+            value = self[c.name]
+            next if value.nil?  || (value == '')
             lob = connection.select_one(
               "select #{ c.name} from #{ self.class.table_name } WHERE #{ self.class.primary_key} = #{quote(id)}",
               'Writable Large Object'