Skip to content

Commit

Permalink
Signal error to callback if we got an error message
Browse files Browse the repository at this point in the history
  • Loading branch information
mperham committed Apr 3, 2010
1 parent 2e50dc1 commit 32e569a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 35 deletions.
13 changes: 2 additions & 11 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim: syntax=Ruby
require 'rubygems'
# require 'rake/testtask'
require 'rake/testtask'

begin
require 'jeweler'
Expand All @@ -26,15 +26,6 @@ task :gin => [:gemspec, :build] do
end


# Rake::TestTask.new do |t|
# t.warning = true
# end

# TODO Figure out how to integrate EM with test/unit.
task :test do
$LOAD_PATH << File.expand_path('lib')
$LOAD_PATH << File.expand_path('test')
require 'test_database'
end
Rake::TestTask.new

task :default => :test
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.1
0.3.0
2 changes: 1 addition & 1 deletion lib/postgres_connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def dispatch_query_message(msg)
@r.cmd_tag = msg.cmd_tag
when ReadyForQuery
pq,@pending_query = @pending_query,nil
pq.succeed true, @r, @e
pq.succeed @e.size == 0, @r, @e
when RowDescription
@r.fields = msg.fields
when CopyInResponse
Expand Down
44 changes: 22 additions & 22 deletions test/test_database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,33 @@
require 'eventmachine'
require 'test/unit'

EM.run do

Fiber.new do
class Site < ActiveRecord::Base
set_table_name 'site'
end

include Test::Unit::Assertions
class TestDatabase < Test::Unit::TestCase
def test_live_server
EM.run do
Fiber.new do
ActiveRecord::Base.establish_connection

class Site < ActiveRecord::Base
set_table_name 'site'
end

ActiveRecord::Base.establish_connection
result = ActiveRecord::Base.connection.query('select id, domain_name from site')
assert result
assert_equal 3, result.size

result = ActiveRecord::Base.connection.query('select id, domain_name from site')
assert result
assert_equal 3, result.size
result = Site.all
assert result
assert_equal 3, result.size

result = Site.all
assert result
assert_equal 3, result.size
result = Site.find(1)
assert_equal 1, result.id
assert_equal 'somedomain.com', result.domain_name
end.resume

result = Site.find(1)
assert_equal 1, result.id
assert_equal 'somedomain.com', result.domain_name
end.resume
EM.add_timer(1) do
EM.stop
end

EM.add_timer(1) do
EM.stop
end
end

end

0 comments on commit 32e569a

Please sign in to comment.