activerecord 1.13.1 → 1.13.2

data/CHANGELOG

@@ -1,9 +1,31 @@
+* 
+*1.13.2* (December 13th, 2005)
+
+* Become part of Rails 1.0
+
+* MySQL: allow encoding option for mysql.rb driver.  [Jeremy Kemper]
+
+* MySQL: fixes for the bundled mysql.rb driver.  #3160 [Justin Forder]
+
+* MySQL, PostgreSQL: reconnect! also reconfigures the connection.  Otherwise, the connection 'loses' its settings if it times out and is reconnected.  #2978 [Shugo Maeda]
+
+* SQLServer: fix obscure optimistic locking bug.  #3068 [kajism@yahoo.com]
+
+* SQLServer: support uniqueidentifier columns.  #2930 [keithm@infused.org]
+
+* SQLServer: cope with tables names qualified by owner.  #3067 [jeff@ministrycentered.com]
+
+* SQLServer: cope with columns with "desc" in the name.  #1950 [Ron Lusk, Ryan Tomayko]
+
+* SQLServer: cope with primary keys with "select" in the name.  #3057 [rdifrango@captechventures.com]
+
+* Oracle: active? performs a select instead of a commit.  #3133 [Michael Schoen]
+
+
 *1.13.1* (December 7th, 2005)
 
 * MySQL: more robust test for nullified result hashes.  #3124 [Stefan Kaes]
 
-* SQLite: find database file when RAILS_ROOT is a symlink.  #3116 [anna@wota.jp]
-
 * Reloading an instance refreshes its aggregations as well as its associations.  #3024 [François Beausolei]
 
 * Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -34,17 +34,7 @@ module ActiveRecord
 
       mysql = Mysql.init
       mysql.ssl_set(config[:sslkey], config[:sslcert], config[:sslca], config[:sslcapath], config[:sslcipher]) if config[:sslkey]
-      if config[:encoding]
-        begin
-          mysql.options(Mysql::SET_CHARSET_NAME, config[:encoding])
-        rescue
-          raise ActiveRecord::ConnectionFailed, 'The :encoding option is only available for MySQL 4.1 and later with the mysql-ruby driver.  Again, this does not work with the ruby-mysql driver or MySQL < 4.1.'
-        end
-      end
-
-      conn = mysql.real_connect(host, username, password, database, port, socket)
-      conn.query("SET NAMES '#{config[:encoding]}'") if config[:encoding]
-      ConnectionAdapters::MysqlAdapter.new(conn, logger, [host, username, password, database, port, socket], mysql)
+      ConnectionAdapters::MysqlAdapter.new(mysql, logger, [host, username, password, database, port, socket], config)
     end
   end
 
@@ -90,11 +80,11 @@ module ActiveRecord
         "MySQL server has gone away"
       ]
 
-      def initialize(connection, logger, connection_options=nil, mysql=Mysql)
+      def initialize(connection, logger, connection_options, config)
         super(connection, logger)
-        @connection_options = connection_options
+        @connection_options, @config = connection_options, config
         @null_values_in_each_hash = Mysql.const_defined?(:VERSION)
-        @mysql = mysql
+        connect
       end
 
       def adapter_name #:nodoc:
@@ -138,7 +128,7 @@ module ActiveRecord
       end
 
       def quote_string(string) #:nodoc:
-        @mysql.quote(string)
+        @connection.quote(string)
       end
 
       def quoted_true
@@ -321,11 +311,7 @@ module ActiveRecord
         def connect
           encoding = @config[:encoding]
           if encoding
-            begin
-              @connection.options(Mysql::SET_CHARSET_NAME, encoding)
-            rescue
-              raise ActiveRecord::ConnectionFailed, 'The :encoding option is only available for MySQL 4.1 and later with the mysql-ruby driver.  Again, this does not work with the ruby-mysql driver or MySQL < 4.1.'
-            end
+            @connection.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil
           end
           @connection.real_connect(*@connection_options)
           execute("SET NAMES '#{encoding}'") if encoding

data/lib/active_record/connection_adapters/oci_adapter.rb

@@ -550,7 +550,7 @@ begin
     # checks the connection, while #active? simply returns the last
     # known state.
     def ping
