Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
446 commits
Select commit Hold shift + click to select a range
f14a996
Merge pull request #140 from codemix/139-embed-subqueries
phpnode Nov 6, 2014
67dae02
prepare 0.5.2
phpnode Nov 13, 2014
1e1432f
Binary transport - destroy socket during close
prasad83 Nov 19, 2014
0ac7395
fix error messages, no more RequestError: null
phpnode Nov 21, 2014
291e401
style tweaks
phpnode Nov 21, 2014
84628a2
Merge pull request #143 from codemix/fix-error-messages
phpnode Nov 21, 2014
dfe970c
Merge pull request #144 from codemix/prasad83-master
phpnode Nov 21, 2014
f33a31a
add RID::equals()
phpnode Nov 21, 2014
bb42f4d
Merge pull request #145 from codemix/rid-equals
phpnode Nov 21, 2014
e76413a
List CLI command output current data.
Nov 24, 2014
38b23a7
Merge pull request #146 from antz29/patch-1
phpnode Nov 24, 2014
788bd8e
add db.registerTransformer()
phpnode Nov 24, 2014
aa6257d
Merge pull request #147 from codemix/register-transformer
phpnode Nov 24, 2014
e129b1d
add registerTransformer() docs [ci skip]
phpnode Nov 24, 2014
860c974
ensure prefetched records are resolved via ridbags
phpnode Nov 26, 2014
41b0373
Merge pull request #148 from codemix/fetchplan-with-ridbag
phpnode Nov 26, 2014
714be17
guarantee migration order
phpnode Nov 26, 2014
1330b94
assert migration order
phpnode Nov 26, 2014
78758ad
Merge pull request #149 from codemix/migration-order
phpnode Nov 26, 2014
fe37c5c
don't cast RID to string
phpnode Nov 30, 2014
02f9268
fix named param regexp
phpnode Nov 30, 2014
4af8e6e
Merge branch 'master' of github.com:codemix/oriento into migration-order
phpnode Nov 30, 2014
95acdd8
RID fixes
phpnode Dec 1, 2014
6f535cc
Merge pull request #151 from codemix/query-fixes
phpnode Dec 1, 2014
2c2a297
start support for multiple protocol versions
phpnode Dec 2, 2014
5f8396b
add support for binary protocol v26
phpnode Dec 2, 2014
c2755f0
drop support for data segments
phpnode Dec 2, 2014
038d784
delete by rid from index no longer supported
phpnode Dec 2, 2014
6095739
tree based ridbag fixes
phpnode Dec 2, 2014
54cd43a
add newer odb server config
phpnode Dec 2, 2014
37e1f20
consolidate rest api tests
phpnode Dec 2, 2014
8e207a0
use plocal for tests because of orientdb issue 3118
phpnode Dec 2, 2014
5726b9f
update travis to latest 1.7.10 and add 2.0-SNAPSHOT
phpnode Dec 2, 2014
6def2a2
fix behavior change test
phpnode Dec 2, 2014
c7abdee
rest api bodge
phpnode Dec 2, 2014
037efad
temporarily downgrade travis to orientdb 1.7.8
phpnode Dec 2, 2014
4dd1db1
use a different config file for 2.0
phpnode Dec 2, 2014
a243376
Merge pull request #152 from codemix/update-binary-protocol
phpnode Dec 2, 2014
bae009c
prepare 0.6.0 [ci skip]
phpnode Dec 2, 2014
6608121
add selective disabling of ridbags
phpnode Dec 2, 2014
98aed92
Merge pull request #153 from codemix/avoid-ridbags
phpnode Dec 2, 2014
95eb77c
fix silly bug
phpnode Dec 2, 2014
23325e3
Merge branch 'master' of github.com:codemix/oriento into avoid-ridbags
phpnode Dec 2, 2014
1456734
Merge pull request #154 from codemix/avoid-ridbags
phpnode Dec 2, 2014
99ba9df
fix utils.escape()
phpnode Dec 4, 2014
d8985dd
resolve nested references
phpnode Dec 4, 2014
7034c9c
disprove #155
phpnode Dec 5, 2014
8c631ff
Merge pull request #156 from codemix/155-param-substitution
phpnode Dec 5, 2014
b24f48b
fix resolveReferences()
phpnode Dec 8, 2014
11debeb
add safe JSON.stringify() substitute
phpnode Dec 8, 2014
1779d1e
Merge pull request #159 from codemix/fix-resolve-references
phpnode Dec 8, 2014
c0b4c86
fix for empty results from query
Dec 9, 2014
b5594b9
Merge pull request #160 from garrett-gottlieb/patch-1
phpnode Dec 9, 2014
f6beb08
preliminary JWT support for protocol v28
phpnode Dec 10, 2014
37e4e61
frustration
phpnode Dec 15, 2014
62644e7
enable javascript in server config
phpnode Dec 17, 2014
a3f9a61
update mocha
phpnode Dec 17, 2014
671f2e0
fix JWT / protocol 28 support
phpnode Dec 17, 2014
fef3482
disable JWT tests on protocol versions prior to 28
phpnode Dec 17, 2014
8040011
Merge pull request #165 from codemix/jwt
phpnode Dec 17, 2014
faff966
add Db.prototype.createUserContext(token)
phpnode Dec 17, 2014
78826f9
fix tests on 1.7.10
phpnode Dec 17, 2014
1302488
Merge pull request #166 from codemix/add-createUserContext
phpnode Dec 17, 2014
277a733
add further perf tests for deserializer [ci skip]
phpnode Dec 19, 2014
0346162
Merge pull request #167 from codemix/more-csv-perf-tests
phpnode Dec 19, 2014
6b8c40e
add ridbag warning
phpnode Dec 19, 2014
43bd66b
deprecate db.edge and db.vertex
phpnode Dec 19, 2014
81bcc71
update package.json for 0.7.0
phpnode Dec 19, 2014
88eb537
Merge pull request #172 from codemix/prepare0.7.0
phpnode Dec 19, 2014
8da445e
resolve #175
phpnode Dec 23, 2014
31f3453
add .npmignore
phpnode Dec 23, 2014
e7d3f43
Merge pull request #176 from codemix/175-fetchplan-depth
phpnode Dec 23, 2014
ddad3f4
to() should support functions
phpnode Jan 5, 2015
bae757d
prepare 0.7.1
phpnode Jan 5, 2015
e01704a
Merge pull request #183 from codemix/query-builder-fix
phpnode Jan 5, 2015
332a2fd
Issue #186: Duplicates test using exec()
dmarcelino Jan 9, 2015
b0c5cef
Issue #186: "soft" fix for duplicates returned with fetch plan depth 2
dmarcelino Jan 9, 2015
e9cb5a1
Merge pull request #187 from dmarcelino/186-resolveReferences-4
phpnode Jan 9, 2015
4f3d626
resolve merge conflicts
phpnode Jan 11, 2015
79637f6
better query serialization, avoid JSON.stringify(). fixes #189
phpnode Jan 11, 2015
73b6d9c
fix escaping issues, always util.prepare() for older ODB versions
phpnode Jan 11, 2015
d23c630
Merge pull request #190 from codemix/189-embedded-document
phpnode Jan 11, 2015
3342ca0
fail to replicate #180
phpnode Jan 11, 2015
818f8ec
remove .only()
phpnode Jan 11, 2015
4d0e774
Merge pull request #191 from codemix/180-more-emoji
phpnode Jan 11, 2015
10fd8a1
add Statement::retry() and Statement::wait()
phpnode Jan 11, 2015
b1e6627
Merge pull request #192 from codemix/181-retry-edges
phpnode Jan 11, 2015
bea4586
fix infinite loop in deserialize()
phpnode Jan 11, 2015
8cbab08
investigate & sort of fix #188
phpnode Jan 11, 2015
ca93608
Merge pull request #193 from codemix/188-subquery-with-vars
phpnode Jan 11, 2015
de89341
rev version number [ci skip]
phpnode Jan 11, 2015
2a1c0e0
Merge pull request #194 from codemix/prepare1.0.0
phpnode Jan 11, 2015
aa91f91
add test for escaping URLs
phpnode Jan 14, 2015
b5d54bb
fix #195
phpnode Jan 15, 2015
b7dda7f
add test for 195, disabled because it requires a manual restart of Or…
phpnode Jan 15, 2015
efa5482
Merge pull request #199 from codemix/195-connection-reset
phpnode Jan 15, 2015
b5dc758
make parens optional in from and to clauses, fix #198
phpnode Jan 15, 2015
cb657e7
better fix for #189
phpnode Jan 15, 2015
5e0646a
Merge pull request #200 from codemix/198-from-clause-parens
phpnode Jan 15, 2015
7a060f9
fix double escaping issue, at the unfortunate expense of quote agnost…
phpnode Jan 15, 2015
49849d9
add lucene fulltext / spatial methods to query builder
phpnode Jan 16, 2015
0d5dd99
Merge pull request #201 from codemix/lucene-query-builder
phpnode Jan 16, 2015
34b617e
add support for LET in select query
phpnode Jan 16, 2015
05041b0
Merge pull request #202 from codemix/lucene-query-builder
phpnode Jan 16, 2015
5e76a16
Issue #203, query serialisation: add support for date
dmarcelino Jan 17, 2015
719f733
Issue #203, utils.encode(): using instanceof instead of Object.protot…
dmarcelino Jan 17, 2015
b5ec977
fix support for multiple let expressions in non-batch queries
phpnode Jan 17, 2015
39cdf91
Merge pull request #205 from codemix/non-batch-let
phpnode Jan 17, 2015
cfb2390
Issue #203, utils.encode(), using SQL function 'date()' when encoding…
dmarcelino Jan 18, 2015
5ef0a33
Merge pull request #204 from dmarcelino/203-parameterised_date
phpnode Jan 19, 2015
f0ec552
support IS NULL and IS NOT NULL, fix #207
phpnode Jan 23, 2015
699f08e
close #206 - failed to replicate
phpnode Jan 23, 2015
f530635
Merge pull request #209 from codemix/207-is-null
phpnode Jan 23, 2015
353cd73
Bumped the bluebird version which fixes #211
orangemug Jan 26, 2015
e45c24e
Merge pull request #212 from orangemug/211-bluebird-out-of-date
phpnode Jan 26, 2015
72924cf
prepare 1.0.1
phpnode Jan 26, 2015
b831141
add 2.0.1-SNAPSHOT and 2.1-SNAPSHOT to .travis.yml
phpnode Jan 27, 2015
cdd35af
Merge pull request #213 from codemix/fix-travis
phpnode Jan 27, 2015
be0140b
Updated should dep to latest.
orangemug Jan 28, 2015
fd9cc70
Added tests for new query events.
orangemug Jan 28, 2015
6a7b09a
Added beginQuery/endQuery events.
orangemug Jan 28, 2015
a8f7f99
Fixed tests post should.js dep upgrade.
orangemug Jan 28, 2015
87abd9e
Change to use "propertyByPath" rather than "property"
orangemug Jan 28, 2015
4d0eef1
Switched to using bluebird bind.
orangemug Jan 28, 2015
371d7dc
Added event listener count.
orangemug Jan 28, 2015
d646928
Merge pull request #216 from orangemug/208-query-data-event
phpnode Jan 28, 2015
44c8481
Added "put" clause support
dehbmarques Jan 29, 2015
ee5ddf7
Fixed README property.delete -> property.drop. Fixes #218
orangemug Jan 29, 2015
92ad8db
Merge pull request #219 from orangemug/218-readme-prop-drop-incorrect
phpnode Jan 29, 2015
970a234
Added 'property.rename' to docs. Fixes #222
orangemug Feb 2, 2015
022c8e0
Merge pull request #223 from orangemug/222-added-rename-to-docs
phpnode Feb 2, 2015
b452589
don't paramify undefined values
phpnode Feb 2, 2015
0ce41fb
add toOrient() method / interface
phpnode Feb 2, 2015
c13fc2d
add forcePrepare() to avoid problems with bound parameters in OrientD…
phpnode Feb 2, 2015
0dc4648
Merge branch 'master' of github.com:codemix/oriento into fix-travis
phpnode Feb 2, 2015
d44fc8d
Added err to endQuery event.
orangemug Feb 2, 2015
9f51c6b
Added 'err' to 'endEvent' object
orangemug Feb 2, 2015
1bf5cdb
let clauses are now wrapped in parens, fixes #226
phpnode Feb 2, 2015
a287c09
Merge pull request #227 from codemix/force-prepare
phpnode Feb 2, 2015
7362912
allow passing a Statement or Query instance directly to .exec() and .…
phpnode Feb 2, 2015
6070785
investigate #224
phpnode Feb 2, 2015
20ad02a
Merge pull request #228 from codemix/224-rest-vs-binary
phpnode Feb 3, 2015
fd1592c
do class transforms at deserialize
phpnode Feb 3, 2015
18ba122
fix failing test in OrientDB 1.7.X
phpnode Feb 3, 2015
35539f1
Merge pull request #229 from codemix/transform-at-deserialize
phpnode Feb 3, 2015
c985dc1
Merge branch 'master' into 215-put-statement-support
dehbmarques Feb 3, 2015
8b60e45
Added 'Query Builder: Put a map entry into a map' to docs
dehbmarques Feb 3, 2015
3c0e17c
use double quotes and wrap key with utils.escape()
dehbmarques Feb 3, 2015
0b462b7
add while keyword to query builder
phpnode Feb 3, 2015
c90546d
disable test #224 due to bug in OrientDB
phpnode Feb 3, 2015
0a7c8a5
Merge pull request #230 from dehbmarques/215-put-statement-support
phpnode Feb 3, 2015
9b2b37e
Merge branch 'master' of github.com:codemix/oriento into while-keyword
phpnode Feb 3, 2015
c2577b1
Merge pull request #232 from codemix/while-keyword
phpnode Feb 3, 2015
781c51d
closes #231 unable to replicate
phpnode Feb 3, 2015
c8fd93b
disable test for #231 on OrientDB 1.7.X
phpnode Feb 3, 2015
c68344a
drop db after test
phpnode Feb 3, 2015
1665b65
Merge pull request #233 from codemix/231-field-filtering
phpnode Feb 3, 2015
565ec8e
add .skip() to query builder, fix #234
phpnode Feb 3, 2015
8ac39eb
allow object params to .return() in query builder, fixes #221
phpnode Feb 3, 2015
4f36b99
attempt to resolve build failure
phpnode Feb 3, 2015
872e8aa
Merge pull request #235 from codemix/234-add-skip-keyword
phpnode Feb 3, 2015
ed66b23
prepare 1.1.0
phpnode Feb 3, 2015
b0de4be
Merge pull request #236 from codemix/prepare-1.1.0
phpnode Feb 3, 2015
ecc9548
Added event docs.
orangemug Feb 4, 2015
4a5ab57
Added failing testcase for result key in endQuery event object.
orangemug Feb 4, 2015
9427330
Added result to endQuery event object.
orangemug Feb 4, 2015
162c05b
Merge pull request #237 from orangemug/225-end-query-err-obj
phpnode Feb 4, 2015
cee136d
close #238 - failed to replicate
phpnode Feb 4, 2015
3807281
fix #239
phpnode Feb 4, 2015
d69d0cd
Merge pull request #240 from codemix/238-request-hangs-on-invalid-cre…
phpnode Feb 4, 2015
d34c210
add .increment(), .add(), .put() to query builder, fixes #215
phpnode Feb 4, 2015
bae4066
temporarily disable travis test for 2.0-SNAPSHOT due to repeated fail…
phpnode Feb 4, 2015
8531239
Merge pull request #241 from codemix/querybuilder-fixes
phpnode Feb 4, 2015
f75f996
prepare 1.1.1 [ci skip]
phpnode Feb 4, 2015
8290a54
Merge pull request #243 from codemix/prepare-1.1.1
phpnode Feb 4, 2015
8ad5de1
further investigate #238 (no luck)
phpnode Feb 5, 2015
69ca078
Merge pull request #244 from codemix/238-request-hangs-on-invalid-cre…
phpnode Feb 5, 2015
f13dc66
Update 238-hang-on-invalid-credentials.js
kgreenpea Feb 5, 2015
32b6075
export Statement and Query classes
phpnode Feb 5, 2015
e317ab8
add @type to embedded documents
phpnode Feb 5, 2015
9b95c39
allow embedded statements in set clauses
phpnode Feb 5, 2015
49f69cd
Merge branch 'master' of github.com:codemix/oriento into embedded-sta…
phpnode Feb 5, 2015
56b8232
prepare 1.1.2
phpnode Feb 5, 2015
2adc519
Merge pull request #247 from codemix/embedded-statements-in-query-bui…
phpnode Feb 5, 2015
75f1b0f
'beginQuery' now returns the full data object, fixes #248.
orangemug Feb 6, 2015
a072bdd
Merge pull request #249 from orangemug/248-beginQuery-full-data-obj
phpnode Feb 6, 2015
e42cd91
Added new Db#createFn API, fixes #245.
orangemug Feb 6, 2015
dddc718
Merge pull request #250 from orangemug/245-create-function-api
phpnode Feb 6, 2015
dd237be
Merge branch 'patch-1' of https://github.com/kgreenpea/oriento into k…
phpnode Feb 6, 2015
d065c4b
fix #238 - hang on invalid credentials when using tokens
phpnode Feb 6, 2015
4957631
Merge pull request #251 from codemix/kgreenpea-patch-1
phpnode Feb 6, 2015
1654040
fix #252 and #255
phpnode Feb 13, 2015
3bd8590
Merge pull request #256 from codemix/252-save-embedded-map
phpnode Feb 13, 2015
265d4b2
Update oriento.opts
RichAyotte Feb 16, 2015
efbdebb
Merge pull request #258 from RichAyotte/patch-1
phpnode Feb 16, 2015
91318c7
ensure db username / password is respected when migrating, also, don'…
phpnode Feb 16, 2015
30cae37
Merge pull request #261 from codemix/migration-fixes
phpnode Feb 16, 2015
c8eed10
use a state machine rather than a RegExp for escaping strings
phpnode Feb 20, 2015
b87b494
investigate create link on edge bug
phpnode Feb 20, 2015
c5647e2
Merge pull request #262 from codemix/escape-fixes
phpnode Feb 20, 2015
f698cfd
allow database connection to not require a server-wide connection
rschmukler Feb 20, 2015
cce410a
add test for 169
rschmukler Feb 21, 2015
96b360b
Merge pull request #263 from rschmukler/fix-db-connection
phpnode Feb 21, 2015
2e2a076
prepare 1.1.3
phpnode Feb 21, 2015
fb10c00
Merge pull request #265 from codemix/prepare1.1.3
phpnode Feb 21, 2015
0f8ae01
add helper that determines whether the given statement requires wrapp…
phpnode Feb 23, 2015
52fd477
Merge pull request #267 from codemix/requiresParens
phpnode Feb 23, 2015
a5ab53d
Fixed the issue #268
mamobyz Feb 26, 2015
1513687
Merge pull request #269 from mamobyz/master
phpnode Feb 26, 2015
7d00ede
add migrate command for direct database connections
rschmukler Feb 26, 2015
48088aa
Merge pull request #270 from rschmukler/migrate-direct-database
phpnode Feb 26, 2015
db75a12
Added strategy clause required for traverse queries which fixes the i…
mamobyz Mar 5, 2015
fa8b222
Added strategy clause required for traverse queries which fixes the i…
mamobyz Mar 5, 2015
315cec8
added support for abstract classes
seeden Mar 15, 2015
47159e0
Bad default config for class properties
seeden Mar 15, 2015
452f578
Merge pull request #285 from seeden/patch-1
phpnode Mar 15, 2015
21d97a2
Merge pull request #286 from seeden/patch-2
phpnode Mar 15, 2015
2e8b27a
disable 2.1-SNAPSHOT tests in travis for now
phpnode Mar 15, 2015
1fce765
added support for abstract classes
seeden Mar 15, 2015
f054e10
Bad default config for class properties
seeden Mar 15, 2015
7e403ca
disable 2.1-SNAPSHOT tests in travis for now
phpnode Mar 15, 2015
dd9aeee
Undo formatting caused by the last changes
mamobyz Mar 16, 2015
fa1cc6b
Merge pull request #282 from mamobyz/master
phpnode Mar 17, 2015
5b2142e
supporting live query
luigidellaquila Mar 26, 2015
28059fa
fixed live query
luigidellaquila Mar 26, 2015
57f9f32
removed useless console log
luigidellaquila Mar 26, 2015
f4ba2b1
Added milliseconds to the date conversion.
Apr 20, 2015
f56a89a
Merge pull request #305 from odiel/master
phpnode Apr 20, 2015
0c48f0c
Missing `readonly` on Property update
bbtx0 May 6, 2015
22a5bb1
Merge pull request #309 from gabrieleds/patch-1
phpnode May 7, 2015
f7b20ea
init
bbtx0 May 10, 2015
5a2870a
rename superClass
bbtx0 May 10, 2015
53f4915
update Readme
bbtx0 May 10, 2015
0924ed0
Merge pull request #310 from gabrieleds/feature/db.class.update
phpnode May 10, 2015
1ff1ded
live query - code cleanup (duplicate variable and some semicolins)
luigidellaquila May 19, 2015
e919717
Merge pull request #306 from luigidellaquila/livequery
phpnode May 19, 2015
b657083
fixed serializasion issue when a field value contains multiple backsl…
luigidellaquila Jun 12, 2015
ecb6205
providing test case for #328
luigidellaquila Jun 12, 2015
119fd51
just typos on a test case
luigidellaquila Jun 12, 2015
952e0ab
Merge pull request #327 from luigidellaquila/master
phpnode Jun 12, 2015
61b9cae
Escaping / (forward slash) causes SQL errors
Ziink Jun 12, 2015
63849b5
Escaping / (forward slash) causes SQL errors
Ziink Jun 15, 2015
addffe3
Merge pull request #329 from Ziink/patch-1
phpnode Jun 16, 2015
5cf9595
adds descriptions to nested errors, should fix #324
Jun 16, 2015
34f6efc
missing semicolon added
Jun 17, 2015
5db8bed
Merge pull request #330 from ibartj/324-nested-errors
phpnode Jun 17, 2015
a093acb
Prepare 1.2
dmarcelino Jun 18, 2015
b5cf6cc
Merge pull request #333 from codemix/1.2
dmarcelino Jun 18, 2015
ce73d9d
Update README.md
phpnode Jun 18, 2015
d2143ed
Update README.md
phpnode Jun 26, 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 .jshintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lib/long.js
79 changes: 79 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"maxerr" : 50,

"bitwise" : false,
"camelcase" : true,
"curly" : true,
"eqeqeq" : false,
"forin" : true,
"immed" : true,
"indent" : 2,
"latedef" : false,
"newcap" : true,
"noarg" : true,
"noempty" : true,
"nonew" : true,
"plusplus" : false,
"quotmark" : false,
"undef" : true,
"unused" : false, // $scope variables are often created but not read in js files
"strict" : true,
"devel" : true,
"node" : true,
"maxlen" :120,
"nonbsp" :true,

"trailing" : true,
"maxparams" : false,
"maxdepth" : false,
"maxstatements" : false,
"maxcomplexity" : false,

"asi" : false,
"boss" : false,
"debug" : false,
"eqnull" : true,
"esnext" : false,
"moz" : false,

"evil" : false,
"expr" : false,
"funcscope" : false,
"globalstrict" : true,
"iterator" : false,
"lastsemic" : false,
"laxbreak" : false,
"laxcomma" : false,
"loopfunc" : true,
"multistr" : false,
"proto" : false,
"scripturl" : false,
"smarttabs" : false,
"shadow" : false,
"sub" : false,
"supernew" : false,
"validthis" : true,

"browser" : false,
"couch" : false,
"dojo" : false,
"jquery" : false,
"mootools" : false,
"nonstandard" : false,
"prototypejs" : false,
"rhino" : false,
"worker" : false,
"wsh" : false,
"yui" : false,
"predef" : ["-Promise"],
"globals" : {
"angular" : false,
"$" : false,
"sinon" : false,
"describe" : false,
"beforeEach" : false,
"inject" : false,
"it" : false,
"expect" : false
}
}
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ci/environment
coverage

