intersys 0.0.2 → 0.0.4

data/lib/Makefile

@@ -0,0 +1,143 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /opt/local/lib/ruby/1.8/powerpc-darwin8.4.0
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/opt/local
+exec_prefix = $(DESTDIR)/opt/local
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+vendordir = $(prefix)/lib/ruby/vendor_ruby
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+sysconfdir = $(prefix)/etc
+mandir = $(DESTDIR)/opt/local/share/man
+libdir = $(DESTDIR)/opt/local/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorarchdir = $(vendorlibdir)/$(vendorarch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+vendorlibdir = $(vendordir)/$(ruby_version)
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = gcc -g
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common -I/Applications/Cache/dev/cpp/include -I/cygdrive/c/Progra~1/Cache/dev/cpp/include -I/cygdrive/c/Cachesys/dev/cpp/include -Wall 
+CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)  -O -pipe -I/opt/local/include
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L/opt/local/lib  
+LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = powerpc-darwin8.4.0
+sitearch = powerpc-darwin8.4.0
+vendorarch = powerpc-darwin8.4.0
+ruby_version = 1.8
+ruby = /opt/local/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = $(libdir)
+LIBPATH =  -L"$(libdir)"
+DEFFILE = 
+
+CLEANFILES = 
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc  
+SRCS = common.c database.c definition.c intersys.c object.c query.c
+OBJS = common.o database.o definition.o intersys.o object.o query.o
+TARGET = intersys_cache
+DLLIB = $(TARGET).bundle
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile extconf.h conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/lib/common.c

@@ -40,14 +40,10 @@ VALUE wcstr_new(const wchar_t *w_str, const char_size_t len) {
 	size = (int)(len)*sizeof(wchar_t);
 	capa = (int)(len + 1)*sizeof(wchar_t);
 	
-    result = rb_str_new(0, 0);
+    result = rb_str_buf_new(capa);
+	bzero(STR(result) + size, capa-size);
+	rb_str_buf_cat(result, (char *)w_str, size);
 
-	RSTRING(result)->len = size;
-    RSTRING(result)->aux.capa = capa;
-    RSTRING(result)->ptr = ALLOC_N(char, capa);
-	bzero(RSTRING(result)->ptr, capa);
-
-	memcpy(RSTRING(result)->ptr, (char *)w_str, size);
 	rb_str_freeze(result);
 	return result;
 }

data/lib/database.c

