Formatting

This commit is contained in:
Alexey Romanov
2010-12-06 19:19:26 +03:00
parent ee13fe6970
commit a6fa7aef21
2 changed files with 54 additions and 46 deletions

View File

@@ -51,7 +51,6 @@
-type result() :: {'ok', pid()} | 'ignore' | {'error', any()}. -type result() :: {'ok', pid()} | 'ignore' | {'error', any()}.
-spec start_link(atom()) -> result(). -spec start_link(atom()) -> result().
start_link(Db) -> start_link(Db) ->
open(Db, []). open(Db, []).
@@ -738,8 +737,8 @@ do_sql_bind_and_exec(SQL, Params, #state{port = Port}) ->
exec(_Port, {create_function, _FunctionName, _Function}) -> exec(_Port, {create_function, _FunctionName, _Function}) ->
error_logger:error_report([{application, sqlite3}, "NOT IMPL YET"]); error_logger:error_report([{application, sqlite3}, "NOT IMPL YET"]);
%port_control(Port, ?SQL_CREATE_FUNCTION, list_to_binary(Cmd)), %port_control(Port, ?SQL_CREATE_FUNCTION, list_to_binary(Cmd)),
%wait_result(Port); %wait_result(Port);
exec(Port, {sql_exec, Cmd}) -> exec(Port, {sql_exec, Cmd}) ->
port_control(Port, ?SQL_EXEC_COMMAND, Cmd), port_control(Port, ?SQL_EXEC_COMMAND, Cmd),
wait_result(Port); wait_result(Port);
@@ -751,14 +750,16 @@ exec(Port, {sql_bind_and_exec, SQL, Params}) ->
wait_result(Port) -> wait_result(Port) ->
receive receive
{Port, error, Code, Reason} -> {Port, error, Code, Reason} ->
error_logger:error_msg("sqlite3 driver error: ~s~n", [Reason]), error_logger:error_msg("sqlite3 driver error: ~s~n",
[Reason]),
% ?dbg("Error: ~p~n", [Reason]), % ?dbg("Error: ~p~n", [Reason]),
{error, Code, Reason}; {error, Code, Reason};
{Port, Reply} -> {Port, Reply} ->
% ?dbg("Reply: ~p~n", [Reply]), % ?dbg("Reply: ~p~n", [Reply]),
Reply; Reply;
{'EXIT', Port, Reason} -> {'EXIT', Port, Reason} ->
error_logger:error_msg("sqlite3 driver port closed with reason ~p~n", [Reason]), error_logger:error_msg("sqlite3 driver port closed with reason ~p~n",
[Reason]),
% ?dbg("Error: ~p~n", [Reason]), % ?dbg("Error: ~p~n", [Reason]),
{error, -1, Reason} {error, -1, Reason}
end. end.

View File

@@ -356,7 +356,8 @@ sql_number(NumberStr) ->
-spec sql_string(string()) -> binary(). -spec sql_string(string()) -> binary().
sql_string(StringWithEscapedQuotes) -> sql_string(StringWithEscapedQuotes) ->
Res1 = re:replace(StringWithEscapedQuotes, "''", "'", [global, {return, binary}]), Res1 = re:replace(StringWithEscapedQuotes, "''", "'",
[global, {return, binary}]),
binary_part(Res1, 0, byte_size(Res1) - 1). binary_part(Res1, 0, byte_size(Res1) - 1).
-spec sql_blob(string()) -> binary(). -spec sql_blob(string()) -> binary().
@@ -386,8 +387,12 @@ constraint_sql(Constraint) ->
-spec table_constraint_sql(any()) -> iolist(). -spec table_constraint_sql(any()) -> iolist().
table_constraint_sql(TableConstraint) -> table_constraint_sql(TableConstraint) ->
case TableConstraint of case TableConstraint of
{primary_key, Columns} -> ["PRIMARY KEY(", map_intersperse(fun indexed_column_sql/1, Columns, ", "), ")"]; {primary_key, Columns} ->
{unique, Columns} -> ["UNIQUE(", map_intersperse(fun indexed_column_sql/1, Columns, ", "), ")"] ["PRIMARY KEY(",
map_intersperse(fun indexed_column_sql/1, Columns, ", "), ")"];
{unique, Columns} ->
["UNIQUE(",
map_intersperse(fun indexed_column_sql/1, Columns, ", "), ")"]
%% TODO: foreign key %% TODO: foreign key
end. end.
@@ -409,8 +414,8 @@ indexed_column_sql(ColumnName) -> atom_to_list(ColumnName).
-ifdef(TEST). -ifdef(TEST).
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-define(FLAT(X), iolist_to_binary(X)). -define(assertFlat(Expected, Value),
-define(assertFlat(Expected, Value), ?assertEqual(iolist_to_binary(Expected), iolist_to_binary(Value))). ?assertEqual(iolist_to_binary(Expected), iolist_to_binary(Value))).
quote_test() -> quote_test() ->
?assertFlat("'abc'", value_to_sql("abc")), ?assertFlat("'abc'", value_to_sql("abc")),
@@ -422,7 +427,9 @@ create_table_sql_test() ->
create_table_sql(user, [{id, integer, [primary_key]}, {name, text}])), create_table_sql(user, [{id, integer, [primary_key]}, {name, text}])),
?assertFlat( ?assertFlat(
"CREATE TABLE user (id INTEGER, name TEXT, PRIMARY KEY(id));", "CREATE TABLE user (id INTEGER, name TEXT, PRIMARY KEY(id));",
create_table_sql(user, [{id, integer}, {name, text}], [{primary_key, [id]}])). create_table_sql(user,
[{id, integer}, {name, text}],
[{primary_key, [id]}])).
update_sql_test() -> update_sql_test() ->
?assertFlat( ?assertFlat(