[Ruby-DBI-devel-CVS] CVS: src/lib/dbd_pg Pg.rb,1.21,1.22

[Michael N. <mne...@us...>]

Update of /cvsroot/ruby-dbi/src/lib/dbd_pg
In directory usw-pr-cvs1:/tmp/cvs-serv10969

Modified Files:
	Pg.rb 
Log Message:
added Statement#fetch_scroll (patch by Stephen Davies)


Index: Pg.rb
===================================================================
RCS file: /cvsroot/ruby-dbi/src/lib/dbd_pg/Pg.rb,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Pg.rb	3 Jul 2002 19:22:47 -0000	1.21
+++ Pg.rb	3 Jul 2002 19:56:10 -0000	1.22
@@ -455,7 +455,11 @@
 	def fetch
 	  @result.fetchrow
 	end
-	
+
+	def fetch_scroll(direction, offset)
+	  @result.fetch_scroll(direction, offset)
+	end
+
 	def finish
 	  @result.finish if @result
 	  @result = nil
@@ -511,18 +515,43 @@
 
 	def fetchrow
 	  @index += 1
-	  if @index < @result.size
+	  if @index < @result.size && @index >= 0
 	    fill_array(@result[@index])
+	    @row
 	  else
-	    @row = nil
+	    nil
 	  end
-	  @row
 	end
 
-	def row_count
-	  @pg_result.num_tuples
+	def fetch_scroll(direction, offset)
+	  # Exact semantics aren't too closely defined.  I attempted to follow the DBI:Mysql example.
+	  case direction
+	  when SQL_FETCH_NEXT
+	    # Nothing special to do, besides the fetchrow
+	  when SQL_FETCH_PRIOR
+	    @index -= 2
+	  when SQL_FETCH_FIRST
+	    @index = -1
+	  when SQL_FETCH_LAST
+	    @index = @result.size - 2
+	  when SQL_FETCH_ABSOLUTE
+	    # Note: if you go "out of range", all fetches will give nil until you get back
+	    # into range, this doesn't raise an error.
+	    @index = offset-1
+	  when SQL_FETCH_RELATIVE
+	    # Note: if you go "out of range", all fetches will give nil until you get back
+	    # into range, this doesn't raise an error.
+	    @index += offset - 1
+	  else
+	    raise NotSupportedError
+	  end
+	  self.fetchrow
 	end
- 
+
+        def row_count
+          @pg_result.num_tuples
+        end
+
         def rows_affected
           @pg_result.cmdtuples
         end