activerecord 1.15.1 → 1.15.2

data/CHANGELOG

@@ -1,3 +1,23 @@
+*1.15.2* (February 5th, 2007)
+
+* Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 [dcmanges]
+    Student.find(:all, :conditions => { :grade => 9..12 })
+
+* Don't create instance writer methods for class attributes. [Rick]
+
+* When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. [Jamis Buck]
+
+* SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob S]
+
+* Consistently use LOWER() for uniqueness validations (rather than mixing with UPPER()) so the database can always use a functional index on the lowercased column.  #6495 [Si]
+
+* MySQL: SET SQL_AUTO_IS_NULL=0 so 'where id is null' doesn't select the last inserted id.  #6778 [Jonathan Viney, timc]
+
+* Fixtures use the table name and connection from set_fixture_class.  #7330 [Anthony Eden]
+
+* SQLServer: quote table name in indexes query.  #2928 [keithm@infused.org]
+
+
 *1.15.1* (January 17th, 2007)
 
 * Fix nodoc breaking of adapters

data/Rakefile

@@ -151,7 +151,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 1.4.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.4.1' + PKG_BUILD)
 
   s.files.delete "test/fixtures/fixture_database.sqlite"
   s.files.delete "test/fixtures/fixture_database_2.sqlite"

data/lib/active_record.rb

@@ -30,7 +30,7 @@ unless defined?(ActiveSupport)
     require 'active_support'  
   rescue LoadError
     require 'rubygems'
-    require_gem 'activesupport'
+    gem 'activesupport'
   end
 end
 

data/lib/active_record/base.rb

@@ -84,7 +84,7 @@ module ActiveRecord #:nodoc:
   # Conditions can either be specified as a string, array, or hash representing the WHERE-part of an SQL statement.
   # The array form is to be used when the condition input is tainted and requires sanitization. The string form can
   # be used for statements that don't involve tainted data. The hash form works much like the array form, except
-  # only equality is possible. Examples:
+  # only equality and range is possible. Examples:
   #
   #   class User < ActiveRecord::Base
   #     def self.authenticate_unsafely(user_name, password)
@@ -120,6 +120,9 @@ module ActiveRecord #:nodoc:
   #   Student.find(:all, :conditions => { :first_name => "Harvey", :status => 1 })
   #   Student.find(:all, :conditions => params[:student])
   #
+  # A range may be used in the hash to use the SQL BETWEEN operator:
+  #
+  #   Student.find(:all, :conditions => { :grade => 9..12 })
   #
   # == Overwriting default accessors
   #
@@ -262,7 +265,7 @@ module ActiveRecord #:nodoc:
   class Base
     # Accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then passed
     # on to any new database connections made and which can be retrieved on both a class and instance level by calling +logger+.
-    cattr_accessor :logger
+    cattr_accessor :logger, :instance_writer => false
     
     include Reloadable::Deprecated
     
@@ -288,54 +291,54 @@ module ActiveRecord #:nodoc:
 
     @@subclasses = {}
 
-    cattr_accessor :configurations
+    cattr_accessor :configurations, :instance_writer => false
     @@configurations = {}
 
     # Accessor for the prefix type that will be prepended to every primary key column name. The options are :table_name and
     # :table_name_with_underscore. If the first is specified, the Product class will look for "productid" instead of "id" as
     # the primary column. If the latter is specified, the Product class will look for "product_id" instead of "id". Remember
     # that this is a global setting for all Active Records.
-    cattr_accessor :primary_key_prefix_type
+    cattr_accessor :primary_key_prefix_type, :instance_writer => false
     @@primary_key_prefix_type = nil
 
     # Accessor for the name of the prefix string to prepend to every table name. So if set to "basecamp_", all
     # table names will be named like "basecamp_projects", "basecamp_people", etc. This is a convenient way of creating a namespace
     # for tables in a shared database. By default, the prefix is the empty string.
-    cattr_accessor :table_name_prefix
+    cattr_accessor :table_name_prefix, :instance_writer => false
     @@table_name_prefix = ""
 
     # Works like +table_name_prefix+, but appends instead of prepends (set to "_basecamp" gives "projects_basecamp",
     # "people_basecamp"). By default, the suffix is the empty string.
-    cattr_accessor :table_name_suffix
+    cattr_accessor :table_name_suffix, :instance_writer => false
     @@table_name_suffix = ""
 
     # Indicates whether or not table names should be the pluralized versions of the corresponding class names.
     # If true, the default table name for a +Product+ class will be +products+. If false, it would just be +product+.
     # See table_name for the full rules on table/class naming. This is true, by default.
