ruby-oci8 2.0.6-x86-mingw32 → 2.1.0-x86-mingw32

data/lib/oci8/encoding-init.rb

@@ -2,44 +2,76 @@
 # setup default OCI encoding from NLS_LANG.
 #
 
-# try to get NLS_LANG.
-nls_lang = ENV['NLS_LANG']
+class OCI8
 
-# if NLS_LANG is not set, get it from the Windows registry.
-if nls_lang.nil? and defined? OCI8::Win32Util
-  dll_path = OCI8::Win32Util.dll_path.upcase
-  if dll_path =~ %r{\\BIN\\OCI.DLL}
-    oracle_home = $`
-    OCI8::Win32Util.enum_homes do |home, lang|
-      if oracle_home == home.upcase
-        nls_lang = lang
-        break
+  # get the environment variable NLS_LANG.
+  nls_lang = ENV['NLS_LANG']
+
+  if nls_lang.is_a? String and nls_lang.length == 0
+    nls_lang = nil
+  end
+
+  # if NLS_LANG is not set, get it from the Windows registry.
+  if nls_lang.nil? and defined? OCI8::Win32Util
+    dll_path = OCI8::Win32Util.dll_path.upcase
+    if dll_path =~ %r{\\BIN\\OCI.DLL}
+      oracle_home = $`
+      OCI8::Win32Util.enum_homes do |home, lang|
+        if oracle_home == home.upcase
+          nls_lang = lang
+          break
+        end
       end
     end
   end
-end
 
-if nls_lang
-  # Extract character set name from NLS_LANG.
-  if nls_lang =~ /\.([[:alnum:]]+)$/
-    charset = $1.upcase
+  # extract the charset name.
+  if nls_lang
+    if nls_lang =~ /\.([[:alnum:]]+)$/
+      @@client_charset_name = $1.upcase
+    else
+      raise "Invalid NLS_LANG format: #{nls_lang}"
+    end
   else
-    raise "Invalid NLS_LANG format: #{nls_lang}"
+    warn "Warning: NLS_LANG is not set. fallback to US7ASCII."
+    @@client_charset_name = 'US7ASCII'
   end
 
-  # Convert the Oracle character set name to Ruby encoding name by
-  # querying the yaml data.
-  require 'yaml'
-  enc = YAML::load_file(File.dirname(__FILE__) + '/encoding.yml')[charset]
-  if enc.nil?
-    raise "Ruby encoding name is not found in encoding.yml for NLS_LANG #{nls_lang}."
+  # NLS ratio, maximum number of bytes per one chracter
+  case @@client_charset_name
+  when 'UTF8'
+    OCI8.nls_ratio = 3
+  when 'AL16UTF16'
+    OCI8.nls_ratio = 4
+  when /^[[:alpha:]]+(\d+)/
+    # convert maximum number of bits per one chracter to NLS ratio.
+    #   charset name  max bits  max bytes
+    #   ------------  --------  ---------
+    #   US7ASCII          7         1
+    #   WE8ISO8859P1      8         1
+    #   JA16SJIS         16         2
+    #   AL32UTF8         32         4
+    #   ...
+    OCI8.nls_ratio = (($1.to_i + 7) >> 3)
+  else
+    raise "Unknown NLS character set name format: #{@@client_charset_name}"
   end
-  if enc.is_a? Array
-    # Use the first available encoding in the array.
-    enc = enc.find do |e| Encoding.find(e) rescue false; end
+
+  # Ruby encoding name for ruby 1.9.
+  if OCI8.respond_to? :encoding
+    if defined? DEFAULT_OCI8_ENCODING
+      enc = DEFAULT_OCI8_ENCODING
+    else
+      require 'yaml'
+      enc = YAML::load_file(File.dirname(__FILE__) + '/encoding.yml')[@@client_charset_name]
+      if enc.nil?
+        raise "Ruby encoding name is not found in encoding.yml for NLS_LANG #{nls_lang}."
+      end
+      if enc.is_a? Array
+        # Use the first available encoding in the array.
+        enc = enc.find do |e| Encoding.find(e) rescue false; end
+      end
+    end
+    OCI8.encoding = enc
   end
-else
-  warn "Warning: NLS_LANG is not set. fallback to US-ASCII."
-  enc = 'US-ASCII'
 end
-OCI8.encoding = enc

data/lib/oci8/encoding.yml

@@ -40,10 +40,10 @@ ZHS16GBK:          GBK
 # MS Windows Code Page 950 with Hong Kong Supplementary Character
 # Set HKSCS-2001 (character set conversion to and from Unicode is
 # based on Unicode 3.0)
-ZHT16HKSCS:        [Big5-HKSCS, Big5]
+ZHT16HKSCS:        [CP951, Big5-HKSCS, Big5]
 
 # MS Windows Code Page 950 Traditional Chinese
-ZHT16MSWIN950:     Big5
+ZHT16MSWIN950:     [CP950, Big5]
 
 # EUC 32-bit Traditional Chinese
 ZHT32EUC:          EUC-TW       # Who use this?
@@ -166,7 +166,7 @@ ZHT16DBT:          nil          # FIXME
 # MS Windows Code Page 950 with Hong Kong Supplementary Character
 # Set HKSCS-2001 (character set conversion to and from Unicode is
 # based on Unicode 3.1)
-ZHT16HKSCS31:      [Big5-HKSCS, Big5]
+ZHT16HKSCS31:      [CP951, Big5-HKSCS, Big5]
 
 # SOPS 32-bit Traditional Chinese
 ZHT32SOPS:         nil          # FIXME

data/lib/oci8/metadata.rb

@@ -1,264 +1,99 @@
-# Implement OCI8::Metadata.
+# oci8.rb -- implements OCI8::Metadata.
+#
+# Copyright (C) 2006-2010 KUBO Takehiro <kubo@jiubao.org>
+#
 # See {'Describing Schema Metadata' in Oracle Call Interface Programmer's Guide}
 # [http://download-west.oracle.com/docs/cd/B19306_01/appdev.102/b14250/oci06des.htm]
 
 #
 class OCI8
 
-  # :stopdoc:
-
-  # Attribute Types in oci.h
-  OCI_ATTR_DATA_SIZE          =   1 # maximum size of the data
-  OCI_ATTR_DATA_TYPE          =   2 # the SQL type of the column/argument
-  OCI_ATTR_NAME               =   4 # the name of the column/argument
-  OCI_ATTR_PRECISION          =   5 # precision if number type
-  OCI_ATTR_SCALE              =   6 # scale if number type
-  OCI_ATTR_IS_NULL            =   7 # is it null ?
-  OCI_ATTR_TYPE_NAME          =   8 # name of the named data type or a package name
-  OCI_ATTR_SCHEMA_NAME        =   9 # the schema name
-  OCI_ATTR_SUB_NAME           =  10 # type name if package private type
-  OCI_ATTR_POSITION           =  11 # relative position
-  OCI_ATTR_PDSCL              =  16 # packed decimal scale
-  OCI_ATTR_FSPRECISION = OCI_ATTR_PDSCL # fs prec for datetime data types
-  OCI_ATTR_PDPRC              =  17 # packed decimal format
-  OCI_ATTR_LFPRECISION = OCI_ATTR_PDPRC # fs prec for datetime data types
-  OCI_ATTR_CHARSET_ID         =  31 # Character Set ID
-  OCI_ATTR_CHARSET_FORM       =  32 # Character Set Form
-  OCI_ATTR_NUM_COLS           = 102 # number of columns
-  OCI_ATTR_LIST_COLUMNS       = 103 # parameter of the column list
-  OCI_ATTR_RDBA               = 104 # DBA of the segment header
-  OCI_ATTR_CLUSTERED          = 105 # whether the table is clustered
-  OCI_ATTR_PARTITIONED        = 106 # whether the table is partitioned
-  OCI_ATTR_INDEX_ONLY         = 107 # whether the table is index only
-  OCI_ATTR_LIST_ARGUMENTS     = 108 # parameter of the argument list
-  OCI_ATTR_LIST_SUBPROGRAMS   = 109 # parameter of the subprogram list
-  OCI_ATTR_REF_TDO            = 110 # REF to the type descriptor
-  OCI_ATTR_LINK               = 111 # the database link name 
-  OCI_ATTR_MIN                = 112 # minimum value
-  OCI_ATTR_MAX                = 113 # maximum value
-  OCI_ATTR_INCR               = 114 # increment value
-  OCI_ATTR_CACHE              = 115 # number of sequence numbers cached
-  OCI_ATTR_ORDER              = 116 # whether the sequence is ordered
-  OCI_ATTR_HW_MARK            = 117 # high-water mark
-  OCI_ATTR_TYPE_SCHEMA        = 118 # type's schema name
-  OCI_ATTR_TIMESTAMP          = 119 # timestamp of the object
-  OCI_ATTR_NUM_PARAMS         = 121 # number of parameters
-  OCI_ATTR_OBJID              = 122 # object id for a table or view
-  OCI_ATTR_OVERLOAD_ID        = 125 # overload ID for funcs and procs
-  OCI_ATTR_TABLESPACE         = 126 # table name space
-  OCI_ATTR_LTYPE              = 128 # list type
-  OCI_ATTR_IS_TEMPORARY       = 130 # whether table is temporary
-  OCI_ATTR_IS_TYPED           = 131 # whether table is typed
-  OCI_ATTR_DURATION           = 132 # duration of temporary table
-  OCI_ATTR_IS_INVOKER_RIGHTS  = 133 # is invoker rights
-  OCI_ATTR_OBJ_NAME           = 134 # top level schema obj name
-  OCI_ATTR_OBJ_SCHEMA         = 135 # schema name
-  OCI_ATTR_OBJ_ID             = 136 # top level schema object id
-  # OCI_ATTR_OVERLOAD           = 210 # is this position overloaded
-  OCI_ATTR_LEVEL              = 211 # level for structured types
-  OCI_ATTR_HAS_DEFAULT        = 212 # has a default value
-  OCI_ATTR_IOMODE             = 213 # in, out inout
-  OCI_ATTR_RADIX              = 214 # returns a radix
-  # OCI_ATTR_NUM_ARGS           = 215 # total number of arguments
-  OCI_ATTR_TYPECODE           = 216 # object or collection
-  OCI_ATTR_COLLECTION_TYPECODE = 217 # varray or nested table
-  OCI_ATTR_VERSION            = 218 # user assigned version
-  OCI_ATTR_IS_INCOMPLETE_TYPE = 219 # is this an incomplete type
-  OCI_ATTR_IS_SYSTEM_TYPE     = 220 # a system type
-  OCI_ATTR_IS_PREDEFINED_TYPE = 221 # a predefined type
-  OCI_ATTR_IS_TRANSIENT_TYPE  = 222 # a transient type
-  OCI_ATTR_IS_SYSTEM_GENERATED_TYPE = 223 # system generated type
-  OCI_ATTR_HAS_NESTED_TABLE   = 224 # contains nested table attr
-  OCI_ATTR_HAS_LOB            = 225 # has a lob attribute
-  OCI_ATTR_HAS_FILE           = 226 # has a file attribute
-  OCI_ATTR_COLLECTION_ELEMENT = 227 # has a collection attribute
-  OCI_ATTR_NUM_TYPE_ATTRS     = 228 # number of attribute types
-  OCI_ATTR_LIST_TYPE_ATTRS    = 229 # list of type attributes
-  OCI_ATTR_NUM_TYPE_METHODS   = 230 # number of type methods
-  OCI_ATTR_LIST_TYPE_METHODS  = 231 # list of type methods
-  OCI_ATTR_MAP_METHOD         = 232 # map method of type
-  OCI_ATTR_ORDER_METHOD       = 233 # order method of type 
-  OCI_ATTR_NUM_ELEMS          = 234 # number of elements
-  OCI_ATTR_ENCAPSULATION      = 235 # encapsulation level
-  OCI_ATTR_IS_SELFISH         = 236 # method selfish
-  # OCI_ATTR_IS_VIRTUAL         = 237 # virtual
-  # OCI_ATTR_IS_INLINE          = 238 # inline
-  # OCI_ATTR_IS_CONSTANT        = 239 # constant
-  OCI_ATTR_HAS_RESULT         = 240 # has result
-  OCI_ATTR_IS_CONSTRUCTOR     = 241 # constructor
-  OCI_ATTR_IS_DESTRUCTOR      = 242 # destructor
-  # OCI_ATTR_IS_OPERATOR        = 243 # operator
-  OCI_ATTR_IS_MAP             = 244 # a map method
-  OCI_ATTR_IS_ORDER           = 245 # order method
-  OCI_ATTR_IS_RNDS            = 246 # read no data state method
-  OCI_ATTR_IS_RNPS            = 247 # read no process state
-  OCI_ATTR_IS_WNDS            = 248 # write no data state method
-  OCI_ATTR_IS_WNPS            = 249 # write no process state
-  OCI_ATTR_IS_SUBTYPE         = 258
-  OCI_ATTR_SUPERTYPE_SCHEMA_NAME = 259
-  OCI_ATTR_SUPERTYPE_NAME     = 260
-  OCI_ATTR_LIST_OBJECTS       = 261 # list of objects in schema
-  OCI_ATTR_NCHARSET_ID        = 262 # char set id
-  OCI_ATTR_LIST_SCHEMAS       = 263 # list of schemas
-  OCI_ATTR_MAX_PROC_LEN       = 264 # max procedure length
-  OCI_ATTR_MAX_COLUMN_LEN     = 265 # max column name length
-  OCI_ATTR_CURSOR_COMMIT_BEHAVIOR = 266 # cursor commit behavior
-  OCI_ATTR_MAX_CATALOG_NAMELEN = 267 # catalog namelength
-  OCI_ATTR_CATALOG_LOCATION   = 268 # catalog location
-  OCI_ATTR_SAVEPOINT_SUPPORT  = 269 # savepoint support
-  OCI_ATTR_NOWAIT_SUPPORT     = 270 # nowait support
-  OCI_ATTR_AUTOCOMMIT_DDL     = 271 # autocommit DDL
-  OCI_ATTR_LOCKING_MODE       = 272 # locking mode
-  # OCI_ATTR_CLIENT_IDENTIFIER  = 278 # value of client id to set
-  OCI_ATTR_IS_FINAL_TYPE      = 279 # is final type ?
-  OCI_ATTR_IS_INSTANTIABLE_TYPE = 280 # is instantiable type ?
-  OCI_ATTR_IS_FINAL_METHOD    = 281 # is final method ?
-  OCI_ATTR_IS_INSTANTIABLE_METHOD = 282 # is instantiable method ?
-  OCI_ATTR_IS_OVERRIDING_METHOD = 283 # is overriding method ?
-  # OCI_ATTR_DESC_SYNBASE       = 284 # Describe the base object
-  OCI_ATTR_CHAR_USED          = 285 # char length semantics
-  OCI_ATTR_CHAR_SIZE          = 286 # char length
-  OCI_ATTR_CONDITION          = 342 # rule condition
-  OCI_ATTR_COMMENT            = 343 # comment
-  OCI_ATTR_VALUE              = 344 # Anydata value
-  OCI_ATTR_EVAL_CONTEXT_OWNER = 345 # eval context owner
-  OCI_ATTR_EVAL_CONTEXT_NAME  = 346 # eval context name
-  OCI_ATTR_EVALUATION_FUNCTION = 347 # eval function name
-  OCI_ATTR_VAR_TYPE           = 348 # variable type
-  OCI_ATTR_VAR_VALUE_FUNCTION = 349 # variable value function
-  OCI_ATTR_VAR_METHOD_FUNCTION = 350 # variable method function
-  # OCI_ATTR_ACTION_CONTEXT     = 351 # action context
-  OCI_ATTR_LIST_TABLE_ALIASES = 352 # list of table aliases
-  OCI_ATTR_LIST_VARIABLE_TYPES = 353 # list of variable types
-  OCI_ATTR_TABLE_NAME         = 356 # table name
-
-  # OCI Parameter Types
-  OCI_PTYPE_UNK                =  0 # unknown
-  OCI_PTYPE_TABLE              =  1 # table
-  OCI_PTYPE_VIEW               =  2 # view
-  OCI_PTYPE_PROC               =  3 # procedure
-  OCI_PTYPE_FUNC               =  4 # function
-  OCI_PTYPE_PKG                =  5 # package
-  OCI_PTYPE_TYPE               =  6 # user-defined type
-  OCI_PTYPE_SYN                =  7 # synonym
-  OCI_PTYPE_SEQ                =  8 # sequence
-  OCI_PTYPE_COL                =  9 # column
-  OCI_PTYPE_ARG                = 10 # argument
-  OCI_PTYPE_LIST               = 11 # list
-  OCI_PTYPE_TYPE_ATTR          = 12 # user-defined type's attribute
-  OCI_PTYPE_TYPE_COLL          = 13 # collection type's element
-  OCI_PTYPE_TYPE_METHOD        = 14 # user-defined type's method
-  OCI_PTYPE_TYPE_ARG           = 15 # user-defined type method's arg
-  OCI_PTYPE_TYPE_RESULT        = 16 # user-defined type method's result
-  OCI_PTYPE_SCHEMA             = 17 # schema
-  OCI_PTYPE_DATABASE           = 18 # database
-  OCI_PTYPE_RULE               = 19 # rule
-  OCI_PTYPE_RULE_SET           = 20 # rule set
-  OCI_PTYPE_EVALUATION_CONTEXT = 21 # evaluation context
-  OCI_PTYPE_TABLE_ALIAS        = 22 # table alias
-  OCI_PTYPE_VARIABLE_TYPE      = 23 # variable type
-  OCI_PTYPE_NAME_VALUE         = 24 # name value pair
-
-  # OCI List Types
-  OCI_LTYPE_UNK                =  0 # unknown
-  OCI_LTYPE_COLUMN             =  1 # column list
-  OCI_LTYPE_ARG_PROC           =  2 # procedure argument list
-  OCI_LTYPE_ARG_FUNC           =  3 # function argument list
-  OCI_LTYPE_SUBPRG             =  4 # subprogram list
-  OCI_LTYPE_TYPE_ATTR          =  5 # type attribute
-  OCI_LTYPE_TYPE_METHOD        =  6 # type method
-  OCI_LTYPE_TYPE_ARG_PROC      =  7 # type method w/o result argument list
-  OCI_LTYPE_TYPE_ARG_FUNC      =  8 # type method w/result argument list
-  OCI_LTYPE_SCH_OBJ            =  9 # schema object list
-  OCI_LTYPE_DB_SCH             = 10 # database schema list
-  OCI_LTYPE_TYPE_SUBTYPE       = 11 # subtype list
-  OCI_LTYPE_TABLE_ALIAS        = 12 # table alias list
-  OCI_LTYPE_VARIABLE_TYPE      = 13 # variable type list
-  OCI_LTYPE_NAME_VALUE         = 14 # name value list
-
-  # OBJECT Duration in oro.h
-  OCI_DURATION_INVALID       = 0xFFFF
-  OCI_DURATION_BEGIN         = 10
-  OCI_DURATION_NULL          = OCI_DURATION_BEGIN - 1
-  OCI_DURATION_DEFAULT       = OCI_DURATION_BEGIN - 2
-  OCI_DURATION_USER_CALLBACK = OCI_DURATION_BEGIN - 3
-  OCI_DURATION_NEXT          = OCI_DURATION_BEGIN - 4
-  OCI_DURATION_SESSION       = OCI_DURATION_BEGIN
-  OCI_DURATION_TRANS         = OCI_DURATION_BEGIN + 1
-  OCI_DURATION_CALL          = OCI_DURATION_BEGIN + 2
-  OCI_DURATION_STATEMENT     = OCI_DURATION_BEGIN + 3
-  OCI_DURATION_CALLOUT       = OCI_DURATION_BEGIN + 4
-
-  # :startdoc:
-
-  # = OCI8 can describe database object's metadata.
-  # [user objects]
-  #     OCI8#describe_any(object_name)
-  # [table or view]
-  #     OCI8#describe_table(table_name, table_only = false)
-  # [view]
-  #     OCI8#describe_view(view_name)
-  # [procedure]
-  #     OCI8#describe_procedure(procedure_name)
-  # [function]
-  #     OCI8#describe_function(function_name)
-  # [package]
-  #     OCI8#describe_package(package_name)
-  # [type]
-  #     OCI8#describe_type(type_name)
-  # [synonym]
-  #     OCI8#describe_synonym(synonym_name, check_public_also = false)
-  # [sequence]
-  #     OCI8#describe_sequence(sequence_name)
-  # [schema]
-  #     OCI8#describe_schema(schema_name)
-  # [database]
-  #     OCI8#describe_database(database_name)
+  # OCI8 has methods to obtain information about database objects such
+  # as tables, views, procedures, functions ans so on. The obtained
+  # data are called metadata and retrived as an instance of
+  # OCI8::Metadata::Base's subclass.
   #
