ruby-postgres 0.7.1.2005.12.19-mswin32 → 0.7.1.2005.12.20-mswin32

data/Makefile

@@ -35,7 +35,7 @@ LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
-CFLAGS   =  -g -O2  
+CFLAGS   =  -g -O2  -Wall  
 CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -DHAVE_LIBPQ_FE_H -DHAVE_LIBPQ_LIBPQ_FS_H -DHAVE_PQSETCLIENTENCODING -DHAVE_PG_ENCODING_TO_CHAR -DHAVE_PQFREEMEM -DHAVE_PQESCAPESTRING -DHAVE_PQEXECPARAMS -Ic:/apps/POSTGR~1/8.1/include 
 CXXFLAGS = $(CFLAGS) 
 DLDFLAGS =   -Wl,--enable-auto-import,--export-all 

data/extconf.rb

@@ -27,6 +27,7 @@ if have_build_env
   required_libraries.each(&method(:have_library))
   desired_functions.each(&method(:have_func))
   $objs = ['postgres.o'] if compat_functions.all?(&method(:have_func))
+  $CFLAGS << ' -Wall '
   create_makefile("postgres")
 else
   puts 'Could not find PostgreSQL build environment (libraries & headers): Makefile not created'

data/postgres.c

@@ -257,7 +257,7 @@ format_array_element(obj)
         return rb_funcall(obj, rb_intern("gsub!"), 2, rb_reg_new("^|$", 3, 0), rb_str_new2("\""));
     }
     else {
-        return pgconn_s_format(NULL, obj);
+        return pgconn_s_format(rb_cPGconn, obj);
     }
 }
 
@@ -309,7 +309,7 @@ build_key_value_string_i(key, value, result)
     if (key == Qundef) return ST_CONTINUE;
     key_value = rb_str_dup(key);
     rb_str_cat(key_value, "=", 1);
-    rb_str_concat(key_value, pgconn_s_quote(NULL, value));
+    rb_str_concat(key_value, pgconn_s_quote(rb_cPGconn, value));
     rb_ary_push(result, key_value);
     return ST_CONTINUE;
 }
@@ -540,14 +540,14 @@ pgconn_exec(argc, argv, obj)
                 values[i] = NULL;
             }
             else {
-                formatted = pgconn_s_format(NULL, *ptr);
+                formatted = pgconn_s_format(rb_cPGconn, *ptr);
                 values[i] = StringValuePtr(formatted);
             }
         }
         result = PQexecParams(conn, StringValuePtr(command), len, NULL, values, NULL, NULL, 0);
 #else
         for (i = 0; i < len; i++) {
-            rb_ary_push(params, pgconn_s_quote(NULL, rb_ary_entry(params, i)));
+            rb_ary_push(params, pgconn_s_quote(rb_cPGconn, rb_ary_entry(params, i)));
         }
         result = PQexecParams_compat(conn, command, params);
 #endif
@@ -1214,7 +1214,7 @@ fetch_pgresult(result, row, column)
       return *string == 't' ? Qtrue : Qfalse;
 
     case BYTEAOID:
-      return pgconn_s_unescape_bytea(NULL, rb_tainted_str_new2(string));
+      return pgconn_s_unescape_bytea(rb_cPGconn, rb_tainted_str_new2(string));
 
     case NUMERICOID:
       if (has_numeric_scale(PQfmod(result, column))) {
@@ -1306,7 +1306,7 @@ pgconn_select_one(argc, argv, self)
     VALUE self;
 {
     VALUE result = pgconn_exec(argc, argv, self);
-    VALUE row = fetch_pgrow(result, pgresult_fields(self), 0);
+    VALUE row = fetch_pgrow(result, pgresult_fields(result), 0);
     pgresult_clear(result);
     return row;
 }
@@ -1324,9 +1324,9 @@ pgconn_select_value(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
-    PGresult *result = get_pgresult(pgconn_exec(argc, argv, self));
-    VALUE value = fetch_pgresult(result, 0, 0);
-    PQclear(result);
+    VALUE result = pgconn_exec(argc, argv, self);
+    VALUE value = fetch_pgresult(get_pgresult(result), 0, 0);
+    pgresult_clear(result);
     return value;
 }
 
@@ -1342,7 +1342,8 @@ pgconn_select_values(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
-    PGresult *result = get_pgresult(pgconn_exec(argc, argv, self));
+    VALUE pg_result = pgconn_exec(argc, argv, self);
+    PGresult * result = get_pgresult(pg_result);
     int ntuples = PQntuples(result);
     int nfields = PQnfields(result);
 
@@ -1354,7 +1355,7 @@ pgconn_select_values(argc, argv, self)
       }
     }
 