-    cattr_accessor :pluralize_table_names
+    cattr_accessor :pluralize_table_names, :instance_writer => false
     @@pluralize_table_names = true
 
     # Determines whether or not to use ANSI codes to colorize the logging statements committed by the connection adapter. These colors
     # make it much easier to overview things during debugging (when used through a reader like +tail+ and on a black background), but
     # may complicate matters if you use software like syslog. This is true, by default.
-    cattr_accessor :colorize_logging
+    cattr_accessor :colorize_logging, :instance_writer => false
     @@colorize_logging = true
 
     # Determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling dates and times from the database.
     # This is set to :local by default.
-    cattr_accessor :default_timezone
+    cattr_accessor :default_timezone, :instance_writer => false
     @@default_timezone = :local
 
     # Determines whether or not to use a connection for each thread, or a single shared connection for all threads.
     # Defaults to false. Set to true if you're writing a threaded application.
-    cattr_accessor :allow_concurrency
+    cattr_accessor :allow_concurrency, :instance_writer => false
     @@allow_concurrency = false
 
     # Determines whether to speed up access by generating optimized reader
     # methods to avoid expensive calls to method_missing when accessing
     # attributes by name. You might want to set this to false in development
     # mode, because the methods would be regenerated on each request.
-    cattr_accessor :generate_read_methods
+    cattr_accessor :generate_read_methods, :instance_writer => false
     @@generate_read_methods = true
     
     # Specifies the format to use when dumping the database schema with Rails'
@@ -344,7 +347,7 @@ module ActiveRecord #:nodoc:
     # ActiveRecord::Schema file which can be loaded into any database that
     # supports migrations.  Use :ruby if you want to have different database
     # adapters for, e.g., your development and test environments.
-    cattr_accessor :schema_format 
+    cattr_accessor :schema_format , :instance_writer => false
     @@schema_format = :ruby
 
     class << self # Class methods
@@ -1264,6 +1267,7 @@ module ActiveRecord #:nodoc:
           case argument
             when nil   then "IS ?"
             when Array then "IN (?)"
+            when Range then "BETWEEN ? AND ?"
             else            "= ?"
           end
         end
@@ -1392,12 +1396,14 @@ module ActiveRecord #:nodoc:
         #     # => "name='foo''bar' and group_id= 4"
         #   { :status => nil, :group_id => [1,2,3] }
         #     # => "status IS NULL and group_id IN (1,2,3)"
+        #   { :age => 13..18 }
+        #     # => "age BETWEEN 13 AND 18"
         def sanitize_sql_hash(attrs)
           conditions = attrs.map do |attr, value|
             "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}"
           end.join(' AND ')
 
-          replace_bind_variables(conditions, attrs.values)
+          replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
         end
 
         # Accepts an array of conditions.  The array has each value
@@ -1433,6 +1439,13 @@ module ActiveRecord #:nodoc:
           end
         end
 
+        def expand_range_bind_variables(bind_vars) #:nodoc:
+          bind_vars.each_with_index do |var, index|
+            bind_vars[index, 1] = [var.first, var.last] if var.is_a?(Range)
+          end
+          bind_vars
+        end
+
         def quote_bound_value(value) #:nodoc:
           if value.respond_to?(:map) && !value.is_a?(String)
             if value.respond_to?(:empty?) && value.empty?

data/lib/active_record/connection_adapters/abstract/connection_specification.rb

@@ -11,7 +11,7 @@ module ActiveRecord
 
     # Check for activity after at least +verification_timeout+ seconds.
     # Defaults to 0 (always check.)
-    cattr_accessor :verification_timeout
+    cattr_accessor :verification_timeout, :instance_writer => false
     @@verification_timeout = 0
 
     # The class -> [adapter_method, config] map

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -388,6 +388,10 @@ module ActiveRecord
           @connection.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher]) if @config[:sslkey]
           @connection.real_connect(*@connection_options)
           execute("SET NAMES '#{encoding}'") if encoding
+
+          # By default, MySQL 'where id is null' selects the last inserted id.
+          # Turn this off. http://dev.rubyonrails.org/ticket/6778
+          execute("SET SQL_AUTO_IS_NULL=0")
         end
 
         def select(sql, name = nil)

