Skip to content

Commit e69edb3

Browse files
committed
re-enable specs
1 parent 01b50ea commit e69edb3

File tree

1 file changed

+83
-83
lines changed

1 file changed

+83
-83
lines changed

spec/mysql2/error_spec.rb

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
1-
# # encoding: UTF-8
2-
3-
# require 'spec_helper'
4-
5-
# describe Mysql2::Error do
6-
# let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
7-
8-
# let :error do
9-
# begin
10-
# client.query("HAHAHA")
11-
# rescue Mysql2::Error => e
12-
# error = e
13-
# ensure
14-
# client.close
15-
# end
16-
17-
# error
18-
# end
19-
20-
# it "responds to error_number and sql_state, with aliases" do
21-
# error.should respond_to(:error_number)
22-
# error.should respond_to(:sql_state)
23-
24-
# # Mysql gem compatibility
25-
# error.should respond_to(:errno)
26-
# error.should respond_to(:error)
27-
# end
28-
29-
# if "".respond_to? :encoding
30-
# let :error do
31-
# client = Mysql2::Client.new(DatabaseCredentials['root'])
32-
# begin
33-
# client.query("\xE9\x80\xA0\xE5\xAD\x97")
34-
# rescue Mysql2::Error => e
35-
# error = e
36-
# ensure
37-
# client.close
38-
# end
39-
40-
# error
41-
# end
42-
43-
# let :bad_err do
44-
# client = Mysql2::Client.new(DatabaseCredentials['root'])
45-
# begin
46-
# client.query("\xE5\xC6\x7D\x1F")
47-
# rescue Mysql2::Error => e
48-
# error = e
49-
# ensure
50-
# client.close
51-
# end
52-
53-
# error
54-
# end
55-
56-
# it "returns error messages as UTF-8 by default" do
57-
# with_internal_encoding nil do
58-
# error.message.encoding.should eql(Encoding::UTF_8)
59-
# error.message.valid_encoding?
60-
61-
# bad_err.message.encoding.should eql(Encoding::UTF_8)
62-
# bad_err.message.valid_encoding?
63-
64-
# bad_err.message.should include("??}\u001F")
65-
# end
66-
# end
67-
68-
# it "returns sql state as ASCII" do
69-
# error.sql_state.encoding.should eql(Encoding::US_ASCII)
70-
# error.sql_state.valid_encoding?
71-
# end
72-
73-
# it "returns error messages and sql state in Encoding.default_internal if set" do
74-
# with_internal_encoding 'UTF-16LE' do
75-
# error.message.encoding.should eql(Encoding.default_internal)
76-
# error.message.valid_encoding?
77-
78-
# bad_err.message.encoding.should eql(Encoding.default_internal)
79-
# bad_err.message.valid_encoding?
80-
# end
81-
# end
82-
# end
83-
# end
1+
# encoding: UTF-8
2+
3+
require 'spec_helper'
4+
5+
describe Mysql2::Error do
6+
let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
7+
8+
let :error do
9+
begin
10+
client.query("HAHAHA")
11+
rescue Mysql2::Error => e
12+
error = e
13+
ensure
14+
client.close
15+
end
16+
17+
error
18+
end
19+
20+
it "responds to error_number and sql_state, with aliases" do
21+
error.should respond_to(:error_number)
22+
error.should respond_to(:sql_state)
23+
24+
# Mysql gem compatibility
25+
error.should respond_to(:errno)
26+
error.should respond_to(:error)
27+
end
28+
29+
if "".respond_to? :encoding
30+
let :error do
31+
client = Mysql2::Client.new(DatabaseCredentials['root'])
32+
begin
33+
client.query("\xE9\x80\xA0\xE5\xAD\x97")
34+
rescue Mysql2::Error => e
35+
error = e
36+
ensure
37+
client.close
38+
end
39+
40+
error
41+
end
42+
43+
let :bad_err do
44+
client = Mysql2::Client.new(DatabaseCredentials['root'])
45+
begin
46+
client.query("\xE5\xC6\x7D\x1F")
47+
rescue Mysql2::Error => e
48+
error = e
49+
ensure
50+
client.close
51+
end
52+
53+
error
54+
end
55+
56+
it "returns error messages as UTF-8 by default" do
57+
with_internal_encoding nil do
58+
error.message.encoding.should eql(Encoding::UTF_8)
59+
error.message.valid_encoding?
60+
61+
bad_err.message.encoding.should eql(Encoding::UTF_8)
62+
bad_err.message.valid_encoding?
63+
64+
bad_err.message.should include("??}\u001F")
65+
end
66+
end
67+
68+
it "returns sql state as ASCII" do
69+
error.sql_state.encoding.should eql(Encoding::US_ASCII)
70+
error.sql_state.valid_encoding?
71+
end
72+
73+
it "returns error messages and sql state in Encoding.default_internal if set" do
74+
with_internal_encoding 'UTF-16LE' do
75+
error.message.encoding.should eql(Encoding.default_internal)
76+
error.message.valid_encoding?
77+
78+
bad_err.message.encoding.should eql(Encoding.default_internal)
79+
bad_err.message.valid_encoding?
80+
end
81+
end
82+
end
83+
end

0 commit comments

Comments
 (0)