Merge branch 'master' of git://github.com/lmjohns3/sequelize into lmjohns3-master

lib/dialects/sqlite/query-generator.js

@@ -182,7 +182,7 @@ module.exports = (function() {
         }
         }
       }
       }
 
 
-      return hashToWhereConditions(hash)
+      return hashToWhereConditions(hash).replace(/\\'/g, "''");
     }
     }
   }
   }
 
 

spec/sqlite/dao.spec.js

@@ -48,6 +48,20 @@ if (dialect === 'sqlite') {
             console.log(err)
             console.log(err)
           })
           })
       })
       })
+    it("escapes strings properly in where clauses", function(done) {
+      var self = this
+
+      this.User
+        .create({ username: "user'name" })
+        .success(function(user) {
+          self.User.findAll({
+            where: { username: "user'name" }
+          }).success(function(users) {
+            expect(users.length).toEqual(1)
+            done()
+          })
+        })
+      })
     })
     })
   })
   })
 }
 }