ruby-postgres 0.7.1.2005.12.19 → 0.7.1.2005.12.20

data/Makefile

@@ -0,0 +1,139 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = c:/mingw/ruby/lib/ruby/1.8/i386-mingw32
+hdrdir = $(topdir)
+VPATH = $(srcdir);$(topdir);$(hdrdir)
+
+DESTDIR = c:
+prefix = $(DESTDIR)/mingw/ruby
+exec_prefix = $(DESTDIR)/mingw/ruby
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+sysconfdir = $(prefix)/etc
+mandir = $(prefix)/man
+libdir = $(DESTDIR)/mingw/ruby/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = gcc
+LIBRUBY = lib$(LIBRUBY_SO).a
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+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 
+LDSHARED = gcc -shared -s
+AR = ar
+EXEEXT = .exe
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = msvcrt-ruby18
+arch = i386-mingw32
+sitearch = i386-msvcrt
+ruby_version = 1.8
+ruby = c:/mingw/ruby/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = c:/apps/POSTGR~1/8.1/lib $(libdir)
+LIBPATH =  -L"c:/apps/POSTGR~1/8.1/lib" -L"$(libdir)"
+DEFFILE = 
+
+CLEANFILES = 
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lpq  -lwsock32  
+SRCS = postgres.c
+OBJS = postgres.o
+TARGET = postgres
+DLLIB = $(TARGET).so
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(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 pre-install-rb-default: $(RUBYLIBDIR)
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+$(RUBYLIBDIR):
+	$(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 .o
+
+.cc.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cpp.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/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/mkmf.log

@@ -0,0 +1,154 @@
+have_library: checking for main() in -lpq... -------------------- yes
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"      -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { main(); return 0; }
+/* end */
+
+--------------------
+
+have_header: checking for libpq-fe.h... -------------------- yes
+
+"gcc -E -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2   conftest.c -o conftest.i"
+checked program was:
+/* begin */
+#include <libpq-fe.h>
+/* end */
+
+--------------------
+
+have_header: checking for libpq/libpq-fs.h... -------------------- yes
+
+"gcc -E -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2   conftest.c -o conftest.i"
+checked program was:
+/* begin */
+#include <libpq/libpq-fs.h>
+/* end */
+
+--------------------
+
+have_library: checking for main() in -lcrypto... -------------------- no
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lcrypto -lpq  -lwsock32  "
+c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lcrypto
+collect2: ld returned 1 exit status
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { main(); return 0; }
+/* end */
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lcrypto -lpq  -lwsock32  "
+c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lcrypto
+collect2: ld returned 1 exit status
+checked program was:
+/* begin */
+#include <windows.h>
+#include <winsock.h>
+
+/*top*/
+int main() { return 0; }
+int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+/* end */
+
+--------------------
+
+have_library: checking for main() in -lssl... -------------------- no
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lssl -lpq  -lwsock32  "
+c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lssl
+collect2: ld returned 1 exit status
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { main(); return 0; }
+/* end */
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lssl -lpq  -lwsock32  "
+c:\mingw\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: cannot find -lssl
+collect2: ld returned 1 exit status
+checked program was:
+/* begin */
+#include <windows.h>
+#include <winsock.h>
+
+/*top*/
+int main() { return 0; }
+int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for PQsetClientEncoding()... -------------------- yes
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { PQsetClientEncoding(); return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for pg_encoding_to_char()... -------------------- yes
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { pg_encoding_to_char(); return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for PQfreemem()... -------------------- yes
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { PQfreemem(); return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for PQescapeString()... -------------------- yes
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { PQescapeString(); return 0; }
+/* end */
+
+--------------------
+
+have_func: checking for PQexecParams()... -------------------- yes
+
+"gcc -o conftest -I. -Ic:/mingw/ruby/lib/ruby/1.8/i386-mingw32 -Ic:/apps/POSTGR~1/8.1/include  -g -O2  conftest.c  -L"c:/apps/POSTGR~1/8.1/lib" -L"c:/mingw/ruby/lib"     -lpq  -lmsvcrt-ruby18-static -lpq  -lwsock32  "
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { PQexecParams(); return 0; }
+/* end */
+
+--------------------
+

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,49 +18,45 @@ 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: ruby
-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
-- MANIFEST
-- postgres.c
-- 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
+  - ChangeLog
+  - Contributors
+  - doc
+  - extconf.rb
+  - libpq-compat.c
+  - Makefile
+  - MANIFEST
+  - mkmf.log
+  - postgres.c
+  - 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: 
-- extconf.rb
+  - extconf.rb
 requirements: 
-- PostgreSQL libpq library and headers
-dependencies: []
-
+  - PostgreSQL libpq library and headers
+dependencies: []