-  # The name can be supplied as 'OBJECT_NAME' or 'SCHEMA_NAME.OBJECT_NAME'.
-  # For example: 'emp', 'scott.emp'.
+  # List of methods which return OCI8::Metadata::Base.
+  # * OCI8#describe_any(object_name)
+  # * OCI8#describe_table(table_name, table_only = false)
+  # * OCI8#describe_view(view_name)
+  # * OCI8#describe_procedure(procedure_name)
+  # * OCI8#describe_function(function_name)
+  # * OCI8#describe_package(package_name)
+  # * OCI8#describe_type(type_name)
+  # * OCI8#describe_synonym(synonym_name, check_public_also = true)
+  # * OCI8#describe_sequence(sequence_name)
+  # * OCI8#describe_schema(schema_name)
+  # * OCI8#describe_database(database_name)
+  # * OCI8::Metadata::Type#map_method
+  # * OCI8::Metadata::Type#order_method
+  # * OCI8::Metadata::Type#collection_element
   #
-  # = Retrieving Column Datatypes for a Table
+  # List of methods which return an array of OCI8::Metadata::Base.
+  # * OCI8::Cursor#column_metadata
+  # * OCI8::Metadata::Database#schemas
+  # * OCI8::Metadata::Schema#all_objects
+  # * OCI8::Metadata::Schema#objects
+  # * OCI8::Metadata::Table#columns
+  # * OCI8::Metadata::Package#subprograms
+  # * OCI8::Metadata::Procedure#arguments
+  # * OCI8::Metadata::Function#arguments
+  # * OCI8::Metadata::Type#type_attrs
+  # * OCI8::Metadata::Type#type_methods
+  # * OCI8::Metadata::TypeMethod#arguments
   #
-  #  conn = OCI8.new('ruby', 'oci8')
-  #  table = conn.describe_table('EMPLOYEES')
-  #  table.columns.each do |col|
-  #    if col.char_used
-  #      col_width = col.char_size
-  #    else
-  #      col_width = col.data_size
-  #    end
-  #  end
+  # Example:
+  #   conn = OCI8.new('username/passord')
+  #   table = conn.describe_table('scott.emp')
+  #   table.columns.each do |col|
+  #     puts "#{col.name} #{col.data_type_string}"
+  #   end
   module Metadata
-    # Abstract super class for Metadata classes.
+    # Abstract super class of Metadata classes.
     class Base
       # Table 6-1 Attributes Belonging to All Parameters
 
-      # don't use this. The number of parameters
-      def num_params
-        __ub2(OCI_ATTR_NUM_PARAMS)
+      # Returns the number of parameters.
+      def num_params # :nodoc:
+        attr_get_ub2(OCI_ATTR_NUM_PARAMS)
       end
       private :num_params
 
-      # object or schema ID
+      # call-seq:
+      #   obj_id -> integer or nil
+      #
+      # Returns the object ID, which is the same as the value of the
+      # OBJECT_ID column from ALL_OBJECTS. It returns +nil+
+      # if the database object doesn't have ID.
       def obj_id
-        __ub4(OCI_ATTR_OBJ_ID)
+        attr_get_ub4(OCI_ATTR_OBJ_ID)
       end
 
-      # database name or object name in a schema
+      # call-seq:
+      #   obj_name -> string
+      #
+      # Retruns the object name such as table name, view name,
+      # procedure name, and so on.
       def obj_name
-        __text(OCI_ATTR_OBJ_NAME)
+        attr_get_string(OCI_ATTR_OBJ_NAME)
       end
 
-      # schema name where the object is located
+      # call-seq:
+      #   obj_schema -> string
+      #
+      # Retruns the schema name. It returns +nil+
+      # if the database object is not defined just under a schema.
       def obj_schema
-        __text(OCI_ATTR_OBJ_SCHEMA)
+        attr_get_string(OCI_ATTR_OBJ_SCHEMA)
       end
 
       # The timestamp of the object
-      def timestamp
-        __oradate(OCI_ATTR_TIMESTAMP)
-      end
+      #-
+      # As far as I checked, it is current timestamp, not the object's timestamp. Why?
+      #+
+      #def timestamp
+      #  attr_get_oradate(OCI_ATTR_TIMESTAMP)
+      #end
 
       def inspect # :nodoc:
         "#<#{self.class.name}:(#{obj_id}) #{obj_schema}.#{obj_name}>"
@@ -266,9 +101,9 @@ class OCI8
       private
 
       def __boolean(idx)
-        __ub1(idx) == 0 ? false : true
+        attr_get_ub1(idx) == 0 ? false : true
       end
-      alias __word __sb4
+      alias __word attr_get_sb4
       def __anydata(idx); raise NotImplementedError; end
 
       # SQLT values to name
@@ -349,7 +184,7 @@ class OCI8
       # SQLT_REF
       DATA_TYPE_MAP[110] = [:ref,
                             Proc.new do |p|
-                              "#{p.schema_name}.#{p.type_name}"
+                              "REF #{p.schema_name}.#{p.type_name}"
                             end]
       # SQLT_CLOB
       DATA_TYPE_MAP[112] = [:clob,
@@ -418,16 +253,16 @@ class OCI8
                               end
                             end]
 
-      def __data_type
+      def __data_type # :nodoc:
         return @data_type if defined? @data_type
-        entry = DATA_TYPE_MAP[__ub2(OCI_ATTR_DATA_TYPE)]
-        type = entry.nil? ? __ub2(OCI_ATTR_DATA_TYPE) : entry[0]
+        entry = DATA_TYPE_MAP[attr_get_ub2(OCI_ATTR_DATA_TYPE)]
+        type = entry.nil? ? attr_get_ub2(OCI_ATTR_DATA_TYPE) : entry[0]
         type = type.call(self) if type.is_a? Proc
         @data_type = type
       end
 
-      def __duration
-        case __ub2(OCI_ATTR_DURATION)
+      def __duration # :nodoc:
+        case attr_get_ub2(OCI_ATTR_DURATION)
         when OCI_DURATION_SESSION
           :session
         when OCI_DURATION_TRANS
@@ -437,8 +272,8 @@ class OCI8
         end
       end
 
-      def __charset_form
-        case __ub1(OCI_ATTR_CHARSET_FORM)
+      def __charset_form # :nodoc:
+        case attr_get_ub1(OCI_ATTR_CHARSET_FORM)
         when 1; :implicit # for CHAR, VARCHAR2, CLOB w/o a specified set
         when 2; :nchar    # for NCHAR, NCHAR VARYING, NCLOB
         when 3; :explicit # for CHAR, etc, with "CHARACTER SET ..." syntax
@@ -447,9 +282,9 @@ class OCI8
         end
       end
 
-      def __type_string
-        entry = DATA_TYPE_MAP[__ub2(OCI_ATTR_DATA_TYPE)]
-        type = entry.nil? ? "unknown(#{__ub2(OCI_ATTR_DATA_TYPE)})" : entry[1]
+      def __data_type_string # :nodoc:
+        entry = DATA_TYPE_MAP[attr_get_ub2(OCI_ATTR_DATA_TYPE)]
+        type = entry.nil? ? "unknown(#{attr_get_ub2(OCI_ATTR_DATA_TYPE)})" : entry[1]
         type = type.call(self) if type.is_a? Proc
         if respond_to?(:nullable?) && !nullable?
           type + " NOT NULL"
@@ -458,8 +293,8 @@ class OCI8
         end
       end
 
-      def __typecode(idx)
-        case __ub2(idx)
+      def __typecode(idx) # :nodoc:
+        case attr_get_ub2(idx)
         when 110; :ref         # OCI_TYPECODE_REF
         when  12; :date        # OCI_TYPECODE_DATE
         when  27; :signed8     # OCI_TYPECODE_SIGNED8
@@ -510,18 +345,18 @@ class OCI8
       end
     end
 
-    # metadata for a object which cannot be classified into other
-    # metadata classes.
+    # Information about database objects which cannot be classified
+    # into other metadata classes.
     #
-    # This is returned by:
+    # An instance of this class is returned by:
     # * OCI8::Metadata::Schema#all_objects
     class Unknown < Base
       register_ptype OCI_PTYPE_UNK
     end
 
-    # Metadata for a table.
+    # Information about tables
     #
-    # This is returned by:
+    # An instance of this class is returned by:
     # * OCI8#describe_any(name)
     # * OCI8#describe_table(name)
     # * OCI8::Metadata::Schema#all_objects
@@ -535,76 +370,126 @@ class OCI8
 
       ## Table 6-2 Attributes Belonging to Tables or Views
 
-      # number of columns
+      # call-seq:
+      #   num_cols -> integer
+      #
+      # Returns number of columns
       def num_cols
-        __ub2(OCI_ATTR_NUM_COLS)
+        attr_get_ub2(OCI_ATTR_NUM_COLS)
       end
 
       # column list
-      def list_columns
+      def list_columns # :nodoc:
         __param(OCI_ATTR_LIST_COLUMNS)
       end
       private :list_columns
 
-      # to type metadata if possible
+      # call-seq:
+      #   type_metadata -> an OCI8::Metadata::Type or nil
+      #
+      # Retruns an instance of OCI8::Metadata::Type if the table is an
+      # {object table}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28371/adobjint.htm#sthref61].
+      # Otherwise, +nil+.
       def type_metadata
-        __type_metadata(OCI8::Metadata::Type)
+        __type_metadata(OCI8::Metadata::Type) if is_typed?
       end
 
-      # indicates the table is temporary.
+      # call-seq:
+      #   is_temporary? -> true or false
+      #
+      # Returns +true+ if the table is a
+      # {temporary table}[http://download.oracle.com/docs/cd/B28359_01/server.111/b28318/schema.htm#i16096].
+      # Otherwise, +false+.
       def is_temporary?
-        __boolean(OCI_ATTR_IS_TEMPORARY)
+        attr_get_ub1(OCI_ATTR_IS_TEMPORARY) != 0
       end
 
-      # indicates the table is typed.
+      # call-seq:
+      #   is_typed? -> true or false
+      #
+      # Returns +true+ if the table is a object table. Otherwise, +false+.
       def is_typed?
-        __boolean(OCI_ATTR_IS_TYPED)
+        attr_get_ub1(OCI_ATTR_IS_TYPED) != 0
       end
 
-      # Duration of a temporary table. Values can be <tt>:session</tt> or
-      # <tt>:transaction</tt>. nil if not a temporary table.
+      # call-seq:
+      #   duration -> :transaction, :session or nil
+      #
+      # Retruns +:transaction+ if the table is a
+      # {transaction-specific temporary table}[http://download.oracle.com/docs/cd/B28359_01/server.111/b28286/statements_7002.htm#i2189569].
+      # +:session+ if it is a
+      # {session-specific temporary table}[http://download.oracle.com/docs/cd/B28359_01/server.111/b28286/statements_7002.htm#i2189569].
+      # Otherwise, +nil+.
       def duration
         __duration
       end
 
       ## Table 6-3 Attributes Specific to Tables
 
-      # data block address of the segment header. (How to use this?)
+      # call-seq:
+      #   dba -> integer
+      #
+      # Returns a Data Block Address(DBA) of the segment header.
+      #
+      # The dba is converted to the file number and the block number
+      # by DBMS_UTILITY.DATA_BLOCK_ADDRESS_FILE and
+      # DBMS_UTILITY.DATA_BLOCK_ADDRESS_BLOCK respectively.
       def dba
-        __ub4(OCI_ATTR_RDBA)
+        attr_get_ub4(OCI_ATTR_RDBA)
       end
 
-      # tablespace the table resides in. (How to use this?)
+      # call-seq:
+      #   tablespace -> integer
+      #
+      # Returns a tablespace number the table resides in.
       def tablespace
         __word(OCI_ATTR_TABLESPACE)
       end
 
-      # indicates the table is clustered.
+      # call-seq:
+      #   clustered? -> true or false
+      #
+      # Returns +true+ if the table is part of a 
+      # cluster[http://download.oracle.com/docs/cd/B28359_01/server.111/b28318/schema.htm#CNCPT608].
+      # Otherwise, +false+.
       def clustered?
-        __boolean(OCI_ATTR_CLUSTERED)
+        attr_get_ub1(OCI_ATTR_CLUSTERED) != 0
       end
 
-      # indicates the table is partitioned.
+      # call-seq:
+      #   partitioned? -> true or false
+      #
+      # Returns +true+ if the table is a
+      # {partitioned table}[http://download.oracle.com/docs/cd/B28359_01/server.111/b28318/partconc.htm#i449863].
+      # Otherwise, +false+.
       def partitioned?
-        __boolean(OCI_ATTR_PARTITIONED)
+        attr_get_ub1(OCI_ATTR_PARTITIONED) != 0
       end
 
-      # indicates the table is index-only.
+      # call-seq:
+      #   index_only? -> true or false
+      #
+      # Returns +true+ if the table is an
+      # {index-organized table}[http://download.oracle.com/docs/cd/B28359_01/server.111/b28318/schema.htm#i23877]
+      # Otherwise, +false+.
       def index_only?
-        __boolean(OCI_ATTR_INDEX_ONLY)
+        attr_get_ub1(OCI_ATTR_INDEX_ONLY) != 0
       end
 
-      # array of Column objects in a table.
+      # call-seq:
+      #   columns -> list of column information
+      #
+      # Returns an array of OCI8::Metadata::Column of the table.
       def columns
         @columns ||= list_columns.to_a
       end
     end
 
-    # Metadata for a view.
+    # Information about views
     #
-    # This is returned by:
+    # An instance of this class is returned by:
     # * OCI8#describe_any(name)
-    # * OCI8#describe_table(name, true)
+    # * OCI8#describe_table(name, false)
     # * OCI8#describe_view(name)
     # * OCI8::Metadata::Schema#all_objects
     # * OCI8::Metadata::Schema#objects
@@ -617,125 +502,163 @@ class OCI8
 
       ## Table 6-2 Attributes Belonging to Tables or Views
 
-      # number of columns
+      # call-seq:
+      #   num_cols -> integer
+      #
+      # Returns number of columns
       def num_cols
-        __ub2(OCI_ATTR_NUM_COLS)
+        attr_get_ub2(OCI_ATTR_NUM_COLS)
       end
 
       # column list
-      def list_columns
+      def list_columns # :nodoc:
         __param(OCI_ATTR_LIST_COLUMNS)
       end
       private :list_columns
 
-      # to type metadata if possible
-      def type_metadata
-        __type_metadata(OCI8::Metadata::Type)
-      end
+      # This does't work for view.
+      #def type_metadata
+      #  __type_metadata(OCI8::Metadata::Type)
+      #end
 
-      # indicates the table is temporary.
-      def is_temporary?
-        __boolean(OCI_ATTR_IS_TEMPORARY)
-      end
+      # This does't work for view.
+      #def is_temporary?
+      #  attr_get_ub1(OCI_ATTR_IS_TEMPORARY) != 0
+      #end
 
-      # indicates the table is typed.
-      def is_typed?
-        __boolean(OCI_ATTR_IS_TYPED)
-      end
+      # This does't work for view.
+      #def is_typed?
+      #  attr_get_ub1(OCI_ATTR_IS_TYPED) != 0
+      #end
 
-      # Duration of a temporary table. Values can be <tt>:session</tt> or
-      # <tt>:transaction</tt>. nil if not a temporary table.
-      def duration
-        __duration
-      end
+      # This does't work for view.
+      #def duration
+      #  __duration
+      #end
 
-      # array of Column objects in a table.
+      # call-seq:
+      #   columns -> list of column information
+      #
+      # Returns an array of OCI8::Metadata::Column of the table.
       def columns
         @columns ||= list_columns.to_a
       end
     end
 
-    # Abstract super class of Procedure and Function.
+    # Information about PL/SQL subprograms
     #
-    #--
-    # How can I know whether FUNCTION or PROCEDURE?
-    #++
-    class ProcBase < Base
+    # A PL/SQL subprogram is a named PL/SQL block that can be invoked
+    # with a set of parameters. A subprogram can be either a procedure
+    # or a function.
+    #
+    # This is the abstract base class of OCI8::Metadata::Procedure and
+    # OCI8::Metadata::Function.
+    class Subprogram < Base
       ## Table 6-4 Attribute Belonging to Procedures or Functions
 
       # Argument list
-      def list_arguments
+      def list_arguments # :nodoc:
         __param(OCI_ATTR_LIST_ARGUMENTS)
       end
       private :list_arguments
 
-      # indicates the procedure or function has invoker's rights
+      def obj_id # :nodoc:
+        super if is_standalone?
+      end
+
+      def obj_name # :nodoc:
+        is_standalone? ? super : attr_get_string(OCI_ATTR_NAME)
+      end
+
+      def obj_schema # :nodoc:
+        super if is_standalone?
+      end
+
+      # call-seq:
+      #   is_invoker_rights? -> true or false
+      #
+      # Returns +true+ if the subprogram has
+      # {invoker's rights}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/subprograms.htm#i18574].
+      # Otherwise, +false+.
       def is_invoker_rights?
-        __boolean(OCI_ATTR_IS_INVOKER_RIGHTS)
+        attr_get_ub1(OCI_ATTR_IS_INVOKER_RIGHTS) != 0
       end
 
       ## Table 6-5 Attributes Specific to Package Subprograms
 
-      # name of the procedure or function.
+      # name of the subprogram
       #
-      # available only for a Package subprogram.
-      def name
-        __text(OCI_ATTR_NAME)
-      end
+      #def name
+      #  attr_get_string(OCI_ATTR_NAME)
+      #end
+      alias name obj_name # :nodoc: for backward compatibility
 
-      # overloading ID number (relevant in case the procedure or
-      # function is part of a package and is overloaded). Values
-      # returned may be different from direct query of a PL/SQL
-      # function or procedure. (What this means?)
+      # call-seq:
+      #   overload_id -> integer or nil
       #