-      @connection.commit
+      @connection.exec("select 1 from dual") { |r| nil }
       @active = true
     rescue
       @active = false

data/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -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.join(RAILS_ROOT, config[:database])
+            config[:database] = File.expand_path(config[:database], RAILS_ROOT)
           end
         end
     end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -68,6 +68,7 @@ module ActiveRecord
           when /binary|image|varbinary/i                             then :binary
           when /char|nchar|nvarchar|string|varchar/i                 then :string
           when /bit/i                                                then :boolean
+          when /uniqueidentifier/i                                   then :string
         end
       end
 
@@ -233,6 +234,9 @@ module ActiveRecord
       end
 
       def columns(table_name, name = nil)
+        return [] if table_name.blank?
+        table_name = table_name.to_s if table_name.is_a?(Symbol)
+        table_name = table_name.split('.')[-1] unless table_name.nil?
         sql = "SELECT COLUMN_NAME as ColName, COLUMN_DEFAULT as DefaultValue, DATA_TYPE as ColType, COL_LENGTH('#{table_name}', COLUMN_NAME) as Length, COLUMNPROPERTY(OBJECT_ID('#{table_name}'), COLUMN_NAME, 'IsIdentity') as IsIdentity, NUMERIC_SCALE as Scale FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '#{table_name}'"
         # Comment out if you want to have the Columns select statment logged.
         # Personnally, I think it adds unneccessary bloat to the log. 
@@ -347,7 +351,7 @@ module ActiveRecord
 
       def add_limit_offset!(sql, options)
         if options[:limit] and options[:offset]
