ruby-oci8 2.2.0.2 → 2.2.12

data/lib/oci8/cursor.rb

@@ -25,7 +25,11 @@ class OCI8
       @names = nil
       @con = conn
       @max_array_size = nil
+      @fetch_array_size = nil
+      @rowbuf_size = 0
+      @rowbuf_index = 0
       __initialize(conn, sql) # Initialize the internal C structure.
+      self.prefetch_rows = conn.instance_variable_get(:@prefetch_rows)
     end
 
     # explicitly indicate the date type of fetched value. run this
@@ -38,7 +42,7 @@ class OCI8
     #   cursor.define(2, Time)       # fetch the second column as Time.
     #   cursor.exec()
     def define(pos, type, length = nil)
-      bindobj = make_bind_object(:type => type, :length => length)
+      bindobj = make_bind_object({:type => type, :length => length}, @fetch_array_size || 1)
       __define(pos, bindobj)
       if old = @define_handles[pos - 1]
         old.send(:free)
@@ -58,15 +62,16 @@ class OCI8
     #   # ...or...
     #   cursor.bind_param(':ename', 'SMITH') # bind by name
     #
-    # To bind as number, Fixnum and Float are available, but Bignum is
-    # not supported. If its initial value is NULL, please set nil to 
-    # +type+ and Fixnum or Float to +val+.
+    # To bind as number, set the number intself to +val+. If its initial value
+    # is NULL, please set nil to +type+ and Integer, Float or OraNumber to +val+.
     #
     # example:
-    #   cursor.bind_param(1, 1234) # bind as Fixnum, Initial value is 1234.
+    #   cursor.bind_param(1, 1234) # bind as Integer, Initial value is 1234.
     #   cursor.bind_param(1, 1234.0) # bind as Float, Initial value is 1234.0.
-    #   cursor.bind_param(1, nil, Fixnum) # bind as Fixnum, Initial value is NULL.
+    #   cursor.bind_param(1, nil, Integer) # bind as Integer, Initial value is NULL.
     #   cursor.bind_param(1, nil, Float) # bind as Float, Initial value is NULL.
+    #   cursor.bind_param(1, OraNumber(1234)) # bind as OraNumber, Initial value is 1234.
+    #   cursor.bind_param(1, nil, OraNumber) # bind as OraNumber, Initial value is NULL.
     #
     # In case of binding a string, set the string itself to
     # +val+. When the bind variable is used as output, set the
@@ -124,7 +129,10 @@ class OCI8
       case type
       when :select_stmt
         __execute(0)
-        define_columns()
+        define_columns() if @column_metadata.size == 0
+        @rowbuf_size = 0
+        @rowbuf_index = 0
+        @column_metadata.size
       else
         __execute(1)
         row_count
@@ -379,17 +387,25 @@ class OCI8
     #
     # FYI: Rails oracle adaptor uses 100 by default.
     #
-    # @param [Fixnum] rows The number of rows to be prefetched
+    # @param [Integer] rows The number of rows to be prefetched
     def prefetch_rows=(rows)
       attr_set_ub4(11, rows) # OCI_ATTR_PREFETCH_ROWS(11)
+      @prefetch_rows = rows
     end
 
-    # Returns the number of processed rows.
-    #
-    # @return [Integer]
-    def row_count
-      # http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/ociaahan.htm#sthref5498
-      attr_get_ub4(9) # OCI_ATTR_ROW_COUNT(9)
+    if OCI8::oracle_client_version >= ORAVER_12_1
+      # Returns the number of processed rows.
+      #
+      # @return [Integer]
+      def row_count
+        # https://docs.oracle.com/database/121/LNOCI/ociaahan.htm#sthref5774
+        attr_get_ub8(457) # OCI_ATTR_UB8_ROW_COUNT(457)
+      end
+    else
+      def row_count
+        # http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/ociaahan.htm#sthref5498
+        attr_get_ub4(9) # OCI_ATTR_ROW_COUNT(9)
+      end
     end
 
     # Returns the text of the SQL statement prepared in the cursor.