-      # available only for a Package subprogram.
+      # Returns +nil+ for a standalone stored subprogram,
+      # positive integer for a
+      # {overloaded packaged subprogram}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/subprograms.htm#i12352].
+      # , otherwise zero.
       def overload_id
-        __ub2(OCI_ATTR_OVERLOAD_ID)
+        attr_get_ub2(OCI_ATTR_OVERLOAD_ID) unless is_standalone?
       end
 
-      # array of Argument objects.
+      # call-seq:
+      #   arguments -> list of argument information
       #
-      # The first element is the return type in case of Function.
+      # Returns an array of OCI8::Metadata::Argument of the subprogram.
+      # If it is a function, the first array element is information of its return type.
       def arguments
         @arguments ||= list_arguments.to_a
       end
 
+      # call-seq:
+      #   is_standalone? -> true or false
+      #
+      # Returns +true+ if the subprogram is standalone, +false+
+      # if packaged.
+      def is_standalone?
+        @is_standalone = true unless defined? @is_standalone
+        @is_standalone
+      end
+
       def inspect # :nodoc:
         "#<#{self.class.name}: #{name}>"
       end
     end
 
-    # Metadata for a procedure.
+    # Information about procedures
     #
-    # This is returned by:
+    # An instance of this class is returned by:
     # * OCI8#describe_any(name)
     # * OCI8#describe_procedure(name)
     # * OCI8::Metadata::Schema#all_objects
     # * OCI8::Metadata::Schema#objects
     # * OCI8::Metadata::Package#subprograms
     #
-    # See ProcBase's methods.
-    class Procedure < ProcBase
+    # See OCI8::Metadata::Subprogram.
+    class Procedure < Subprogram
       register_ptype OCI_PTYPE_PROC
     end
 
-    # Metadata for a function.
+    # Information about functions
     #
-    # This is returned by:
+    # An instance of this class is returned by:
     # * OCI8#describe_any(name)
     # * OCI8#describe_function(name)
     # * OCI8::Metadata::Schema#all_objects
     # * OCI8::Metadata::Schema#objects
     # * OCI8::Metadata::Package#subprograms
     #
-    # See ProcBase's methods.
-    class Function < ProcBase
+    # See OCI8::Metadata::Subprogram.
+    class Function < Subprogram
       register_ptype OCI_PTYPE_FUNC
     end
 
-    # Metadata for a package.
+    # Information about packages.
     #
-    # This is returned by:
+    # An instance of this class is returned by:
     # * OCI8#describe_any(name)
     # * OCI8#describe_package(name)
     # * OCI8::Metadata::Schema#all_objects
@@ -746,25 +669,35 @@ class OCI8
       ## Table 6-6 Attributes Belonging to Packages
 
       # subprogram list
-      def list_subprograms
+      def list_subprograms # :nodoc:
         __param(OCI_ATTR_LIST_SUBPROGRAMS)
       end
       private :list_subprograms
 
-      # is the package invoker's rights?
+      # call-seq:
+      #   is_invoker_rights? -> true or false
+      #
+      # Returns +true+ if the package subprograms have
+      # {invoker's rights}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/subprograms.htm#i18574].
+      # Otherwise, +false+.
       def is_invoker_rights?
-        __boolean(OCI_ATTR_IS_INVOKER_RIGHTS)
+        attr_get_ub1(OCI_ATTR_IS_INVOKER_RIGHTS) != 0
       end
 
-      # array of Procedure or Function objects.
+      # call-seq:
+      #   subprograms -> array
+      #
+      # Returns an array of Function and Procedure defined within the Package.
       def subprograms
-        @subprograms ||= list_subprograms.to_a
+        @subprograms ||= list_subprograms.to_a.each do |prog|
+          prog.instance_variable_set(:@is_standalone, false)
+        end
       end
     end
 
-    # Metadata for a type.
+    # Information about types
     #
-    # This is returned by:
+    # An instance of this class is returned by:
     # * OCI8#describe_any(name)
     # * OCI8#describe_type(name)
     # * OCI8::Metadata::Schema#all_objects
@@ -779,139 +712,250 @@ class OCI8
         self
       end
 
-      # typecode. :object or :named_collection
+      # call-seq:
+      #   typecode -> :named_type or :named_collection
+      #
+      # Returns +:named_type+ if the type is an object type,
+      # +:named_collection+ if it is a nested table or a varray.
       def typecode
         __typecode(OCI_ATTR_TYPECODE)
       end
 
-      # typecode of collection if type is collection. nil if otherwise.
+      # call-seq:
+      #   collection_typecode -> :table, :varray or nil
+      #
+      # Returns +:table+ if the type is a nested table,
+      # +:varray+ if it is a varray. Otherwise, +nil+.
       def collection_typecode
         __typecode(OCI_ATTR_COLLECTION_TYPECODE) if typecode == :named_collection
       end
 
-      # indicates this is an incomplete type
+      # call-seq:
+      #   is_incomplete_type? -> boolean
+      #
+      # Returns +true+ if the type is an
+      # {incomplete type}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28371/adobjmng.htm#i1003083],
+      # which is used for {forward declaration}[http://en.wikipedia.org/wiki/Forward_declaration].
+      # Otherwise, +false+.
       def is_incomplete_type?
-        __boolean(OCI_ATTR_IS_INCOMPLETE_TYPE)
+        attr_get_ub1(OCI_ATTR_IS_INCOMPLETE_TYPE) != 0
       end
 
-      # indicates this is a system type
-      def is_system_type?
-        __boolean(OCI_ATTR_IS_SYSTEM_TYPE)
+      # call-seq:
+      #   is_system_type? -> boolean
+      #
+      # Always returns +false+ because there is no way to create
+      # a type metadata object for a system type such as +NUMBER+,
+      # +CHAR+ and +VARCHAR+.
+      def is_system_type? # :nodoc:
+        attr_get_ub1(OCI_ATTR_IS_SYSTEM_TYPE) != 0
       end
 
-      # indicates this is a predefined type
-      def is_predefined_type?
-        __boolean(OCI_ATTR_IS_PREDEFINED_TYPE)
+      # call-seq:
+      #   is_predefined_type? -> boolean
+      #
+      # Always returns +false+.
+      #--
+      # I don't know the definition of predefined type...
+      def is_predefined_type? # :nodoc:
+        attr_get_ub1(OCI_ATTR_IS_PREDEFINED_TYPE) != 0
       end
 
-      # indicates this is a transient type
-      def is_transient_type?
-        __boolean(OCI_ATTR_IS_TRANSIENT_TYPE)
+      # call-seq:
+      #   is_transient_type? -> boolean
+      #
+      # Always returns +false+ because there is no way to create
+      # a type metadata object for a transient type, which is a type
+      # dynamically created by C API.
+      def is_transient_type? # :nodoc:
+        attr_get_ub1(OCI_ATTR_IS_TRANSIENT_TYPE) != 0
       end
 
-      # indicates this is a system-generated type
-      def is_system_generated_type?
-        __boolean(OCI_ATTR_IS_SYSTEM_GENERATED_TYPE)
+      # call-seq:
+      #   is_predefined_type? -> boolean
+      #
+      # Always returns +false+.
+      #--
+      # I don't know the definition of system generated type.
+      # What is different with system type and predefined type.
+      def is_system_generated_type? # :nodoc:
+        attr_get_ub1(OCI_ATTR_IS_SYSTEM_GENERATED_TYPE) != 0
       end
 
-      # indicates this type contains a nested table attribute.
+      # call-seq:
+      #   has_nested_table? -> boolean
+      #
+      # Returns +true+ if the type is a nested table or
+      # has a nested table attribute.
+      # Otherwise, +false+.
       def has_nested_table?
-        __boolean(OCI_ATTR_HAS_NESTED_TABLE)
+        attr_get_ub1(OCI_ATTR_HAS_NESTED_TABLE) != 0
       end
 
-      # indicates this type contains a LOB attribute
+      # call-seq:
+      #   has_lob? -> boolean
+      #
+      # Returns +true+ if the type has a CLOB, NCLOB or BLOB
+      # attribute.
+      # Otherwise, +false+.
       def has_lob?
-        __boolean(OCI_ATTR_HAS_LOB)
+        attr_get_ub1(OCI_ATTR_HAS_LOB) != 0
       end
 
-      # indicates this type contains a BFILE attribute
+      # call-seq:
+      #   has_file? -> boolean
+      #
+      # Returns +true+ if the type has a BFILE attribute.
+      # Otherwise, +false+.
       def has_file?
-        __boolean(OCI_ATTR_HAS_FILE)
+        attr_get_ub1(OCI_ATTR_HAS_FILE) != 0
       end
 
-      # returns OCI8::Metadata::Collection if type is collection. nil if otherwise.
+      # call-seq:
+      #   collection_element -> element information of the collection type
+      #
+      # Returns an OCI8::Metadata::Collection if the type is a nested
+      # table or a varray.
+      # Otherwise, +nil+.
       def collection_element
         __param(OCI_ATTR_COLLECTION_ELEMENT) if typecode == :named_collection
       end
 
-      # number of type attributes
+      # call-seq:
+      #   num_type_attrs -> integer
+      #
+      # Returns number of type attributes.
       def num_type_attrs
-        __ub2(OCI_ATTR_NUM_TYPE_ATTRS)
+        attr_get_ub2(OCI_ATTR_NUM_TYPE_ATTRS)
       end
 
       # list of type attributes
-      def list_type_attrs
+      def list_type_attrs # :nodoc:
         __param(OCI_ATTR_LIST_TYPE_ATTRS)
       end
       private :list_type_attrs
 
-      # number of type methods
+      # call-seq:
+      #   num_type_methods -> integer
+      #
+      # Returns number of type methods.
       def num_type_methods
-        __ub2(OCI_ATTR_NUM_TYPE_METHODS)
+        attr_get_ub2(OCI_ATTR_NUM_TYPE_METHODS)
       end
 
       # list of type methods
