activerecord 1.13.0 → 1.13.1

data/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -47,7 +47,7 @@ module ActiveRecord
         def parse_config!(config)
           config[:database] ||= config[:dbfile]
           # Require database.
-          unless config.has_key?(:database)
+          unless config[:database]
             raise ArgumentError, "No database file specified. Missing argument: database"
           end
 
@@ -55,7 +55,7 @@ module ActiveRecord
           # the database path is not the special path that tells
           # Sqlite build a database only in memory.
           if Object.const_defined?(:RAILS_ROOT) && ':memory:' != config[:database]
-            config[:database] = File.expand_path(config[:database], RAILS_ROOT)
+            config[:database] = File.join(RAILS_ROOT, config[:database])
           end
         end
     end
@@ -123,7 +123,7 @@ module ActiveRecord
       end
 
       def quote_column_name(name) #:nodoc:
-        "'#{name}'"
+        %Q("#{name}")
       end
 
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -30,16 +30,17 @@ module ActiveRecord
       if mode == "ODBC"
         raise ArgumentError, "Missing DSN. Argument ':dsn' must be set in order for this adapter to work." unless config.has_key?(:dsn)
         dsn       = config[:dsn]
-        conn      = DBI.connect("DBI:ODBC:#{dsn}", username, password)
+        driver_url = "DBI:ODBC:#{dsn}"
       else
         raise ArgumentError, "Missing Database. Argument ':database' must be set in order for this adapter to work." unless config.has_key?(:database)
         database  = config[:database]
         host      = config[:host] ? config[:host].to_s : 'localhost'
-        conn      = DBI.connect("DBI:ADO:Provider=SQLOLEDB;Data Source=#{host};Initial Catalog=#{database};User Id=#{username};Password=#{password};")
+        driver_url = "DBI:ADO:Provider=SQLOLEDB;Data Source=#{host};Initial Catalog=#{database};User Id=#{username};Password=#{password};"
       end
+      conn      = DBI.connect(driver_url, username, password)
 
       conn["AutoCommit"] = true
-      ConnectionAdapters::SQLServerAdapter.new(conn, logger)
+      ConnectionAdapters::SQLServerAdapter.new(conn, logger, [driver_url, username, password])
     end
   end # class Base
 
@@ -52,6 +53,8 @@ module ActiveRecord
         @identity = is_identity
         @is_special = sql_type =~ /text|ntext|image/i ? true : false
         @scale = scale_value
+        # SQL Server only supports limits on *char and float types
+        @limit = nil unless @type == :float or @type == :string
       end
 
       def simplified_type(field_type)
@@ -170,6 +173,12 @@ module ActiveRecord
     # unixODBC 2.2.11, Ruby ODBC 0.996, Ruby DBI 0.0.23 and Ruby 1.8.2.
     # [Linux strongmad 2.6.11-1.1369_FC4 #1 Thu Jun 2 22:55:56 EDT 2005 i686 i686 i386 GNU/Linux]
     class SQLServerAdapter < AbstractAdapter