@@ -423,12 +439,12 @@ class OCI8
     # * OCI8::STMT_ALTER
     # * OCI8::STMT_BEGIN (PL/SQL block which starts with a BEGIN keyword)
     # * OCI8::STMT_DECLARE (PL/SQL block which starts with a DECLARE keyword)
-    # * Other Fixnum value undocumented in Oracle manuals.
+    # * Other Integer value undocumented in Oracle manuals.
     #
     # <em>Changes between ruby-oci8 1.0 and 2.0.</em>
     #
     # [ruby-oci8 2.0] OCI8::STMT_* are Symbols. (:select_stmt, :update_stmt, etc.)
-    # [ruby-oci8 1.0] OCI8::STMT_* are Fixnums. (1, 2, 3, etc.)
+    # [ruby-oci8 1.0] OCI8::STMT_* are Integers. (1, 2, 3, etc.)
     #
     def type
       # http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/ociaahan.htm#sthref5506
@@ -459,7 +475,7 @@ class OCI8
 
     private
 
-    def make_bind_object(param)
+    def make_bind_object(param, fetch_array_size = nil)
       case param
       when Hash
         key = param[:type]
@@ -501,26 +517,38 @@ class OCI8
         OCI8::BindType::Mapping[key] = bindclass if bindclass
       end
       raise "unsupported datatype: #{key}" if bindclass.nil?
-      bindclass.create(@con, val, param, max_array_size)
+      bindclass.create(@con, val, param, fetch_array_size || max_array_size)
     end
 
+    @@use_array_fetch = false
+
     def define_columns
       # http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/ociaahan.htm#sthref5494
       num_cols = attr_get_ub4(18) # OCI_ATTR_PARAM_COUNT(18)
-      1.upto(num_cols) do |i|
-        parm = __paramGet(i)
-        define_one_column(i, parm) unless @define_handles[i - 1]
-        @column_metadata[i - 1] = parm
+      @column_metadata = 1.upto(num_cols).collect do |i|
+        __paramGet(i)
+      end
+      if @define_handles.size == 0
+        use_array_fetch = @@use_array_fetch
+        @column_metadata.each do |md|
+          case md.data_type
+          when :clob, :blob, :bfile
+            # Rows prefetching doesn't work for CLOB, BLOB and BFILE.
+            # Use array fetching to get more than one row in a network round trip.
+            use_array_fetch = true
+          end
+        end
+        @fetch_array_size = @prefetch_rows if use_array_fetch
+      end
+      @column_metadata.each_with_index do |md, i|
+        define_one_column(i + 1, md) unless @define_handles[i]
       end
       num_cols
     end
 
     def define_one_column(pos, param)
-      bindobj = make_bind_object(param)
+      bindobj = make_bind_object(param, @fetch_array_size || 1)
       __define(pos, bindobj)
-      if old = @define_handles[pos - 1]
-        old.send(:free)
-      end
       @define_handles[pos - 1] = bindobj
     end
 
@@ -534,22 +562,33 @@ class OCI8
       end
     end
 
+    def fetch_row_internal
+      if @rowbuf_size && @rowbuf_size == @rowbuf_index
+        @rowbuf_size = __fetch(@con, @fetch_array_size || 1)
+        @rowbuf_index = 0
+      end
+      @rowbuf_size
+    end
+
     def fetch_one_row_as_array
-      if __fetch(@con)
-        @define_handles.collect do |handle|
-          handle.send(:get_data)
+      if fetch_row_internal
+        ret = @define_handles.collect do |handle|
+          handle.send(:get_data, @rowbuf_index)
         end
+        @rowbuf_index += 1
+        ret
       else
         nil
       end
     end
 
     def fetch_one_row_as_hash
