do_oracle 0.10.2 → 0.10.3

data/ChangeLog.markdown

@@ -1,3 +1,6 @@
+## 0.10.3 2011-01-30
+* No changes
+
 ## 0.10.2 2010-05-19
 * Rework logging for making callbacks possible
 

data/Rakefile

@@ -40,7 +40,7 @@ begin
     gem.add_dependency 'ruby-oci8',    '~>2.0'
 
     gem.add_development_dependency 'bacon',         '~>1.1'
-    gem.add_development_dependency 'rake-compiler', '~>0.7'
+    gem.add_development_dependency 'rake-compiler', '= 0.7.0'
 
     gem.has_rdoc = false
     gem.rubyforge_project = 'dorb'

data/ext/do_oracle/do_oracle.c

@@ -212,7 +212,7 @@ static VALUE parse_date(VALUE r_value) {
   } else if (rb_obj_class(r_value) == rb_cDateTime) {
     rational = rb_iv_get(r_value, "@ajd");
     return rb_funcall(rb_cDate, ID_NEW_DATE, 3, rational, INT2NUM(0), INT2NUM(2299161));
-    
+
   } else {
     // Something went terribly wrong
     rb_raise(eDataError, "Couldn't parse date from class %s object", rb_obj_classname(r_value));
@@ -299,7 +299,7 @@ static VALUE parse_time(VALUE r_value) {
   } else {
     // Something went terribly wrong
     rb_raise(eDataError, "Couldn't parse time from class %s object", rb_obj_classname(r_value));
-  }  
+  }
 }
 
 static VALUE parse_boolean(VALUE r_value) {
@@ -318,7 +318,7 @@ static VALUE parse_boolean(VALUE r_value) {
 
 static VALUE infer_ruby_type(VALUE type, VALUE precision, VALUE scale) {
   ID type_id = SYM2ID(type);
-  
+
   if (type_id == ID_NUMBER)
     return scale != Qnil && NUM2INT(scale) == 0 ?
             (NUM2INT(precision) == 1 ? rb_cTrueClass : rb_cInteger) : rb_cBigDecimal;
@@ -342,7 +342,7 @@ static VALUE infer_ruby_type(VALUE type, VALUE precision, VALUE scale) {
 
 static VALUE typecast(VALUE r_value, const VALUE type) {
   VALUE r_data;
-  
+
   if (type == rb_cInteger) {
     return TYPE(r_value) == T_FIXNUM || TYPE(r_value) == T_BIGNUM ? r_value : rb_funcall(r_value, ID_TO_I, 0);
 
@@ -494,7 +494,7 @@ static VALUE cCommand_execute_internal(VALUE self, VALUE connection, VALUE sql,
   arg.cursor = rb_funcall(oci8_conn, ID_PARSE, 1, sql);
   arg.statement_type = rb_funcall(arg.cursor, ID_TYPE, 0);
   arg.args = args;
-    
+
   return rb_ensure(cCommand_execute_try, (VALUE)&arg, cCommand_execute_ensure, (VALUE)&arg);
 }
 
@@ -506,7 +506,7 @@ static VALUE execute_sql(VALUE connection, VALUE sql) {
 static VALUE cCommand_execute_try(cCommand_execute_try_t *arg) {
   VALUE result = Qnil;
   int insert_id_present;
-  
+
   // no arguments given
   if NIL_P(arg->args) {
     result = rb_funcall(arg->cursor, ID_EXEC, 0);
@@ -556,7 +556,7 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   char *non_blocking = NULL;
   char *time_zone = NULL;
   char set_time_zone_command[80];
-  
+
   char *host = "localhost", *port = "1521", *path = NULL;
   char *connect_string;
   int connect_string_length;
@@ -569,13 +569,13 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   if ( Qnil != r_host && RSTRING_LEN(r_host) > 0) {
     host = StringValuePtr(r_host);
   }
-  
+
   r_port = rb_funcall(uri, rb_intern("port"), 0);
   if ( Qnil != r_port ) {
     r_port = rb_funcall(r_port, ID_TO_S, 0);
     port = StringValuePtr(r_port);
   }
-  
+
   r_path = rb_funcall(uri, rb_intern("path"), 0);
   if ( Qnil != r_path ) {
     path = StringValuePtr(r_path);
@@ -627,7 +627,7 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
     snprintf(set_time_zone_command, 80, "alter session set time_zone = '%s'", time_zone);
     execute_sql(self, RUBY_STRING(set_time_zone_command));
   }
-  
+
   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'"));
@@ -649,7 +649,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv[], VALUE self) {
   VALUE reader, query;
   VALUE field_names, field_types;
   VALUE column_metadata, column, column_name;
-  
+
   int i;
   int field_count;
   int infer_types = 0;
@@ -660,7 +660,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv[], VALUE self) {
     rb_raise(eArgumentError, "\"%s\" is invalid SELECT query", StringValuePtr(query));
   }
 
-  column_metadata = rb_funcall(cursor, ID_COLUMN_METADATA, 0);  
+  column_metadata = rb_funcall(cursor, ID_COLUMN_METADATA, 0);
   field_count = RARRAY_LEN(column_metadata);
   // reduce field_count by 1 if RAW_RNUM_ is present as last column
   // (generated by DataMapper to simulate LIMIT and OFFSET)
@@ -734,7 +734,7 @@ static VALUE cReader_next(VALUE self) {
   VALUE value;
 
   VALUE fetch_result = rb_funcall(cursor, ID_FETCH, 0);
-  
+
   if (Qnil == fetch_result) {
     rb_iv_set(self, "@values", Qnil);
     rb_iv_set(self, "@last_row", Qtrue);
@@ -782,7 +782,9 @@ static VALUE cReader_field_count(VALUE self) {
 void Init_do_oracle() {
   // rb_require("oci8");
   rb_require("date");
+  rb_require("rational");
   rb_require("bigdecimal");
+  rb_require("data_objects");
 
   // Get references classes needed for Date/Time parsing
   rb_cDate = CONST_GET(rb_mKernel, "Date");
@@ -826,16 +828,16 @@ void Init_do_oracle() {
   ID_TO_I = rb_intern("to_i");
   ID_TO_S = rb_intern("to_s");
   ID_TO_F = rb_intern("to_f");
-  
+
   ID_UTC_OFFSET = rb_intern("utc_offset");
   ID_FULL_CONST_GET = rb_intern("full_const_get");
-  
+
   ID_PARSE = rb_intern("parse");
   ID_FETCH = rb_intern("fetch");
   ID_TYPE = rb_intern("type");
   ID_EXECUTE = rb_intern("execute");
   ID_EXEC = rb_intern("exec");
-  
+
   ID_SELECT_STMT = rb_intern("select_stmt");
   ID_COLUMN_METADATA = rb_intern("column_metadata");
   ID_PRECISION = rb_intern("precision");
@@ -843,10 +845,10 @@ void Init_do_oracle() {
   ID_BIND_PARAM = rb_intern("bind_param");
   ID_ELEM = rb_intern("[]");
   ID_READ = rb_intern("read");
-  
+
   ID_CLOSE = rb_intern("close");
   ID_LOGOFF = rb_intern("logoff");
-  
+
   // Get references to the Extlib module
   mExtlib = CONST_GET(rb_mKernel, "Extlib");
   rb_cByteArray = CONST_GET(mExtlib, "ByteArray");

data/lib/do_oracle/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Oracle
-    VERSION = '0.10.2'
+    VERSION = '0.10.3'
   end
 end

data/spec/spec_helper.rb

@@ -181,6 +181,10 @@ module DataObjectsSpecHelpers
       update widgets set release_timestamp = NULL where id = 9
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_datetime = '2008-07-14 00:31:12' where id = 10
+    EOF
+
     conn.close
     $test_environment_setup_done = true
   end

data/tasks/compile.rake

@@ -27,14 +27,14 @@ begin
     ext.lib_dir   = "lib/#{gemspec.name}"
     ext.ext_dir   = 'ext-java/src/main/java'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
-    ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
+    ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar:../jdbc_drivers/oracle/ojdbc5.jar'
     ext.java_compiling do |gem|
 
       # Hack: Unfortunately there is no way to remove a dependency in the
       #       Gem::Specification API.
       gem.dependencies.delete_if { |d| d.name == 'ruby-oci8'}
 
-      gem.add_dependency "do_jdbc", '0.10.2'
+      gem.add_dependency "do_jdbc", '0.10.3'
     end
   end
 rescue LoadError

data/tasks/release.rake

@@ -3,7 +3,7 @@ task :build_all do
   `rake clean`
   `rake build`
   `rake java gem`
-  `rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1`
+  `rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2`
 end
 
 desc 'Release all gems (native, binaries for JRuby and Windows)'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_oracle
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +02:00
+date: 2011-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby-oci8
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
@@ -48,9 +53,11 @@ dependencies:
   name: bacon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
@@ -61,13 +68,16 @@ dependencies:
   name: rake-compiler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
-        version: "0.7"
+        - 0
+        version: 0.7.0
   type: :development
   version_requirements: *id004
 description: Implements the DataObjects API for Oracle
@@ -126,23 +136,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DataObjects Oracle Driver