5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ language: node_js
node_js:
- "0.10"
before_script:
- sh -c ./ci/initialize-ci.sh 1.7-rc2
- ./ci/initialize-ci.sh $ORIENTDB_VERSION
env:
- ORIENTDB_VERSION=1.7.10
- ORIENTDB_VERSION=2.0.2
22 changes: 0 additions & 22 deletions CHANGELOG.md

This file was deleted.

64 changes: 39 additions & 25 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Before running the tests, ensure you've configured your orientdb server to use t

To run the tests:

```
```sh
npm test
```

To generate the code coverage report, run:

```
```sh
npm run coverage
```

Expand All @@ -35,16 +35,20 @@ And have a look at `coverage/lcov-report/index.html`.


### 1. [Fork](http://help.github.com/fork-a-repo/) the oriento repository on github and clone your fork to your development environment
<pre>

```sh
git clone git@github.com:YOUR-GITHUB-USERNAME/oriento.git
</pre>
```

If you have trouble setting up GIT with GitHub in Linux, or are getting errors like "Permission Denied (publickey)", then you must [setup your GIT installation to work with GitHub](http://help.github.com/linux-set-up-git/)

### 2. Add the main oriento repository as an additional git remote called "upstream"
Change to the directory where you cloned oriento normally, "oriento". Then enter the following command:
<pre>

```sh
git remote add upstream git://github.com/codemix/oriento.git
</pre>
```


### 3. Make sure there is an issue created for the thing you are working on.

Expand All @@ -53,20 +57,23 @@ All new features and bug fixes should have an associated issue to provide a sing
> For small changes or documentation issues, you don't need to create an issue, a pull request is enough in this case.

### 4. Fetch the latest code from the main oriento branch
<pre>

```sh
git fetch upstream
</pre>
```

You should start at this point for every new contribution to make sure you are working on the latest code.

### 5. Create a new branch for your feature based on the current oriento master branch

> That's very important since you will not be able to submit more than one pull request from your account if you'll use master.

Each separate bug fix or change should go in its own branch. Branch names should be descriptive and start with the number of the issue that your code relates to. If you aren't fixing any particular issue, just skip number. For example:
<pre>

```sh
git checkout upstream/master
git checkout -b 999-name-of-your-branch-goes-here
</pre>
```

### 6. Do your magic, write your code
Make sure it works and run the tests :)
Expand All @@ -76,26 +83,33 @@ Unit tests are always welcome. Tested and well covered code greatly simplifies t
### 7. Commit your changes

add the files/changes you want to commit to the [staging area](http://gitref.org/basic/#add) with
<pre>

```sh
git add path/to/my/file.js
</pre>
```

You can use the <code>-p</code> option to select the changes you want to have in your commit.

Commit your changes with a descriptive commit message. Make sure to mention the ticket number with #XXX so github will automatically link your commit with the ticket:
<pre>

```sh
git commit -m "A brief description of this change which fixes #42 goes here"
</pre>
```

### 8. Pull the latest oriento code from upstream into your branch
<pre>

```sh
git pull upstream master
</pre>
```

This ensures you have the latest code in your branch before you open your pull request. If there are any merge conflicts, you should fix them now and commit the changes again. This ensures that it's easy for the oriento team to merge your changes with one click.

### 9. Having resolved any conflicts, push your code to github
<pre>

```sh
git push -u origin 999-name-of-your-branch-goes-here
</pre>
```

The `-u` parameter ensures that your branch will now automatically push and pull from the github branch. That means if you type `git push` the next time it will know where to push to.

### 10. Open a [pull request](http://help.github.com/send-pull-requests/) against upstream.
Expand All @@ -109,27 +123,27 @@ Someone will review your code, and you might be asked to make some changes, if s
### 12. Cleaning it up

After your code was either accepted or declined you can delete branches you've worked with from your local repository and `origin`.
<pre>

```sh
git checkout master
git branch -D 999-name-of-your-branch-goes-here
git push origin --delete 999-name-of-your-branch-goes-here
</pre>
```

### Command overview (for advanced contributors)

<pre>
```sh
git clone git@github.com:YOUR-GITHUB-USERNAME/oriento.git
git remote add upstream git://github.com/codemix/oriento.git
</pre>
<pre>

git fetch upstream
git checkout upstream/master
git checkout -b 999-name-of-your-branch-goes-here

/* do your magic, update changelog if needed */
# do your magic, update changelog if needed

git add path/to/my/file.js
git commit -m "A brief description of this change which fixes #42 goes here"
git pull upstream master
git push -u origin 999-name-of-your-branch-goes-here
</pre>
```
Loading