antage-postgres 0.7.9.2009.05.12 → 0.7.9.2009.05.13

data/Contributors

@@ -26,3 +26,4 @@ Yuta TSUBOI <yuuta-t@is.aist-nara.ac.jp>
 Lugovoi Nikolai <meadow.nnick@gmail.com>
 Jeff Davis <ruby@j-davis.com>
 Bertram Scharpf <software@bertram-scharpf.de>
+Anton Ageev <antage@gmail.com>

data/ext/postgres.c

@@ -25,11 +25,11 @@
 
 
 #ifdef RUBY_18_COMPAT
-#include "st.h"
-#include "intern.h"
+  #include "st.h"
+  #include "intern.h"
 #else
-#include "ruby/st.h"
-#include "ruby/intern.h"
+  #include "ruby/st.h"
+  #include "ruby/intern.h"
 #endif
 
 /* grep '^#define' $(pg_config --includedir)/server/catalog/pg_type.h | grep OID */
@@ -49,27 +49,35 @@ PQserverVersion(const PGconn *conn)
 #endif /* HAVE_PQSERVERVERSION */
 
 #ifndef RHASH_SIZE
-#define RHASH_SIZE(x) RHASH((x))->tbl->num_entries
+  #define RHASH_SIZE(x) RHASH((x))->tbl->num_entries
 #endif /* RHASH_SIZE */
 
 #ifndef RSTRING_LEN
-#define RSTRING_LEN(x) RSTRING((x))->len
+  #define RSTRING_LEN(x) RSTRING((x))->len
 #endif /* RSTRING_LEN */
 
 #ifndef RSTRING_PTR
-#define RSTRING_PTR(x) RSTRING((x))->ptr
+  #define RSTRING_PTR(x) RSTRING((x))->ptr
 #endif /* RSTRING_PTR */
 
+#ifndef RARRAY_LEN
+  #define RARRAY_LEN(x) RARRAY((x))->len
+#endif /* RARRAY_LEN */
+
+#ifndef RARRAY_PTR
+  #define RARRAY_PTR(x) RARRAY((x))->ptr
+#endif /* RARRAY_PTR */
+
 #ifndef HAVE_PG_ENCODING_TO_CHAR
-#define pg_encoding_to_char(x) "SQL_ASCII"
+  #define pg_encoding_to_char(x) "SQL_ASCII"
 #endif
 
 #ifndef HAVE_PQFREEMEM
-#define PQfreemem(ptr) free(ptr)
+  #define PQfreemem(ptr) free(ptr)
 #endif
 
 #ifndef StringValuePtr
-#define StringValuePtr(x) STR2CSTR(x)
+  #define StringValuePtr(x) STR2CSTR(x)
 #endif
 
 #define AssignCheckedStringValue(cstring, rstring) do { \
@@ -80,7 +88,7 @@ PQserverVersion(const PGconn *conn)
 } while (0)
 
 #if RUBY_VERSION_CODE < 180
-#define rb_check_string_type(x) rb_check_convert_type(x, T_STRING, "String", "to_str")
+  #define rb_check_string_type(x) rb_check_convert_type(x, T_STRING, "String", "to_str")
 #endif
 
 #define rb_check_hash_type(x) rb_check_convert_type(x, T_HASH, "Hash", "to_hash")
@@ -197,11 +205,7 @@ pgconn_connect(argc, argv, self)
     PGconn *conn = NULL;
 
     rb_scan_args(argc, argv, "0*", &args); 