-      if __fetch(@con)
+      if fetch_row_internal
         ret = {}
         get_col_names.each_with_index do |name, idx|
-          ret[name] = @define_handles[idx].send(:get_data)
+          ret[name] = @define_handles[idx].send(:get_data, @rowbuf_index)
         end
+        @rowbuf_index += 1
         ret
       else
         nil

data/lib/oci8/metadata.rb

@@ -1503,7 +1503,11 @@ class OCI8
         attr_get_sb1(OCI_ATTR_SCALE)
       end
 
-      # The datatype levels. This attribute always returns zero.
+      # The nest level.
+      #
+      # Oracle manual says that it always returns zero. However it returns
+      # the depth of {OCI8::ArgBase#arguments} calls when #arguments returns
+      # a non-empty array.
       def level
         attr_get_ub2(OCI_ATTR_LEVEL)
       end
@@ -1607,6 +1611,10 @@ class OCI8
 
       # The list of arguments at the next level (when the argument is
       # of a record or table type).
+      #
+      # This method returns an array containing type information when
+      # the type is a user-defined type and the Oracle server version
+      # is 12c or earlier. Otherwise, it returns an empty array.
       def arguments
         @arguments ||= list_arguments.to_a
       end

data/lib/oci8/object.rb

@@ -78,7 +78,8 @@ EOS
   #
   # @private
   def get_tdo_by_typename(typename)
-    tdo = @name_to_tdo && @name_to_tdo[typename]
+    @name_to_tdo ||= {}
+    tdo = @name_to_tdo[typename]
     return tdo if tdo
 
     metadata = describe_any(typename)
@@ -383,8 +384,10 @@ EOS
 
       case metadata.typecode
       when :named_type
+        @is_final_type = metadata.is_final_type?
         initialize_named_type(con, metadata)
       when :named_collection
+        @is_final_type = true
         initialize_named_collection(con, metadata)
       end
     end
@@ -490,6 +493,16 @@ EOS
          Proc.new do |val| datetime_to_array(val, :date) end, # set_proc
          Proc.new do |val| array_to_time(val, :local) end, # get_proc
         ]
+      when :timestamp
+        [ATTR_TIMESTAMP, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER,
+         Proc.new do |val| datetime_to_array(val, :timestamp) end, # set_proc
+         Proc.new do |val| array_to_time(val, :local) end, # get_proc
+        ]
+      when :timestamp_tz
+        [ATTR_TIMESTAMP_TZ, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER,
+         Proc.new do |val| datetime_to_array(val, :timestamp_tz) end, # set_proc
+         Proc.new do |val| array_to_time(val, nil) end, # get_proc
+        ]
       when :binary_double
         [ATTR_BINARY_DOUBLE, nil, SIZE_OF_DOUBLE, 2, ALIGNMENT_OF_DOUBLE]
       when :binary_float

data/lib/oci8/oci8.rb

@@ -63,9 +63,9 @@ class OCI8
   #
   # === connecting as a privileged user
   #
-  # Set :SYSDBA or :SYSOPER to +privilege+, otherwise
-  # "username/password as sysdba" or "username/password as sysoper"
-  # as a single argument.
+  # Set :SYSDBA, :SYSOPER, :SYSASM, :SYSBACKUP, :SYSDG or :SYSKM
+  # to +privilege+, otherwise "username/password as sysdba",
+  # "username/password as sysoper", etc. as a single argument.
   #
   #   OCI8.new('sys', 'change_on_install', nil, :SYSDBA)
   # or
@@ -96,29 +96,15 @@ class OCI8
   #
   def initialize(*args)
     if args.length == 1
-      username, password, dbname, mode = parse_connect_string(args[0])
+      username, password, dbname, privilege = parse_connect_string(args[0])
     else
-      username, password, dbname, mode = args
+      username, password, dbname, privilege = args
     end
 
     if username.nil? and password.nil?
       cred = OCI_CRED_EXT
     end