+    
+      def initialize(connection, logger, connection_options=nil)
+        super(connection, logger)
+        @connection_options = connection_options
+      end
+
       def native_database_types
         {
           :primary_key => "int NOT NULL IDENTITY(1, 1) PRIMARY KEY",
@@ -194,6 +203,25 @@ module ActiveRecord
         true
       end
 
+      # CONNECTION MANAGEMENT ====================================#
+
+      # Returns true if the connection is active.
+      def active?
+        @connection.execute("SELECT 1") { }
+        true
+      rescue DBI::DatabaseError, DBI::InterfaceError
+        false
+      end
+
+      # Reconnects to the database, returns false if no connection could be made.
+      def reconnect!
+        @connection.disconnect rescue nil
+        @connection = DBI.connect(*@connection_options)
+      rescue DBI::DatabaseError => e
+        @logger.warn "#{adapter_name} reconnection failed: #{e.message}" if @logger
+        false
+      end
+
       def select_all(sql, name = nil)
         select(sql, name)
       end
@@ -234,7 +262,7 @@ module ActiveRecord
           end
           log(sql, name) do
             @connection.execute(sql)
-            select_one("SELECT @@IDENTITY AS Ident")["Ident"]
+            id_value || select_one("SELECT @@IDENTITY AS Ident")["Ident"]
           end
         ensure
           if ii_enabled
@@ -328,7 +356,12 @@ module ActiveRecord
           if options[:order]
             options[:order] = options[:order].split(',').map do |field|
               parts = field.split(" ")
-              if sql =~ /#{parts[0]} AS (t\d_r\d\d?)/
+              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
               end
               parts.join(' ')
@@ -478,7 +511,7 @@ module ActiveRecord
           case order
             when  /DESC/i     then order.gsub(/DESC/i, "ASC")
             when  /ASC/i      then order.gsub(/ASC/i, "DESC")
-            else                   String.new(order).insert(-1, " DESC")
+            else                   String.new(order).split(',').join(' DESC,') + ' DESC'
           end
         end
 

data/lib/active_record/fixtures.rb

@@ -508,6 +508,7 @@ module Test #:nodoc:
           ActiveRecord::Base.connection.rollback_db_transaction
           ActiveRecord::Base.unlock_mutex
         end
+        ActiveRecord::Base.clear_connection_cache!
       end
 
       alias_method :teardown, :teardown_with_fixtures

data/lib/active_record/migration.rb

@@ -20,7 +20,7 @@ module ActiveRecord
   #     def self.up
   #       add_column :accounts, :ssl_enabled, :boolean, :default => 1
   #     end
-  #   
+  #
   #     def self.down
   #       remove_column :accounts, :ssl_enabled
   #     end
@@ -28,7 +28,7 @@ module ActiveRecord
   #
   # This migration will add a boolean flag to the accounts table and remove it again, if you're backing out of the migration.
   # It shows how all migrations have two class methods +up+ and +down+ that describes the transformations required to implement
-  # or remove the migration. These methods can consist of both the migration specific methods, like add_column and remove_column, 
+  # or remove the migration. These methods can consist of both the migration specific methods, like add_column and remove_column,
   # but may also contain regular Ruby code for generating data needed for the transformations.
   #
   # Example of a more complex migration that also needs to initialize data:
@@ -42,10 +42,10 @@ module ActiveRecord
   #         t.column :type,     :string
   #         t.column :position, :integer
   #       end
-  #   
+  #
   #       SystemSetting.create :name => "notice", :label => "Use notice?", :value => 1
   #     end
-  #   
+  #
   #     def self.down
   #       drop_table :system_settings
   #     end
@@ -79,13 +79,29 @@ module ActiveRecord
   #
   # == Running migrations from within Rails
   #
-  # The Rails package has support for migrations with the <tt>script/generate migration my_new_migration</tt> command and
-  # with the <tt>rake migrate</tt> command that'll run all the pending migrations. It'll even create the needed schema_info
-  # table automatically if it's missing.
+  # The Rails package has several tools to help create and apply migrations.
+  #
+  # To generate a new migration, use <tt>script/generate migration MyNewMigration</tt>
+  # where MyNewMigration is the name of your migration. The generator will
+  # create a file <tt>nnn_my_new_migration.rb</tt> in the <tt>db/migrate/</tt>
+  # directory, where <tt>nnn</tt> is the next largest migration number.
+  # You may then edit the <tt>self.up</tt> and <tt>self.down</tt> methods of
+  # n MyNewMigration.
+  #
+  # To run migrations against the currently configured database, use
+  # <tt>rake migrate</tt>. This will update the database by running all of the
+  # pending migrations, creating the <tt>schema_info</tt> table if missing.
+  #
+  # To roll the database back to a previous migration version, use
+  # <tt>rake migrate version=X</tt> where <tt>X</tt> is the version to which
+  # you wish to downgrade. If any of the migrations throw an
+  # <tt>IrreversibleMigration</tt> exception, that step will fail and you'll
+  # have some manual work to do.
   #
   # == Database support
   #
-  # Migrations are currently only supported in MySQL and PostgreSQL.
+  # Migrations are currently supported in MySQL, PostgreSQL, SQLite,
+  # SQL Server, and Oracle (all supported databases except DB2).
   #
   # == More examples
   #
@@ -95,7 +111,7 @@ module ActiveRecord
   #     def self.up
   #       Tag.find(:all).each { |tag| tag.destroy if tag.pages.empty? }
   #     end
-  #   
+  #
   #     def self.down
   #       # not much we can do to restore deleted data
   #       raise IrreversibleMigration
@@ -128,20 +144,21 @@ module ActiveRecord
   #     end
   #   end
   #
-  # == Using the class after changing table
+  # == Using a model after changing its table
   #
   # Sometimes you'll want to add a column in a migration and populate it immediately after. In that case, you'll need
-  # to make a call to Base#reset_column_information in order to ensure that the class has the latest column data from 
+  # to make a call to Base#reset_column_information in order to ensure that the model has the latest column data from
   # after the new column was added. Example:
   #
-  #   class MakeJoinUnique < ActiveRecord::Migration
+  #   class AddPeopleSalary < ActiveRecord::Migration
   #     def self.up
   #       add_column :people, :salary, :integer
+  #       Person.reset_column_information
   #       Person.find(:all).each do |p|
   #         p.salary = SalaryCalculator.compute(p)
   #       end
   #     end
-  #   end  
+  #   end
   class Migration
     class << self
       def up() end

data/lib/active_record/validations.rb

@@ -17,6 +17,8 @@ module ActiveRecord
   # Active Record validation is reported to and from this object, which is used by Base#save to
   # determine whether the object in a valid state to be saved. See usage example in Validations.
   class Errors
+    include Enumerable
+
     def initialize(base) # :nodoc:
       @base, @errors = base, {}
     end
@@ -485,13 +487,20 @@ module ActiveRecord
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken] }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
-        if scope = configuration[:scope]
-          validates_each(attr_names,configuration) do |record, attr_name, value|
-            record.errors.add(attr_name, configuration[:message]) if record.class.find(:first, :conditions => (record.new_record? ? ["#{attr_name} = ? AND #{scope} = ?", record.send(attr_name), record.send(scope)] : ["#{attr_name} = ? AND #{record.class.primary_key} <> ? AND #{scope} = ?", record.send(attr_name), record.send(:id), record.send(scope)]))
+        validates_each(attr_names,configuration) do |record, attr_name, value|
+          condition_sql = "#{attr_name} #{attribute_condition(value)}"
+          condition_params = [value]
+          if scope = configuration[:scope]
+            scope_value = record.send(scope)
+            condition_sql << " AND #{scope} #{attribute_condition(scope_value)}"
+            condition_params << scope_value
           end
