pg 0.7.9.2008.10.13 → 0.8.0

data/ext/pg.h

@@ -3,7 +3,6 @@
 #include <sys/types.h>
 
 #include "ruby.h"
-#include "rubyio.h"
 #include "libpq-fe.h"
 #include "libpq/libpq-fs.h"              /* large-object interface */
 
@@ -31,7 +30,13 @@
 
 #ifdef RUBY_18_COMPAT
 #define rb_io_stdio_file GetWriteFile
+#include "rubyio.h"
+#else
+#include "ruby/io.h"
 #endif
 
+#if defined(_WIN32)
+__declspec(dllexport)
+#endif
 void Init_pg(void);
 

data/ext/vc/pg.sln

@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pg", "pg_18\pg.vcproj", "{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pg_19", "pg_19\pg_19.vcproj", "{2EE30C74-074F-4611-B39B-38D5F3C9B071}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Debug|Win32.Build.0 = Debug|Win32
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Release|Win32.ActiveCfg = Release|Win32
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Release|Win32.Build.0 = Release|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Debug|Win32.Build.0 = Debug|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Release|Win32.ActiveCfg = Release|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

data/spec/pgconn_spec.rb

@@ -8,22 +8,21 @@ describe PGconn do
 
 	before( :all ) do
 		puts "======  TESTING PGconn  ======"
-		@test_directory = "#{Dir.getwd}/tmp_test_#{rand}"
-		@test_pgdata = @test_directory + '/data'
+		@test_directory = File.join(Dir.getwd, "tmp_test_#{rand}")
+		@test_pgdata = File.join(@test_directory, 'data')
 		if File.exists?(@test_directory) then
 			raise "test directory exists!"
 		end
-		@conninfo = "host='#{@test_directory}' dbname=test"
+    @port = 54321
+		@conninfo = "host=localhost port=#{@port} dbname=test"
 		Dir.mkdir(@test_directory)
 		Dir.mkdir(@test_pgdata)
 		cmds = []
-		cmds << "initdb -D '#{@test_pgdata}'"
-		cmds << "pg_ctl -D '#{@test_pgdata}' " + 
-			%!-o "--unix-socket-directory='#{@test_directory}' ! + 
-			%!--listen-addresses=''" ! + 
-			"start"
-		cmds << "sleep 2"
-		cmds << "createdb -h '#{@test_directory}' test"
+		cmds << "initdb -D \"#{@test_pgdata}\""
+    cmds << "pg_ctl -o \"-p #{@port}\" -D \"#{@test_pgdata}\" start"
+		cmds << "sleep 5"
+    cmds << "createdb -p #{@port} test"
+
 		cmds.each do |cmd|
 			if not system(cmd) then
 				raise "Error executing cmd: #{cmd}: #{$?}"
@@ -39,15 +38,15 @@ describe PGconn do
 	end
 
 	it "should connect using 7 arguments converted to strings" do
-		tmpconn = PGconn.connect(@test_directory, 5432, nil, nil, :test, nil, nil)
+		tmpconn = PGconn.connect('localhost', @port, nil, nil, :test, nil, nil)
 		tmpconn.status.should== PGconn::CONNECTION_OK
 		tmpconn.finish
 	end
 
 	it "should connect using hash" do
 		tmpconn = PGconn.connect(
-			:host => @test_directory,
-			:port => 5432,
+			:host => 'localhost',
+			:port => @port,
 			:dbname => :test)
 		tmpconn.status.should== PGconn::CONNECTION_OK
 		tmpconn.finish
@@ -82,23 +81,27 @@ describe PGconn do
 		res[0]['n'].should == '1'
 	end
 
-	it "should trace and untrace client-server communication" do
-		# be careful to explicitly close files so that the 
-		# directory can be removed and we don't have to wait for
-		# the GC to run.
-		expected_trace_data = open('spec/data/expected_trace.out').read
-		trace_file = open("#{@test_directory}/test_trace.out", 'w')
-		@conn.trace(trace_file)
-		trace_file.close
-		res = @conn.exec("SELECT 1 AS one")
-		@conn.untrace
-		res = @conn.exec("SELECT 2 AS two")
-		trace_file = open("#{@test_directory}/test_trace.out")
-		trace_data = trace_file.read
-		trace_file.close
-		trace_data.should == expected_trace_data
-	end
+	unless RUBY_PLATFORM =~ /mswin|mingw/
+		it "should trace and untrace client-server communication" do
+			# be careful to explicitly close files so that the
+			# directory can be removed and we don't have to wait for
+			# the GC to run.
 
+			expected_trace_file = File.join(Dir.getwd, "spec/data", "expected_trace.out")
+			expected_trace_data = open(expected_trace_file, 'rb').read
+			trace_file = open(File.join(@test_directory, "test_trace.out"), 'wb')
+			@conn.trace(trace_file)
+			trace_file.close
+			res = @conn.exec("SELECT 1 AS one")
+			@conn.untrace
+			res = @conn.exec("SELECT 2 AS two")
+			trace_file = open(File.join(@test_directory, "test_trace.out"), 'rb')
+			trace_data = trace_file.read
+			trace_file.close
+			trace_data.should == expected_trace_data
+		end
+	end
+	
 	it "should cancel a query" do
 		error = false
 		@conn.send_query("SELECT pg_sleep(1000)")
@@ -114,8 +117,8 @@ describe PGconn do
 		puts ""
 		@conn.finish
 		cmds = []
-		cmds << "pg_ctl -D '#{@test_pgdata}' stop"
-		cmds << "rm -rf '#{@test_directory}'"
+		cmds << "pg_ctl -D \"#{@test_pgdata}\" stop"
+		cmds << "rm -rf \"#{@test_directory}\""
 		cmds.each do |cmd|
 			if not system(cmd) then
 				raise "Error executing cmd: #{cmd}: #{$?}"

data/spec/pgresult_spec.rb

@@ -8,22 +8,21 @@ describe PGconn do
 
 	before( :all ) do
 		puts "======  TESTING PGresult  ======"
-		@test_directory = "#{Dir.getwd}/tmp_test_#{rand}"
-		@test_pgdata = @test_directory + '/data'
+		@test_directory = File.join(Dir.getwd, "tmp_test_#{rand}")
+		@test_pgdata = File.join(@test_directory, 'data')
 		if File.exists?(@test_directory) then
 			raise "test directory exists!"
 		end
-		@conninfo = "host='#{@test_directory}' dbname=test"
+    @port = 54321
+		@conninfo = "host=localhost port=#{@port} dbname=test"
 		Dir.mkdir(@test_directory)
 		Dir.mkdir(@test_pgdata)
 		cmds = []
-		cmds << "initdb -D '#{@test_pgdata}'"
-		cmds << "pg_ctl -D '#{@test_pgdata}' " + 
-			%!-o "--unix-socket-directory='#{@test_directory}' ! + 
-			%!--listen-addresses=''" ! +
-			"start"
-		cmds << "sleep 2"
-		cmds << "createdb -h '#{@test_directory}' test"
+		cmds << "initdb -D \"#{@test_pgdata}\""
+    cmds << "pg_ctl -o \"-p #{@port}\" -D \"#{@test_pgdata}\" start"
+		cmds << "sleep 5"
+    cmds << "createdb -p #{@port} test"
+
 		cmds.each do |cmd|
 			if not system(cmd) then
 				raise "Error executing cmd: #{cmd}: #{$?}"
@@ -56,14 +55,16 @@ describe PGconn do
 	end
 
 	it "should return the same bytes in binary format that are sent in binary format" do
-		bytes = File.open('spec/data/random_binary_data').read
+		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
+		bytes = File.open(binary_file, 'rb').read
 		res = @conn.exec('VALUES ($1::bytea)', 
 			[ { :value => bytes, :format => 1 } ], 1)
 		res[0]['column1'].should== bytes
 	end
 
 	it "should return the same bytes in binary format that are sent as inline text" do
-		in_bytes = File.open('spec/data/random_binary_data').read
+		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
+		in_bytes = File.open(binary_file, 'rb').read
 		out_bytes = nil
 		@conn.transaction do |conn|
 			conn.exec("SET standard_conforming_strings=on")
@@ -74,14 +75,17 @@ describe PGconn do
 	end
 
 	it "should return the same bytes in text format that are sent in binary format" do
-		bytes = File.open('spec/data/random_binary_data').read
+		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
+		bytes = File.open(binary_file, 'rb').read
 		res = @conn.exec('VALUES ($1::bytea)', 
 			[ { :value => bytes, :format => 1 } ])
 		PGconn.unescape_bytea(res[0]['column1']).should== bytes
 	end
 
 	it "should return the same bytes in text format that are sent as inline text" do
-		in_bytes = File.open('spec/data/random_binary_data').read
+		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
+		in_bytes = File.open(binary_file, 'rb').read
+
 		out_bytes = nil
 		@conn.transaction do |conn|
 			conn.exec("SET standard_conforming_strings=on")
@@ -95,8 +99,8 @@ describe PGconn do
 		puts ""
 		@conn.finish
 		cmds = []
-		cmds << "pg_ctl -D '#{@test_pgdata}' stop"
-		cmds << "rm -rf '#{@test_directory}'"
+		cmds << "pg_ctl -D \"#{@test_pgdata}\" stop"
+		cmds << "rm -rf \"#{@test_directory}\""
 		cmds.each do |cmd|
 			if not system(cmd) then
 				raise "Error executing cmd: #{cmd}: #{$?}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pg
 version: !ruby/object:Gem::Version 
-  version: 0.7.9.2008.10.13
+  version: 0.8.0
 platform: ruby
 authors: 
 - Yukihiro Matsumoto
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -07:00
+date: 2009-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,14 +26,27 @@ extensions:
 extra_rdoc_files: 
 - ext/pg.c
 files: 
+- Rakefile
+- README
+- LICENSE
+- COPYING.txt
+- ChangeLog
+- Contributors
+- GPL
+- BSD
 - doc/postgres.html
 - doc/postgres.jp.html
 - ext/extconf.rb
 - ext/pg.h
+- ext/vc
 - ext/compat.c
 - ext/pg.c
+- ext/mingw
 - ext/mkrf_config.rb
 - ext/compat.h
+- ext/mingw/Rakefile
+- ext/mingw/build.rake
+- ext/vc/pg.sln
 - sample/losample.rb
 - sample/psqlHelp.rb
 - sample/psql.rb
@@ -56,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.4
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: