@@ -112,8 +112,18 @@ open_connection(#pool{pool_id=PoolId, host=Host, port=Port, user=User, password= caps = Greeting#greeting.caps, language = Greeting#greeting.language }, - emysql_conn:set_database(Connection, Database), - emysql_conn:set_encoding(Connection, Encoding), + case emysql_conn:set_database(Connection, Database) of + OK1 when is_record(OK1, ok_packet) -> + ok; + Err1 when is_record(Err1, error_packet) -> + exit({failed_to_set_database, Err1#error_packet.msg}) + end, + case emysql_conn:set_encoding(Connection, Encoding) of + OK2 when is_record(OK2, ok_packet) -> + ok; + Err2 when is_record(Err2, error_packet) -> + exit({failed_to_set_encoding, Err2#error_packet.msg}) + end, Connection; {error, Reason} -> exit({failed_to_connect_to_database, Reason}) @@ -162,7 +172,11 @@ prepare_statement(Connection, StmtName) -> Version -> ok; _ -> - prepare(Connection, StmtName, Statement), - emysql_statements:prepare(Connection#connection.id, StmtName, Version) + case prepare(Connection, StmtName, Statement) of + OK when is_record(OK, ok_packet) -> + emysql_statements:prepare(Connection#connection.id, StmtName, Version); + Err when is_record(Err, error_packet) -> + exit({failed_to_prepare_statement, Err#error_packet.msg}) + end end end. \ No newline at end of file src/emysql_conn.erl @@ -45,7 +45,9 @@ start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). all() -> - gen_server:call(?MODULE, all, infinity). + State = gen_server:call(?MODULE, all, infinity), + [{statements, [StmtName || {StmtName, _} <- gb_trees:to_list(State#state.statements)]}, + {prepared, gb_trees:to_list(State#state.prepared)}]. fetch(StmtName) -> gen_server:call(?MODULE, {fetch, StmtName}, infinity). src/emysql_statements.erl 4ccbc92b0190279eec75f4c52f9d9b8a39bdef62 f662d222d683be4305b3a5763acf5c510779899e Jacob Vorreuter jvorreuter@ea.com http://github.com/JacobVorreuter/emysql/commit/839cbc3c566db144c3f6e077de66bba97c79df6f 839cbc3c566db144c3f6e077de66bba97c79df6f 2009-11-06T13:22:53-08:00 2009-11-06T13:22:53-08:00 Merge branch 'wtf' 26dec016963104d9c14239f63c407c2993506f3b Jacob Vorreuter jvorreuter@ea.com