-        else
-          validates_each(attr_names,configuration) do |record, attr_name, value|
-            record.errors.add(attr_name, configuration[:message]) if record.class.find(:first, :conditions => (record.new_record? ? ["#{attr_name} = ?", record.send(attr_name)] : ["#{attr_name} = ? AND #{record.class.primary_key} <> ?", record.send(attr_name), record.send(:id) ] ))
+          unless record.new_record?
+            condition_sql << " AND #{record.class.primary_key} <> ?"
+            condition_params << record.send(:id)
+          end
+          if record.class.find(:first, :conditions => [condition_sql, *condition_params])
+            record.errors.add(attr_name, configuration[:message])
           end
         end
       end
@@ -500,7 +509,7 @@ module ActiveRecord
       # provided.
       #
       #   class Person < ActiveRecord::Base
-      #     validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :on => :create
+      #     validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :on => :create
       #   end
       #
       # A regular expression must be provided or else an exception will be raised.
@@ -658,6 +667,8 @@ module ActiveRecord
         if attributes.is_a?(Array)
           attributes.collect { |attr| create!(attr) }
         else
+          attributes.reverse_merge!(scope(:create)) if scoped?(:create)
+
           object = new(attributes)
           object.save!
           object

data/lib/active_record/vendor/mysql.rb

@@ -1,14 +1,15 @@
-# $Id: mysql.rb,v 1.1 2004/02/24 15:42:29 webster132 Exp $
+# $Id: mysql.rb,v 1.24 2005/02/12 11:37:15 tommy Exp $
 #