data/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -22,7 +22,7 @@ module ActiveRecord
 
         db.busy_timeout(config[:timeout]) unless config[:timeout].nil?
 
-        ConnectionAdapters::SQLiteAdapter.new(db, logger)
+        ConnectionAdapters::SQLite3Adapter.new(db, logger)
       end
 
       # Establishes a connection to the database that's used by all Active Record objects
@@ -354,6 +354,14 @@ module ActiveRecord
         end
     end
     
+    class SQLite3Adapter < SQLiteAdapter # :nodoc:
+      def table_structure(table_name)
+        returning structure = @connection.table_info(table_name) do
+          raise ActiveRecord::StatementInvalid if structure.empty?
+        end
+      end
+    end
+
     class SQLite2Adapter < SQLiteAdapter # :nodoc:
       # SQLite 2 does not support COUNT(DISTINCT) queries:
       #

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -73,7 +73,7 @@ module ActiveRecord
       end
 
       def type_cast(value)
-        return nil if value.nil? || value =~ /^\s*null\s*$/i
+        return nil if value.nil?
         case type
         when :datetime  then cast_to_datetime(value)
         when :timestamp then cast_to_time(value)
@@ -425,7 +425,7 @@ module ActiveRecord
       def indexes(table_name, name = nil)
         ActiveRecord::Base.connection.instance_variable_get("@connection")["AutoCommit"] = false
         indexes = []        
-        execute("EXEC sp_helpindex #{table_name}", name) do |sth|
+        execute("EXEC sp_helpindex '#{table_name}'", name) do |sth|
           sth.each do |index| 
             unique = index[1] =~ /unique/
             primary = index[1] =~ /primary key/

data/lib/active_record/fixtures.rb

@@ -276,6 +276,8 @@ class Fixtures < YAML::Omap
     @class_name = class_name || 
                   (ActiveRecord::Base.pluralize_table_names ? @table_name.singularize.camelize : @table_name.camelize)
     @table_name = ActiveRecord::Base.table_name_prefix + @table_name + ActiveRecord::Base.table_name_suffix
+    @table_name = class_name.table_name if class_name.respond_to?(:table_name)
+    @connection = class_name.connection if class_name.respond_to?(:connection)
     read_fixture_files
   end
 

data/lib/active_record/locking/optimistic.rb

@@ -26,7 +26,7 @@ module ActiveRecord
         super
         base.extend ClassMethods
 
-        base.cattr_accessor :lock_optimistically
+        base.cattr_accessor :lock_optimistically, :instance_writer => false
         base.lock_optimistically = true
 
         base.alias_method_chain :update, :lock

data/lib/active_record/timestamp.rb

@@ -23,7 +23,7 @@ module ActiveRecord
       base.alias_method_chain :create, :timestamps
       base.alias_method_chain :update, :timestamps
 
-      base.cattr_accessor :record_timestamps
+      base.cattr_accessor :record_timestamps, :instance_writer => false
       base.record_timestamps = true
     end
 

data/lib/active_record/validations.rb

@@ -534,8 +534,8 @@ module ActiveRecord
             condition_sql = "#{record.class.table_name}.#{attr_name} #{attribute_condition(value)}"
             condition_params = [value]
           else
-            condition_sql = "UPPER(#{record.class.table_name}.#{attr_name}) #{attribute_condition(value)}"
-            condition_params = [value.upcase]
+            condition_sql = "LOWER(#{record.class.table_name}.#{attr_name}) #{attribute_condition(value)}"
+            condition_params = [value.downcase]
           end
           if scope = configuration[:scope]
             Array(scope).map do |scope_item|

data/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 15
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/abstract_unit.rb

@@ -56,7 +56,7 @@ end
 def current_adapter?(*types)
   types.any? do |type|
     ActiveRecord::ConnectionAdapters.const_defined?(type) &&
-      ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
+      ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters.const_get(type))
   end
 end
 

data/test/base_test.rb

@@ -164,8 +164,16 @@ class BasicsTest < Test::Unit::TestCase
     topic.reload
     assert_equal("null", topic.title)
     assert_equal("null", topic.author_name)
-  end  
-  
+  end
+
+  def test_save_nil_string_attributes
+    topic = Topic.find(1)
+    topic.title = nil
+    topic.save!
+    topic.reload
+    assert_nil topic.title
+  end
+
   def test_hashes_not_mangled
     new_topic = { :title => "New Topic" }
     new_topic_values = { :title => "AnotherTopic" }