-#ifdef RUBY_18_COMPAT
-    if (RARRAY(args)->len == 1) {
-#else
     if (RARRAY_LEN(args) == 1) {
-#endif
         conn = try_connectdb(rb_ary_entry(args, 0));
     }
     if (conn == NULL) {
@@ -729,26 +733,14 @@ pgconn_exec(argc, argv, obj)
 
     Check_Type(command, T_STRING);
 
-#ifdef RUBY_18_COMPAT
-    if (RARRAY(params)->len <= 0) {
-#else
     if (RARRAY_LEN(params) <= 0) {
-#endif
         result = PQexec(conn, StringValuePtr(command));
     }
     else {
-#ifdef RUBY_18_COMPAT
-        int len = RARRAY(params)->len;
-#else
         int len = RARRAY_LEN(params);
-#endif
         int i;
 #ifdef HAVE_PQEXECPARAMS
-  #ifdef RUBY_18_COMPAT
-        VALUE* ptr = RARRAY(params)->ptr;
-  #else
         VALUE* ptr = RARRAY_PTR(params);
-  #endif
         char const** values = ALLOCA_N(char const*, len);
         int* lengths = ALLOCA_N(int, len);
         int* formats = ALLOCA_N(int, len);
@@ -968,17 +960,9 @@ pgconn_insert_table(obj, table, values)
 
     Check_Type(table, T_STRING);
     Check_Type(values, T_ARRAY);
-#ifdef RUBY_18_COMPAT
-    i = RARRAY(values)->len;
-#else
     i = RARRAY_LEN(values);
-#endif
     while (i--) {
-#ifdef RUBY_18_COMPAT
-        if (TYPE(RARRAY(RARRAY(values)->ptr[i])) != T_ARRAY) {
-#else
         if (TYPE(RARRAY(RARRAY_PTR(values)[i])) != T_ARRAY) {
-#endif
             rb_raise(rb_ePGError, "second arg must contain some kind of arrays.");
         }
     }
@@ -993,32 +977,15 @@ pgconn_insert_table(obj, table, values)
     }
     PQclear(result);
 
-#ifdef RUBY_18_COMPAT
-    for (i = 0; i < RARRAY(values)->len; i++) {
-        struct RArray *row = RARRAY(RARRAY(values)->ptr[i]);
-#else
     for (i = 0; i < RARRAY_LEN(values); i++) {
         struct RArray *row = RARRAY(RARRAY_PTR(values)[i]);
-#endif
         buffer = rb_tainted_str_new(0,0);
-#ifdef RUBY_18_COMPAT
-        for (j = 0; j < row->len; j++) {
-#else
         for (j = 0; j < RARRAY_LEN(row); j++) {
-#endif
             if (j > 0) rb_str_cat(buffer, "\t", 1);
-#ifdef RUBY_18_COMPAT
-            if (NIL_P(row->ptr[j])) {
-#else
             if (NIL_P(RARRAY_PTR(row)[j])) {
-#endif
                 rb_str_cat(buffer, "\\N",2);
             } else {
-#ifdef RUBY_18_COMPAT
-                s = rb_obj_as_string(row->ptr[j]);
-#else
                 s = rb_obj_as_string(RARRAY_PTR(row)[j]);
-#endif
                 rb_funcall(s,pg_gsub_bang_id,2,
 					rb_str_new("([\\t\\n\\\\])", 10),pg_escape_str);
                 rb_str_cat(buffer, StringValuePtr(s), RSTRING_LEN(s));
@@ -1536,11 +1503,7 @@ fetch_pgrow(self, fields, row_num)
     PGresult *result = get_pgresult(self);
     VALUE row = rb_funcall(rb_cPGrow, rb_intern("new"), 1, fields);
     int field_num;
-#ifdef RUBY_18_COMPAT
-    for (field_num = 0; field_num < RARRAY(fields)->len; field_num++) {
-#else
     for (field_num = 0; field_num < RARRAY_LEN(fields); field_num++) {
-#endif
         /* don't use push, PGrow is sized with nils in #new */
         rb_ary_store(row, field_num, fetch_pgresult(result, row_num, field_num));
     }
@@ -2475,11 +2438,7 @@ static VALUE
 pgrow_init(self, keys)
     VALUE self, keys;
 {
-#ifdef RUBY_18_COMPAT
-    VALUE args[1] = { LONG2NUM(RARRAY(keys)->len) };
-#else
     VALUE args[1] = { LONG2NUM(RARRAY_LEN(keys)) };
-#endif
     rb_call_super(1, args);
     rb_iv_set(self, "@keys", keys);
     return self;
@@ -2563,11 +2522,7 @@ pgrow_each_pair(self)
 {
     VALUE keys = pgrow_keys(self);
     int i;
-#ifdef RUBY_18_COMPAT
-    for (i = 0; i < RARRAY(keys)->len; ++i) {
-#else
     for (i = 0; i < RARRAY_LEN(keys); ++i) {
-#endif
         rb_yield(rb_assoc_new(rb_ary_entry(keys, i), rb_ary_entry(self, i)));
     }
     return self;
@@ -2622,11 +2577,7 @@ pgrow_to_hash(self)
     VALUE result = rb_hash_new();
     VALUE keys = pgrow_keys(self);
     int i;
-#ifdef RUBY_18_COMPAT
-    for (i = 0; i < RARRAY(self)->len; ++i) {
-#else
     for (i = 0; i < RARRAY_LEN(self); ++i) {
-#endif
         rb_hash_aset(result, rb_ary_entry(keys, i), rb_ary_entry(self, i));
     }
     return result;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: antage-postgres
 version: !ruby/object:Gem::Version 
-  version: 0.7.9.2009.05.12
+  version: 0.7.9.2009.05.13
 platform: ruby
 authors: 
 - Yukihiro Matsumoto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: []