ruby-informix 0.7.1 → 0.7.2

data/ext/informixc.ec

@@ -1,4 +1,3 @@
-/* $Id: informixc.ec,v 1.29 2008/04/03 00:50:20 santana Exp $ */
 /*
  * Copyright (c) 2006-2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
  * All rights reserved.
@@ -28,8 +27,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-static const char rcsid[] = "$Id: informixc.ec,v 1.29 2008/04/03 00:50:20 santana Exp $";
-
 #include "ruby.h"
 
 #include <sqlstype.h>
@@ -49,8 +46,6 @@ static VALUE rb_cStatement, rb_cCursorBase;
 static VALUE rb_cSequentialCursor, rb_cScrollCursor, rb_cInsertCursor;
 static VALUE rb_cIfxVersion;
 
-static VALUE rb_cArray;
-
 /* Exceptions */
 static VALUE rb_eError, rb_eWarning, rb_eInternalError;
 static VALUE rb_eProgrammingError, rb_eOperationalError, rb_eDatabaseError;
@@ -180,82 +175,74 @@ rbifx_ext_exception(VALUE exception_class)
 	mint i;
 	EXEC SQL END DECLARE SECTION;
 
-    new_instance = rb_class_new_instance(0, 0, exception_class);
-
-    /* Check that instance of exception_class is derived from
-     * Informix::Error
-     */
-    if (!rb_obj_is_kind_of(new_instance, rb_eError) &&
-        !rb_obj_is_kind_of(new_instance, rb_eWarning)) {
-        rb_raise(rb_eRuntimeError,
-                "Can't instantiate exception from %s, only from %s or %s or their children",
-                rb_class2name(exception_class),
-                rb_class2name(rb_eWarning),
-                rb_class2name(rb_eError));
-    }
-    
-    EXEC SQL GET DIAGNOSTICS :exc_count = NUMBER;
-
-    if (exc_count == 0) { /* Something went wrong */
-        char message[128];
-        snprintf(message,
-                 sizeof(message),
-                 "SQL ERROR: SQLCODE %d (sorry, no GET DIAGNOSTICS information available)",
-                 SQLCODE);
-
-        {
-            VALUE argv[] = { rb_str_new2(message) };
-            return rb_class_new_instance(NUM_ELEMS(argv), argv, rb_eOperationalError);
-        }
-    }
-
-    for (i = 0; i < exc_count; ++i) {
-        sql_exception_number = i + 1;
-
-        EXEC SQL GET DIAGNOSTICS EXCEPTION :sql_exception_number
-            :sql_code            = INFORMIX_SQLCODE,
-            :sql_state           = RETURNED_SQLSTATE,
-            :class_origin_val    = CLASS_ORIGIN,
-            :subclass_origin_val = SUBCLASS_ORIGIN,
-            :message             = MESSAGE_TEXT,
-            :message_len         = MESSAGE_LENGTH,
-            :server_name         = SERVER_NAME,
-            :connection_name     = CONNECTION_NAME
-            ;
-        
-        TRIM_BLANKS(class_origin_val);
-        TRIM_BLANKS(subclass_origin_val);
-        TRIM_BLANKS(server_name);
-        TRIM_BLANKS(connection_name);
-        message[message_len - 1] = '\0';
-        TRIM_BLANKS(message);
-
-        {
-            VALUE sprintf_args[] = { rb_str_new2(message), rb_str_new2(sqlca.sqlerrm) };
-            VALUE argv[] = {
-                INT2FIX(sql_code),
-                rb_str_new2(sql_state),
-                rb_str_new2(class_origin_val),
-                rb_str_new2(subclass_origin_val),
-                rb_f_sprintf(NUM_ELEMS(sprintf_args), sprintf_args),
-                rb_str_new2(server_name),
-                rb_str_new2(connection_name)
-            };
-
-			rb_funcall(new_instance, s_add_info, 1, rb_ary_new4(7, argv));
-        }
-    }
+	new_instance = rb_class_new_instance(0, 0, exception_class);
+
+	/* Check that instance of exception_class is derived from Informix::Error */
+	if (!rb_obj_is_kind_of(new_instance, rb_eError) &&
+		!rb_obj_is_kind_of(new_instance, rb_eWarning)) {
+		rb_raise(rb_eRuntimeError, "Can't instantiate exception from %s, "
+				"only from %s or %s or their children",
+				rb_class2name(exception_class),
+				rb_class2name(rb_eWarning),
+				rb_class2name(rb_eError));
+	}
     