-    case mode
-    when :SYSDBA
-      mode = OCI_SYSDBA
-    when :SYSOPER
-      mode = OCI_SYSOPER
-    when :SYSASM
-      if OCI8.oracle_client_version < OCI8::ORAVER_11_1
-        raise "SYSASM is not supported on Oracle version #{OCI8.oracle_client_version}"
-      end
-      mode = OCI_SYSASM
-    when nil
-      # do nothing
-    else
-      raise "unknown privilege type #{mode}"
-    end
+    auth_mode = to_auth_mode(privilege)
 
     stmt_cache_size = OCI8.properties[:statement_cache_size]
     stmt_cache_size = nil if stmt_cache_size == 0
@@ -127,32 +113,38 @@ class OCI8
     if dbname.is_a? OCI8::ConnectionPool
       @pool = dbname # to prevent GC from freeing the connection pool.
       dbname = dbname.send(:pool_name)
-      attach_mode |= 0x0200 # OCI_CPOOL and OCI_LOGON2_CPOOL
+      attach_mode |= 0x0200 # OCI_CPOOL
+    else
+      tcp_connect_timeout = OCI8::properties[:tcp_connect_timeout]
+      connect_timeout = OCI8::properties[:connect_timeout]
+      tcp_keepalive = OCI8::properties[:tcp_keepalive]
+      if tcp_connect_timeout || connect_timeout || tcp_keepalive
+        dbname = to_connect_descriptor(dbname, tcp_connect_timeout, connect_timeout, tcp_keepalive)
+      end
     end
     if stmt_cache_size
       # enable statement caching
-      attach_mode |= 0x0004 # OCI_STMT_CACHE and OCI_LOGON2_STMTCACHE
+      attach_mode |= 0x0004 # OCI_STMT_CACHE
     end
 
-    if true
-      # logon by the OCI function OCISessionBegin().
-      allocate_handles()
-      @session_handle.send(:attr_set_string, OCI_ATTR_USERNAME, username) if username
-      @session_handle.send(:attr_set_string, OCI_ATTR_PASSWORD, password) if password
-      if @@oracle_client_version >= ORAVER_11_1
-        # Sets the driver name displayed in V$SESSION_CONNECT_INFO.CLIENT_DRIVER
-        # if both the client and the server are Oracle 11g or upper.
-        # Only the first 8 chracters "ruby-oci" are displayed when the Oracle
-        # server version is lower than 12.0.1.2.
-        # 424: OCI_ATTR_DRIVER_NAME
-        @session_handle.send(:attr_set_string, 424, "ruby-oci8 : #{OCI8::VERSION}")
-      end
-      server_attach(dbname, attach_mode)
-      session_begin(cred ? cred : OCI_CRED_RDBMS, mode ? mode : OCI_DEFAULT)
-    else
-      # logon by the OCI function OCILogon2().
-      logon2(username, password, dbname, attach_mode)
+    # logon by the OCI function OCISessionBegin().
+    allocate_handles()
+    @session_handle.send(:attr_set_string, OCI_ATTR_USERNAME, username) if username
+    @session_handle.send(:attr_set_string, OCI_ATTR_PASSWORD, password) if password
+    if @@oracle_client_version >= ORAVER_11_1
+      # Sets the driver name displayed in V$SESSION_CONNECT_INFO.CLIENT_DRIVER
+      # if both the client and the server are Oracle 11g or upper.
+      # Only the first 8 chracters "ruby-oci" are displayed when the Oracle
+      # server version is lower than 12.0.1.2.
+      # 424: OCI_ATTR_DRIVER_NAME
+      @session_handle.send(:attr_set_string, 424, "ruby-oci8 : #{OCI8::VERSION}")
     end
