postgres-pr 0.0.1 → 0.1.0

data/lib/postgres-pr/connection.rb

@@ -48,35 +48,44 @@ class Connection
     }
   end
 
+  class Result 
+    attr_accessor :rows, :fields
+    def initialize(rows=[], fields=[])
+      @rows, @fields = rows, fields
+    end
+  end
+
   def query(sql)
     @mutex.synchronize {
       @conn << Query.dump(sql)
 
-      rows = []
+      result = Result.new
 
       loop do
         msg = Message.read(@conn)
         case msg
         when DataRow
-          rows << msg.columns 
+          result.rows << msg.columns
         when CommandComplete
         when ReadyForQuery
           break
         when RowDescription
-          # TODO
+          result.fields = msg.fields
         when CopyInResponse
         when CopyOutResponse
         when EmptyQueryResponse
+          p "EMPTY!"
         when ErrorResponse
           p msg
           raise 
         when NoticeResponse
+          p msg
           # TODO
         else
           raise
         end
       end
-      rows
+      result
     }
   end
 

data/lib/postgres-pr/message.rb

@@ -399,6 +399,7 @@ end
 
 class RowDescription < Message
   register_message_type ?T
+  fields :fields
 
   class FieldInfo < Struct.new(:name, :oid, :attr_nr, :type_oid, :typlen, :atttypmod, :formatcode); end
 
@@ -430,6 +431,7 @@ class RowDescription < Message
         f.typlen     = buffer.read_int16_network
         f.atttypmod  = buffer.read_int32_network
         f.formatcode = buffer.read_int16_network
+        f
       }
     end
   end

data/lib/postgres.rb

@@ -0,0 +1,53 @@
+# This is a compatibility layer for using the pure Ruby postgres-pr instead of
+# the C interface of postgres.
+
+begin
+  require 'postgres.so'
+rescue LoadError
+  require 'postgres-pr/connection'
+  class PGconn
+    class << self
+      alias connect new
+    end
+
+    def initialize(host, port, options, tty, database, user, auth)
+      uri =
+      if host[0] != ?/
+        "tcp://#{ host }:#{ port }"
+      else
+        "unix:#{ host }/.s.PGSQL.#{ port }"
+      end
+
+      @db = database
+      @conn = Connection.new(database, user, auth, uri)
+    end
+
+    attr_reader :db
+
+    def query(sql)
+      PGresult.new(@conn.query(sql))
+    end
+
+    alias exec query
+  end
+
+  class PGresult
+    def initialize(res)
+      @res = res
+    end
+
+    def fields
+      @res.fields.map {|f| f.name}
+    end
+
+    def result
+      @res.rows.map {|row| row.map {|c| c || ""} }
+    end
+
+    include Enumerable
+
+    def each(&block)
+      result.each(&block)
+    end
+  end
+end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: postgres-pr
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 date: 2004-11-18
 summary: A pure Ruby interface to the PostgreSQL database
 require_paths: 
@@ -27,8 +27,9 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 files: 
   - lib/postgres-pr
-  - lib/binary_writer.rb
   - lib/byteorder.rb
+  - lib/postgres.rb
+  - lib/binary_writer.rb
   - lib/binary_reader.rb
   - lib/buffer.rb
   - lib/postgres-pr/typeconv