-      def list_type_methods
+      def list_type_methods # :nodoc:
         __param(OCI_ATTR_LIST_TYPE_METHODS)
       end
       private :list_type_methods
 
-      # map method of type
+      # call-seq:
+      #   map_method -> map method information
+      #
+      # Returns an instance of OCI8::Metadata::TypeMethod of a
+      # {map method}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28371/adobjbas.htm#sthref180]
+      # if it is defined in the type. Otherwise, +nil+.
       def map_method
         __param(OCI_ATTR_MAP_METHOD)
       end
 
-      # order method of type
+      # call-seq:
+      #   order_method -> order method information
+      #
+      # Returns an instance of OCI8::Metadata::TypeMethod of a
+      # {order method}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28371/adobjbas.htm#sthref185]
+      # if it is defined in the type. Otherwise, +nil+.
       def order_method
         __param(OCI_ATTR_ORDER_METHOD)
       end
 
-      # indicates the type has invoker's rights
+      # call-seq:
+      #   is_invoker_rights? -> boolean
+      #
+      # Returns +true+ if the type has
+      # {invoker's rights}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/appdev.111/b28371/adobjdes.htm#ADOBJ00810].
+      # Otherwise, +false+.
       def is_invoker_rights?
-        __boolean(OCI_ATTR_IS_INVOKER_RIGHTS)
+        attr_get_ub1(OCI_ATTR_IS_INVOKER_RIGHTS) != 0
       end
 
-      # type name
+      # call-seq:
+      #   name -> string
+      #
+      # Returns the type name.
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
-      # schema name where the type has been created
+      # call-seq:
+      #   schema_name -> string
+      #
+      # Returns the schema name where the type has been created.
       def schema_name
-        __text(OCI_ATTR_SCHEMA_NAME)
+        attr_get_string(OCI_ATTR_SCHEMA_NAME)
       end
 
-      # indicates this is a final type
+      # call-seq:
+      #   is_final_type? -> boolean
+      #
+      # Returns +true+ if the type is a
+      # {final type}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28371/adobjbas.htm#CIHFBHFC];
+      # in other words, subtypes cannot be derived from the type.
+      # Otherwise, +false+.
       def is_final_type?
-        __boolean(OCI_ATTR_IS_FINAL_TYPE)
+        attr_get_ub1(OCI_ATTR_IS_FINAL_TYPE) != 0
       end
 
-      # indicates this is an instantiable type
+      # call-seq:
+      #   is_instantiable_type? -> boolean
+      #
+      # Returns +true+ if the type is not declared without
+      # {<tt>NOT INSTANTIABLE</tt>}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28371/adobjbas.htm#i456586].
+      # Otherwise, +false+.
       def is_instantiable_type?
-        __boolean(OCI_ATTR_IS_INSTANTIABLE_TYPE)
+        attr_get_ub1(OCI_ATTR_IS_INSTANTIABLE_TYPE) != 0
       end
 
-      # indicates this is a subtype
+      # call-seq:
+      #   is_subtype? -> boolean
+      #
+      # Returns +true+ if the type is a
+      # {subtype}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28371/adobjbas.htm#BCFJJADG].
+      # Otherwise, +false+.
       def is_subtype?
-        __boolean(OCI_ATTR_IS_SUBTYPE)
+        attr_get_ub1(OCI_ATTR_IS_SUBTYPE) != 0
       end
 
-      # supertype's schema name
+      # call-seq:
+      #   supertype_schema_name -> string or nil
+      #
+      # Returns the supertype's schema name if the type is a subtype.
+      # Otherwise, +nil+.
       def supertype_schema_name
-        __text(OCI_ATTR_SUPERTYPE_SCHEMA_NAME) if is_subtype?
+        attr_get_string(OCI_ATTR_SUPERTYPE_SCHEMA_NAME) if is_subtype?
       end
 
-      # supertype's name
+      # call-seq:
+      #   supertype_name -> string or nil
+      #
+      # Returns the supertype's name if the type is a subtype.
+      # Otherwise, +nil+.
       def supertype_name
-        __text(OCI_ATTR_SUPERTYPE_NAME) if is_subtype?
+        attr_get_string(OCI_ATTR_SUPERTYPE_NAME) if is_subtype?
       end
 
-      # array of TypeAttr objects.
+      # call-seq:
+      #   type_attrs -> list of attribute information
+      #
+      # Returns an array of OCI8::Metadata::TypeAttr which the type has.
       def type_attrs
         @type_attrs ||= list_type_attrs.to_a
       end
 
-      # array of TypeMethod objects.
+      # call-seq:
+      #   type_methods -> list of method information
+      #
+      # Returns an array of OCI8::Metadata::TypeMethod which the type has.
       def type_methods
         @type_methods ||= list_type_methods.to_a
       end
@@ -934,7 +978,7 @@ class OCI8
       # returned in bytes and not characters for strings and raws. It
       # returns 22 for NUMBERs.
       def data_size
-        __ub2_nc(OCI_ATTR_DATA_SIZE)
+        attr_get_ub2(OCI_ATTR_DATA_SIZE)
       end
 
       # typecode
@@ -949,7 +993,7 @@ class OCI8
 
       # the type attribute name
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
       # The precision of numeric type attributes. If the precision is
@@ -957,7 +1001,7 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def precision
-        __is_implicit? ? __sb2(OCI_ATTR_PRECISION) : __ub1(OCI_ATTR_PRECISION)
+        __is_implicit? ? attr_get_sb2(OCI_ATTR_PRECISION) : attr_get_ub1(OCI_ATTR_PRECISION)
       end
 
       # The scale of numeric type attributes. If the precision is
@@ -965,7 +1009,7 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def scale
-        __sb1(OCI_ATTR_SCALE)
+        attr_get_sb1(OCI_ATTR_SCALE)
       end
 
       # A string which is the type name. The returned value will
@@ -975,12 +1019,12 @@ class OCI8
       # is <tt>:ref</tt>, the type name of the named datatype pointed
       # to by the REF is returned.
       def type_name
-        __text(OCI_ATTR_TYPE_NAME)
+        attr_get_string(OCI_ATTR_TYPE_NAME)
       end
 
       # schema name where the type has been created.
       def schema_name
-        __text(OCI_ATTR_SCHEMA_NAME)
+        attr_get_string(OCI_ATTR_SCHEMA_NAME)
       end
 
       # to type metadata if possible
@@ -990,7 +1034,7 @@ class OCI8
 
       # character set id if the type attribute is of a string/character type.
       def charset_id
-        __ub2(OCI_ATTR_CHARSET_ID)
+        attr_get_ub2(OCI_ATTR_CHARSET_ID)
       end
 
       # character set form, if the type attribute is of a string/character type.
@@ -1003,24 +1047,24 @@ class OCI8
         #
         # (unavailable on Oracle 8.1 or lower)
         def fsprecision
-          __ub1(OCI_ATTR_FSPRECISION)
+          attr_get_ub1(OCI_ATTR_FSPRECISION)
         end
 
         # The leading field precision of an interval
         #
         # (unavailable on Oracle 8.1 or lower)
         def lfprecision
-          __ub1(OCI_ATTR_LFPRECISION)
+          attr_get_ub1(OCI_ATTR_LFPRECISION)
         end
       end
 
       # character set name if the type attribute is of a string/character type.
       def charset_name
-        __charset_name(charset_id)
+        __con.charset_id2name(charset_id)
       end
 
       def inspect # :nodoc:
-        "#<#{self.class.name}: #{name} #{__type_string}>"
+        "#<#{self.class.name}: #{name} #{__data_type_string}>"
       end
     end
 
@@ -1041,13 +1085,13 @@ class OCI8
 
       # Name of method (procedure or function)
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
       # encapsulation level of the method. Values are <tt>:public</tt>
       # or <tt>:private</tt>.
       def encapsulation
-        case __ub4(OCI_ATTR_ENCAPSULATION)
+        case attr_get_ub4(OCI_ATTR_ENCAPSULATION)
         when 0; :private
         when 1; :public
         end
@@ -1154,7 +1198,7 @@ class OCI8
       # returned in bytes and not characters for strings and raws. It
       # returns 22 for NUMBERs.
       def data_size
-        __ub2_nc(OCI_ATTR_DATA_SIZE)
+        attr_get_ub2(OCI_ATTR_DATA_SIZE)
       end
 
       # typecode
@@ -1170,7 +1214,7 @@ class OCI8
       # the number of elements in an array. It is only valid for
       # collections that are arrays.
       def num_elems
-        __ub4(OCI_ATTR_NUM_ELEMS)
+        attr_get_ub4(OCI_ATTR_NUM_ELEMS)
       end
 
       # The precision of numeric type attributes. If the precision is
@@ -1178,7 +1222,7 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def precision
-        __is_implicit? ? __sb2(OCI_ATTR_PRECISION) : __ub1(OCI_ATTR_PRECISION)
+        __is_implicit? ? attr_get_sb2(OCI_ATTR_PRECISION) : attr_get_ub1(OCI_ATTR_PRECISION)
       end
 
       # The scale of numeric type attributes. If the precision is
@@ -1186,7 +1230,7 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def scale
-        __sb1(OCI_ATTR_SCALE)
+        attr_get_sb1(OCI_ATTR_SCALE)
       end
 
       # A string which is the type name. The returned value will
@@ -1195,12 +1239,12 @@ class OCI8
       # type is returned. If the datatype is <tt>:ref</tt>, the type name
       # of the named datatype pointed to by the REF is returned.
       def type_name
-        __text(OCI_ATTR_TYPE_NAME)
+        attr_get_string(OCI_ATTR_TYPE_NAME)
       end
 
       # schema name where the type has been created.
       def schema_name
