-
-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from crystal-lang/feature/unprepared
implement TextProtocol for unprepared statements without arguments
- Loading branch information
Showing
5 changed files
with
182 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
# Implementation of ProtocolText::Resultset. | ||
# Used for unprepared statements. | ||
class MySql::TextResultSet < DB::ResultSet | ||
getter columns | ||
|
||
@conn : MySql::Connection | ||
@row_packet : MySql::ReadPacket? | ||
@header : UInt8 | ||
|
||
def initialize(statement, column_count) | ||
super(statement) | ||
@conn = statement.connection.as(MySql::Connection) | ||
|
||
columns = @columns = [] of ColumnSpec | ||
@conn.read_column_definitions(columns, column_count) | ||
|
||
@column_index = 0 # next column index to return | ||
|
||
@header = 0u8 | ||
@eof_reached = false | ||
end | ||
|
||
def do_close | ||
super | ||
|
||
while move_next | ||
end | ||
|
||
if row_packet = @row_packet | ||
row_packet.discard | ||
end | ||
end | ||
|
||
def move_next : Bool | ||
return false if @eof_reached | ||
|
||
# skip previous row_packet | ||
if row_packet = @row_packet | ||
row_packet.discard | ||
end | ||
|
||
@row_packet = row_packet = @conn.build_read_packet | ||
|
||
@header = row_packet.read_byte! | ||
if @header == 0xfe # EOF | ||
@eof_reached = true | ||
return false | ||
end | ||
|
||
@column_index = 0 | ||
# TODO remove row_packet.read(@null_bitmap_slice) | ||
return true | ||
end | ||
|
||
def column_count : Int32 | ||
@columns.size | ||
end | ||
|
||
def column_name(index : Int32) : String | ||
@columns[index].name | ||
end | ||
|
||
def read | ||
row_packet = @row_packet.not_nil! | ||
|
||
is_nil = @header == 0xfb | ||
col = @column_index | ||
@column_index += 1 | ||
if is_nil | ||
nil | ||
else | ||
length = row_packet.read_lenenc_int(@header) | ||
val = row_packet.read_string(length) | ||
val = @columns[col].column_type.parse(val) | ||
|
||
# http://dev.mysql.com/doc/internals/en/character-set.html | ||
if val.is_a?(Slice(UInt8)) && @columns[col].character_set != 63 | ||
::String.new(val) | ||
else | ||
val | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
class MySql::UnpreparedStatement < DB::Statement | ||
def initialize(connection, @sql : String) | ||
super(connection) | ||
end | ||
|
||
protected def conn | ||
@connection.as(Connection) | ||
end | ||
|
||
protected def perform_query(args : Enumerable) : DB::ResultSet | ||
perform_exec_or_query(args).as(DB::ResultSet) | ||
end | ||
|
||
protected def perform_exec(args : Enumerable) : DB::ExecResult | ||
perform_exec_or_query(args).as(DB::ExecResult) | ||
end | ||
|
||
private def perform_exec_or_query(args : Enumerable) | ||
raise "exec/query with args is not supported" if args.size > 0 | ||
|
||
conn = self.conn | ||
conn.write_packet do |packet| | ||
packet.write_byte 0x03u8 | ||
packet << @sql | ||
# TODO to support args an interpolation needs to be done | ||
end | ||
|
||
conn.read_packet do |packet| | ||
case header = packet.read_byte.not_nil! | ||
when 255 # err packet | ||
conn.handle_err_packet(packet) | ||
when 0 # ok packet | ||
affected_rows = packet.read_lenenc_int | ||
last_insert_id = packet.read_lenenc_int | ||
DB::ExecResult.new affected_rows, last_insert_id | ||
else | ||
MySql::TextResultSet.new(self, packet.read_lenenc_int(header)) | ||
end | ||
end | ||
end | ||
end |