+    server_attach(dbname, attach_mode)
+    if OCI8.oracle_client_version >= OCI8::ORAVER_11_1
+      self.send_timeout = OCI8::properties[:send_timeout] if OCI8::properties[:send_timeout]
+      self.recv_timeout = OCI8::properties[:recv_timeout] if OCI8::properties[:recv_timeout]
+    end
+    session_begin(cred ? cred : OCI_CRED_RDBMS, auth_mode)
 
     if stmt_cache_size
       # set statement cache size
@@ -177,7 +169,6 @@ class OCI8
   # @private
   def parse_internal(sql)
     cursor = OCI8::Cursor.new(self, sql)
-    cursor.prefetch_rows = @prefetch_rows if @prefetch_rows
     cursor
   end
 
@@ -313,6 +304,7 @@ class OCI8
   # @return [Array] an array of first row.
   def select_one(sql, *bindvars)
     cursor = self.parse(sql)
+    cursor.prefetch_rows = 1
     begin
       cursor.exec(*bindvars)
       row = cursor.fetch
@@ -348,25 +340,16 @@ class OCI8
 
   # Returns the Oracle server version.
   #
+  # When the Oracle client version is 12c or earlier and
+  # the Oracle server version is 18c or later, this method
+  # doesn't return *full* version number such as '18.3.0.0.0'.
+  # It returns version number whose number components after
+  # the first dot are zeros such as '18.0.0.0.0'.
+  #
   # @see OCI8.oracle_client_version
   # @return [OCI8::OracleVersion]
   def oracle_server_version
-    unless defined? @oracle_server_version
-      if vernum = oracle_server_vernum
-        # If the Oracle client is Oracle 9i or upper,
-        # get the server version from the OCI function OCIServerRelease.
-        @oracle_server_version = OCI8::OracleVersion.new(vernum)
-      else
-        # Otherwise, get it from v$version.
-        self.exec('select banner from v$version') do |row|
-          if /^Oracle.*?(\d+\.\d+\.\d+\.\d+\.\d+)/ =~ row[0]
-            @oracle_server_version = OCI8::OracleVersion.new($1)
-            break
-          end
-        end
-      end
-    end
-    @oracle_server_version
+    @oracle_server_version ||= OCI8::OracleVersion.new(oracle_server_vernum)
   end
 
   # Returns the Oracle database character set name such as AL32UTF8.
@@ -404,6 +387,10 @@ class OCI8
     # Zero means no timeout.
     # This is equivalent to {http://docs.oracle.com/database/121/NETRF/sqlnet.htm#NETRF228 SQLNET.SEND_TIMEOUT} in client-side sqlnet.ora.
     #
+    # If you need to set send timeout while establishing a connection, use {file:docs/timeout-parameters.md timeout parameters in OCI8::properties} instead.
+    #
+    # Note that the connection becomes unusable on timeout.
+    #
     # If you have trouble by setting this, don't use it because it uses
     # {http://blog.jiubao.org/2015/01/undocumented-oci-handle-attributes.html an undocumented OCI handle attribute}.
     #
@@ -432,6 +419,10 @@ class OCI8
     # Zero means no timeout.
     # This is equivalent to {http://docs.oracle.com/database/121/NETRF/sqlnet.htm#NETRF227 SQLNET.RECV_TIMEOUT} in client-side sqlnet.ora.
     #
+    # If you need to set receive timeout while establishing a connection, use {file:docs/timeout-parameters.md timeout parameters in OCI8::properties} instead.
+    #
+    # Note that the connection becomes unusable on timeout.
+    #
     # If you have trouble by setting this, don't use it because it uses
     # {http://blog.jiubao.org/2015/01/undocumented-oci-handle-attributes.html an undocumented OCI handle attribute}.
     #
@@ -457,6 +448,141 @@ class OCI8
       raise NotImplementedError, 'revc_timeout= is unimplemented in this Oracle version'
     end
   end