@@ -700,6 +708,16 @@ class BasicsTest < Test::Unit::TestCase
     firm.attributes = { "name" => "Next Angle", "rating" => 5 }
     assert_equal 1, firm.rating
   end
+  
+  def test_mass_assignment_protection_against_class_attribute_writers
+    [:logger, :configurations, :primary_key_prefix_type, :table_name_prefix, :table_name_suffix, :pluralize_table_names, :colorize_logging,
+      :default_timezone, :allow_concurrency, :generate_read_methods, :schema_format, :verification_timeout, :lock_optimistically, :record_timestamps].each do |method|
+      assert  Task.respond_to?(method)
+      assert  Task.respond_to?("#{method}=")
+      assert  Task.new.respond_to?(method)
+      assert !Task.new.respond_to?("#{method}=")
+    end
+  end
 
   def test_customized_primary_key_remains_protected
     subscriber = Subscriber.new(:nick => 'webster123', :name => 'nice try')

data/test/finder_test.rb

@@ -136,6 +136,16 @@ class FinderTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :approved => true }) }
   end
   
+  def test_find_on_hash_conditions_with_range
+    assert_equal [1,2], Topic.find(:all, :conditions => { :id => 1..2 }).map(&:id).sort
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :id => 2..3 }) }
+  end
+  
+  def test_find_on_hash_conditions_with_multiple_ranges
+    assert_equal [1,2,3], Comment.find(:all, :conditions => { :id => 1..3, :post_id => 1..2 }).map(&:id).sort
+    assert_equal [1], Comment.find(:all, :conditions => { :id => 1..1, :post_id => 1..10 }).map(&:id).sort
+  end
+  
   def test_find_on_multiple_hash_conditions
     assert Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => false })
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
@@ -450,6 +460,12 @@ class FinderTest < Test::Unit::TestCase
     end
   end
 
+  # http://dev.rubyonrails.org/ticket/6778
+  def test_find_ignores_previously_inserted_record
+    post = Post.create!(:title => 'test', :body => 'it out')
+    assert_equal [], Post.find_all_by_id(nil)
+  end
+
   def test_find_by_empty_ids
     assert_equal [], Post.find([])
   end

data/test/fixtures_test.rb

@@ -5,6 +5,7 @@ require 'fixtures/company'
 require 'fixtures/task'
 require 'fixtures/reply'
 require 'fixtures/joke'
+require 'fixtures/course'
 require 'fixtures/category'
 
 class FixturesTest < Test::Unit::TestCase
@@ -334,6 +335,16 @@ class SetTableNameFixturesTest < Test::Unit::TestCase
   end
 end
 
+class CustomConnectionFixturesTest < Test::Unit::TestCase
+  set_fixture_class :courses => Course
+  fixtures :courses
+  
+  def test_connection
+    assert_kind_of Course, courses(:ruby)
+    assert_equal Course.connection, courses(:ruby).connection
+  end
+end
+
 class InvalidTableNameFixturesTest < Test::Unit::TestCase
   fixtures :funny_jokes
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.15.1
-date: 2007-01-18 00:00:00 -06:00
+  version: 1.15.2
+date: 2007-02-05 00:00:00 -06:00
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
 - lib
@@ -87,7 +87,6 @@ files:
 - lib/active_record/connection_adapters/sqlserver_adapter.rb
 - lib/active_record/connection_adapters/sybase_adapter.rb
 - lib/active_record/connection_adapters/abstract/connection_specification.rb
-- lib/active_record/connection_adapters/abstract/connection_specification.rb.rej
 - lib/active_record/connection_adapters/abstract/database_statements.rb
 - lib/active_record/connection_adapters/abstract/quoting.rb
 - lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -354,5 +353,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.4.1
     version: 

data/lib/active_record/connection_adapters/abstract/connection_specification.rb.rej

@@ -1,21 +0,0 @@
-***************
-*** 90,97 ****
-        # Clears the cache which maps classes 
-        def clear_reloadable_connections!
-          @@active_connections.each do |name, conn|
--           conn.disconnect! if conn.supports_reloading?
--           @@active_connections.delete(name)
-          end
-        end
-  
---- 90,99 ----
-        # Clears the cache which maps classes 
-        def clear_reloadable_connections!
-          @@active_connections.each do |name, conn|
-+           if conn.requires_reloading?
-+             conn.disconnect!
-+             @@active_connections.delete(name)
-+           end
-          end
-        end
-