Permalink
Browse files

Merge branch 'master' of git://github.com/evanmiller/boss_db into mig…

…rations

Conflicts:
	rebar.config
  • Loading branch information...
2 parents a6fd34f + ad171d9 commit 6ac7fd582824326a06ae8ae1b2b1e82c58e792a1 @davidw davidw committed Mar 18, 2013
Showing with 378 additions and 1 deletion.
  1. +1 −0 README.md
  2. +2 −1 rebar.config
  3. +4 −0 src/boss_db.erl
  4. +371 −0 src/db_adapters/boss_db_adapter_dynamodb.erl
View
@@ -4,6 +4,7 @@ BossDB: A sharded, caching, pooling, evented ORM for Erlang
Supported databases
-------------------
+* *NEW* DynamoDB (experimental)
* Mnesia
* MongoDB
* MySQL
View
@@ -2,10 +2,11 @@
{deps, [
{aleppo, ".*", {git, "git://github.com/evanmiller/aleppo.git", {tag, "bef139e4c7"}}},
{bson, ".*", {git, "git://github.com/mongodb/bson-erlang.git", {tag, "adce0e94ab"}}},
+ {ddb, ".*", {git, "https://github.com/Concurix/ddb.git", {tag, "HEAD"}}},
{epgsql, ".*", {git, "git://github.com/wg/epgsql.git", "master"}},
{erlmc, ".*", {git, "git://github.com/bipthelin/erlmc.git", {tag, "HEAD"}}},
{medici, ".*", {git, "git://github.com/evanmiller/medici.git", {branch, "rebarify"}}},
- {mongodb, ".*", {git, "git://github.com/mongodb/mongodb-erlang.git", {tag, "4f330e6bab"}}},
+ {mongodb, ".*", {git, "git://github.com/evanmiller/mongodb-erlang.git", {tag, "c582c911cd"}}},
{mysql, ".*", {git, "git://github.com/dizzyd/erlang-mysql-driver.git", {tag, "16cae84b5e"}}},
{poolboy, ".*", {git, "git://github.com/devinus/poolboy.git", {tag, "855802e0cc"}}},
{riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {tag, "1.3.0"}}},
View
@@ -396,6 +396,10 @@ normalize_conditions([Key, Operator, Value|Rest], Acc) when is_atom(Key), is_ato
normalize_conditions(Rest, [{Key, Operator, Value}|Acc]);
normalize_conditions([{Key, Value}|Rest], Acc) when is_atom(Key) ->
normalize_conditions(Rest, [{Key, 'equals', Value}|Acc]);
+normalize_conditions([{Key, 'eq', Value}|Rest], Acc) when is_atom(Key) ->
+ normalize_conditions(Rest, [{Key, 'equals', Value}|Acc]);
+normalize_conditions([{Key, 'ne', Value}|Rest], Acc) when is_atom(Key) ->
+ normalize_conditions(Rest, [{Key, 'not_equals', Value}|Acc]);
normalize_conditions([{Key, Operator, Value}|Rest], Acc) when is_atom(Key), is_atom(Operator) ->
normalize_conditions(Rest, [{Key, Operator, Value}|Acc]).
Oops, something went wrong.

0 comments on commit 6ac7fd5

Please sign in to comment.