activerecord 1.0.0 → 2.0.0

data/lib/active_record/vendor/db2.rb

@@ -0,0 +1,362 @@
+require 'db2/db2cli.rb'
+
+module DB2
+  module DB2Util
+    include DB2CLI
+
+    def free() SQLFreeHandle(@handle_type, @handle); end
+    def handle() @handle; end
+
+    def check_rc(rc)
+      if ![SQL_SUCCESS, SQL_SUCCESS_WITH_INFO, SQL_NO_DATA_FOUND].include?(rc)
+        rec = 1
+        msg = ''
+        loop do
+          a = SQLGetDiagRec(@handle_type, @handle, rec, 500)
+          break if a[0] != SQL_SUCCESS
+          msg << a[3] if !a[3].nil? and a[3] != '' # Create message.
+          rec += 1
+        end
+        raise "DB2 error: #{msg}"
+      end
+    end
+  end
+
+  class Environment
+    include DB2Util
+
+    def initialize
+      @handle_type = SQL_HANDLE_ENV
+      rc, @handle = SQLAllocHandle(@handle_type, SQL_NULL_HANDLE)
+      check_rc(rc)
+    end
+
+    def data_sources(buffer_length = 1024)
+      retval = []
+      max_buffer_length = buffer_length
+
+      a = SQLDataSources(@handle, SQL_FETCH_FIRST, SQL_MAX_DSN_LENGTH + 1, buffer_length)
+      retval << [a[1], a[3]]
+      max_buffer_length = [max_buffer_length, a[4]].max
+
+      loop do
+        a = SQLDataSources(@handle, SQL_FETCH_NEXT, SQL_MAX_DSN_LENGTH + 1, buffer_length)
+        break if a[0] == SQL_NO_DATA_FOUND
+
+        retval << [a[1], a[3]]
+        max_buffer_length = [max_buffer_length, a[4]].max
+      end
+
+      if max_buffer_length > buffer_length
+        get_data_sources(max_buffer_length)
+      else
+        retval
+      end
+    end
+  end
+
+  class Connection
+    include DB2Util
+
+    def initialize(environment)
+      @env = environment
+      @handle_type = SQL_HANDLE_DBC
+      rc, @handle = SQLAllocHandle(@handle_type, @env.handle)
+      check_rc(rc)
+    end
+
+    def connect(server_name, user_name = '', auth = '')
+      check_rc(SQLConnect(@handle, server_name, user_name.to_s, auth.to_s))
+    end
+
+    def set_connect_attr(attr, value)
+      value += "\0" if value.class == String
+      check_rc(SQLSetConnectAttr(@handle, attr, value))
+    end
+
+    def set_auto_commit_on
+      set_connect_attr(SQL_ATTR_AUTOCOMMIT, SQL_AUTOCOMMIT_ON)
+    end
+
+    def set_auto_commit_off
+      set_connect_attr(SQL_ATTR_AUTOCOMMIT, SQL_AUTOCOMMIT_OFF)
+    end
+
+    def disconnect
+      check_rc(SQLDisconnect(@handle))
+    end
+
+    def rollback
+      check_rc(SQLEndTran(@handle_type, @handle, SQL_ROLLBACK))
+    end
+
+    def commit
+      check_rc(SQLEndTran(@handle_type, @handle, SQL_COMMIT))
+    end
+  end
+
+  class Statement
+    include DB2Util
+
+    def initialize(connection)
+      @conn = connection
+      @handle_type = SQL_HANDLE_STMT
+      @parms = []                           #yun
+      @sql = ''                             #yun
+      @numParms = 0                         #yun
+      @prepared = false                     #yun
+      @parmArray = []                       #yun. attributes of the parameter markers
+      rc, @handle = SQLAllocHandle(@handle_type, @conn.handle)
+      check_rc(rc)
+    end
+
+    def columns(table_name, schema_name = '%')
+      check_rc(SQLColumns(@handle, '', schema_name.upcase, table_name.upcase, '%'))
+      fetch_all
+    end
+
+    def tables(schema_name = '%')
+      check_rc(SQLTables(@handle, '', schema_name.upcase, '%', 'TABLE'))
+      fetch_all
+    end
+
+    def indexes(table_name, schema_name = '')
+      check_rc(SQLStatistics(@handle, '', schema_name.upcase, table_name.upcase, SQL_INDEX_ALL, SQL_ENSURE))
+      fetch_all
+    end
+
+    def prepare(sql)
+      @sql = sql
+      check_rc(SQLPrepare(@handle, sql))
+      rc, @numParms = SQLNumParams(@handle) #number of question marks
+      check_rc(rc)
+      #--------------------------------------------------------------------------
+      # parameter attributes are stored in instance variable @parmArray so that
+      # they are available when execute method is called.
+      #--------------------------------------------------------------------------
+      if @numParms > 0           # get parameter marker attributes
+        1.upto(@numParms) do |i| # parameter number starts from 1
+          rc, type, size, decimalDigits = SQLDescribeParam(@handle, i)
+          check_rc(rc)
+          @parmArray << Parameter.new(type, size, decimalDigits)
+        end
+      end
+      @prepared = true
+      self
+    end
+
+    def execute(*parms)
+      raise "The statement was not prepared" if @prepared == false
+
+      if parms.size == 1 and parms[0].class == Array
+        parms = parms[0]
+      end
+
+      if @numParms != parms.size
+        raise "Number of parameters supplied does not match with the SQL statement"
+      end
+
+      if @numParms > 0            #need to bind parameters
+        #--------------------------------------------------------------------
+        #calling bindParms may not be safe. Look comment below.
+        #--------------------------------------------------------------------
+        #bindParms(parms)
+
+        valueArray = []
+        1.upto(@numParms) do |i|  # parameter number starts from 1
+          type = @parmArray[i - 1].class
+          size = @parmArray[i - 1].size
+          decimalDigits = @parmArray[i - 1].decimalDigits
+
+          if parms[i - 1].class == String
+            valueArray << parms[i - 1]
+          else
+            valueArray << parms[i - 1].to_s
+          end
+
+          rc = SQLBindParameter(@handle, i, type, size, decimalDigits, valueArray[i - 1])
+          check_rc(rc)
+        end
+      end
+
+      check_rc(SQLExecute(@handle))
+
+      if @numParms != 0
+        check_rc(SQLFreeStmt(@handle, SQL_RESET_PARAMS)) # Reset parameters
+      end
+
+      self
+    end
+
+    #-------------------------------------------------------------------------------
+    # The last argument(value) to SQLBindParameter is a deferred argument, that is,
+    # it should be available when SQLExecute is called. Even though "value" is
+    # local to bindParms method, it seems that it is available when SQLExecute
+    # is called. I am not sure whether it would still work if garbage collection
+    # is done between bindParms call and SQLExecute call inside the execute method
+    # above.
+    #-------------------------------------------------------------------------------
+    def bindParms(parms)        # This is the real thing. It uses SQLBindParms
+      1.upto(@numParms) do |i|  # parameter number starts from 1
+        rc, dataType, parmSize, decimalDigits = SQLDescribeParam(@handle, i)
+        check_rc(rc)
+        if parms[i - 1].class == String
+          value = parms[i - 1]
+        else
+          value = parms[i - 1].to_s
+        end
+        rc = SQLBindParameter(@handle, i, dataType, parmSize, decimalDigits, value)
+        check_rc(rc)
+      end
+    end
+ 
+    #------------------------------------------------------------------------------
+    # bind method does not use DB2's SQLBindParams, but replaces "?" in the
+    # SQL statement with the value before passing the SQL statement to DB2.
+    # It is not efficient and can handle only strings since it puts everything in
+    # quotes.
+    #------------------------------------------------------------------------------
+    def bind(sql, args)                #does not use SQLBindParams
+      arg_index = 0
+      result = ""
+      tokens(sql).each do |part|
+        case part
+        when '?'
+          result << "'" + (args[arg_index]) + "'"  #put it into quotes
+          arg_index += 1
+        when '??'
+          result << "?"
+        else
+          result << part
+        end
+      end
+      if arg_index < args.size
+        raise "Too many SQL parameters"
+      elsif arg_index > args.size
+        raise "Not enough SQL parameters"
+      end
+      result
+    end
+
+    ## Break the sql string into parts.
+    #
+    # This is NOT a full lexer for SQL.  It just breaks up the SQL
+    # string enough so that question marks, double question marks and
+    # quoted strings are separated.  This is used when binding
+    # arguments to "?" in the SQL string.  Note: comments are not
+    # handled.
+    #
+    def tokens(sql)
+      toks = sql.scan(/('([^'\\]|''|\\.)*'|"([^"\\]|""|\\.)*"|\?\??|[^'"?]+)/)
+      toks.collect { |t| t[0] }
+    end
+
+    def exec_direct(sql)
+      check_rc(SQLExecDirect(@handle, sql))
+      self
+    end
+
+    def set_cursor_name(name)
+      check_rc(SQLSetCursorName(@handle, name))
+      self
+    end
+
+    def get_cursor_name
+      rc, name = SQLGetCursorName(@handle)
+      check_rc(rc)
+      name
+    end
+
+    def row_count
+      rc, rowcount = SQLRowCount(@handle)
+      check_rc(rc)
+      rowcount
+    end
+
+    def num_result_cols
+      rc, cols = SQLNumResultCols(@handle)
+      check_rc(rc)
+      cols
+    end
+
+    def fetch_all
+      if block_given?
+        while row = fetch do
+          yield row
+        end
+      else
+        res = []
+        while row = fetch do
+          res << row
+        end
+        res
+      end
+    end
+
+    def fetch
+      cols = get_col_desc
+      rc = SQLFetch(@handle)
+      if rc == SQL_NO_DATA_FOUND
+        SQLFreeStmt(@handle, SQL_CLOSE)        # Close cursor
+        SQLFreeStmt(@handle, SQL_RESET_PARAMS) # Reset parameters
+        return nil
+      end
+      raise "ERROR" unless rc == SQL_SUCCESS
+
+      retval = []
+      cols.each_with_index do |c, i|
+        rc, content = SQLGetData(@handle, i + 1, c[1], c[2] + 1) #yun added 1 to c[2]
+        retval << adjust_content(content)
+      end
+      retval
+    end
+
+    def fetch_as_hash
+      cols = get_col_desc
+      rc = SQLFetch(@handle)
+      if rc == SQL_NO_DATA_FOUND
+        SQLFreeStmt(@handle, SQL_CLOSE)        # Close cursor
+        SQLFreeStmt(@handle, SQL_RESET_PARAMS) # Reset parameters
+        return nil
+      end
+      raise "ERROR" unless rc == SQL_SUCCESS
+
+      retval = {}
+      cols.each_with_index do |c, i|
+        rc, content = SQLGetData(@handle, i + 1, c[1], c[2] + 1)   #yun added 1 to c[2]
+        retval[c[0]] = adjust_content(content)
+      end
+      retval
+    end
+
+    def get_col_desc
+      rc, nr_cols = SQLNumResultCols(@handle)
+      cols = (1..nr_cols).collect do |c|
+        rc, name, bl, type, col_sz = SQLDescribeCol(@handle, c, 1024)
+        [name.downcase, type, col_sz]
+      end
+    end
+
+    def adjust_content(c)
+      case c.class.to_s
+      when 'DB2CLI::NullClass'
+        return nil
+      when 'DB2CLI::Time'
+        "%02d:%02d:%02d" % [c.hour, c.minute, c.second]
+      when 'DB2CLI::Date'
+        "%04d-%02d-%02d" % [c.year, c.month, c.day]
+      when 'DB2CLI::Timestamp'
+        "%04d-%02d-%02d %02d:%02d:%02d" % [c.year, c.month, c.day, c.hour, c.minute, c.second]
+      else
+        return c
+      end
+    end
+  end
+
+  class Parameter
+    attr_reader :type, :size, :decimalDigits
+    def initialize(type, size, decimalDigits)
+      @type, @size, @decimalDigits = type, size, decimalDigits
+    end
+  end
+end

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.6-plus-changes"
 
   require "socket"
