Skip to content

fds #1

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.

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 35 commits into from
Nov 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
360866d
Fix tests actually running (mocha.start.js wasn't being added, so co-…
techniq Oct 22, 2015
d4a7f98
Merge pull request #28 from js-data/develop
techniq Oct 22, 2015
c678b6b
Allow passing database test configuration using environment variables…
techniq Oct 22, 2015
df50955
Merge pull request #29 from js-data/develop
techniq Oct 22, 2015
0eca2c7
Allow qualified local columns names if joined relations has same colu…
techniq Oct 22, 2015
641d836
Merge pull request #30 from js-data/develop
techniq Oct 22, 2015
e3cfef4
Stable Version 0.11.3
techniq Oct 22, 2015
800788e
Merge pull request #31 from js-data/develop
techniq Oct 22, 2015
b1ec3de
#10 - transaction support via knex
Oct 22, 2015
4622d8b
Merge branch 'master' into gh-issue-10-transaction-support
Oct 22, 2015
49bb7cc
#10 - move co into mocha.start.js and tidy up the transaction tests
Oct 23, 2015
41c8831
Merge pull request #32 from mechanicalpulse/gh-issue-10-transaction-s…
techniq Oct 23, 2015
7d66910
Stable Version 0.11.4
techniq Oct 23, 2015
1a9a663
Merge pull request #33 from js-data/develop
techniq Oct 23, 2015
4a43e5c
exposed filterQuery on the API for all to (ab)use
Oct 23, 2015
3a0386c
Merge pull request #34 from natevecc/master
techniq Oct 23, 2015
dc81294
Added code coverage
jmdobry Oct 24, 2015
a1498f9
Merge pull request #35 from js-data/coverage
jmdobry Oct 24, 2015
04a7961
Add support for custom queries.
jmdobry Oct 24, 2015
94859ef
Merge pull request #36 from js-data/query
jmdobry Oct 26, 2015
254de72
Stable Version 0.11.5
techniq Oct 26, 2015
db45130
Merge pull request #37 from js-data/develop
techniq Oct 26, 2015
fddee68
Update CONTRIBUTING.md
jmdobry Nov 10, 2015
ec58392
Merge branch 'master' into develop
jmdobry Nov 10, 2015
5d22b9b
Merge pull request #38 from js-data/develop
jmdobry Nov 10, 2015
2428892
Refactored core adapter tests into a re-usable, standalone repo.
jmdobry Nov 10, 2015
1121614
Merge pull request #39 from js-data/develop
jmdobry Nov 10, 2015
ceac75d
Added missing semicolons.
jmdobry Nov 12, 2015
002f2af
Added back two tests.
jmdobry Nov 12, 2015
99a92f8
Merge branch 'master' into develop
jmdobry Nov 12, 2015
9dbd048
Merge pull request #40 from js-data/develop
jmdobry Nov 12, 2015
94a0061
Add support for "near" filtering, closes #41
techniq Nov 16, 2015
47d90d9
Merge pull request #42 from js-data/near-filter
techniq Nov 16, 2015
34e12e5
Merge branch 'master' into develop
techniq Nov 16, 2015
fff7576
Merge pull request #43 from js-data/develop
techniq Nov 16, 2015
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ node_modules

.idea/
*.iml
coverage/
36 changes: 36 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Commenting this out is preferred by some people, see
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
node_modules

# Users Environment Variables
.lock-wscript

.idea/
*.iml
coverage/
src/
test/
mocha.start.js
webpack.config.js
31 changes: 21 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
# Contributing Guide

First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
First, support is handled via the [Slack Channel](http://slack.js-data.io) and
the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions
there.

When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
When submitting issues on GitHub, please include as much detail as possible to
make debugging quick and easy.

- good - Your versions of js-data, js-data-sql, etc., relevant console logs/error, code examples that revealed the issue
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix
- good - Your versions of js-data, js-data-sql, etc., relevant console
logs/error, code examples that revealed the issue
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or
[bin](http://jsbin.com/?html,output) that demonstrates the issue
- best - A Pull Request that fixes the issue, including test coverage for the
issue and the fix

[Github Issues](https://github.com/js-data/js-data-sql/issues).

#### Submitting Pull Requests

1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
1. Contribute to the issue/discussion that is the reason you'll be developing in
the first place
1. Fork js-data-sql
1. `git clone [email protected]:<you>/js-data-sql.git`
1. `cd js-data-sql; npm install;`
1. Write your code, including relevant documentation and tests
1. Run `npm test` (build and test)
- You need io.js or Node 4.x that includes generator support without a flag
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.
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They
will be committed when a release is cut.
1. Submit your PR and we'll review!
1. Thanks!

Expand All @@ -30,10 +38,13 @@ Here's how to make a release on the `master` branch:

1. Bump `package.json` to the appropriate version.
1. `npm test` must succeed.
1. This time, the built `dist/js-data-sql.js` file _will_ be committed, so stage its changes.
1. This time, the built `dist/js-data-sql.js` file _will_ be committed, so stage
its changes.
1. Mention the release version in the commit message, e.g. `Stable Version 1.2.3`
1. Push to master.
1. Create a git tag. Name it the version of the release, e.g. `1.2.3`
- Easiest way is to just create a GitHub Release, which will create the tag for you. Name the Release and the git tag the same thing.
1. `git fetch origin` if you tagged it via GitHub Release, so you can get the tag on your local machine.
- Easiest way is to just create a GitHub Release, which will create the tag
for you. Name the Release and the git tag the same thing.
1. `git fetch origin` if you tagged it via GitHub Release, so you can get the
tag on your local machine.
1. `npm publish .` (Make sure you got the version bumped correctly!)
41 changes: 31 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<img src="https://github.com/raw/js-data/js-data/master/js-data.png" alt="js-data logo" title="js-data" align="right" width="64" height="64" />

## js-data-sql [![npm version](https://img.shields.io/npm/v/js-data-sql.svg?style=flat-square)](https://www.npmjs.org/package/js-data-sql) [![Circle CI](https://img.shields.io/circleci/project/js-data/js-data-sql/master.svg?style=flat-square)](https://circleci.com/gh/js-data/js-data-sql/tree/master) [![npm downloads](https://img.shields.io/npm/dm/js-data-sql.svg?style=flat-square)](https://www.npmjs.org/package/js-data-sql)
## js-data-sql [![Slack Status][sl_b]][sl_l] [![npm version][npm_b]][npm_l] [![Circle CI][circle_b]][circle_l] [![npm downloads][dn_b]][dn_l] [![Coverage Status][cov_b]][cov_l] [![Codacy][cod_b]][cod_l]

Postgres/MySQL/MariaDB/SQLite3 adapter for [js-data](http://www.js-data.io/).

### API Documentation
[DSSqlAdapter](http://www.js-data.io/docs/dssqladapter)

### Quick Start
`npm install --save js-data js-data-sql`.
`npm install --save knex js-data js-data-sql`.

You also need to install the driver for the database you want to connect to.

Expand Down Expand Up @@ -39,7 +39,7 @@ Read about using [JSData on the Server](http://www.js-data.io/docs/jsdata-on-the
[CHANGELOG.md](https://github.com/js-data/js-data-sql/blob/master/CHANGELOG.md)

### Community
- [Gitter Channel](https://gitter.im/js-data/js-data) - Better than IRC!
- [Slack Channel](http://slack.js-data.io) - Better than IRC!
- [Announcements](http://www.js-data.io/blog)
- [Mailing List](https://groups.io/org/groupsio/jsdata) - Ask your questions!
- [Issues](https://github.com/js-data/js-data-sql/issues) - Found a bug? Feature request? Submit an issue!
Expand All @@ -48,27 +48,35 @@ Read about using [JSData on the Server](http://www.js-data.io/docs/jsdata-on-the

### Contributing

First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
First, support is handled via the [Slack Channel](http://slack.js-data.io) and
the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions
there.

When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
When submitting issues on GitHub, please include as much detail as possible to
make debugging quick and easy.

- good - Your versions of js-data, js-data-sql, etc., relevant console logs/error, code examples that revealed the issue
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix
- good - Your versions of js-data, js-data-sql, etc., relevant console
logs/error, code examples that revealed the issue
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or
[bin](http://jsbin.com/?html,output) that demonstrates the issue
- best - A Pull Request that fixes the issue, including test coverage for the
issue and the fix

[Github Issues](https://github.com/js-data/js-data-sql/issues).

#### Submitting Pull Requests

1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
1. Contribute to the issue/discussion that is the reason you'll be developing in
the first place
1. Fork js-data-sql
1. `git clone [email protected]:<you>/js-data-sql.git`
1. `cd js-data-sql; npm install;`
1. Write your code, including relevant documentation and tests
1. Run `npm test` (build and test)
- You need io.js or Node 4.x that includes generator support without a flag
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.
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They
will be committed when a release is cut.
1. Submit your PR and we'll review!
1. Thanks!

Expand Down Expand Up @@ -109,3 +117,16 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

[sl_b]: http://slack.js-data.io/badge.svg
[sl_l]: http://slack.js-data.io
[npm_b]: https://img.shields.io/npm/v/js-data-sql.svg?style=flat
[npm_l]: https://www.npmjs.org/package/js-data-sql
[circle_b]: https://img.shields.io/circleci/project/js-data/js-data-sql/master.svg?style=flat
[circle_l]: https://circleci.com/gh/js-data/js-data-sql/tree/master
[dn_b]: https://img.shields.io/npm/dm/js-data-sql.svg?style=flat
[dn_l]: https://www.npmjs.org/package/js-data-sql
[cov_b]: https://img.shields.io/coveralls/js-data/js-data-sql/master.svg?style=flat
[cov_l]: https://coveralls.io/github/js-data/js-data-sql?branch=master
[cod_b]: https://img.shields.io/codacy/307c2e9399394fdaa5354cda7329516d.svg
[cod_l]: https://www.codacy.com/app/jasondobry/js-data-sql/dashboard
3 changes: 3 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ machine:
database:
override:
- mysql -u ubuntu circle_test < test/setup.sql
test:
override:
- npm run ci
Loading