@@ -1,7 +1,6 @@
 #include "intersys.h"
 
 void intersys_base_free(struct rbDatabase* base) {
-//	printf("Releasing database\n");
 	RUN(cbind_free_db(base->database));
 	RUN(cbind_free_conn(base->connection));
 	free(base);
@@ -37,7 +36,9 @@ VALUE intersys_base_connect(VALUE self, VALUE options) {
 	VALUE host, port, user, password, namespace, timeout;
 
 	host = connect_get_options(options, "host", "localhost", 0);
-	port = connect_get_options(options, "port", "1972", 0);
+	port = connect_get_options(options, "port", "1973", 0);
+	//port = connect_get_options(options, "port", "1972", 0);
+	//namespace = connect_get_options(options, "namespace", "User", 0);
 	namespace = connect_get_options(options, "namespace", "Samples", 0);
 
 	user = connect_get_options(options, "user", "_SYSTEM", 1);

data/lib/definition.c

@@ -1,7 +1,6 @@
 #include "intersys.h"
 
 static void intersys_definition_free(struct rbDefinition* definition) {
-//	printf("Releasing definition (%d)\n", definition->type);
 	switch(definition->type) {
 		case D_PROPERTY: {
 			RUN(cbind_free_prop_def(definition->def));
@@ -98,7 +97,7 @@ VALUE intersys_property_get(VALUE self) {
     RUN(cbind_reset_args(property->database));    
     RUN(cbind_set_next_arg_as_res(property->database, property->cpp_type));    
     RUN(cbind_get_prop(property->database, property->oref, property->in_name));
-	return rb_funcall(self, rb_intern("extract_retval!"), 0);
+	return intersys_method_extract_retval(self);
 }
 
 VALUE intersys_property_set(VALUE self, VALUE value) {
@@ -107,7 +106,7 @@ VALUE intersys_property_set(VALUE self, VALUE value) {
 	Data_Get_Struct(self, struct rbDefinition, property);
 
     RUN(cbind_reset_args(property->database));
-	rb_funcall(self, rb_intern("marshall!"), 1, value);
+	intersys_argument_set(self, value);
 	RUN(cbind_set_prop(property->database, property->oref, property->in_name));
 	return self;
 }
@@ -159,27 +158,6 @@ VALUE intersys_method_num_args(VALUE self) {
 	return INT2FIX(method->num_args);
 }
 
-VALUE intersys_method_prepare_call(VALUE self) {
-	struct rbDefinition* method;
-	
-	Data_Get_Struct(self, struct rbDefinition, method);
-	
-	RUN(cbind_reset_args(method->database));
-	RUN(cbind_mtd_rewind_args(method->def));
-	return self;
-}
-
-VALUE intersys_method_call(VALUE self) {
-	struct rbDefinition* method;
-	
-	Data_Get_Struct(self, struct rbDefinition, method);
-
-    if (method->cpp_type != CBIND_VOID) {    
-        RUN(cbind_set_next_arg_as_res(method->database, method->cpp_type));
-    }
-    RUN(cbind_run_method(method->database, method->oref, CLASS_NAME(method), method->in_name));
-	return self;
-}
 
 static VALUE extract_next_dlist_elem(char *dlist, int* elem_size) {
 	bool_t flag;
@@ -222,6 +200,71 @@ static VALUE extract_next_dlist_elem(char *dlist, int* elem_size) {
 
 
 
+
+VALUE intersys_method_call(VALUE self, VALUE args) {
+	struct rbDefinition* method;
+	int i;
+	Check_Type(args, T_ARRAY);
+	Data_Get_Struct(self, struct rbDefinition, method);
+	if(method->num_args < RARRAY(args)->len) {
+		rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", RARRAY(args)->len, method->num_args);
+	}
+	VALUE database = rb_iv_get(self, "@database");
+	VALUE class_name = rb_iv_get(self, "@class_name");
+	VALUE name = rb_iv_get(self, "@name");
+	
+	RUN(cbind_reset_args(method->database));
+	RUN(cbind_mtd_rewind_args(method->def));
+	
+	for(i = 0; i < RARRAY(args)->len; i++) {
+		VALUE arg = rb_funcall(cArgument, rb_intern("new"), 4, database, class_name, name, self);
+		intersys_argument_set(arg, RARRAY(args)->ptr[i]);
+		RUN(cbind_mtd_arg_next(method->def));
+	}
+	method->passed_args = RARRAY(args)->len;
+
+    if (method->cpp_type != CBIND_VOID) {
+        RUN(cbind_set_next_arg_as_res(method->database, method->cpp_type));
+    }
+    RUN(cbind_run_method(method->database, method->oref, CLASS_NAME(method), method->in_name));
+	return intersys_method_extract_retval(self);
+}
+
+
+VALUE intersys_argument_initialize(VALUE self, VALUE r_database, VALUE class_name, VALUE name, VALUE r_method) {
+	struct rbDefinition* argument;
+	struct rbDefinition* method;
+	VALUE args[] = {r_database, class_name, name};
+	rb_call_super(3, args);
+	
+	Data_Get_Struct(self, struct rbDefinition, argument);
+	Data_Get_Struct(r_method, struct rbDefinition, method);
+
+
+	argument->type = D_ARGUMENT;
+	RUN(cbind_alloc_arg_def(&argument->def));
+    RUN(cbind_mtd_arg_get(method->def, argument->def));
+    RUN(cbind_get_arg_cpp_type(argument->def, &argument->cpp_type));
+    RUN(cbind_get_arg_cache_type(argument->def, &argument->cache_type));
+    RUN(cbind_get_arg_name(argument->def, &argument->name));
+    RUN(cbind_get_arg_is_by_ref(argument->def, &argument->is_by_ref));
+    RUN(cbind_get_arg_is_default(argument->def, &argument->is_default));    
+    RUN(cbind_get_arg_def_val(argument->def, &argument->default_value));
+    RUN(cbind_get_arg_def_val_size(argument->def, &argument->default_value_size));
+	argument->arg_number = method->arg_counter;
+	method->arg_counter++;
+	return self;
+}
+
+VALUE intersys_argument_default_value(VALUE self) {
+	struct rbDefinition* argument;
+	Data_Get_Struct(self, struct rbDefinition, argument);
+	if(!argument->is_default) {
+		return Qnil;
+	}
+	return rb_str_new(argument->default_value, argument->default_value_size);
+}
+
 VALUE intersys_method_extract_retval(VALUE self) {
 	struct rbDefinition* method;
 	bool_t is_null;
@@ -232,7 +275,7 @@ VALUE intersys_method_extract_retval(VALUE self) {
 	}
 
 
-    RUN(cbind_get_is_null(method->database, method->num_args, &is_null));
+    RUN(cbind_get_is_null(method->database, method->passed_args, &is_null));
 	if(is_null) {
 		return Qnil;
 	}
@@ -250,7 +293,7 @@ VALUE intersys_method_extract_retval(VALUE self) {
 			VALUE class_name_w, class_name;
             const wchar_t *cl_name = 0;
 			struct rbObject* object;
-            RUN(cbind_get_arg_as_obj(method->database, method->num_args, &oref, &cl_name, &len, &is_null));
+            RUN(cbind_get_arg_as_obj(method->database, method->passed_args, &oref, &cl_name, &len, &is_null));
 			if(is_null) {
 				printf("Loaded NULL object\n");
 				return Qnil;
@@ -267,95 +310,95 @@ VALUE intersys_method_extract_retval(VALUE self) {
         case CBIND_TIME_ID:
         {
 			int hour, minute, second;
-			RUN(cbind_get_arg_as_time(method->database, method->num_args, &hour, &minute, &second, &is_null));
+			RUN(cbind_get_arg_as_time(method->database, method->passed_args, &hour, &minute, &second, &is_null));
 			return Qnil;
             break;
         }
         case CBIND_DATE_ID:
         {
 			int year, month,day;
-			RUN(cbind_get_arg_as_date(method->database, method->num_args, &year, &month, &day, &is_null));
-			return Qnil;
-            break;
+			RUN(cbind_get_arg_as_date(method->database, method->passed_args, &year, &month, &day, &is_null));
+			if(is_null) {
+				return Qnil;
+			}
+			return rb_funcall(rb_cTime, rb_intern("local"), 3, INT2NUM(year), INT2NUM(month), INT2NUM(day))
         }
         case CBIND_TIMESTAMP_ID:
         {
 			int year, month, day, hour, minute, second, fraction;
-		  	RUN(cbind_get_arg_as_timestamp(method->database, method->num_args, 
+		  	RUN(cbind_get_arg_as_timestamp(method->database, method->passed_args, 
 					&year, &month, &day, &hour, &minute, &second, &fraction, &is_null));
-			return Qnil;
-            break;
+			if(is_null) {
+				return Qnil;
+			}
+			//TODO: fraction also should be included
+			return rb_funcall(rb_cTime, rb_intern("local"), 6, 
+				INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(minute), INT2NUM(second));
         }
 		
 		case CBIND_INT_ID: {
 			int val;
-			RUN(cbind_get_arg_as_int(method->database, method->num_args, &val, &is_null));
+			RUN(cbind_get_arg_as_int(method->database, method->passed_args, &val, &is_null));
 			return INT2FIX(val);
 		}
 		
 		case CBIND_DOUBLE_ID: {
 			double val;
-            RUN(cbind_get_arg_as_double(method->database, method->num_args, &val, &is_null));
+            RUN(cbind_get_arg_as_double(method->database, method->passed_args, &val, &is_null));
 			return rb_float_new(val);
 		}
         case CBIND_CURRENCY_ID:
         {
             double val;
-            RUN(cbind_get_arg_as_cy(method->database, method->num_args, &val, &is_null));
+            RUN(cbind_get_arg_as_cy(method->database, method->passed_args, &val, &is_null));
 			return rb_float_new(val);
         }
 		
 		case CBIND_BINARY_ID: {
             byte_size_t size;
-            char *buf;
-			VALUE result = rb_str_new(0, 0);
+			VALUE result = Qnil;
 
-            RUN(cbind_get_arg_as_bin(method->database, method->num_args, NULL, 0, &size, &is_null));
-			buf = ALLOC_N(char, size + 1);
-            RUN(cbind_get_arg_as_bin(method->database, method->num_args, buf, size, &size, &is_null));
-			
-			RSTRING(result)->ptr = buf;
-			RSTRING(result)->len = size;
-		    RSTRING(result)->aux.capa = size;
+            RUN(cbind_get_arg_as_bin(method->database, method->passed_args, NULL, 0, &size, &is_null));
+			result = rb_str_buf_new((int)size);
+            RUN(cbind_get_arg_as_bin(method->database, method->passed_args, STR(result), size, &size, &is_null));
+			LEN(result) = size;
 			return result;
 		}
 		case CBIND_STATUS_ID:{
             byte_size_t size;
-            char *buf;
+			VALUE buf;
 			int code;
 
-            RUN(cbind_get_arg_as_status(method->database, method->num_args, &code, NULL, 0, MULTIBYTE, &size, &is_null));
-			buf = ALLOC_N(char, size + 1);
-            RUN(cbind_get_arg_as_status(method->database, method->num_args, &code, buf, size, MULTIBYTE, &size, &is_null));
-			
-			free(buf);
-			return rb_funcall(cStatus, rb_intern("new"), 2, INT2NUM(code), FROMWCHAR(rb_str_new(buf, size)));
+			//TODO: if code is not OK, we should throw exception. No class Status is required
+            RUN(cbind_get_arg_as_status(method->database, method->passed_args, &code, NULL, 0, MULTIBYTE, &size, &is_null));
+			if(!code || is_null) {
+				return Qtrue;
+			}
+			buf = rb_str_buf_new(size);
+            RUN(cbind_get_arg_as_status(method->database, method->passed_args, &code, STR(buf), RSTRING(buf)->aux.capa, MULTIBYTE, &size, &is_null));
+			STR(buf)[size] = '\0';
+			rb_exc_raise(rb_funcall(cStatus, rb_intern("new"), 2, INT2FIX(code), buf));
+			return Qnil;
 		}
 
 		case CBIND_STRING_ID: {
             byte_size_t size;
-            char *buf;
-			VALUE result = rb_str_new(0, 0);
-			VALUE res;
+			VALUE result = Qnil;
 
-            RUN(cbind_get_arg_as_str(method->database, method->num_args, NULL, 0, CPP_UNICODE, &size, &is_null));
+            RUN(cbind_get_arg_as_str(method->database, method->passed_args, NULL, 0, CPP_UNICODE, &size, &is_null));
 			//It is important to add wchar_t to end, because for wcslen we need more than 1 terminating zero.
 			//I don't know exactly, how works wcslen, but I add 4 (sizeof wchar_t) terminating zeroes
-			buf = ALLOC_N(char, size + sizeof(wchar_t));
-			bzero(buf, size + sizeof(wchar_t));
-            RUN(cbind_get_arg_as_str(method->database, method->num_args, buf, size, CPP_UNICODE, &size, &is_null));
-			
-			RSTRING(result)->ptr = buf;
-			RSTRING(result)->len = size;
-		    RSTRING(result)->aux.capa = size;
-			res = rb_funcall(result, rb_intern("from_wchar"), 0);
-			return res;
+			result = rb_str_buf_new(size + sizeof(wchar_t));
+			bzero(STR(result) + size, sizeof(wchar_t));
+            RUN(cbind_get_arg_as_str(method->database, method->passed_args, STR(result), size, CPP_UNICODE, &size, &is_null));
+			LEN(result) = size;
+			return FROMWCHAR(result);
 		}
 
         case CBIND_BOOL_ID:
         {
             bool_t val;
-            RUN(cbind_get_arg_as_bool(method->database, method->num_args, &val, &is_null));
+            RUN(cbind_get_arg_as_bool(method->database, method->passed_args, &val, &is_null));
 			if(val) {
 				return Qtrue;
 			}
@@ -364,26 +407,26 @@ VALUE intersys_method_extract_retval(VALUE self) {
 		
         case CBIND_DLIST_ID:
         {
-            char *buf;
+			VALUE buf = Qnil;
             char *p;
             byte_size_t size;
             int num_elems;
             int i;
 			VALUE list;
 
-            RUN(cbind_get_arg_as_dlist(method->database, method->num_args, NULL, 0, &size, &is_null));
-            buf = ALLOC_N(char, size);
-            RUN(cbind_get_arg_as_dlist(method->database, method->num_args, buf, size, &size, &is_null));	    
+            RUN(cbind_get_arg_as_dlist(method->database, method->passed_args, NULL, 0, &size, &is_null));
+			buf = rb_str_buf_new(size);
+            RUN(cbind_get_arg_as_dlist(method->database, method->passed_args, STR(buf), size, &size, &is_null));
+			LEN(buf) = size;
 
-            RUN(cbind_dlist_calc_num_elems(buf, size, &num_elems));
+            RUN(cbind_dlist_calc_num_elems(STR(buf), LEN(buf), &num_elems));
 			list = rb_ary_new2(num_elems);
-            p = buf;
+            p = STR(buf);
 			for (i=0; i < num_elems; i++) {
 	            int elem_size;
 				rb_ary_push(list, extract_next_dlist_elem(p, &elem_size));
 				p += elem_size;
 			}
-			free(buf);
             return list;
         }
 		
@@ -392,41 +435,6 @@ VALUE intersys_method_extract_retval(VALUE self) {
 }
 
 
-VALUE intersys_argument_initialize(VALUE self, VALUE r_database, VALUE class_name, VALUE name, VALUE r_method) {
-	struct rbDefinition* argument;
-	struct rbDefinition* method;
-	VALUE args[] = {r_database, class_name, name};
-	rb_call_super(3, args);
-	
-	Data_Get_Struct(self, struct rbDefinition, argument);
-	Data_Get_Struct(r_method, struct rbDefinition, method);
-
-
-	argument->type = D_ARGUMENT;
-	RUN(cbind_alloc_arg_def(&argument->def));
-    RUN(cbind_mtd_arg_get(method->def, argument->def));
-    RUN(cbind_get_arg_cpp_type(argument->def, &argument->cpp_type));
-    RUN(cbind_get_arg_cache_type(argument->def, &argument->cache_type));
-    RUN(cbind_get_arg_name(argument->def, &argument->name));
-    RUN(cbind_get_arg_is_by_ref(argument->def, &argument->is_by_ref));
-    RUN(cbind_get_arg_is_default(argument->def, &argument->is_default));    
-    RUN(cbind_get_arg_def_val(argument->def, &argument->default_value));
-    RUN(cbind_get_arg_def_val_size(argument->def, &argument->default_value_size));
-    RUN(cbind_mtd_arg_next(method->def));
-	argument->arg_number = method->arg_counter;
-	method->arg_counter++;
-	return self;
-}
-
-VALUE intersys_argument_default_value(VALUE self) {
-	struct rbDefinition* argument;
-	Data_Get_Struct(self, struct rbDefinition, argument);
-	if(!argument->is_default) {
-		return Qnil;
-	}
-	return rb_str_new(argument->default_value, argument->default_value_size);
-}
-
 VALUE intersys_argument_marshall_dlist_elem(VALUE self, VALUE elem) {
 	struct rbDefinition* argument;
 	Data_Get_Struct(self, struct rbDefinition, argument);
@@ -467,7 +475,7 @@ VALUE intersys_argument_set(VALUE self, VALUE obj) {
 	
 	if(obj == Qnil) {
         RUN(cbind_set_next_arg_as_null(property->database, property->cpp_type, property->is_by_ref));
-        return obj;
+        return self;
 	}
     switch (property->cpp_type) {
         case CBIND_VOID:
@@ -507,7 +515,7 @@ VALUE intersys_argument_set(VALUE self, VALUE obj) {
         }
         case CBIND_STRING_ID:
         {
-			VALUE res = (rb_funcall(obj, rb_intern("to_s"), 0));
+			VALUE res = rb_funcall(obj, rb_intern("to_s"), 0);
             RUN(cbind_set_next_arg_as_str(property->database, STR(res), LEN(res), MULTIBYTE, property->is_by_ref));
             break;
         }
@@ -568,8 +576,8 @@ VALUE intersys_argument_set(VALUE self, VALUE obj) {
         default:
             rb_raise(rb_eStandardError,"unknown type for argument, type = %d", 
 				property->cpp_type, CLASS_NAME(property));
-            return Qnil;
+            return self;
 	}
-	return obj;
+	return self;
 	
 }