+  require "digest/sha1"
 
   MAX_PACKET_LENGTH = 256*256*256-1
   MAX_ALLOWED_PACKET = 1024*1024*1024
@@ -17,6 +18,9 @@ class Mysql
   MYSQL_PORT = 3306
   PROTOCOL_VERSION = 10
 
+  SCRAMBLE_LENGTH = 20
+  SCRAMBLE_LENGTH_323 = 8
+
   # Command
   COM_SLEEP		= 0
   COM_QUIT		= 1
@@ -51,11 +55,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,23 +123,50 @@ 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 db and @server_capabilities & CLIENT_CONNECT_WITH_DB != 0 then
-      data << "\0"+db
+
+    @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)
+    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
+      data << "\0" if @pre_411
+      data << db
       @db = db.dup
     end
     write data
-    read
+    pkt = read
+    handle_auth_fallback(pkt, passwd)
+    ObjectSpace.define_finalizer(self, Mysql.finalizer(@net))
     self
   end
   alias :connect :real_connect
 
+  def handle_auth_fallback(pkt, passwd)
+    # A packet like this means that we need to send an old-format password
+    if pkt.size == 1 and pkt[0] == 254 and
+       @server_capabilities & CLIENT_SECURE_CONNECTION != 0 then
+      data = scramble(passwd, @scramble_buff, @protocol_version == 9)
+      write data + "\0"
+      read
+    end
+  end
+
   def escape_string(str)
     Mysql::escape_string str
   end