-          total_rows = @connection.select_all("SELECT count(*) as TotalRows from (#{sql.gsub(/SELECT/i, "SELECT TOP 1000000000")}) tally")[0][:TotalRows].to_i
+          total_rows = @connection.select_all("SELECT count(*) as TotalRows from (#{sql.gsub(/\bSELECT\b/i, "SELECT 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
@@ -509,9 +513,9 @@ module ActiveRecord
 
         def change_order_direction(order)
           case order
-            when  /DESC/i     then order.gsub(/DESC/i, "ASC")
-            when  /ASC/i      then order.gsub(/ASC/i, "DESC")
-            else                   String.new(order).split(',').join(' DESC,') + ' DESC'
+            when  /\bDESC\b/i     then order.gsub(/\bDESC\b/i, "ASC")
+            when  /\bASC\b/i      then order.gsub(/\bASC\b/i, "DESC")
+            else                  String.new(order).split(',').join(' DESC,') + ' DESC'
           end
         end
 

data/lib/active_record/vendor/mysql.rb

@@ -127,7 +127,8 @@ class Mysql
     flag |= @client_flag | CLIENT_CAPABILITIES
     flag |= CLIENT_CONNECT_WITH_DB if db
 
-    if !@server_capabilities & PROTO_AUTH41
+    @pre_411 = (0 == @server_capabilities & PROTO_AUTH41)
+    if @pre_411
       data = Net::int2str(flag)+Net::int3str(@max_allowed_packet)+
              (user||"")+"\0"+
                    scramble(passwd, @scramble_buff, @protocol_version==9)
@@ -139,13 +140,10 @@ class Mysql
              ([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
-      if PROTO_AUTH41
-        data << db+"\0"
-      else
-        data << "\0"+db
-      end
+
+    if db and @server_capabilities & CLIENT_CONNECT_WITH_DB != 0
+      data << "\0" if @pre_411
+      data << db
       @db = db.dup
     end
     write data
@@ -205,10 +203,10 @@ 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
+    if @pre_411
+      data = user+"\0"+scramble(passwd, @scramble_buff, @protocol_version==9)+"\0"+db
     else
-      data = user+"\0"+ scramble41(passwd, @scramble_buff)
+      data = user+"\0"+scramble41(passwd, @scramble_buff)+db
     end
     command COM_CHANGE_USER, data
     @user = user
@@ -270,8 +268,8 @@ 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
+    if @pre_411
+      f = read_rows 6
     else
       f = read_rows 7
     end
@@ -284,8 +282,8 @@ class Mysql
   def list_processes()
     data = command COM_PROCESS_INFO
     @field_count = get_length data
-    if !@server_capabilities & PROTO_AUTH41
-    fields = read_rows 5
+    if @pre_411
+      fields = read_rows 5
     else
       fields = read_rows 7
     end
@@ -402,8 +400,8 @@ class Mysql
       end
     else
       @extra_info = get_length(data, true)
-      if !@server_capabilities & PROTO_AUTH41
-      fields = read_rows 5
+      if @pre_411
+        fields = read_rows(5)
       else
         fields = read_rows(7)
       end
@@ -416,20 +414,20 @@ 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
-      type = f[3][0]
-      if long_flag_protocol then
-	flags = f[4][0]+f[4][1]*256
-	decimals = f[4][2]
-      else
-	flags = f[4][0]
-	decimals = f[4][1]
-      end
-      def_value = f[5]
-      max_length = 0
+      if @pre_411
+        table = org_table = f[0]
+        name = f[1]
+        length = f[2][0]+f[2][1]*256+f[2][2]*256*256
+        type = f[3][0]
+        if long_flag_protocol then
+          flags = f[4][0]+f[4][1]*256
+          decimals = f[4][2]
+        else
+          flags = f[4][0]
+          decimals = f[4][1]
+        end
+        def_value = f[5]
+        max_length = 0
       else
         catalog = f[0]
         db = f[1]
@@ -443,9 +441,9 @@ class Mysql
         decimals = f[6][9]
         def_value = ""
         max_length = 0
+      end
       ret << Field::new(table, org_table, name, length, type, flags, decimals, def_value, max_length)
     end
-    end
     ret
   end
 
@@ -548,16 +546,13 @@ class Mysql
   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
+    return 0x00.chr if password.nil? or password.empty?
+    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*")
   end
 
   def error(errno)

data/lib/active_record/version.rb

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

data/rakefile

@@ -106,7 +106,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.2.4' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.2.5' + PKG_BUILD)
 
   s.files.delete "test/fixtures/fixture_database.sqlite"
   s.files.delete "test/fixtures/fixture_database_2.sqlite"

data/test/associations_go_eager_test.rb

@@ -222,17 +222,23 @@ class EagerAssociationTest < Test::Unit::TestCase
 
   def test_preconfigured_includes_with_has_many
     posts = authors(:david).posts_with_comments
-    assert_equal 2, posts.first.comments.size
+    one = posts.detect { |p| p.id == 1 }
+    assert_equal 5, posts.size
+    assert_equal 2, one.comments.size
   end
 
   def test_preconfigured_includes_with_habtm
     posts = authors(:david).posts_with_categories
-    assert_equal 2, posts.first.categories.size
+    one = posts.detect { |p| p.id == 1 }
+    assert_equal 5, posts.size
+    assert_equal 2, one.categories.size
   end
 
   def test_preconfigured_includes_with_has_many_and_habtm
     posts = authors(:david).posts_with_comments_and_categories
-    assert_equal 2, posts.first.comments.size
-    assert_equal 2, posts.first.categories.size
+    one = posts.detect { |p| p.id == 1 }
+    assert_equal 5, posts.size
+    assert_equal 2, one.comments.size
+    assert_equal 2, one.categories.size
   end
 end

data/test/associations_test.rb

@@ -1388,7 +1388,10 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
     assert developer.save
     developer.projects << project
     developer.update_attribute("name", "Bruza")
-    assert_equal 1, developer.connection.select_one("SELECT count(*) FROM developers_projects WHERE 
-      project_id = #{project.id} AND developer_id = #{developer.id}")["count(*)"].to_i
+    assert_equal 1, Developer.connection.select_value(<<-end_sql).to_i
+      SELECT count(*) FROM developers_projects
+      WHERE project_id = #{project.id}
+      AND developer_id = #{developer.id}
+    end_sql
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.13.1
-date: 2005-12-07 00:00:00 -06:00
+  version: 1.13.2
+date: 2005-12-13 00:00:00 -06:00
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
   - lib
@@ -285,5 +285,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.2.4
+            version: 1.2.5
       version: