do_oracle 0.10.1-x86-mswin32-60 → 0.10.2-x86-mswin32-60

data/ChangeLog.markdown

@@ -1,3 +1,6 @@
-## 0.10.1 (unreleased, in git)
+## 0.10.2 2010-05-19
+* Rework logging for making callbacks possible
+
+## 0.10.1 2010-01-08
 
 Initial release.

data/ext/do_oracle/do_oracle.c

@@ -38,6 +38,7 @@ static ID ID_NEW_DATE;
 static ID ID_LOGGER;
 static ID ID_DEBUG;
 static ID ID_LEVEL;
+static ID ID_LOG;
 static ID ID_TO_S;
 static ID ID_RATIONAL;
 
@@ -91,6 +92,8 @@ static VALUE cDO_Connection;
 static VALUE cDO_Command;
 static VALUE cDO_Result;
 static VALUE cDO_Reader;
+static VALUE cDO_Logger;
+static VALUE cDO_Logger_Message;
 
 static VALUE rb_cDate;
 static VALUE rb_cDateTime;
@@ -113,31 +116,19 @@ static VALUE eSQLError;
 static VALUE eConnectionError;
 static VALUE eDataError;
 
-static void data_objects_debug(VALUE string, struct timeval* start) {
+static void data_objects_debug(VALUE connection, VALUE string, struct timeval* start) {
   struct timeval stop;
-  char *message;
+  VALUE message;
 
-  char *query = RSTRING_PTR(string);
-  int length  = RSTRING_LEN(string);
-  char total_time[32];
-  do_int64 duration = 0;
+  gettimeofday(&stop, NULL);
+  do_int64 duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
 
-  VALUE logger = rb_funcall(mOracle, ID_LOGGER, 0);
-  int log_level = NUM2INT(rb_funcall(logger, ID_LEVEL, 0));
+  message = rb_funcall(cDO_Logger_Message, ID_NEW, 3, string, rb_time_new(start->tv_sec, start->tv_usec), INT2NUM(duration));
 
-  if (0 == log_level) {
-    gettimeofday(&stop, NULL);
-
-    duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
-
-    snprintf(total_time, 32, "%.6f", duration / 1000000.0);
-    message = (char *)calloc(length + strlen(total_time) + 4, sizeof(char));
-    snprintf(message, length + strlen(total_time) + 4, "(%s) %s", total_time, query);
-    rb_funcall(logger, ID_DEBUG, 1, rb_str_new(message, length + strlen(total_time) + 3));
-    free(message);
-  }
+  rb_funcall(connection, ID_LOG, 1, message);
 }
 
+
 static char * get_uri_option(VALUE query_hash, char * key) {
   VALUE query_value;
   char * value = NULL;
@@ -392,13 +383,6 @@ static VALUE typecast(VALUE r_value, const VALUE type) {
   } else if (type == rb_cClass) {
     return rb_funcall(mDO, ID_FULL_CONST_GET, 1, r_value);
 
-  // TODO: where are tests for this mapping?
-  } else if (type == rb_cObject) {
-    if (rb_obj_class(r_value) == cOCI8_CLOB)
-      return rb_marshal_load(rb_funcall(r_value, ID_READ, 0));
-    else
-      return rb_marshal_load(r_value);
-
   } else if (type == rb_cNilClass) {
     return Qnil;
 
@@ -411,8 +395,9 @@ static VALUE typecast(VALUE r_value, const VALUE type) {
 
 }
 
-static VALUE typecast_bind_value(VALUE oci8_conn, VALUE r_value) {
+static VALUE typecast_bind_value(VALUE connection, VALUE r_value) {
   VALUE r_class = rb_obj_class(r_value);
+  VALUE oci8_conn = rb_iv_get(connection, "@connection");
   // replace nil value with '' as otherwise OCI8 cannot get bind variable type
   // '' will be inserted as NULL by Oracle
   if (NIL_P(r_value))
@@ -483,7 +468,7 @@ static VALUE cCommand_set_types(int argc, VALUE *argv, VALUE self) {
 
 typedef struct {
   VALUE self;
-  VALUE oci8_conn;
+  VALUE connection;
   VALUE cursor;
   VALUE statement_type;
   VALUE args;
@@ -495,12 +480,16 @@ static VALUE cCommand_execute_try(cCommand_execute_try_t *arg);
 static VALUE cCommand_execute_ensure(cCommand_execute_try_t *arg);
 
 // called by Command#execute that is written in Ruby
-static VALUE cCommand_execute_internal(VALUE self, VALUE oci8_conn, VALUE sql, VALUE args) {
+static VALUE cCommand_execute_internal(VALUE self, VALUE connection, VALUE sql, VALUE args) {
   cCommand_execute_try_t arg;
   arg.self = self;
-  arg.oci8_conn = oci8_conn;
+  arg.connection = connection;
   arg.sql = sql;
   // store start time before SQL parsing
+  VALUE oci8_conn = rb_iv_get(connection, "@connection");
+  if (Qnil == oci8_conn) {
+    rb_raise(eConnectionError, "This connection has already been closed.");
+  }
   gettimeofday(&arg.start, NULL);
   arg.cursor = rb_funcall(oci8_conn, ID_PARSE, 1, sql);
   arg.statement_type = rb_funcall(arg.cursor, ID_TYPE, 0);
@@ -510,8 +499,8 @@ static VALUE cCommand_execute_internal(VALUE self, VALUE oci8_conn, VALUE sql, V
 }
 
 // wrapper for simple SQL calls without arguments
-static VALUE execute_sql(VALUE oci8_conn, VALUE sql) {
-  return cCommand_execute_internal(Qnil, oci8_conn, sql, Qnil);
+static VALUE execute_sql(VALUE connection, VALUE sql) {
+  return cCommand_execute_internal(Qnil, connection, sql, Qnil);
 }
 
 static VALUE cCommand_execute_try(cCommand_execute_try_t *arg) {
@@ -532,7 +521,7 @@ static VALUE cCommand_execute_try(cCommand_execute_try_t *arg) {
     VALUE r_orig_value, r_new_value;
     for (i = 0; i < RARRAY_LEN(arg->args); i++) {
       r_orig_value = rb_ary_entry(arg->args, i);
-      r_new_value = typecast_bind_value(arg->oci8_conn, r_orig_value);
+      r_new_value = typecast_bind_value(arg->connection, r_orig_value);
       if (r_orig_value != r_new_value)
         rb_ary_store(arg->args, i, r_new_value);
     }
@@ -557,7 +546,7 @@ static VALUE cCommand_execute_ensure(cCommand_execute_try_t *arg) {
   if (SYM2ID(arg->statement_type) != ID_SELECT_STMT)
     rb_funcall(arg->cursor, ID_CLOSE, 0);
   // Log SQL and execution time
-  data_objects_debug(arg->sql, &(arg->start));
+  data_objects_debug(arg->connection, arg->sql, &(arg->start));
   return Qnil;
 }
 
@@ -588,7 +577,9 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   }
   
   r_path = rb_funcall(uri, rb_intern("path"), 0);
-  path = StringValuePtr(r_path);
+  if ( Qnil != r_path ) {
+    path = StringValuePtr(r_path);
+  }
 
   // If just host name is specified then use it as TNS names alias
   if ((r_host != Qnil && RSTRING_LEN(r_host) > 0) &&
@@ -596,7 +587,7 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
       (r_path == Qnil || RSTRING_LEN(r_path) == 0)) {
     connect_string = host;
   // If database name is specified in path (in format "/database")
-  } else if (strlen(path) > 1) {
+  } else if (path != NULL && strlen(path) > 1) {
     connect_string_length = strlen(host) + strlen(port) + strlen(path) + 4;
     connect_string = (char *)calloc(connect_string_length, sizeof(char));
     snprintf(connect_string, connect_string_length, "//%s:%s%s", host, port, path);
@@ -622,6 +613,10 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   // Set session time zone
   // at first look for option in connection string
   time_zone = get_uri_option(r_query, "time_zone");
+
+  rb_iv_set(self, "@uri", uri);
+  rb_iv_set(self, "@connection", oci8_conn);
+
   // if no option specified then look in ENV['TZ']
   if (time_zone == NULL) {
     r_time_zone = rb_funcall(cConnection, rb_intern("ruby_time_zone"), 0);
@@ -630,15 +625,12 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   }
   if (time_zone) {
     snprintf(set_time_zone_command, 80, "alter session set time_zone = '%s'", time_zone);
-    execute_sql(oci8_conn, RUBY_STRING(set_time_zone_command));
+    execute_sql(self, RUBY_STRING(set_time_zone_command));
   }
   
-  execute_sql(oci8_conn, RUBY_STRING("alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'"));
-  execute_sql(oci8_conn, RUBY_STRING("alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS.FF'"));
-  execute_sql(oci8_conn, RUBY_STRING("alter session set nls_timestamp_tz_format = 'YYYY-MM-DD HH24:MI:SS.FF TZH:TZM'"));
-
-  rb_iv_set(self, "@uri", uri);
-  rb_iv_set(self, "@connection", oci8_conn);
+  execute_sql(self, RUBY_STRING("alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'"));
+  execute_sql(self, RUBY_STRING("alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS.FF'"));
+  execute_sql(self, RUBY_STRING("alter session set nls_timestamp_tz_format = 'YYYY-MM-DD HH24:MI:SS.FF TZH:TZM'"));
 
   return Qtrue;
 }
@@ -808,6 +800,7 @@ void Init_do_oracle() {
   ID_LOGGER = rb_intern("logger");
   ID_DEBUG = rb_intern("debug");
   ID_LEVEL = rb_intern("level");
+  ID_LOG = rb_intern("log");
   ID_TO_S = rb_intern("to_s");
   ID_RATIONAL = rb_intern("Rational");
 
@@ -871,6 +864,8 @@ void Init_do_oracle() {
   cDO_Command = CONST_GET(mDO, "Command");
   cDO_Result = CONST_GET(mDO, "Result");
   cDO_Reader = CONST_GET(mDO, "Reader");
+  cDO_Logger = CONST_GET(mDO, "Logger");
+  cDO_Logger_Message = CONST_GET(cDO_Logger, "Message");
 
   // Top Level Module that all the classes live under
   mOracle = rb_define_module_under(mDO, "Oracle");

data/lib/do_oracle.rb

@@ -41,11 +41,8 @@ if RUBY_PLATFORM !~ /java/
         private
 
         def execute(*args)
-          oci8_conn = @connection.instance_variable_get("@connection")
-          raise ConnectionError, "This connection has already been closed." unless oci8_conn
-
           sql, bind_variables = replace_argument_placeholders(@text, args)
-          execute_internal(oci8_conn, sql, bind_variables)
+          execute_internal(@connection, sql, bind_variables)
         rescue OCIError => e
           raise SQLError.new(e.message, e.code, nil, e.sql, @connection.to_s)
         end

data/lib/do_oracle/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Oracle
-    VERSION = '0.10.1'.freeze
+    VERSION = '0.10.2'
   end
 end

data/tasks/compile.rake

@@ -34,7 +34,7 @@ begin
       #       Gem::Specification API.
       gem.dependencies.delete_if { |d| d.name == 'ruby-oci8'}
 
-      gem.add_dependency "do_jdbc", '0.10.1'
+      gem.add_dependency "do_jdbc", '0.10.2'
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: do_oracle
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 2
+  version: 0.10.2
 platform: x86-mswin32-60
 authors: 
 - Raimonds Simanovskis
@@ -9,49 +14,62 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
-    version: 
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby-oci8
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
         version: "2.0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
         version: "1.1"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
         version: "0.7"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Implements the DataObjects API for Oracle
 email: raimonds.simanovskis@gmail.com
 executables: []
@@ -113,18 +131,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects Oracle Driver