Merge branch 'master' of github.com:evanmiller/boss_db

ErlyORM · Feb 26, 2013 · 3acc481 · 3acc481
2 parents f07bb17 + 69889d8
commit 3acc481
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/db_adapters/boss_db_adapter_mysql.erl b/src/db_adapters/boss_db_adapter_mysql.erl
@@ -326,11 +326,11 @@ build_conditions(Type, Conditions) ->
 
 build_conditions1([], Acc) ->
     Acc;
-build_conditions1([{Key, 'equals', Value}|Rest], Acc) when Value == undefined ->
+build_conditions1([{Key, 'equals', Value}|Rest], Acc) when Value == undefined ; Value == null->
     build_conditions1(Rest, add_cond(Acc, Key, "is", pack_value(Value)));
 build_conditions1([{Key, 'equals', Value}|Rest], Acc) ->
     build_conditions1(Rest, add_cond(Acc, Key, "=", pack_value(Value)));
-build_conditions1([{Key, 'not_equals', Value}|Rest], Acc) when Value == undefined ->
+build_conditions1([{Key, 'not_equals', Value}|Rest], Acc) when Value == undefined ; Value == null ->
     build_conditions1(Rest, add_cond(Acc, Key, "is not", pack_value(Value)));
 build_conditions1([{Key, 'not_equals', Value}|Rest], Acc) ->
     build_conditions1(Rest, add_cond(Acc, Key, "!=", pack_value(Value)));