Merge branch 'master' into update-test-readme

Author: Sadman Sakib Hasan

README.md

@@ -350,13 +350,40 @@ Destroying models may result in errors due to foreign key integrity. First delet
 
 ## Running tests
 
-You will need a postgres database created locally and a user with full read/write access to the database (substitute as required with values appropriate to your setup):
+**Install postgresql locally**
 
-1. `CI=true PGHOST=localhost PGPORT=<pgport> PGDATABASE=<dbname> PGUSER=<username> PGPASSWORD=<password> npm test`
+<https://www.postgresql.org/download/macosx/>
 
-The defaults are:
+**Set up the database**
 
-Host | Port | Database | User | Password
---- | --- | --- | --- | ----
-localhost | 5432 | emptytest | test | _none_
+1. Go to pgAdmin.<br>
+  By default, the local database is one of the servers under Server Groups > Servers.
+2. Under Login Roles, add a user called `strongloop`.
 
+**Change configuration for database connection (Choose either of step 1 or 2)**
+
+1. In `test\init.js`, change the value of `config` to be pointing to the local database and then run `npm test`. For example,
+
+```
+var config = {
+  host: 'localhost',
+  port: '5432',
+  database:'strongloop',
+  username: 'postgres',
+  password: 'postgres',
+};
+```
+
+2. **Linux Only** `CI=true PGHOST=localhost PGPORT=<pgport> PGDATABASE=<dbname> PGUSER=<username> PGPASSWORD=<password> npm test`
+
+**Troubleshooting**
+
+When running npm test, it runs the `pretest.js` which eventually runs `schema.sql` to set up the database and tables. If there is problem, you can run the `schema.sql` manually. To do this:
+
+1. Go to SQL Shell (psql)
+2. Run:
+```
+\i <<file path>>
+
+For example on Windows, \i c:/somepath/test/schema.sql
+```

lib/postgresql.js

@@ -387,10 +387,10 @@ PostgreSQL.prototype.buildExpression = function(columnName, operator,
     operatorValue, propertyDefinition) {
   switch (operator) {
     case 'like':
-      return new ParameterizedSQL(columnName + " LIKE ? ESCAPE '\\'",
+      return new ParameterizedSQL(columnName + " LIKE ? ESCAPE E'\\\\'",
           [operatorValue]);
     case 'nlike':
-      return new ParameterizedSQL(columnName + " NOT LIKE ? ESCAPE '\\'",
+      return new ParameterizedSQL(columnName + " NOT LIKE ? ESCAPE E'\\\\'",
           [operatorValue]);
     case 'regexp':
       if (operatorValue.global)