-# Copyright (C) 2003 TOMITA Masahiro
+# Copyright (C) 2003-2005 TOMITA Masahiro
 # tommy@tmtm.org
 #
 
 class Mysql
 
-  VERSION = "4.0-ruby-0.2.4"
+  VERSION = "4.0-ruby-0.2.5"
 
   require "socket"
+  require "digest/sha1"
 
   MAX_PACKET_LENGTH = 256*256*256-1
   MAX_ALLOWED_PACKET = 1024*1024*1024
@@ -51,11 +52,15 @@ class Mysql
   CLIENT_ODBC		= 1 << 6
   CLIENT_LOCAL_FILES	= 1 << 7
   CLIENT_IGNORE_SPACE	= 1 << 8
+  CLIENT_PROTOCOL_41	= 1 << 9
   CLIENT_INTERACTIVE	= 1 << 10
   CLIENT_SSL		= 1 << 11
   CLIENT_IGNORE_SIGPIPE	= 1 << 12
   CLIENT_TRANSACTIONS	= 1 << 13
+  CLIENT_RESERVED	= 1 << 14
+  CLIENT_SECURE_CONNECTION	= 1 << 15
   CLIENT_CAPABILITIES = CLIENT_LONG_PASSWORD|CLIENT_LONG_FLAG|CLIENT_TRANSACTIONS
+  PROTO_AUTH41 = CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION
 
   # Connection Option
   OPT_CONNECT_TIMEOUT	= 0
@@ -115,19 +120,37 @@ class Mysql
       @server_capabilities, = a.slice!(0,2).unpack("v")
     end
     if a.size >= 16 then
-      @server_language, @server_status = a.unpack("cv")
+      @server_language, @server_status = a.slice!(0,3).unpack("cv")
     end
 
     flag = 0 if flag == nil
     flag |= @client_flag | CLIENT_CAPABILITIES
     flag |= CLIENT_CONNECT_WITH_DB if db
-    data = Net::int2str(flag)+Net::int3str(@max_allowed_packet)+(user||"")+"\0"+scramble(passwd, @scramble_buff, @protocol_version==9)
+
+    if !@server_capabilities & PROTO_AUTH41
+      data = Net::int2str(flag)+Net::int3str(@max_allowed_packet)+
+             (user||"")+"\0"+
+                   scramble(passwd, @scramble_buff, @protocol_version==9)
+    else
+      dummy, @salt2 = a.unpack("a13a12")
+      @scramble_buff += @salt2
+      flag |= PROTO_AUTH41
+      data = Net::int4str(flag) + Net::int4str(@max_allowed_packet) +
+             ([8] + Array.new(23, 0)).pack("c24") + (user||"")+"\0"+
+             scramble41(passwd, @scramble_buff)
+    end
+    
     if db and @server_capabilities & CLIENT_CONNECT_WITH_DB != 0 then
-      data << "\0"+db
+      if PROTO_AUTH41
+        data << db+"\0"
+      else
+        data << "\0"+db
+      end
       @db = db.dup
     end
     write data
     read
+    ObjectSpace.define_finalizer(self, Mysql.finalizer(@net))
     self
   end
   alias :connect :real_connect
@@ -182,7 +205,11 @@ class Mysql
   end
 
   def change_user(user="", passwd="", db="")
+    if !@server_capabilities & PROTO_AUTH41
     data = user+"\0"+scramble(passwd, @scramble_buff, @protocol_version==9)+"\0"+db
+    else
+      data = user+"\0"+ scramble41(passwd, @scramble_buff)
+    end
     command COM_CHANGE_USER, data
     @user = user
     @passwd = passwd
@@ -243,7 +270,11 @@ class Mysql
 
   def list_fields(table, field=nil)
     command COM_FIELD_LIST, "#{table}\0#{field}", true
+    if !@server_capabilities & PROTO_AUTH41
     f = read_rows 6
+    else
+      f = read_rows 7
+    end
     fields = unpack_fields(f, @server_capabilities & CLIENT_LONG_FLAG != 0)
     res = Result::new self, fields, f.length
     res.eof = true
@@ -253,7 +284,11 @@ class Mysql
   def list_processes()
     data = command COM_PROCESS_INFO
     @field_count = get_length data
+    if !@server_capabilities & PROTO_AUTH41
     fields = read_rows 5
+    else
+      fields = read_rows 7
+    end
     @fields = unpack_fields(fields, @server_capabilities & CLIENT_LONG_FLAG != 0)
     @status = :STATUS_GET_RESULT
     store_result
@@ -311,7 +346,11 @@ class Mysql
 
   def read_one_row(field_count)
     data = read
-    return if data[0] == 254 and data.length == 1
+    if data[0] == 254 and data.length == 1 ## EOF
+      return
+    elsif data[0] == 254 and data.length == 5
+      return
+    end
     rec = []
     field_count.times do
       len = get_length data
@@ -363,7 +402,11 @@ class Mysql
       end
     else
       @extra_info = get_length(data, true)
+      if !@server_capabilities & PROTO_AUTH41
       fields = read_rows 5
+      else
+        fields = read_rows(7)
+      end
       @fields = unpack_fields(fields, @server_capabilities & CLIENT_LONG_FLAG != 0)
       @status = :STATUS_GET_RESULT
     end
@@ -373,6 +416,7 @@ class Mysql
   def unpack_fields(data, long_flag_protocol)
     ret = []
     data.each do |f|
+      if !@server_capabilities & PROTO_AUTH41
       table = org_table = f[0]
       name = f[1]
       length = f[2][0]+f[2][1]*256+f[2][2]*256*256
@@ -386,8 +430,22 @@ class Mysql
       end
       def_value = f[5]
       max_length = 0
+      else
+        catalog = f[0]
+        db = f[1]
+        table = f[2]
+        org_table = f[3]
+        name = f[4]
+        org_name = f[5]
+        length = f[6][2]+f[6][3]*256+f[6][4]*256*256
+        type = f[6][6]
+        flags = f[6][7]+f[6][8]*256
+        decimals = f[6][9]
+        def_value = ""
+        max_length = 0
       ret << Field::new(table, org_table, name, length, type, flags, decimals, def_value, max_length)
     end
+    end
     ret
   end
 
@@ -489,6 +547,19 @@ class Mysql
     to.join
   end
 
+  def scramble41(password, message)
+    if password.length != 0
+      buf = [0x14]
+      s1 = Digest::SHA1.new(password).digest
+      s2 = Digest::SHA1.new(s1).digest
+      x = Digest::SHA1.new(message + s2).digest
+      (0..s1.length - 1).each {|i| buf.push(s1[i] ^ x[i])}
+      buf.pack("C*")
+    else
+      0x00.chr
+    end
+  end
+
   def error(errno)
     @errno = errno
     @error = Error::err errno
@@ -574,7 +645,6 @@ class Mysql
     def free()
       @handle.skip_result
       @handle = @fields = @data = nil
-      GC::start
     end
 
     def num_fields()
@@ -1023,8 +1093,8 @@ class Mysql
       @sock.sync = true
       buf.join
     rescue
-      errno = Error::CR_SERVER_LOST
-      raise Error::new(errno, Error::err(errno))
+      errno = Error::CR_SERVER_LOST 
+      raise Error::new(errno, Error::err(errno)) 
     end
     
     def write(data)
@@ -1043,8 +1113,8 @@ class Mysql
       @sock.sync = true
       @sock.flush
     rescue
-      errno = Error::CR_SERVER_LOST
-      raise Error::new(errno, Error::err(errno))
+      errno = Error::CR_SERVER_LOST 
+      raise Error::new(errno, Error::err(errno)) 
     end
 
     def close()
@@ -1091,6 +1161,13 @@ class << Mysql
   end
   alias :connect :real_connect
 
+  def finalizer(net)
+    proc {
+      net.clear
+      net.write Mysql::COM_QUIT.chr
+    }
+  end
+
   def escape_string(str)
     str.gsub(/([\0\n\r\032\'\"\\])/) do
       case $1