ruby-oci8 2.2.6.1 → 2.2.10

data/docs/install-on-osx.md

@@ -1,133 +1,46 @@
-# @title Install ruby-oci8 on OS X
+# @title Install ruby-oci8 on macOS
 
-Install ruby-oci8 on OS X
+Install ruby-oci8 on macOS
 =========================
 
-This page explains the way to install ruby-oci8 os OS X.
+**Note: Ruby-oci8 doesn't run on Apple Silicon because Oracle instant client
+for Apple Silicon has not been released yet.**
 
-Look at {file:docs/install-full-client.md}, {file:docs/install-instant-client.md}
-or {file:docs/install-binary-package.md} for other platforms.
-
-Install C compiler
-------------------
-
-You need to install the command line developer tools or the Xcode.
-(The latter includes the former.)
-
-Run `"cc --version"` in a terminal to check whether they are installed.
-
-If the cc version is printed, the tools are installed.
-
-If the follwoing dialog is displayed, click its Install button to
-install the tools.
-You have no need to install the Xcode to compile ruby-oci8.
-It requires command line tools, not an IDE such as the Xcode.
-
-![dialog](osx-install-dev-tools.png)
+Prerequisite
+------------
 
-If `"Agreeing to the Xcode/iOS license requires admin privileges,
-please re-run as root via sudo."` is printed, you need to run
-`"sudo cc --version"`, enter your password, look at the license
-and type `"agree"`.
+* Command line tools for Xcode or Xcode (by executing `xcode-select --install`) or [Xcode]
 
 Install Oracle Instant Client Packages
 --------------------------------------
 
-### Download Oracle Instant Client Packages
-
-Download the following packages from [Oracle Technology Network][]
-
-* Instant Client Package - Basic (`instantclient-basic-macos.x64-12.1.0.2.0.zip`) or Basic Lite (`instantclient-basiclite-macos.x64-12.1.0.2.0.zip`)
-* Instant Client Package - SDK (`instantclient-sdk-macos.x64-12.1.0.2.0.zip`)
-* Instant Client Package - SQL*Plus (`instantclient-sqlplus-macos.x64-12.1.0.2.0.zip`) (optionally) 
-
-### Install Oracle Instant Client Packages via Homebrew
-
-To install `Oracle Instant Client Basic` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basic
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus # (optionally)
-
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-To install `Oracle Instant Client Basic Lite` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basiclite
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus --with-basiclite # (optionally)
-        
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-### Install Oracle Instant Client Manually
-
-If you don't use [Homebrew][], do the following:
-
-Unzip the packages as follows:
-
-    mkdir -p /opt/oracle
-    cd /opt/oracle
-
-Copy downloaded files to /opt/oracle before running the following commands.
-
-    unzip instantclient-basic-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sdk-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sqlplus-macos.x64-12.1.0.2.0.zip
-
-Make a symbolic link to link the library.
-
-    cd /opt/oracle/instantclient_12_1
-    ln -s libclntsh.dylib.12.1 libclntsh.dylib
-
-Set the environment variable OCI_DIR while performing the following installation steps.
-
-    export OCI_DIR=/opt/oracle/instantclient_12_1
-
-Installation
-------------
-
-If you get a problem in the following steps, look at {file:docs/report-installation-issue.md}.
-
-### gem package
-
-Run the following command.
+If you have installed [Homebrew], use the following command:
 
-    gem install ruby-oci8
+```shell
+$ brew tap InstantClientTap/instantclient
+$ brew install instantclient-basic   # or instantclient-basiclite
+$ brew install instantclient-sdk
+$ brew install instantclient-sqlplus # (optionally)
+```
 
-### tar.gz package
+Otherwise, look at this [page][OTN] and set the environment variable
+`OCI_DIR` to point the the directory where instant client is installed.
+Ruby-oci8 installation script checks the directory.
 
-#### Download the source code
+```shell
+export OCI_DIR=$HOME/Downloads/instantclient_19_8  # for example
+```
 
-Download the latest tar.gz package from [download page][].
+Install ruby-oci8
+-----------------
 
-#### Run make and install
+Note that `/usr/bin/ruby` isn't available. You need to use [`rbenv`] or so.
 
-    tar xvfz ruby-oci8-VERSION.tar.gz
-    cd ruby-oci8-VERSION
-    make
-    make install
+```shell
+$ gem install ruby-oci8
+```
 
-[download page]: https://bintray.com/kubo/generic/ruby-oci8
 [Homebrew]: http://brew.sh/
-[fix_oralib]: https://github.com/kubo/fix_oralib_osx
-[Oracle Technology Network]: http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html
+[OTN]: https://www.oracle.com/database/technologies/instant-client/macos-intel-x86-downloads.html#ic_osx_inst
+[Xcode]: https://apps.apple.com/us/app/xcode/id497799835
+[`rbenv`]: https://github.com/rbenv/rbenv

data/ext/oci8/apiwrap.c.tmpl

@@ -4,7 +4,6 @@
 %>
 #define API_WRAP_C 1
 #include "apiwrap.h"
-#define BLOCKING_FUNCTION_EPILOGUE(svcctx) do { (svcctx)->executing_thread = Qnil; } while (0)
 
 <%
 prev_name = ''
@@ -59,11 +58,9 @@ static void *oci8_<%=f.name%>_cb(void *user_data)
 %>    data->rv = <%=f.name%>(<%= f.args.collect do |a| 'data->' + a.name; end.join(', ') %>);
 <% end %>
 <% if f.ret == 'sword'
-%>    BLOCKING_FUNCTION_EPILOGUE(data->svcctx);
-    return (void*)(VALUE)data->rv;
+%>    return (void*)(VALUE)data->rv;
 <% else
-%>    BLOCKING_FUNCTION_EPILOGUE(data->svcctx);
-    return NULL;
+%>    return NULL;
 <% end %>
 }
 #else

data/ext/oci8/apiwrap.yml

@@ -83,6 +83,17 @@ OCIBindByPos:
             - ub4 *curelep
             - ub4 mode
 
+# round trip: 0
+OCIBindDynamic:
+  :version: 800
+  :args:
+            - OCIBind *bindp
+            - OCIError *errhp
+            - void  *ictxp
+            - OCICallbackInBind icbfp
+            - void  *octxp
+            - OCICallbackOutBind ocbfp
+
 # round trip: 0
 OCIBindObject:
   :version: 800
@@ -180,6 +191,15 @@ OCIDefineByPos:
             - ub2 *rcodep
             - ub4 mode
 
+# round trip: 0
+OCIDefineDynamic:
+  :version: 800
+  :args:
+            - OCIDefine *defnp
+            - OCIError *errhp
+            - dvoid *octxp
+            - OCICallbackDefine ocbfp
+
 # round trip: 0
 OCIDefineObject:
   :version: 800

data/ext/oci8/attr.c

@@ -15,8 +15,9 @@ typedef struct {
     OCIRowid *ridp;
 } rowid_arg_t;
 
-static VALUE get_rowid_attr(rowid_arg_t *arg)
+static VALUE get_rowid_attr(VALUE varg)
 {
+    rowid_arg_t *arg = (rowid_arg_t *)varg;
     oci8_base_t *base = arg->base;
     ub4 attrtype = arg->attrtype;
     char buf[MAX_ROWID_LEN];
@@ -36,8 +37,9 @@ static VALUE get_rowid_attr(rowid_arg_t *arg)
     return rb_external_str_new_with_enc(buf, buflen, rb_usascii_encoding());
 }
 