-    PQclear(result);
+    pgresult_clear(pg_result);
     return values;
 }
 

data/ruby-postgres.gemspec

@@ -21,10 +21,8 @@ SPEC = Gem::Specification.new do |s|
     s.extensions      = 'extconf.rb'
   end
 
-  if File.exists? '_darcs'
-    s.files           = Dir.chdir('_darcs/current') { Dir['**/*'] }
-  else
-    s.files           = Dir['**/*']
+  s.files             = Dir.chdir(File.exists?('_darcs') ? '_darcs/current' : '.') do
+    Dir['**/*'].reject { |file| file =~ /\.gem$/ }
   end
 
 end

data/tests/tc_postgres.rb

@@ -41,4 +41,28 @@ EOT
     assert_equal(BigDecimal("12345.12345"), tuple['numeric_10_5_value'])
   end
 
+  def test_select_one
+    res = @conn.select_one("select 1 as a,2 as b union select 2 as a,3 as b order by 1")
+    assert_equal([1,2], res)
+  end
+
+  def test_select_values
+    res = @conn.select_values("select 1,2 union select 2,3 order by 1")
+    assert_equal([1,2,2,3], res)
+  end
+
+  def test_select_value
+    res = @conn.select_value("select 'test', 123")
+    assert_equal("test", res)
+  end
+
+  def test_row_each
+    res = @conn.exec("select 1 as a union select 2 as a union select 3 as a order by 1")
+    n = 1
+    res.each do |tuple|
+      assert_equal(n, tuple['a'])
+      n +=1
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
-!ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.8.10
 specification_version: 1
 name: ruby-postgres
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.2005.12.19
-date: 2005-12-19 00:00:00 -07:00
+  version: 0.7.1.2005.12.20
+date: 2005-12-20
 summary: Ruby extension for PostgreSQL database coordination
 require_paths: 
-- .
+  - "."
 email: davelee.com@gmail.com
 homepage: http://ruby.scripting.ca/postgres/
 rubyforge_project: ruby-postgres
@@ -18,54 +18,46 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
+    - 
+      - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
   version: 
 platform: mswin32
-signing_key: 
-cert_chain: 
 authors: 
-- Yukihiro Matsumoto, Eiji Matsumoto, Noboru Saitou, Dave Lee
+  - "Yukihiro Matsumoto, Eiji Matsumoto, Noboru Saitou, Dave Lee"
 files: 
-- ChangeLog
-- Contributors
-- doc
-- extconf.rb
-- libpq-compat.c
-- Makefile
-- MANIFEST
-- mkmf.log
-- postgres.c
-- postgres.o
-- postgres.so
-- README
-- README.ja
-- ruby-postgres-0.7.1.2005.12.19.gem
-- ruby-postgres.gemspec
-- sample
-- tests
-- type-oids.h
-- doc/postgres.html
-- doc/postgres.jp.html
-- sample/losample.rb
-- sample/psql.rb
-- sample/psqlHelp.rb
-- sample/test1.rb
-- sample/test2.rb
-- sample/test4.rb
-- tests/tc_postgres.rb
+  - ChangeLog
+  - Contributors
+  - doc
+  - extconf.rb
+  - libpq-compat.c
+  - Makefile
+  - MANIFEST
+  - mkmf.log
+  - postgres.c
+  - postgres.o
+  - postgres.so
+  - README
+  - README.ja
+  - ruby-postgres.gemspec
+  - sample
+  - tests
+  - type-oids.h
+  - doc/postgres.html
+  - doc/postgres.jp.html
+  - sample/losample.rb
+  - sample/psql.rb
+  - sample/psqlHelp.rb
+  - sample/test1.rb
+  - sample/test2.rb
+  - sample/test4.rb
+  - tests/tc_postgres.rb
 test_files: []
-
 rdoc_options: []
-
 extra_rdoc_files: []
-
 executables: []
-
 extensions: []
-
 requirements: 
-- PostgreSQL libpq library and headers
-dependencies: []
-
+  - PostgreSQL libpq library and headers
+dependencies: []