-    return new_instance;
+	EXEC SQL GET DIAGNOSTICS :exc_count = NUMBER;
+
+	if (exc_count == 0) { /* Something went wrong */
+		char message[128];
+		snprintf(message, sizeof(message), "SQL ERROR: SQLCODE %d "
+				"(sorry, no GET DIAGNOSTICS information available)", SQLCODE);
+		{
+		VALUE argv[] = { rb_str_new2(message) };
+		return rb_class_new_instance(NUM_ELEMS(argv),argv,rb_eOperationalError);
+		}
+	}
+
+	for (i = 0; i < exc_count; ++i) {
+		sql_exception_number = i + 1;
+
+		EXEC SQL GET DIAGNOSTICS EXCEPTION :sql_exception_number
+			:sql_code            = INFORMIX_SQLCODE,
+			:sql_state           = RETURNED_SQLSTATE,
+			:class_origin_val    = CLASS_ORIGIN,
+			:subclass_origin_val = SUBCLASS_ORIGIN,
+			:message             = MESSAGE_TEXT,
+			:message_len         = MESSAGE_LENGTH,
+			:server_name         = SERVER_NAME,
+			:connection_name     = CONNECTION_NAME
+			;
+
+		TRIM_BLANKS(class_origin_val);
+		TRIM_BLANKS(subclass_origin_val);
+		TRIM_BLANKS(server_name);
+		TRIM_BLANKS(connection_name);
+		message[message_len - 1] = '\0';
+		TRIM_BLANKS(message);
+
+		{
+		VALUE sprintf_args[] = { rb_str_new2(message), rb_str_new2(sqlca.sqlerrm) };
+		VALUE argv[] = {
+			INT2FIX(sql_code),
+			rb_str_new2(sql_state),
+			rb_str_new2(class_origin_val),
+			rb_str_new2(subclass_origin_val),
+			rb_f_sprintf(NUM_ELEMS(sprintf_args), sprintf_args),
+			rb_str_new2(server_name),
+			rb_str_new2(connection_name)
+		};
+
+		rb_funcall(new_instance, s_add_info, 1, rb_ary_new4(7, argv));
+		}
+	}
+
+	return new_instance;
 }
 
-/*
- * C helper functions (see ifx_except.h for documentation)
- */
 static void
 raise_ifx_extended(void)
 {
-    rb_exc_raise(rbifx_ext_exception(rb_eDatabaseError));
+	rb_exc_raise(rbifx_ext_exception(rb_eDatabaseError));
 }
 /*
  *****************************************************************************
@@ -1511,7 +1498,7 @@ free_output_slots(cursor_t *c)
 {
 	if (c->daOutput != NULL) {
 		struct sqlvar_struct *var = c->daOutput->sqlvar;
-		if (var) {
+		if (var != NULL) {
 			register int i;
 			for (i = 0; i < c->daOutput->sqld; i++, var++) {
 				if (ISBLOBTYPE(var->sqltype)) {
@@ -1522,6 +1509,7 @@ free_output_slots(cursor_t *c)
 				if (ISSMARTBLOB(var->sqltype, var->sqlxid))
 					xfree(var->sqldata);
 			}
+			c->daOutput->sqlvar = NULL;
 		}
 		xfree(c->daOutput);
 		c->daOutput = NULL;
@@ -2925,7 +2913,7 @@ static void
 cursorbase_close_or_free(cursor_t *c, short op)
 {
 	EXEC SQL begin declare section;
-		char *cid, *sid, *did;
+		char *cid, *did;
 	EXEC SQL end   declare section;
 
 	if (op == 1 && !c->is_open)
@@ -3381,8 +3369,6 @@ void Init_informixc(void)
 	rb_define_singleton_method(rb_mCursor, "new0", rb_cursor_s_new0, -1);
 
 	/* Global constants --------------------------------------------------- */
-	rb_cArray = rb_const_get(rb_cObject, rb_intern("Array"));
-
 	rb_require("date");
 	rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
 

data/lib/informix.rb

@@ -1,5 +1,4 @@
-# $Id: informix.rb,v 1.13 2008/04/01 01:17:21 santana Exp $
-#
+#--
 # Copyright (c) 2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
@@ -26,13 +25,14 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#++
 
 require 'informixc'
 require 'informix/seqcursor'
 require 'informix/scrollcursor'
 
 module Informix
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
   VERSION.freeze
 
   # Shortcut to create a +Database+ object connected to +dbname+ as
@@ -195,35 +195,39 @@ module Informix
     # Examples:
     #
     # Iterating over a table:
-    #   db.each('select * from customer') do |cust|
+    #   db.foreach('select * from customer') do |cust|
     #     # do something with cust
     #     puts "#{cust[0] cust[1]}"
     #   end
     # Same thing, using input parameters:
     #   query = 'select * from orders where order_date = ?'