@@ -182,8 +217,13 @@ class Mysql
   end
 
   def change_user(user="", passwd="", db="")
-    data = user+"\0"+scramble(passwd, @scramble_buff, @protocol_version==9)+"\0"+db
-    command COM_CHANGE_USER, data
+    if @pre_411
+      data = user+"\0"+scramble(passwd, @scramble_buff, @protocol_version==9)+"\0"+db
+    else
+      data = user+"\0"+scramble41(passwd, @scramble_buff)+db
+    end
+    pkt = command COM_CHANGE_USER, data
+    handle_auth_fallback(pkt, passwd)
     @user = user
     @passwd = passwd
     @db = db
@@ -243,7 +283,11 @@ class Mysql
 
   def list_fields(table, field=nil)
     command COM_FIELD_LIST, "#{table}\0#{field}", true
-    f = read_rows 6
+    if @pre_411
+      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 +297,11 @@ class Mysql
   def list_processes()
     data = command COM_PROCESS_INFO
     @field_count = get_length data
-    fields = read_rows 5
+    if @pre_411
+      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 +359,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 +415,11 @@ class Mysql
       end
     else
       @extra_info = get_length(data, true)
-      fields = read_rows 5
+      if @pre_411
+        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,19 +429,34 @@ class Mysql
   def unpack_fields(data, long_flag_protocol)
     ret = []
     data.each do |f|
