postgres-pr 0.2.2 → 0.3.0

data/examples/og/test.rb

@@ -0,0 +1,50 @@
+$LOAD_PATH.unshift '../../lib'
+$LOAD_PATH.unshift '/tmp/og-0.5.0/lib'
+require 'og'
+require 'glue/logger'
+
+$DBG = true
+
+class User
+end
+
+class Comment
+  prop_accessor :body, String
+  belongs_to :user, User
+end
+
+class User
+  prop_accessor :name, String
+  has_many :comments, Comment
+end
+
+if __FILE__ == $0
+  config = {
+    :address => "localhost",
+    :database => "mneumann",
+    :backend => "psql",
+    :user => "mneumann",
+    :password => "",
+    :connection_count => 1
+  }
+  $log = Logger.new(STDERR)
+  $og = Og::Database.new(config)
+
+  $og.get_connection
+
+  u1 = User.new
+  u1.name = "Michael Neumann"
+  u1.save!
+
+  u2 = User.new
+  u2.name = "John User"
+  u2.save!
+
+  c1 = Comment.new
+  c1.body = "og test"
+  c1.user = u1
+  c1.save!
+
+  p User.all
+  p Comment.all
+end

data/lib/buffer.rb

@@ -7,12 +7,19 @@ class Buffer
   class Error < RuntimeError; end
   class EOF < Error; end 
 
-  def initialize(size)
+  def self.from_string(str)
+    new(str)
+  end
+
+  def self.of_size(size)
     raise ArgumentError if size < 0
+    new('#' * size)
+  end 
 
-    @size = size
+  def initialize(content)
+    @size = content.size
+    @content = content
     @position = 0
-    @content = "#" * @size
   end
 
   def size
@@ -58,10 +65,11 @@ class Buffer
       write(str)
       n -= str.size
     end
+    raise if n < 0 
   end
 
   def write_cstring(cstr)
-    raise ArgumentError, "Invalid Ruby/cstring" if cstr.include?("\000")
+    raise ArgumentError, "Invalid Ruby/cstring" if cstr.include?(0)
     write(cstr)
     write("\000")
   end

data/lib/postgres-pr/message.rb

@@ -34,7 +34,7 @@ class Message
     raise ParseError unless length >= 4
 
     # initialize buffer
-    buffer = Buffer.new(startup ? length : 1+length)
+    buffer = Buffer.of_size(startup ? length : 1+length)
     buffer.write_byte(type) unless startup
     buffer.write_int32_network(length)
     buffer.copy_from_stream(stream, length-4)
@@ -53,7 +53,7 @@ class Message
   end
 
   def dump(body_size=0)
-    buffer = Buffer.new(5 +  body_size)
+    buffer = Buffer.of_size(5 +  body_size)
     buffer.write_byte(self.message_type)
     buffer.write_int32_network(4 + body_size)
     yield buffer if block_given?
@@ -462,7 +462,7 @@ class StartupMessage < Message
   def dump
     sz = @params.inject(4 + 4) {|sum, kv| sum + kv[0].size + 1 + kv[1].size + 1} + 1
 
-    buffer = Buffer.new(sz)
+    buffer = Buffer.of_size(sz)
     buffer.write_int32_network(sz)
     buffer.write_int32_network(@proto_version)
     @params.each_pair {|key, value| 
@@ -498,7 +498,7 @@ class SSLRequest < Message
 
   def dump
     sz = 4 + 4
-    buffer = Buffer.new(sz)
+    buffer = Buffer.of_size(sz)
     buffer.write_int32_network(sz)
     buffer.write_int32_network(@ssl_request_code)
     raise DumpError unless buffer.at_end?

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

@@ -29,24 +29,69 @@ class PGconn
   end
 
   alias exec query
+
+  def self.escape(str)
+    # TODO: correct?
+    str.gsub(/\\/){ '\\\\' }.gsub(/'/){ '\\\'' }
+  end
+
 end
 
 class PGresult
-  attr_reader :fields, :result
+  include Enumerable
+
+  def each(&block)
+    @result.each(&block)
+  end
 
+  def [](index)
+    @result[index]
+  end
+ 
   def initialize(res)
     @res = res
     @fields = @res.fields.map {|f| f.name}
     @result = @res.rows
   end
 
-  include Enumerable
+  # TODO: status, getlength, cmdstatus
 
-  def each(&block)
-    @result.each(&block)
+  attr_reader :result, :fields
+
+  def num_tuples
+    @result.size
   end
 
-  def [](index)
-    @result[index]
+  def num_fields
+    @fields.size
+  end
+
+  def fieldname(index)
+    @fields[index]
+  end
+
+  def fieldnum(name)
+    @fields.index(name)
+  end
+
+  def type(index)
+    raise
+    # TODO: correct?
+    @res.fields[index].type_oid
+  end
+
+  def size(index)
+    raise
+    # TODO: correct?
+    @res.fields[index].typlen
+  end
+
+  def getvalue(tup_num, field_num)
+    @result[tup_num][field_num]
+  end
+
+  # free the result set
+  def clear
+    @res = @fields = @result = nil
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: postgres-pr
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2004-11-23
+  version: 0.3.0
+date: 2004-12-07
 summary: A pure Ruby interface to the PostgreSQL database
 require_paths: 
   - lib
@@ -29,18 +29,20 @@ files:
   - lib/binary_writer.rb
   - lib/byteorder.rb
   - lib/postgres-pr
-  - lib/binary_reader.rb
-  - lib/postgres.rb
-  - lib/buffer.rb
-  - lib/postgres-pr/connection.rb
   - lib/postgres-pr/typeconv
-  - lib/postgres-pr/message.rb
-  - lib/postgres-pr/postgres-compat.rb
   - lib/postgres-pr/typeconv/array.rb
   - lib/postgres-pr/typeconv/bytea.rb
   - lib/postgres-pr/typeconv/conv.rb
   - lib/postgres-pr/typeconv/TC_conv.rb
+  - lib/postgres-pr/connection.rb
+  - lib/postgres-pr/message.rb
+  - lib/postgres-pr/postgres-compat.rb
+  - lib/binary_reader.rb
+  - lib/postgres.rb
+  - lib/buffer.rb
   - test/TC_message.rb
+  - examples/og
+  - examples/og/test.rb
   - examples/test_connection.rb
   - examples/client.rb
   - examples/server.rb