-    #   db.each(query, :params => [Date.today]) do |order|
+    #   db.foreach(query, :params => [Date.today]) do |order|
     #     # do something with order
     #   end
-    def each(query, options = nil, &block)
+    def foreach(query, options = nil, &block)
       Cursor.open(self, query, options) {|cur| cur.each(&block)}
       self
     end
+
+    alias each foreach
  
-    # Similar to +Database#each+, except that retrieves records as hashes
+    # Similar to +Database#foreach+, except that retrieves records as hashes
     # instead of arrays.
     #
     # Examples:
     #
     # Iterating over a table:
-    #   db.each_hash('select * from customer') do |cust|
+    #   db.foreach_hash('select * from customer') do |cust|
     #     # do something with cust
     #     puts "#{cust['fname'] cust['lname']}"
     #   end
-    def each_hash(query, options = nil, &block)
+    def foreach_hash(query, options = nil, &block)
       Cursor.open(self, query, options) {|cur| cur.each_hash(&block)}
       self
     end
 
+    alias each_hash foreach_hash
+
     # Shortcut to create a +Slob+ object.
     #
     # The +Slob+ object is passed to the block if it's given, and

data/lib/informix/exceptions.rb

@@ -1,5 +1,4 @@
-# $Id: exceptions.rb,v 1.2 2008/03/29 01:38:35 santana Exp $
-#
+#--
 # Copyright (c) 2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
@@ -26,6 +25,7 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#++
 
 #--
 # The following code is a translation of the original C code written

data/lib/informix/interval.rb

@@ -1,5 +1,4 @@
-# $Id: interval.rb,v 1.3 2008/03/29 20:32:57 santana Exp $
-#
+#--
 # Copyright (c) 2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
@@ -26,6 +25,7 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#++
 
 module Informix
   # The +IntervalBase+ class is used for sending and retrieving INTERVAL

data/lib/informix/scrollcursor.rb

@@ -1,5 +1,4 @@
-# $Id: scrollcursor.rb,v 1.4 2008/03/29 07:35:03 santana Exp $
-#
+#--
 # Copyright (c) 2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
@@ -26,6 +25,7 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#++
 
 require 'informixc'
 

data/lib/informix/seqcursor.rb

@@ -1,5 +1,4 @@
-# $Id: seqcursor.rb,v 1.3 2008/03/29 07:35:03 santana Exp $
-#
+#--
 # Copyright (c) 2008, Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 # All rights reserved.
 # 
@@ -26,6 +25,7 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#++
 
 require 'informixc'
 

metadata

@@ -1,42 +1,34 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ruby-informix
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2008-04-02 00:00:00 -06:00
-summary: Ruby library for IBM Informix
-require_paths: 
-- lib
-email: gerardo.santana@gmail.com
-homepage: http://santanatechnotes.blogspot.com
-rubyforge_project: ruby-informix
-description: Ruby library for connecting to IBM Informix 7 and above
-autorequire: informix
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.7.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Gerardo Santana Gomez Garrido
+autorequire: informix
+bindir: bin
+cert_chain: []
+
+date: 2008-11-21 00:00:00 -06:00
+default_executable: 
+dependencies: []
+
+description: Ruby library for connecting to IBM Informix 7 and above
+email: gerardo.santana@gmail.com
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- README
+- ext/informixc.c
 files: 
 - ext/informixc.ec
 - lib/informix.rb
+- lib/informix/exceptions.rb
 - lib/informix/interval.rb
 - lib/informix/scrollcursor.rb
 - lib/informix/seqcursor.rb
-- lib/informix/CVS
-- lib/informix/exceptions.rb
-- test/testcase.rb
 - test/ifx_all.rb
 - test/ifx_test_create_table.rb
 - test/ifx_test_errinfo.rb
@@ -44,12 +36,14 @@ files:
 - test/ifx_test_fetch_n_each.rb
 - test/ifx_test_insert.rb
 - test/ifx_test_select.rb
+- test/testcase.rb
 - COPYRIGHT
 - Changelog
 - README
 - ext/informixc.c
-test_files: []
-
+has_rdoc: true
+homepage: http://santanatechnotes.blogspot.com
+post_install_message: 
 rdoc_options: 
 - --title
 - Ruby/Informix -- Ruby library for IBM Informix
@@ -61,14 +55,26 @@ rdoc_options:
 - --line-numbers
 - --main
 - README
-extra_rdoc_files: 
-- README
-- ext/informixc.c
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: ruby-informix
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: Ruby library for IBM Informix
+test_files: []