-      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]
+      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
-	flags = f[4][0]
-	decimals = f[4][1]
+        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
       end
-      def_value = f[5]
-      max_length = 0
       ret << Field::new(table, org_table, name, length, type, flags, decimals, def_value, max_length)
     end
     ret
@@ -478,10 +549,10 @@ class Mysql
     return "" if password == nil or password == ""
     raise "old version password is not implemented" if old_ver
     hash_pass = hash_password password
-    hash_message = hash_password message
+    hash_message = hash_password message.slice(0,SCRAMBLE_LENGTH_323)
     rnd = Random::new hash_pass[0] ^ hash_message[0], hash_pass[1] ^ hash_message[1]
     to = []
-    1.upto(message.length) do
+    1.upto(SCRAMBLE_LENGTH_323) do
       to << ((rnd.rnd*31)+64).floor
     end
     extra = (rnd.rnd*31).floor
@@ -489,6 +560,16 @@ class Mysql
     to.join
   end
 
+  def scramble41(password, message)
+    return 0x00.chr if password.nil? or password.empty?
+    buf = [0x14]
+    s1 = Digest::SHA1.digest(password)
+    s2 = Digest::SHA1.digest(s1)
+    x = Digest::SHA1.digest(message + s2)
+    (0..s1.length - 1).each {|i| buf.push(s1[i] ^ x[i])}
+    buf.pack("C*")
+  end
+
   def error(errno)
     @errno = errno
     @error = Error::err errno
@@ -574,7 +655,6 @@ class Mysql
     def free()
       @handle.skip_result
       @handle = @fields = @data = nil
-      GC::start
     end
 
     def num_fields()
@@ -1022,6 +1102,9 @@ class Mysql
       end
       @sock.sync = true
       buf.join
+    rescue
+      errno = Error::CR_SERVER_LOST 
+      raise Error::new(errno, Error::err(errno)) 
     end
     
     def write(data)
@@ -1039,6 +1122,9 @@ class Mysql
       @pkt_nr = @pkt_nr + 1 & 0xff
       @sock.sync = true
       @sock.flush
+    rescue
+      errno = Error::CR_SERVER_LOST 
+      raise Error::new(errno, Error::err(errno)) 
     end
 
     def close()
@@ -1085,13 +1171,24 @@ class << Mysql
   end
   alias :connect :real_connect
 
+  def finalizer(net)
+    proc {
+      net.clear
+      begin
+        net.write(Mysql::COM_QUIT.chr)
+        net.close
+      rescue  # Ignore IOError if socket is already closed.
+      end
+    }
+  end
+
   def escape_string(str)
     str.gsub(/([\0\n\r\032\'\"\\])/) do
       case $1
       when "\0" then "\\0"
       when "\n" then "\\n"
       when "\r" then "\\r"
-      when "\032" then "\Z"
+      when "\032" then "\\Z"
       else "\\"+$1
       end
     end

data/lib/active_record/version.rb

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