Skip to content

Thread cursor fix #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Thread cursor fix #53

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9f2f7d
Added cursor closing debugging messages.
mike-bourgeous Sep 3, 2014
ef4db71
Try using thread local variables to fix the threaded cursor issues.
mike-bourgeous Sep 3, 2014
5d23944
Added current thread to cursor closing debugging messages.
mike-bourgeous Sep 3, 2014
8efcc51
Log the current thread and connection object when parsing for a cursor.
mike-bourgeous Sep 3, 2014
568b5c3
Log cursor execution, display cursor object in cursor debug messages.
mike-bourgeous Sep 3, 2014
a1fbdf7
Removed cursor creation and closing debugging messages.
mike-bourgeous Sep 3, 2014
b09d29b
Set the open cursors array to nil if it becomes empty.
mike-bourgeous Sep 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions lib/plsql/oci_connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,12 @@ def exec(sql, *bindvars)
class Cursor #:nodoc:
include Connection::CursorCommon

# stack of open cursors
@@open_cursors = []
attr_reader :raw_cursor

def initialize(conn, raw_cursor)
@connection = conn
@raw_cursor = raw_cursor
@@open_cursors.push self
open_cursors.push self
end

def self.new_from_parse(conn, sql)
Expand Down Expand Up @@ -125,12 +123,20 @@ def close_raw_cursor

def close
# close all cursors that were created after this one
while (open_cursor = @@open_cursors.pop) && !open_cursor.equal?(self)
while (open_cursor = open_cursors.pop) && !open_cursor.equal?(self)
open_cursor.close_raw_cursor
end

close_raw_cursor

Thread.current[:__ruby_plsql_open_cursors] = nil if open_cursors.empty?
end

# Returns the (modifiable) list of open cursors in the current thread.
def open_cursors
Thread.current[:__ruby_plsql_open_cursors] ||= []
Thread.current[:__ruby_plsql_open_cursors]
end
end

def parse(sql)
Expand Down Expand Up @@ -336,4 +342,4 @@ def ora_date_to_ruby_date(val)

end

end
end