postgres-pr 0.3.2 → 0.3.3

data/examples/client.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift "../lib"
 require 'postgres-pr/message'
 require 'socket'
+include PostgresPR
 
 s = UNIXSocket.new(ARGV.shift || "/tmp/.s.PGSQL.5432")
 

data/examples/server.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift "../lib"
 require 'postgres-pr/message'
 require 'socket'
+include PostgresPR
 
 s = UNIXServer.open(ARGV.shift || raise).accept
 startup = true

data/lib/postgres-pr/connection.rb

@@ -1,12 +1,13 @@
 #
 # Author:: Michael Neumann
-# Copyright:: (c) 2004 by Michael Neumann
+# Copyright:: (c) 2005 by Michael Neumann
+# License:: Same as Ruby's or BSD
 #
 
 require 'postgres-pr/message'
+require 'postgres-pr/version'
 require 'uri'
 require 'socket'
-require 'thread'
 
 module PostgresPR
 
@@ -14,63 +15,61 @@ PROTO_VERSION = 3 << 16   #196608
 
 class Connection
 
-  # sync
-
   def initialize(database, user, password=nil, uri = nil)
     uri ||= DEFAULT_URI
 
-    raise unless @mutex.nil?
-
-    @mutex = Mutex.new
-
-    @mutex.synchronize {
-      @params = {}
-      establish_connection(uri)
-    
-      @conn << StartupMessage.new(PROTO_VERSION, 'user' => user, 'database' => database).dump
-
-      loop do
-        msg = Message.read(@conn)
-
-        case msg
-        when AuthentificationClearTextPassword
-          raise ArgumentError, "no password specified" if password.nil?
-          @conn << PasswordMessage.new(password).dump
-
-        when AuthentificationCryptPassword
-          raise ArgumentError, "no password specified" if password.nil?
-          @conn << PasswordMessage.new(password.crypt(msg.salt)).dump
-
-        when AuthentificationMD5Password
-          raise ArgumentError, "no password specified" if password.nil?
-          require 'digest/md5'
-
-          m = Digest::MD5.hexdigest(password + user) 
-          m = Digest::MD5.hexdigest(m + msg.salt)
-          m = 'md5' + m
-          @conn << PasswordMessage.new(m).dump
-
-        when AuthentificationKerberosV4, AuthentificationKerberosV5, AuthentificationSCMCredential
-          raise "unsupported authentification"
-
-        when AuthentificationOk
-        when ErrorResponse
-          raise msg.field_values.join("\t")
-        when NoticeResponse
-          # TODO
-        when ParameterStatus
-          @params[msg.key] = msg.value
-        when BackendKeyData
-          # TODO
-          #p msg
-        when ReadyForQuery
-          # TODO: use transaction status
-          break
-        else
-          raise "unhandled message type"
-        end
+    @params = {}
+    establish_connection(uri)
+  
+    @conn << StartupMessage.new(PROTO_VERSION, 'user' => user, 'database' => database).dump
+
+    loop do
+      msg = Message.read(@conn)
+
+      case msg
+      when AuthentificationClearTextPassword
+        raise ArgumentError, "no password specified" if password.nil?
+        @conn << PasswordMessage.new(password).dump
+
+      when AuthentificationCryptPassword
+        raise ArgumentError, "no password specified" if password.nil?
+        @conn << PasswordMessage.new(password.crypt(msg.salt)).dump
+
+      when AuthentificationMD5Password
+        raise ArgumentError, "no password specified" if password.nil?
+        require 'digest/md5'
+
+        m = Digest::MD5.hexdigest(password + user) 
+        m = Digest::MD5.hexdigest(m + msg.salt)
+        m = 'md5' + m
+        @conn << PasswordMessage.new(m).dump
+
+      when AuthentificationKerberosV4, AuthentificationKerberosV5, AuthentificationSCMCredential
+        raise "unsupported authentification"
+
+      when AuthentificationOk
+      when ErrorResponse
+        raise msg.field_values.join("\t")
+      when NoticeResponse
+        # TODO
+      when ParameterStatus
+        @params[msg.key] = msg.value
+      when BackendKeyData
+        # TODO
+        #p msg
+      when ReadyForQuery
+        # TODO: use transaction status
+        break
+      else
+        raise "unhandled message type"
       end
-    }
+    end
+  end
+
+  def close
+    raise "connection already closed" if @conn.nil?
+    @conn.shutdown
+    @conn = nil
   end
 
   class Result 
@@ -81,40 +80,38 @@ class Connection
   end
 
   def query(sql)
-    @mutex.synchronize {
-      @conn << Query.dump(sql)
-
-      result = Result.new
-      errors = []
-
-      loop do
-        msg = Message.read(@conn)
-        case msg
-        when DataRow
-          result.rows << msg.columns
-        when CommandComplete
-          result.cmd_tag = msg.cmd_tag
-        when ReadyForQuery
-          break
-        when RowDescription
-          result.fields = msg.fields
-        when CopyInResponse
-        when CopyOutResponse
-        when EmptyQueryResponse
-        when ErrorResponse
-          # TODO
-          errors << msg
-        when NoticeResponse
-          p msg
-        else
-          # TODO
-        end
+    @conn << Query.dump(sql)
+
+    result = Result.new
+    errors = []
+
+    loop do
+      msg = Message.read(@conn)
+      case msg
+      when DataRow
+        result.rows << msg.columns
+      when CommandComplete
+        result.cmd_tag = msg.cmd_tag
+      when ReadyForQuery
+        break
+      when RowDescription
+        result.fields = msg.fields
+      when CopyInResponse
+      when CopyOutResponse
+      when EmptyQueryResponse
+      when ErrorResponse
+        # TODO
+        errors << msg
+      when NoticeResponse
+        p msg
+      else
+        # TODO
       end
+    end
 
-      raise errors.map{|e| e.field_values.join("\t") }.join("\n") unless errors.empty?
+    raise errors.map{|e| e.field_values.join("\t") }.join("\n") unless errors.empty?
 
-      result
-    }
+    result
   end
 
   DEFAULT_PORT = 5432

data/lib/postgres-pr/message.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Michael Neumann
-# Copyright:: (c) 2004 by Michael Neumann
+# Copyright:: (c) 2005 by Michael Neumann
+# License:: Same as Ruby's or BSD
 # 
 
 require 'buffer'

data/lib/postgres-pr/postgres-compat.rb

@@ -22,6 +22,10 @@ class PGconn
     @conn = PostgresPR::Connection.new(database, user, auth, uri)
   end
 
+  def close
+    @conn.close
+  end
+
   attr_reader :db
 
   def query(sql)

data/lib/postgres-pr/version.rb

@@ -0,0 +1,3 @@
+module PostgresPR
+  Version = "0.3.3"
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: postgres-pr
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2005-01-04
+  version: 0.3.3
+date: 2005-01-06
 summary: A pure Ruby interface to the PostgreSQL database
 require_paths: 
   - lib
@@ -37,6 +37,7 @@ files:
   - lib/postgres-pr/connection.rb
   - lib/postgres-pr/message.rb
   - lib/postgres-pr/postgres-compat.rb
+  - lib/postgres-pr/version.rb
   - lib/postgres-pr/typeconv/array.rb
   - lib/postgres-pr/typeconv/bytea.rb
   - lib/postgres-pr/typeconv/conv.rb