-        __text(OCI_ATTR_SCHEMA_NAME)
+        attr_get_string(OCI_ATTR_SCHEMA_NAME)
       end
 
       # to type metadata if possible
@@ -1210,7 +1254,7 @@ class OCI8
 
       # character set id if the type attribute is of a string/character type.
       def charset_id
-        __ub2(OCI_ATTR_CHARSET_ID)
+        attr_get_ub2(OCI_ATTR_CHARSET_ID)
       end
 
       # character set form, if the type attribute is of a string/character type.
@@ -1224,7 +1268,7 @@ class OCI8
       end
 
       def inspect # :nodoc:
-        "#<#{self.class.name}: #{__type_string}>"
+        "#<#{self.class.name}: #{__data_type_string}>"
       end
     end
 
@@ -1242,22 +1286,22 @@ class OCI8
 
       # object id
       def objid
-        @objid ||= __ub4(OCI_ATTR_OBJID)
+        @objid ||= attr_get_ub4(OCI_ATTR_OBJID)
       end
 
       # schema name of the synonym translation
       def schema_name
-        @schema_name ||= __text(OCI_ATTR_SCHEMA_NAME)
+        @schema_name ||= attr_get_string(OCI_ATTR_SCHEMA_NAME)
       end
 
       # object name of the synonym translation
       def name
-        @name ||= __text(OCI_ATTR_NAME)
+        @name ||= attr_get_string(OCI_ATTR_NAME)
       end
 
       # database link name of the synonym translation or nil
       def link
-        @link ||= __text(OCI_ATTR_LINK)
+        @link ||= attr_get_string(OCI_ATTR_LINK)
         @link.size == 0 ? nil : @link
       end
 
@@ -1289,7 +1333,7 @@ class OCI8
 
       # object id
       def objid
-        __ub4(OCI_ATTR_OBJID)
+        attr_get_ub4(OCI_ATTR_OBJID)
       end
 
       # minimum value
@@ -1339,14 +1383,14 @@ class OCI8
         #
         # (unavailable on Oracle 8.1 or lower)
         def char_used?
-          __ub4(OCI_ATTR_CHAR_USED) != 0
+          attr_get_ub1(OCI_ATTR_CHAR_USED) != 0
         end
 
         # returns the column character length which is the number of
         # characters allowed in the column. It is the counterpart of
         # OCI8::Metadata::Column#data_size which gets the byte length.
         def char_size
-          __ub2(OCI_ATTR_CHAR_SIZE)
+          attr_get_ub2(OCI_ATTR_CHAR_SIZE)
         end
       else
         def char_used?
@@ -1364,7 +1408,7 @@ class OCI8
       # character-length semantics columns when using Oracle 9i
       # or upper.
       def data_size
-        __ub2_nc(OCI_ATTR_DATA_SIZE)
+        attr_get_ub2(OCI_ATTR_DATA_SIZE)
       end
 
       # the datatype of the column.
@@ -1374,7 +1418,7 @@ class OCI8
 
       # column name
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
       # The precision of numeric columns. If the precision is nonzero
@@ -1382,7 +1426,7 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def precision
-        __is_implicit? ? __sb2(OCI_ATTR_PRECISION) : __ub1(OCI_ATTR_PRECISION)
+        __is_implicit? ? attr_get_sb2(OCI_ATTR_PRECISION) : attr_get_ub1(OCI_ATTR_PRECISION)
       end
 
       # The scale of numeric columns. If the precision is nonzero and
@@ -1390,7 +1434,7 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def scale
-        __sb1(OCI_ATTR_SCALE)
+        attr_get_sb1(OCI_ATTR_SCALE)
       end
 
       # Returns 0 if null values are not permitted for the column
@@ -1405,19 +1449,19 @@ class OCI8
       # type name of the named datatype pointed to by the REF is
       # returned
       def type_name
-        rv = __text(OCI_ATTR_TYPE_NAME)
+        rv = attr_get_string(OCI_ATTR_TYPE_NAME)
         rv.length == 0 ? nil : rv
       end
 
       # Returns a string with the schema name under which the type has been created
       def schema_name
-        rv = __text(OCI_ATTR_SCHEMA_NAME)
+        rv = attr_get_string(OCI_ATTR_SCHEMA_NAME)
         rv.length == 0 ? nil : rv
       end
 
       # to type metadata if possible
       def type_metadata
-        case __ub2(OCI_ATTR_DATA_TYPE)
+        case attr_get_ub2(OCI_ATTR_DATA_TYPE)
         when 108, 110 # named_type or ref
           __type_metadata(OCI8::Metadata::Type)
         else
@@ -1427,7 +1471,7 @@ class OCI8
 
       # The character set id, if the column is of a string/character type
       def charset_id
-        __ub2(OCI_ATTR_CHARSET_ID)
+        attr_get_ub2(OCI_ATTR_CHARSET_ID)
       end
 
       # The character set form, if the column is of a string/character type
@@ -1443,14 +1487,14 @@ class OCI8
         #
         # (unavailable on Oracle 8.1 or lower)
         def fsprecision
-          __ub1(OCI_ATTR_FSPRECISION)
+          attr_get_ub1(OCI_ATTR_FSPRECISION)
         end
 
         # The leading field precision of an interval
         #
         # (unavailable on Oracle 8.1 or lower)
         def lfprecision
-          __ub1(OCI_ATTR_LFPRECISION)
+          attr_get_ub1(OCI_ATTR_LFPRECISION)
         end
       end
 
@@ -1459,16 +1503,17 @@ class OCI8
         __charset_name(charset_id)
       end
 
-      def type_string
-        __type_string
+      def data_type_string
+        __data_type_string
       end
+      alias :type_string :data_type_string # :nodoc: old name of data_type_string
 
       def to_s
-        %Q{"#{name}" #{__type_string}}
+        %Q{"#{name}" #{__data_type_string}}
       end
 
       def inspect # :nodoc:
-        "#<#{self.class.name}: #{name} #{__type_string}>"
+        "#<#{self.class.name}: #{name} #{__data_type_string}>"
       end
     end
 
@@ -1478,12 +1523,12 @@ class OCI8
 
       # the argument name
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
       # the position of the argument in the argument list.
       def position
-        __ub2(OCI_ATTR_POSITION)
+        attr_get_ub2(OCI_ATTR_POSITION)
       end
 
       # typecode
@@ -1500,7 +1545,7 @@ class OCI8
       # returned in bytes and not characters for strings and raws. It
       # returns 22 for NUMBERs.
       def data_size
-        __ub2_nc(OCI_ATTR_DATA_SIZE)
+        attr_get_ub2(OCI_ATTR_DATA_SIZE)
       end
 
       # The precision of numeric arguments. If the precision is
@@ -1508,7 +1553,7 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def precision
-        __is_implicit? ? __sb2(OCI_ATTR_PRECISION) : __ub1(OCI_ATTR_PRECISION)
+        __is_implicit? ? attr_get_sb2(OCI_ATTR_PRECISION) : attr_get_ub1(OCI_ATTR_PRECISION)
       end
 
       # The scale of numeric arguments. If the precision is nonzero
@@ -1516,17 +1561,17 @@ class OCI8
       # NUMBER(precision, scale). For the case when precision is 0,
       # NUMBER(precision, scale) can be represented simply as NUMBER.
       def scale
-        __sb1(OCI_ATTR_SCALE)
+        attr_get_sb1(OCI_ATTR_SCALE)
       end
 
       # The datatype levels. This attribute always returns zero.
       def level
-        __ub2(OCI_ATTR_LEVEL)
+        attr_get_ub2(OCI_ATTR_LEVEL)
       end
 
       # Indicates whether an argument has a default
       def has_default
-        __ub1(OCI_ATTR_HAS_DEFAULT)
+        attr_get_ub1(OCI_ATTR_HAS_DEFAULT)
       end
 
       # The list of arguments at the next level (when the argument is
@@ -1539,7 +1584,7 @@ class OCI8
       # Indicates the argument mode. Values are <tt>:in</tt>,
       # <tt>:out</tt> or <tt>:inout</tt>
       def iomode
-        case __ub4(OCI_ATTR_IOMODE)
+        case attr_get_ub4(OCI_ATTR_IOMODE)
         when 0; :in
         when 1; :out
         when 2; :inout
@@ -1548,7 +1593,7 @@ class OCI8
 
       # Returns a radix (if number type)
       def radix
-        __ub1(OCI_ATTR_RADIX)
+        attr_get_ub1(OCI_ATTR_RADIX)
       end
 
       # doesn't work.
@@ -1563,20 +1608,20 @@ class OCI8
       # datatype's type is returned. If the datatype is <tt>:ref</tt>, the type
       # name of the named datatype pointed to by the REF is returned.
       def type_name
-        __text(OCI_ATTR_TYPE_NAME)
+        attr_get_string(OCI_ATTR_TYPE_NAME)
       end
 
       # For <tt>:named_type</tt> or <tt>:ref</tt>, returns a string with the schema name
       # under which the type was created, or under which the package
       # was created in the case of package local types
       def schema_name
-        __text(OCI_ATTR_SCHEMA_NAME)
+        attr_get_string(OCI_ATTR_SCHEMA_NAME)
       end
 
       # For <tt>:named_type</tt> or <tt>:ref</tt>, returns a string with the type name,
       # in the case of package local types
       def sub_name
-        __text(OCI_ATTR_SUB_NAME)
+        attr_get_string(OCI_ATTR_SUB_NAME)
       end
 
       # For <tt>:named_type</tt> or <tt>:ref</tt>, returns a string with the database
@@ -1584,7 +1629,7 @@ class OCI8
       # happen only in the case of package local types, when the
       # package is remote.
       def link
-        __text(OCI_ATTR_LINK)
+        attr_get_string(OCI_ATTR_LINK)
       end
 
       # to type metadata if possible
@@ -1595,7 +1640,7 @@ class OCI8
       # Returns the character set ID if the argument is of a
       # string/character type
       def charset_id
-        __ub2(OCI_ATTR_CHARSET_ID)
+        attr_get_ub2(OCI_ATTR_CHARSET_ID)
       end
 
       # Returns the character set form if the argument is of a
@@ -1617,7 +1662,7 @@ class OCI8
       end
 
       def inspect # :nodoc:
-        "#<#{self.class.name}: #{name} #{__type_string}>"
+        "#<#{self.class.name}: #{name} #{__data_type_string}>"
       end
     end
 
@@ -1664,7 +1709,7 @@ class OCI8
         end
       else
         def ltype
-          __ub2(OCI_ATTR_LTYPE)
+          attr_get_ub2(OCI_ATTR_LTYPE)
         end
       end
 
@@ -1715,41 +1760,51 @@ class OCI8
       # array of objects in the schema.
       # This includes unusable objects.
       def all_objects
-        unless @all_objects
+        @all_objects ||=
           begin
-            objs = list_objects
-          rescue OCIError => exc
-            if exc.code != -1
-              raise
+            begin
+              objs = list_objects
+            rescue OCIError => exc
+              if exc.code != -1
+                raise
+              end
+              # describe again.
+              objs = __con.describe_schema(obj_schema).list_objects
             end
-            # describe again.
-            objs = __con.describe_schema(obj_schema).list_objects
+            objs.to_a.collect! do |elem|
+              case elem
+              when OCI8::Metadata::Type
+                # to avoid a segmentation fault
+                begin
+                  __con.describe_type(elem.obj_schema + '.' + elem.obj_name)
+                rescue OCIError
+                  # ignore ORA-24372: invalid object for describe
+                  raise if $!.code != 24372
+                end
+              else
+                elem
+              end
+            end.compact
           end
-          @all_objects = objs.to_a
-        end
-        @all_objects
       end
 
       # array of objects in the schema.
       def objects
-        unless @objects
-          @objects = all_objects.dup.reject! do |obj|
-            case obj
-            when Unknown
-              true
-            when Synonym
-              begin
-                obj.objid
-                false
-              rescue OCIError
-                true
-              end
-            else
+        @objects ||= all_objects.reject do |obj|
+          case obj
+          when Unknown
+            true
+          when Synonym
+            begin
+              obj.objid
               false
+            rescue OCIError
+              true
             end
+          else
+            false
           end
         end
-        @objects
       end
 
       def inspect # :nodoc:
@@ -1768,17 +1823,17 @@ class OCI8
 
       # database version
       def version
-        __text(OCI_ATTR_VERSION)
+        attr_get_string(OCI_ATTR_VERSION)
       end
 
       # database character set Id
       def charset_id
-        __ub2(OCI_ATTR_CHARSET_ID)
+        attr_get_ub2(OCI_ATTR_CHARSET_ID)
       end
 
       # database national language support character set Id
       def ncharset_id
-        __ub2(OCI_ATTR_NCHARSET_ID)
+        attr_get_ub2(OCI_ATTR_NCHARSET_ID)
       end
 
       # List of schemas in the database
@@ -1789,12 +1844,12 @@ class OCI8
 
       # Maximum length of a procedure name
       def max_proc_len
-        __ub4(OCI_ATTR_MAX_PROC_LEN)
+        attr_get_ub4(OCI_ATTR_MAX_PROC_LEN)
       end
 
       # Maximum length of a column name
       def max_column_len
-        __ub4(OCI_ATTR_MAX_COLUMN_LEN)
+        attr_get_ub4(OCI_ATTR_MAX_COLUMN_LEN)
       end
 
       # How a COMMIT operation affects cursors and prepared statements in
@@ -1805,7 +1860,7 @@ class OCI8
       #                           application can still re-execute the
       #                           statement without re-preparing it
       def cursor_commit_behavior
-        case __ub1(OCI_ATTR_CURSOR_COMMIT_BEHAVIOR)
+        case attr_get_ub1(OCI_ATTR_CURSOR_COMMIT_BEHAVIOR)
         when 0; :cusror_open
         when 1; :cursor_closed
         end
@@ -1813,13 +1868,13 @@ class OCI8
 
       # Maximum length of a catalog (database) name
       def max_catalog_namelen
-        __ub1(OCI_ATTR_MAX_CATALOG_NAMELEN)
+        attr_get_ub1(OCI_ATTR_MAX_CATALOG_NAMELEN)
       end
 
       # Position of the catalog in a qualified table. Values are
       # <tt>:cl_start</tt> and <tt>:cl_end</tt>
       def catalog_location
-        case __ub1(OCI_ATTR_CATALOG_LOCATION)
+        case attr_get_ub1(OCI_ATTR_CATALOG_LOCATION)
         when 0; :cl_start
         when 1; :cl_end
         end
@@ -1828,7 +1883,7 @@ class OCI8
       # Does database support savepoints? Values are
       # <tt>:sp_supported</tt> and <tt>:sp_unsupported</tt>
       def savepoint_support
-        case __ub1(OCI_ATTR_SAVEPOINT_SUPPORT)
+        case attr_get_ub1(OCI_ATTR_SAVEPOINT_SUPPORT)
         when 0; :sp_supported
         when 1; :sp_unsupported
         end
@@ -1837,7 +1892,7 @@ class OCI8
       # Does database support the nowait clause? Values are
       # <tt>:nw_supported</tt> and <tt>:nw_unsupported</tt>
       def nowait_support
-        case __ub1(OCI_ATTR_NOWAIT_SUPPORT)
+        case attr_get_ub1(OCI_ATTR_NOWAIT_SUPPORT)
         when 0; :nw_supported
         when 1; :nw_unsupported
         end
@@ -1846,7 +1901,7 @@ class OCI8
       # Is autocommit mode required for DDL statements? Values are
       # <tt>:ac_ddl</tt> and <tt>:no_ac_ddl</tt>
       def autocommit_ddl
-        case __ub1(OCI_ATTR_AUTOCOMMIT_DDL)
+        case attr_get_ub1(OCI_ATTR_AUTOCOMMIT_DDL)
         when 0; :ac_ddl
         when 1; :no_ac_ddl
         end
@@ -1855,7 +1910,7 @@ class OCI8
       # Locking mode for the database. Values are <tt>:lock_immediate</tt> and
       # <tt>:lock_delayed</tt>
       def locking_mode
-        case __ub1(OCI_ATTR_LOCKING_MODE)
+        case attr_get_ub1(OCI_ATTR_LOCKING_MODE)
         when 0; :lock_immediate
         when 1; :lock_delayed
         end
@@ -1888,19 +1943,19 @@ class OCI8
       # Table 6-18 Attributes Specific to Rules
 
       def condition
-        __text(OCI_ATTR_CONDITION)
+        attr_get_string(OCI_ATTR_CONDITION)
       end
 
       def eval_context_owner
-        __text(OCI_ATTR_EVAL_CONTEXT_OWNER)
+        attr_get_string(OCI_ATTR_EVAL_CONTEXT_OWNER)
       end
 
       def eval_context_name
-        __text(OCI_ATTR_EVAL_CONTEXT_NAME)
+        attr_get_string(OCI_ATTR_EVAL_CONTEXT_NAME)
       end
 
       def comment
-        __text(OCI_ATTR_COMMENT)
+        attr_get_string(OCI_ATTR_COMMENT)
       end
 
       # def list_action_context
@@ -1914,15 +1969,15 @@ class OCI8
       # Table 6-19 Attributes Specific to Rule Sets
 
       def eval_context_owner
-        __text(OCI_ATTR_EVAL_CONTEXT_OWNER)
+        attr_get_string(OCI_ATTR_EVAL_CONTEXT_OWNER)
       end
 
       def eval_context_name
-        __text(OCI_ATTR_EVAL_CONTEXT_NAME)
+        attr_get_string(OCI_ATTR_EVAL_CONTEXT_NAME)
       end
 
       def comment
-        __text(OCI_ATTR_COMMENT)
+        attr_get_string(OCI_ATTR_COMMENT)
       end
 
       # def list_rules
@@ -1936,11 +1991,11 @@ class OCI8
       # Table 6-20 Attributes Specific to Evaluation Contexts
 
       def evaluation_function
-        __text(OCI_ATTR_EVALUATION_FUNCTION)
+        attr_get_string(OCI_ATTR_EVALUATION_FUNCTION)
       end
 
       def comment
-        __text(OCI_ATTR_COMMENT)
+        attr_get_string(OCI_ATTR_COMMENT)
       end
 
       def list_table_aliases
@@ -1958,11 +2013,11 @@ class OCI8
       # Table 6-21 Attributes Specific to Table Aliases
 
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
       def table_name
-        __text(OCI_ATTR_TABLE_NAME)
+        attr_get_string(OCI_ATTR_TABLE_NAME)
       end
     end
 
@@ -1972,19 +2027,19 @@ class OCI8
       # Table 6-22 Attributes Specific to Variable Types
 
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
       def var_type
-        __text(OCI_ATTR_VAR_TYPE)
+        attr_get_string(OCI_ATTR_VAR_TYPE)
       end
 
       def var_value_function
-        __text(OCI_ATTR_VAR_VALUE_FUNCTION)
+        attr_get_string(OCI_ATTR_VAR_VALUE_FUNCTION)
       end
 
       def var_method_function
-        __text(OCI_ATTR_VAR_METHOD_FUNCTION)
+        attr_get_string(OCI_ATTR_VAR_METHOD_FUNCTION)
       end
     end
 
@@ -1994,7 +2049,7 @@ class OCI8
       # Table 6-23 Attributes Specific to Name Value Pair
 
       def name
-        __text(OCI_ATTR_NAME)
+        attr_get_string(OCI_ATTR_NAME)
       end
 
       # not implemented