Commit011702f

and

authored

Allow binary as the name of prepared statement (#206)

This is to avoid creating atoms when making use of prepared statements.---------Co-authored-by: Stefan Strigler <stefan@strigler.de>

1 parentb97ef3d commit011702fCopy full SHA for 011702f

File tree

+27

-3

lines changed

+27

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`\| {true,term()}.`
`64`	`64`
`65`	`65`	`-typestatement_id()::integer().`
`66`		`--typestatement_name()::atom().`
	`66`	`+-typestatement_name()::atom() \|binary().`
`67`	`67`	`-typestatement_ref()::statement_id() \|statement_name().`
`68`	`68`
`69`	`69`	`-typedecode_decimal()::auto \|binary \|float \|number.`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -385,11 +385,13 @@ handle_call({prepare, Query}, _From, State) ->`
`385`	`385`	`State2=State#state{stmts=Stmts1},`
`386`	`386`	`{reply, {ok,Id},State2}`
`387`	`387`	`end;`
`388`		`-handle_call({prepare,Name,Query},_From,State)whenis_atom(Name)->`
	`388`	`+handle_call({prepare,Name,Query},_From,State)whenis_atom(Name);`
	`389`	`+is_binary(Name)->`
`389`	`390`	`{Reply,State1}=named_prepare(Name,Query,State),`
`390`	`391`	`{reply,Reply,State1};`
`391`	`392`	`handle_call({unprepare,Stmt},_From,State)whenis_atom(Stmt);`
`392`		`-is_integer(Stmt)->`
	`393`	`+is_integer(Stmt);`
	`394`	`+is_binary(Stmt)->`
`393`	`395`	`casedict:find(Stmt,State#state.stmts)of`
`394`	`396`	`{ok,StmtRec} ->`
`395`	`397`	`#state{socket=Socket,sockmod=SockMod}=State,`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,28 @@ common_basic_check(ExtraOpts) ->`
`128`	`128`	`mysql:execute(Pid,foo, [])),`
`129`	`129`	`Pid.`
`130`	`130`
	`131`	`+successful_connect_binary_ref_test()->`
	`132`	`+%% A connection with a registered name and execute initial queries and`
	`133`	`+%% create prepared statements.`
	`134`	`+Pid=common_basic_check_binary_ref([{user,?user}, {password,?password}]),`
	`135`	`+`
	`136`	`+%% Test some gen_server callbacks not tested elsewhere`
	`137`	`+State=get_state(Pid),`
	`138`	`+?assertMatch({ok,State},mysql_conn:code_change("0.1.0",State, [])),`
	`139`	`+?assertMatch({error,_},mysql_conn:code_change("2.0.0",unknown_state, [])),`
	`140`	`+common_conn_close().`
	`141`	`+`
	`142`	`+common_basic_check_binary_ref(ExtraOpts)->`
	`143`	`+Options= [{name, {local,tardis}},`
	`144`	`+ {queries, ["SET @foo = 'bar'","SELECT 1",`
	`145`	`+"SELECT 1; SELECT 2"]},`
	`146`	`+ {prepare, [{<<"foo">>,"SELECT @foo"}]} \|ExtraOpts],`
	`147`	`+ {ok,Pid}=mysql:start_link(Options),`
	`148`	`+%% Check that queries and prepare has been done.`
	`149`	`+?assertEqual({ok, [<<"@foo">>], [[<<"bar">>]]},`
	`150`	`+mysql:execute(Pid, <<"foo">>, [])),`
	`151`	`+Pid.`
	`152`	`+`
`131`	`153`	`common_conn_close()->`
`132`	`154`	`Pid=whereis(tardis),`
`133`	`155`	`process_flag(trap_exit,true),`

Comments

(0)