+
+  # A helper class to bind an array to paramters in IN-condition.
+  #
+  # See {file:docs/bind-array-to-in_cond.md Bind an Array to IN-condition}
+  class InCondBindHelper
+    def initialize(bind_name_prefix, array, type = nil, length = nil)
+      bind_name_prefix = bind_name_prefix.to_s
+      if bind_name_prefix !~ /^\w+$/
+        raise ArgumentError, "The first argument doesn't consist of alphanumeric characters and underscores."
+      end
+      if array.empty?
+        # This doesn't match anything.
+        # However in-condition requires at least one value.
+        @bind_names = ":#{bind_name_prefix}_0"
+        @bind_values = [[nil, type.nil? ? String : type, length]]
+      else
+        @bind_names = Array.new(array.length) do |index|
+          ":#{bind_name_prefix}_#{index}"
+        end.join(', ')
+        first_non_nil = array.find do |e|
+          !e.nil?
+        end
+        first_non_nil = '' if first_non_nil.nil?
+        @bind_values = array.collect do |elem|
+          if elem.nil? and type.nil?
+            [elem, first_non_nil.class]
+          else
+            [elem, type, length]
+          end
+        end
+      end
+    end
+
+    def names
+      @bind_names
+    end
+
+    def values
+      @bind_values
+    end
+  end
+
+  # Creates a helper object to bind an array to paramters in IN-condition.
+  #
+  # See {file:docs/bind-array-to-in_cond.md Bind an Array to IN-condition}
+  #
+  # @param [Symbol]  bind_name_prefix prefix of the place holder name
+  # @param [Object]  array an array of values to be bound.
+  # @param [Class]   type data type. This is used as the third argument of {OCI8::Cursor#bind_param}.
+  # @param [Integer] length maximum bind length for string values. This is used as the fourth argument of {OCI8::Cursor#bind_param}.
+  # @return [OCI8::InCondBindHelper]
+  def self.in_cond(bind_name_prefix, array, type = nil, length = nil)
+    InCondBindHelper.new(bind_name_prefix, array, type, length)
+  end
+
+  private
+
+  # Converts the specified privilege name to the value passed to the
+  # fifth argument of OCISessionBegin().
+  #
+  # @private
+  def to_auth_mode(privilege)
+    case privilege
+    when :SYSDBA
+      0x00000002 # OCI_SYSDBA in oci.h
+    when :SYSOPER
+      0x00000004 # OCI_SYSOPER in oci.h
+    when :SYSASM
+      if OCI8.oracle_client_version < OCI8::ORAVER_11_1
+        raise "SYSASM is not supported on Oracle version #{OCI8.oracle_client_version}"
+      end
+      0x00008000 # OCI_SYSASM in oci.h
+    when :SYSBACKUP
+      if OCI8.oracle_client_version < OCI8::ORAVER_12_1
+        raise "SYSBACKUP is not supported on Oracle version #{OCI8.oracle_client_version}"
+      end
+      0x00020000 # OCI_SYSBKP in oci.h
+    when :SYSDG
+      if OCI8.oracle_client_version < OCI8::ORAVER_12_1
+        raise "SYSDG is not supported on Oracle version #{OCI8.oracle_client_version}"
+      end
+      0x00040000 # OCI_SYSDGD in oci.h
+    when :SYSKM
+      if OCI8.oracle_client_version < OCI8::ORAVER_12_1
+        raise "SYSKM is not supported on Oracle version #{OCI8.oracle_client_version}"
+      end
+      0x00080000 # OCI_SYSKMT in oci.h
+    when nil
+      0 # OCI_DEFAULT
+    else
+      raise "unknown privilege type #{privilege}"
+    end
+  end
+
+  @@easy_connect_naming_regex = %r{
+    ^
+    (//)?                  # preceding double-slash($1)
+    (?:\[([\h:]+)\]|([^\s:/]+)) # IPv6 enclosed by square brackets($2) or hostname($3)
+    (?::(\d+))?            # port($4)
+    (?:
+      /
+      ([^\s:/]+)?          # service name($5)
+      (?::([^\s:/]+))?     # server($6)
+      (?:/([^\s:/]+))?     # instance name($7)
+    )?
+    $
+  }x
+
+  # Parse easy connect string as described in https://docs.oracle.com/database/121/NETAG/naming.htm
+  # and add TRANSPORT_CONNECT_TIMEOUT or CONNECT_TIMEOUT.
+  #
+  # @private
+  def to_connect_descriptor(database, tcp_connect_timeout, connect_timeout, tcp_keepalive)
+    if @@easy_connect_naming_regex =~ database && ($1 || $2 || $4 || $5 || $6 || $7)
+      connect_data = []
+      connect_data << "(SERVICE_NAME=#$5)"
+      connect_data << "(SERVER=#$6)" if $6
+      connect_data << "(INSTANCE_NAME=#$7)" if $7
+      desc = []
+      desc << "(CONNECT_DATA=#{connect_data.join})"
+      desc << "(ADDRESS=(PROTOCOL=TCP)(HOST=#{$2 || $3})(PORT=#{$4 || 1521}))"
+      if tcp_connect_timeout
+        desc << "(TRANSPORT_CONNECT_TIMEOUT=#{tcp_connect_timeout})"
+      end
+      if connect_timeout
+        desc << "(CONNECT_TIMEOUT=#{connect_timeout})"
+      end
+      if tcp_keepalive
+        desc << "(ENABLE=BROKEN)"
+      end
+      "(DESCRIPTION=#{desc.join})"
+    else
+      database
+    end
+  end
 end
 
 class OCIError
@@ -501,7 +627,7 @@ class OCIError
   #
   def initialize(*args)
     if args.length > 0
-      if args[0].is_a? Fixnum
+      if args[0].is_a? Integer
         @code = args.shift
         super(OCI8.error_message(@code).gsub('%s') {|s| args.empty? ? '%s' : args.shift})
         @sql = nil

data/lib/oci8/ocihandle.rb

@@ -425,22 +425,6 @@ class OCIHandle
   # @private
   OCI_CRED_EXT                =   2
 
-  #################################
-  #
-  # Authentication Modes
-  #
-  #################################
-
-  # for SYSDBA authorization
-  # @private
-  OCI_SYSDBA                  = 0x0002
-  # for SYSOPER authorization
-  # @private
-  OCI_SYSOPER                 = 0x0004
-  # for SYSASM authorization
-  # @private
-  OCI_SYSASM                  = 0x8000
-
   #################################
   #
   # OCI Parameter Types

data/lib/oci8/oracle_version.rb

@@ -66,6 +66,12 @@ class OCI8
         major, minor, update, patch, port_update = arg.split('.').collect do |v|
           v.to_i
         end
+      elsif arg >= 0x12000000
+        major  = (arg & 0xFF000000) >> 24
+        minor  = (arg & 0x00FF0000) >> 16
+        update = (arg & 0x0000F000) >> 12
+        patch  = (arg & 0x00000FF0) >>  4
+        port_update = (arg & 0x0000000F)
       elsif arg >= 0x08000000
         major  = (arg & 0xFF000000) >> 24
         minor  = (arg & 0x00F00000) >> 20
@@ -80,7 +86,11 @@ class OCI8
       @update = update || 0
       @patch = patch || 0
       @port_update = port_update || 0
-      @vernum = (@major << 24) | (@minor << 20) | (@update << 12) | (@patch << 8) | @port_update
+      @vernum = if @major >= 18
+                  (@major << 24) | (@minor << 16) | (@update << 12) | (@patch << 4) | @port_update
+                else
+                  (@major << 24) | (@minor << 20) | (@update << 12) | (@patch << 8) | @port_update
+                end
     end
 
     # Compares +self+ and +other+.