-static VALUE rowid_ensure(rowid_arg_t *arg)
+static VALUE rowid_ensure(VALUE varg)
 {
+    rowid_arg_t *arg = (rowid_arg_t *)varg;
     if (arg->ridp != NULL) {
         OCIDescriptorFree(arg->ridp, OCI_DTYPE_ROWID);
     }

data/ext/oci8/bind.c

@@ -11,6 +11,7 @@
 #endif
 
 static ID id_bind_type;
+static ID id_charset_form;
 static VALUE sym_length;
 static VALUE sym_length_semantics;
 static VALUE sym_char;
@@ -25,6 +26,29 @@ typedef struct {
     ub1 csfrm;
 } oci8_bind_string_t;
 
+static ub4 initial_chunk_size = 32 * 1024;
+static ub4 max_chunk_size = 8 * 1024 * 1024;
+
+typedef struct chunk {
+    struct chunk *next;
+    ub4 alloc_len;
+    ub4 used_len;
+    char buf[1];
+} chunk_t;
+
+typedef struct {
+    chunk_t *head;
+    chunk_t **tail;
+    chunk_t **inpos;
+} chunk_buf_t;
+
+typedef struct {
+    oci8_bind_t obind;
+    ub1 csfrm;
+} oci8_bind_long_t;
+
+#define IS_BIND_LONG(obind) (((oci8_bind_data_type_t*)obind->base.data_type)->dty == SQLT_CHR)
+
 const oci8_handle_data_type_t oci8_bind_data_type = {
     {
         "OCI8::BindType::Base",
@@ -61,7 +85,7 @@ static void bind_string_set(oci8_bind_t *obind, void *data, void **null_structp,
         rb_raise(rb_eArgError, "too long String to set. (%ld for %d)", RSTRING_LEN(val), obs->bytelen);
     }
     memcpy(vstr->buf, RSTRING_PTR(val), RSTRING_LEN(val));
-    vstr->size = RSTRING_LEN(val);
+    vstr->size = RSTRING_LENINT(val);
 }
 
 static void bind_string_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE param)
@@ -171,7 +195,7 @@ static void bind_raw_set(oci8_bind_t *obind, void *data, void **null_structp, VA
         rb_raise(rb_eArgError, "too long String to set. (%ld for %d)", RSTRING_LEN(val), obs->bytelen);
     }
     memcpy(vstr->buf, RSTRING_PTR(val), RSTRING_LEN(val));
-    vstr->size = RSTRING_LEN(val);
+    vstr->size = RSTRING_LENINT(val);
 }
 
 static const oci8_bind_data_type_t bind_raw_data_type = {
@@ -306,6 +330,295 @@ static VALUE bind_boolean_alloc(VALUE klass)
     return oci8_allocate_typeddata(klass, &bind_boolean_data_type.base);
 }
 
+/*
+ * bind_long
+ */
+static chunk_t *next_chunk(chunk_buf_t *cb)
+{
+   chunk_t *chunk;
+
+   if (*cb->tail != NULL) {
+       chunk = *cb->tail;
+   } else {
+       ub4 alloc_len;
+       if (cb->head == NULL) {
+           alloc_len = initial_chunk_size;
+       } else {
+           alloc_len = ((chunk_t*)((size_t)cb->tail - offsetof(chunk_t, next)))->alloc_len * 2;
+           if (alloc_len > max_chunk_size) {
+               alloc_len = max_chunk_size;
+           }
+       }
+       chunk = xmalloc(offsetof(chunk_t, buf) + alloc_len);
+       chunk->next = NULL;
+       chunk->alloc_len = alloc_len;
+       *cb->tail = chunk;
+   }
+   cb->tail = &chunk->next;
+   return chunk;
+}
+
+static sb4 define_callback(void *octxp, OCIDefine *defnp, ub4 iter, void **bufpp, ub4 **alenp, ub1 *piecep, void **indp, ub2 **rcodep)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)octxp;
+    chunk_buf_t *cb = ((chunk_buf_t*)obind->valuep) + iter;
+    chunk_t *chunk;
+
+    if (*piecep == OCI_FIRST_PIECE) {
+        cb->tail = &cb->head;
+    }
+    chunk = next_chunk(cb);
+    chunk->used_len = chunk->alloc_len;
+    *bufpp = chunk->buf;
+    *alenp = &chunk->used_len;
+    *indp = (void*)&obind->u.inds[iter];
+    *rcodep = NULL;
+    return OCI_CONTINUE;
+}
+
+static sb4 in_bind_callback(void *ictxp, OCIBind *bindp, ub4 iter, ub4 index, void **bufpp, ub4 *alenp, ub1 *piecep, void **indp)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)ictxp;
+    chunk_buf_t *cb = ((chunk_buf_t*)obind->valuep) + iter;
+
+    if (cb->tail == &cb->head) {
+        /* empty string */
+        *bufpp = (void *)"";
+        *alenp = 0;
+        *piecep = OCI_ONE_PIECE;
+    } else {
+        chunk_t *chunk = *cb->inpos;
+        *bufpp = chunk->buf;
+        *alenp = chunk->used_len;
+        if (cb->tail == &cb->head->next) {
+            *piecep = OCI_ONE_PIECE;
+        } else if (cb->inpos == &cb->head) {
+            *piecep = OCI_FIRST_PIECE;
+            cb->inpos = &chunk->next;
+        } else if (&chunk->next != cb->tail) {
+            *piecep = OCI_NEXT_PIECE;
+            cb->inpos = &chunk->next;
+        } else {
+            *piecep = OCI_LAST_PIECE;
+            cb->inpos = &cb->head;
+        }
+    }
+    *indp = (void*)&obind->u.inds[iter];
+    return OCI_CONTINUE;
+}
+
+static sb4 out_bind_callback(void *octxp, OCIBind *bindp, ub4 iter, ub4 index, void **bufpp, ub4 **alenp, ub1 *piecep, void **indp, ub2 **rcodep)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)octxp;
+    chunk_buf_t *cb = ((chunk_buf_t*)obind->valuep) + iter;
+    chunk_t *chunk;
+
+    if (*piecep == OCI_ONE_PIECE) {
+        *piecep = OCI_FIRST_PIECE;
+        cb->tail = &cb->head;
+    }
+    chunk = next_chunk(cb);
+    chunk->used_len = chunk->alloc_len;
+    *bufpp = chunk->buf;
+    *alenp = &chunk->used_len;
+    *indp = (void*)&obind->u.inds[iter];
+    *rcodep = NULL;
+    return OCI_CONTINUE;
+}
+
+static void bind_long_free(oci8_base_t *base)
+{
+    oci8_bind_t *obind = (oci8_bind_t *)base;
+    chunk_buf_t *cb = (chunk_buf_t *)obind->valuep;
+
+    if (cb != NULL) {
+        ub4 idx = 0;
+        do {
+            chunk_t *chunk, *chunk_next;
+            for (chunk = cb[idx].head; chunk != NULL; chunk = chunk_next) {
+                chunk_next = chunk->next;
+                xfree(chunk);
+            }
+        } while (++idx < obind->maxar_sz);
+    }
+    oci8_bind_free(base);
+}
+
+static VALUE bind_long_get(oci8_bind_t *obind, void *data, void *null_struct)
+{
+    chunk_buf_t *cb = (chunk_buf_t *)data;
+    chunk_t *chunk;
+    long len = 0;
+    VALUE str;
+    char *buf;
+
+    for (chunk = cb->head; chunk != *cb->tail; chunk = chunk->next) {
+        len += chunk->used_len;
+    }
+    str = rb_str_buf_new(len);
+    buf = RSTRING_PTR(str);
+    for (chunk = cb->head; chunk != *cb->tail; chunk = chunk->next) {
+        memcpy(buf, chunk->buf, chunk->used_len);
+        buf += chunk->used_len;
+    }
+    rb_str_set_len(str, len);
+    if (IS_BIND_LONG(obind)) {
+        rb_encoding *enc = rb_default_internal_encoding();
+
+        rb_enc_associate(str, oci8_encoding);
+        if (enc != NULL) {
+            str = rb_str_conv_enc(str, oci8_encoding, enc);
+        }
+    }
+    return str;
+}
+
+static void bind_long_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
+{
+    chunk_buf_t *cb = (chunk_buf_t *)data;
+    ub4 len;
+    const char *buf;
+
+    if (IS_BIND_LONG(obind)) {
+        OCI8StringValue(val);
+    } else {
+        StringValue(val);
+    }
+    len = (ub4)RSTRING_LEN(val);
+    buf = RSTRING_PTR(val);
+    cb->tail = &cb->head;
+    while (1) {
+        chunk_t *chunk = next_chunk(cb);
+        if (len <= chunk->alloc_len) {
+            memcpy(chunk->buf, buf, len);
+            chunk->used_len = len;
+            break;
+        }
+        memcpy(chunk->buf, buf, chunk->alloc_len);
+        chunk->used_len = chunk->alloc_len;
+        len -= chunk->alloc_len;
+        buf += chunk->alloc_len;
+    }
+}
+
+static void bind_long_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE param)
+{
+    if (IS_BIND_LONG(obind)) {
+        oci8_bind_long_t *obl = (oci8_bind_long_t *)obind;
+        VALUE nchar;
+
+        if (rb_respond_to(param, id_charset_form)) {
+            VALUE csfrm = rb_funcall(param, id_charset_form, 0);
+            nchar = (csfrm == sym_nchar) ? Qtrue : Qfalse;
+        } else {
+            Check_Type(param, T_HASH);
+            nchar = rb_hash_aref(param, sym_nchar);
+        }
+
+        if (RTEST(nchar)) {
+            obl->csfrm = SQLCS_NCHAR; /* bind as NCHAR/NVARCHAR2 */
+        } else {
+            obl->csfrm = SQLCS_IMPLICIT; /* bind as CHAR/VARCHAR2 */
+        }
+    }
+    obind->value_sz = SB4MAXVAL;
+    obind->alloc_sz = sizeof(chunk_buf_t);
+}
+
+static void bind_long_init_elem(oci8_bind_t *obind, VALUE svc)
+{
+    chunk_buf_t *cb = (chunk_buf_t *)obind->valuep;
+    ub4 idx = 0;
+
+    do {
+        cb[idx].tail = &cb[idx].head;
+        cb[idx].inpos = &cb[idx].head;
+    } while (++idx < obind->maxar_sz);
+}
+
+static void bind_long_post_bind_hook(oci8_bind_t *obind)
+{
+    oci8_bind_long_t *ds = (oci8_bind_long_t *)obind;
+
+    if (IS_BIND_LONG(obind)) {
+        chker2(OCIAttrSet(obind->base.hp.ptr, obind->base.type, (void*)&ds->csfrm, 0, OCI_ATTR_CHARSET_FORM, oci8_errhp),
+               &obind->base);
+    }
+    switch (obind->base.type) {
+    case OCI_HTYPE_DEFINE:
+        chker2(OCIDefineDynamic(obind->base.hp.dfn, oci8_errhp, obind, define_callback),
+               &obind->base);
+        break;
+    case OCI_HTYPE_BIND:
+        chker2(OCIBindDynamic(obind->base.hp.bnd, oci8_errhp, obind, in_bind_callback,
+                              obind, out_bind_callback),
+               &obind->base);
+        break;
+    }
+}
+
+static const oci8_bind_data_type_t bind_long_data_type = {
+    {
+        {
+            "OCI8::BindType::Long",
+            {
+                NULL,
+                oci8_handle_cleanup,
+                oci8_handle_size,
+            },
+            &oci8_bind_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+            RUBY_TYPED_WB_PROTECTED,
+#endif
+        },
+        bind_long_free,
+        sizeof(oci8_bind_long_t)
+    },
+    bind_long_get,
+    bind_long_set,
+    bind_long_init,
+    bind_long_init_elem,
+    NULL,
+    SQLT_CHR,
+    bind_long_post_bind_hook,
+};
+
+static VALUE bind_long_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_long_data_type.base);
+}
+
+static const oci8_bind_data_type_t bind_long_raw_data_type = {
+    {
+        {
+            "OCI8::BindType::LongRaw",
+            {
+                NULL,
+                oci8_handle_cleanup,
+                oci8_handle_size,
+            },
+            &oci8_bind_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+            RUBY_TYPED_WB_PROTECTED,
+#endif
+        },
+        bind_long_free,
+        sizeof(oci8_bind_long_t)
+    },
+    bind_long_get,
+    bind_long_set,
+    bind_long_init,
+    bind_long_init_elem,
+    NULL,
+    SQLT_BIN,
+    bind_long_post_bind_hook,
+};
+
+static VALUE bind_long_raw_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_long_raw_data_type.base);
+}
+
 static VALUE oci8_bind_get(VALUE self)
 {
     oci8_bind_t *obind = TO_BIND(self);
@@ -320,11 +633,20 @@ static VALUE oci8_bind_get(VALUE self)
     return data_type->get(obind, (void*)((size_t)obind->valuep + obind->alloc_sz * idx), null_structp);
 }
 
-static VALUE oci8_bind_get_data(VALUE self)
+static VALUE oci8_bind_get_data(int argc, VALUE *argv, VALUE self)
 {
     oci8_bind_t *obind = TO_BIND(self);
+    VALUE index;
 
-    if (obind->maxar_sz == 0) {
+    rb_scan_args(argc, argv, "01", &index);
+    if (!NIL_P(index)) {
+        ub4 idx = NUM2UINT(index);
+        if (idx >= obind->maxar_sz) {
+            rb_raise(rb_eRuntimeError, "data index is too big. (%u for %u)", idx, obind->maxar_sz);
+        }
+        obind->curar_idx = idx;
+        return rb_funcall(self, oci8_id_get, 0);
+    } else if (obind->maxar_sz == 0) {
         obind->curar_idx = 0;
         return rb_funcall(self, oci8_id_get, 0);
     } else {
@@ -378,7 +700,7 @@ static VALUE oci8_bind_set_data(VALUE self, VALUE val)
         ub4 idx;
         Check_Type(val, T_ARRAY);
 
-        size = RARRAY_LEN(val);
+        size = RARRAY_LENINT(val);
         if (size > obind->maxar_sz) {
             rb_raise(rb_eRuntimeError, "over the max array size");
         }
@@ -391,6 +713,36 @@ static VALUE oci8_bind_set_data(VALUE self, VALUE val)
     return self;
 }
 
+static VALUE get_initial_chunk_size(VALUE klass)
+{
+    return UINT2NUM(initial_chunk_size);
+}
+
+static VALUE set_initial_chunk_size(VALUE klass, VALUE arg)
+{
+    ub4 size = NUM2UINT(arg);
+    if (size == 0) {
+        rb_raise(rb_eArgError, "Could not set zero");
+    }
+    initial_chunk_size = size;
+    return arg;
+}
+
+static VALUE get_max_chunk_size(VALUE klass)
+{
+    return UINT2NUM(max_chunk_size);
+}
+
+static VALUE set_max_chunk_size(VALUE klass, VALUE arg)
+{
+    ub4 size = NUM2UINT(arg);
+    if (size == 0) {
+        rb_raise(rb_eArgError, "Could not set zero");
+    }
+    max_chunk_size = size;
+    return arg;
+}
+
 static VALUE oci8_bind_initialize(VALUE self, VALUE svc, VALUE val, VALUE length, VALUE max_array_size)
 {
     oci8_bind_t *obind = TO_BIND(self);
@@ -456,6 +808,7 @@ void Init_oci8_bind(VALUE klass)
 {
     cOCI8BindTypeBase = klass;
     id_bind_type = rb_intern("bind_type");
+    id_charset_form = rb_intern("charset_form");
     sym_length = ID2SYM(rb_intern("length"));
     sym_length_semantics = ID2SYM(rb_intern("length_semantics"));
     sym_char = ID2SYM(rb_intern("char"));
@@ -464,9 +817,14 @@ void Init_oci8_bind(VALUE klass)
     rb_define_method(cOCI8BindTypeBase, "initialize", oci8_bind_initialize, 4);
     rb_define_method(cOCI8BindTypeBase, "get", oci8_bind_get, 0);
     rb_define_method(cOCI8BindTypeBase, "set", oci8_bind_set, 1);
-    rb_define_private_method(cOCI8BindTypeBase, "get_data", oci8_bind_get_data, 0);
+    rb_define_private_method(cOCI8BindTypeBase, "get_data", oci8_bind_get_data, -1);
     rb_define_private_method(cOCI8BindTypeBase, "set_data", oci8_bind_set_data, 1);
 
+    rb_define_singleton_method(klass, "initial_chunk_size", get_initial_chunk_size, 0);
+    rb_define_singleton_method(klass, "initial_chunk_size=", set_initial_chunk_size, 1);
+    rb_define_singleton_method(klass, "max_chunk_size", get_max_chunk_size, 0);
+    rb_define_singleton_method(klass, "max_chunk_size=", set_max_chunk_size, 1);
+
     /* register primitive data types. */
     oci8_define_bind_class("String", &bind_string_data_type, bind_string_alloc);
     oci8_define_bind_class("RAW", &bind_raw_data_type, bind_raw_alloc);
@@ -474,4 +832,6 @@ void Init_oci8_bind(VALUE klass)
     if (oracle_client_version >= ORAVER_12_1) {
         oci8_define_bind_class("Boolean", &bind_boolean_data_type, bind_boolean_alloc);
     }
+    klass = oci8_define_bind_class("Long", &bind_long_data_type, bind_long_alloc);
+    klass = oci8_define_bind_class("LongRaw", &bind_long_data_type, bind_long_raw_alloc);
 }