Skip to content

Stable Version 0.11.10 #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 28, 2016
Merged

Stable Version 0.11.10 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
731b370
Prefer ES5 array methods or use mout directly over JSUtils
techniq Jan 24, 2016
a10acf5
Setup (and fix) tests to run against Postgres as well as MySQL. Issu…
techniq Jan 25, 2016
cc46463
Attempt to fix Circle CI locating knexfile due to NODE_ENV being set
techniq Jan 25, 2016
0418cf2
Add support for registering custom query operators. Closes #60;
techniq Jan 28, 2016
a5c360a
Stable Version 0.11.10
techniq Jan 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,40 @@ the first place
- `DB_HOST`: `localhost`
- `DB_NAME`: `circle_test`
- `DB_USER`: `ubuntu`
- You may use `docker`/`docker-compose` to create MySql and Postgres containers to test against
- `docker-compose up -d`
- Start containers named `js-data-sql-mysql` and `js-data-sql-pg`
- MySQL
- Environment variables
- `DB_CLIENT` = `mysql`
- `DB_USER` = `root`
- `DB_HOST` = `IP of docker-machine if not localhost`
- Populate schema
- `DB_CLIENT=mysql DB_USER=root npm run migrate-db`
- Also set `DB_HOST` if different from `localhost`
- Run tests
- `npm run mocha-mysql`
- Set `DB_HOST` if different from `localhost`
- Run cli
- `docker exec -it js-data-sql-mysql mysql circle_test`
- Postgres
- Environment variables
- `DB_CLIENT` = `pg`
- `DB_USER` = `ubuntu`
- `DB_HOST` = `IP of docker-machine if not localhost`
- Populate schema
- `DB_CLIENT=pg npm run migrate-db`
- Also set `DB_HOST` if different from `localhost`
- Run tests
- `npm run mocha-pg`
- Also set `DB_HOST` if different from `localhost`
- `docker exec -it js-data-sql-pg psql -U ubuntu -d circle_test`
- Run cli
- All databases
- Run all tests against MySQL and Postgres
- `npm run mocha-all`
- Also set `DB_HOST` if different from `localhost`

1. Your code will be linted and checked for formatting, the tests will be run
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They
will be committed when a release is cut.
Expand Down
3 changes: 2 additions & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ machine:

database:
override:
- mysql -u ubuntu circle_test < test/setup.sql
- DB_CLIENT=mysql npm run migrate-db
- DB_CLIENT=pg npm run migrate-db
test:
override:
- npm run ci
Loading