Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Mar 03, 2014
@mde mde Version 0.5.8 390b1c4
@mde mde Merge branch 'v0.5'
Conflicts:
	lib/adapters/sql/mysql.js
ed8b686
Commits on Mar 09, 2014
@mde mde Revert "Confine `1=0` hack to SQLite. Mixin transformer in subclasses…
… instead of base class."

This reverts commit ce56a41.
4a0b7c7
@mde mde Use existing FALSE_VALUE constant for SQLite transformations b242ca9
Commits on Mar 10, 2014
@ben-ng ben-ng Fix postgres disconnect method f062e77
@ben-ng ben-ng Fix postgres disconnect method 789afc4
@mde mde Version 0.5.9 b037569
@ben-ng ben-ng Emit error event in sqlite adapter 495b3d2
@ben-ng ben-ng Revert "Emit error event in sqlite adapter"
This reverts commit 495b3d2.
998abec
@mde mde Revert "Emit error event in sqlite adapter"
This reverts commit 495b3d2.
76c3a9c
@mde mde Fixed error emit in SQLite adapter 3aefe14
@mde mde Version 0.5.10 d10416b
@mde mde Merge branch 'v0.5' 6f7fb22
@mde mde Merge branch 'master' of github.com:geddy/model 1394f5e
@mde mde Use filesystem as alternative to default, not Mongo 0a2e3a5
@mde mde Merge branch 'v0.5' 5105022
@mde mde Guard against test pollution 447affb
@mde mde Merge branch 'v0.5' acde5ba
Commits on Mar 16, 2014
@snnd snnd addjusting example of documentation for using model with postgres ada…
…pter
78645f9
@snnd snnd adds consequent usage of the database parameter naming convention whe…
…n it comes to the configs/opts for adapters
4661651
@mde mde Merge pull request #180 from snnd/master
Addjusting Example of Documentation for using model with postgres adapter
6eb7c3c
@mde mde Revert "adds consequent usage of the database parameter naming conven…
…tion when it comes to the configs/opts for adapters"

This reverts commit 4661651.
b77f860
Commits on Mar 19, 2014
@der-On der-On Memory adapter transformer now convert date strings do dates 63d83cb
Commits on Mar 25, 2014
Ondrej Brinkel added TOC to README 61fda67
Commits on Mar 31, 2014
@der-On der-On added docs on how to remove items in README d3181ff
Commits on Apr 09, 2014
@mde mde Issue #182, eager-fetched hasMany name should be in camelCase e974950
Commits on Apr 10, 2014
@mde mde Bump the Mongo dep version c22acd5
@mde mde Version 0.5.11 94a2bc0
@ben-ng ben-ng Temp fix for sporadic test failures 7568135
@ben-ng ben-ng Merge branch 'v0.5' 7232a62
Commits on Apr 12, 2014
@ben-ng ben-ng Add nested eager loading of associations 7f50433
@ben-ng ben-ng Fix inaccurate comment 18af762
@ben-ng ben-ng Fix mysql quirks (backticks) 1437232
@ben-ng ben-ng Fix sporadic postgres failure by ordering results 73b61f7
Commits on Apr 13, 2014
@ben-ng ben-ng Improve hasMany/through > hasMany test assertions 3fe3be7
@ben-ng ben-ng Force riak to run last 657cb7f
@ben-ng ben-ng Add hasMany/through -> hasMany/through test, pull out nested eager as…
…sn tests
d2a33c9
@ben-ng ben-ng Exclude nested eager tests f1dafc6
@ben-ng ben-ng Revert trying to make riak run last.. a0b4c69
@ben-ng ben-ng Fix typo in nested eager-fetch tests 03a1799
Commits on Apr 16, 2014
@viniciusrmcarneiro viniciusrmcarneiro send message error from function validation 34dceb5
Commits on Apr 17, 2014
@viniciusrmcarneiro viniciusrmcarneiro function validation returnig custom message error f38572e
@flyswatter flyswatter Describing named through associations
My original example is online [here](https://gist.github.com/flyswatter/10938369), just wanted to save future people the trouble.
7ebd57b
@mde mde Merge pull request #187 from flyswatter/patch-1
Describing named through associations
27839d3
@ben-ng ben-ng Add test for hasMany -> belongsTo b8dd9b2
@viniciusrmcarneiro viniciusrmcarneiro code style fix b0f8a68
@viniciusrmcarneiro viniciusrmcarneiro code style fix 9e69fc5
Commits on Apr 18, 2014
root fix mysql reconnect b0185eb
@mde mde Merge pull request #189 from evgk/fix_mysql_reconnect
fix mysql reconnect
f0b68c2
Commits on Apr 20, 2014
@viniciusrmcarneiro viniciusrmcarneiro improving unit test 4fae1f0
@mde mde Merge pull request #186 from Ornitorrinko/master
custom message on validatesWithFunction
727deed
Commits on Apr 25, 2014
@ben-ng ben-ng Add test for belongsTo -> hasMany 7bd4257
@ben-ng ben-ng Add test for hasMany/through > hasOne 4e8cc88
Commits on May 02, 2014
@ben-ng ben-ng Add belongsTo -> through test b6e8fd0
@ben-ng ben-ng Update docs for nested eager loading of associations 8f5e127
@ben-ng ben-ng Move nested eager tests to the right file e222c7e
Commits on May 04, 2014
@ben-ng ben-ng Fix breakage on empty query via .getAssn of a hasMany/through relatio…
…nship
dbd0641
@ben-ng ben-ng Fix breakage on empty query via .getAssn of a hasMany/through relatio…
…nship
6f8517d
@mde mde Version 0.5.12 770daf1
@mde mde Version 0.5.13 6361007
Commits on May 08, 2014
@mde mde Better variable name, don't omit brackets 84889d0
Commits on May 18, 2014
@benatkin benatkin proofread, format, and improve clarity in README 5b86f05
@benatkin benatkin move the contributing section to the bottom, surround names in backqu…
…otes
9a872cf
@benatkin benatkin make intro example more concise, add detail about properties/methods 25ca755
@benatkin benatkin make it conform better to the style guide 151ca69
Commits on May 19, 2014
@mde mde Merge pull request #194 from benatkin/readme
proofread, format, and improve clarity in README
db78127
Commits on May 25, 2014
@mde mde Don't rely on return value -- just for consistent use of this method 0b55f52
@mde mde Use JSON datatype for objects in Postgres so values can be queryable b865fe8
@mde mde Merge branch 'v0.5'
Conflicts:
	lib/adapters/transformers/sql.js
1db9d86
@mde mde Merge branch 'master' of github.com:geddy/model a6a7b1b
Commits on May 26, 2014
@mde mde Defer to already-set id if one exists, base DB adapter 4f04908
@mde mde Pass autoIncrementId flag from Postgres adapter 895aaeb
@mde mde Pass autoIncrementId flag from all SQL adapters d108edb
@mde mde Use bigint for default int datatype 5a71b62
Commits on May 27, 2014
@ben-ng ben-ng Add test for #166 and #193 4ef574e
@ben-ng ben-ng Fix #166 #193 in memory adapter 429b574
Commits on May 28, 2014
@OscarGodson OscarGodson Fix broken MD in README cf8f7d4
@ben-ng ben-ng Merge pull request #196 from OscarGodson/patch-1
Fix broken MD in README
fe40b30
@mde mde Pass params into beforeValidate for use in setting default values 9d655a9
@mde mde Version 0.5.14 7e81315
@mde mde Merge branch 'v0.5'
Conflicts:
	README.md
2f8ab56
Ondrej Brinkel started work on rest-adapter: couple tests already passing 58fc7f4
Commits on May 29, 2014
@OscarGodson OscarGodson Cleaner, more documented, boostrapped model 818e39a
@OscarGodson OscarGodson Delete explanation of setAdapter from section c759e86
@OscarGodson OscarGodson Clean up adapter section and fix mongo references 81aff29
@OscarGodson OscarGodson Add alias mongodb to mongo adapter 9ba018b
@OscarGodson OscarGodson Add "how to install adapters" section bff8144
@OscarGodson OscarGodson Add docs on .connect/.disconnect & those events d249a2e
@OscarGodson OscarGodson Note about createAdapter config param 33235c0
@OscarGodson OscarGodson Remove deprecated doc on manually setting adapters bd81dcb
@OscarGodson OscarGodson Note about Riak, in-memory, & filesystem adapters a88df92
Ondrej Brinkel - fix in dep version for node <= 0.8
- rest adapter tests now almost working (5 are disabled for now)
416a73a
@mde mde Alias commonly used property names in configs 347ffa0
@mde mde autoIncrementId in query, id is an int, not a string 27e763b
@mde mde Get tests working with auto-increment IDs a6b2ed7
Commits on May 30, 2014
@OscarGodson OscarGodson Add docs for setAdapter ae77bc4
@OscarGodson OscarGodson Fix format of defineProperties in setAdapter docs 1448008
@OscarGodson OscarGodson Fix link 26465a7
@OscarGodson OscarGodson NPM->npm 25fbc13
Ondrej Brinkel two more shared tests working now after changes in mock server
if rest server sends errors with the model data they will be appended to each model instance
df09fff
@mde mde Merge pull request #202 from OscarGodson/patch-2
Cleaner, more documented, boostrapped model
240585a
@mde mde Merge pull request #203 from OscarGodson/patch-3
Clean up adapter section and fix mongo references
653b1f7
@mde mde Lowercasing NPM is a silly affectation IMO. fbee4d2
@mde mde Revert to TEXT for object datatype in Postgres da6e129
@mde mde Version 0.5.15 5c5b9aa
@mde mde Merge branch 'v0.5'
Conflicts:
	lib/generators/sql.js
b86621b
@mde mde Ugh, get tests passing 9e8cb04
Commits on May 31, 2014
@mde mde Split Postgres adapter tests into string/int ID 951b214
Commits on Jun 01, 2014
@mde mde Get the fucking auto-increment tests working 4d7ec92
@mde mde Clear definitions so the can be re-registered 5c60112
Commits on Jun 02, 2014
@mde mde Get more tests passing, use explicit load/registration of models 4e2547c
@mde mde Clear out goddamn model definitions between *all* adapter tests 12eee75
Commits on Jun 03, 2014
@mde mde Make sure date datatype doesn't accept arbitrary strings 78d7f03
Commits on Jun 09, 2014
@mde mde Distinguish between defaultAdapter and config.defaultAdapter 7e5b332
@mde mde Merge branch 'master' into nested-eager
Conflicts:
	Jakefile
	test/integration/adapters/sql/postgres_common.js
67bc03b
@mde mde Get defaultAdatper unit test working c8a4bc5
@mde mde Merge branch 'master' into nested-eager e1aaad4
Commits on Jun 11, 2014
Matias Lahti implement getAdapter 1d6d046
Matias Lahti update tests of default adapter to use getAdapter() 5966a73
Matias Lahti remove superfluous sanity checks, getAdapterForModel throws an error …
…in any case if adapter is not found.
7c0a34e
Matias Lahti update EventedQueryProcessor constructor to use getAdapter() instead …
…of straight model.adapter
575c99c
@mde mde Merge pull request #209 from moitias/getAdapter
This is awesome!

There's breakage in the build, but it's in Node v0.8, and looks to be the tilde/caret changes in the package versioning. I'll take a look at this later.

Thanks for knocking this out.
a479b6b
@mde mde Merge branch 'master' of github.com:geddy/model into nested-eager
Conflicts:
	lib/adapters/sql/base.js
71a37ed
Commits on Jun 12, 2014
@mde mde Test eager fetch with query against array of ids 778c568
@mde mde Merge branch 'master' into nested-eager 9da6cd9
@mde mde Test for nested eager-fetch querying by array of ids 06328a5
Commits on Jun 13, 2014
@mde mde This is horrible, but it works 18a567f
@mde mde Slightly less horrible, working in all SQL adapters 8914dd9
@mde mde Merge branch 'master' into nested-eager 16a29a9
@mde mde Added method for getting valid property names on a model definition a6c4152
@mde mde Version 0.5.16 c9237dd
Commits on Jun 14, 2014
@mde mde Empty query object should return all items in SQL adapters 1b2dbfe
Commits on Jun 15, 2014
@phanect phanect Fix code which do not work in strict mode 86e5844
@phanect phanect Fix indents b15febd
@mde mde Merge pull request #213 from phanect/strict-mode
Fix code which do not work in strict mode
73eed40
@mde mde Missing declaration c0b0bbf
@mde mde More work for strict mode 5bee430
@mde mde Fix pre-query for limited eager fetch 07abf7e
@mde mde No need to touch includes in query opts d26e5d1
Commits on Jun 16, 2014
@mde mde Limited eager-fetch pre-query should handle sorts d4422f3
@mde mde Handle multiple sort items 0def8ad
@mde mde Restore shared tests for Postgres 4cfb2eb
Commits on Jun 17, 2014
@ben-ng ben-ng Add a default top-level sort on ID to eager loading queries if one is…
…n't already specified, fix #212
fd58194
@ben-ng ben-ng Add querying on nested attributes de290c3
@ben-ng ben-ng Add sorting on nested associations 914e345
@ben-ng ben-ng Add back disabled test 8c93936
@ben-ng ben-ng Document nested query and sort cb608b5
@ben-ng ben-ng Update transformer test 110d538
@ben-ng ben-ng Take out test for unsupported feature (querying in object) 99f1277
@ben-ng ben-ng Merge branch 'nested-eager' 06555c4
@ben-ng ben-ng Resolve merge conflicts 2c48674
@ben-ng ben-ng Fix prequery 0a993e8
@ben-ng ben-ng Remove debug code
[ci skip]
a0962a2
@ben-ng ben-ng Use the adapter's delimiter c91a5ed
@ben-ng ben-ng Avoid duplicate clauses in distinct 4ae2550
Commits on Jun 18, 2014
@ben-ng ben-ng Fix streaming api when sorting on nested attributes 3f0404f
@ben-ng ben-ng Add method to properly alias the association keys to avoid case sensi…
…tivity issues
a093ccb
@ben-ng ben-ng Add @mde's "dominant top level id sort idea" so that only the stupide…
…st sort clauses are unstreamable, update test to use streaming API
96fc06e
@ben-ng ben-ng Document limitations 1b50299
@ben-ng ben-ng Fix formatting d6ccf47
@troyastorino troyastorino Coerces queries in postgres to use a value of type REAL for propertie…
…s of type number. fixes #191
262ec97
Commits on Jun 28, 2014
@mde mde Merge pull request #207 from troyastorino/master
Fixes problem of queries on datatype number in postgres.
f8b56a2
Commits on Jun 29, 2014
@mde mde Update NPM for Travis in Node v0.8 290de88
@mde mde Merge branch 'v0.5' 593e319
@mde mde Merge branch 'master' of github.com:geddy/model b5b956f
Commits on Jul 15, 2014
@giodamelio giodamelio Fix link to model.config.defaultAdapter in README 458c13f
@mde mde Merge pull request #216 from giodamelio/patch-1
Fix link to model.config.defaultAdapter in README
93fb17d
Commits on Jul 24, 2014
@mde mde Mojor version bump 5e595ff
@mde mde Updated deps de07536
Commits on Jul 25, 2014
@ben-ng ben-ng Fix #217 7fead62
@ben-ng ben-ng Add test for #217 b749d12
@ben-ng ben-ng Code cleanup 2cc8ae4
@ben-ng ben-ng Fix unit tests expecting assnTokens 5d5bf8f
@ben-ng ben-ng Add note about .first query, querying on assn, and limit clause [ci s…
…kip]
db92a92
@ben-ng ben-ng Add warning when user attempts to query on an assn with a limit claus…
…e, issue #215
7cead43
@ben-ng ben-ng Update edge case docs [ci skip] 5f4ff53
@ben-ng ben-ng Fix #217 85b17de
@ben-ng ben-ng Add test for #217 0021106
@ben-ng ben-ng Code cleanup a0a578f
@ben-ng ben-ng Fix unit tests expecting assnTokens cf55fe8
@ben-ng ben-ng Add note about .first query, querying on assn, and limit clause [ci s…
…kip]
1d6332c
@ben-ng ben-ng Add warning when user attempts to query on an assn with a limit claus…
…e, issue #215
d10b815
@ben-ng ben-ng Update edge case docs [ci skip] 70730d6
@mde mde Merge branch 'master' into v6 77a68f3
@mde mde Merge branch 'v6' of github.com:geddy/model into v6 e825ee2
Commits on Jul 29, 2014
@mde mde Version 6.0.1 1ba6cc3
Commits on Jul 30, 2014
@mshick mshick initial refactor to hide instance methods a1f7524
Commits on Jul 31, 2014
@mshick mshick cleanup a few more props, and added allowExtra flag 54d4256
Commits on Aug 09, 2014
@mshick mshick clarify allowExtra method invocation 01e1ba1
@mshick mshick spacing change 45c8dcd
Commits on Aug 10, 2014
@Duvel Duvel Fixed typo in index 188b384
Commits on Aug 11, 2014
@mde mde Merge pull request #220 from Duvel/master
Fixed typo in index
7f254a9
@mde mde Merge pull request #218 from mshick/master
Display "clean" models and allow for extra (non-schema-defined) properties
4981820
Commits on Aug 21, 2014
@mde mde Merge branch 'master' of github.com:geddy/model bf235a9
Commits on Sep 02, 2014
@mshick mshick basic support for multilevel and sublevels 1942564
@mshick mshick code cleanup, and support for sublevel with regular level dbs 8abcae9
@mde mde Removed deprecated Jakefile syntax 2044f24
@mde mde Merge branch 'v6' 632ec02
@mde mde Merge pull request #224 from mshick/master
Adding Level adapter support for Sublevel and Multilevel
2a16d73
Commits on Sep 08, 2014
@mshick mshick applying skip option to leveldb adapter 9939914
@mde mde Merge pull request #228 from mshick/master
Applying skip option to leveldb adapter
27d8086
@mshick mshick make disconnect command perform a close (works on multilevel and level) 89cc2c0
Commits on Sep 09, 2014
@mshick mshick handle manifest objects as well as paths bbcc1e0
Commits on Sep 13, 2014
@mshick mshick generate id from key if item is found lacking 2868145
@mshick mshick oh my f271613
@mshick mshick save fix 9683af4
@mde mde Merge pull request #229 from mshick/save-fix
Super important fix!
b346e96
Commits on Sep 14, 2014
@mshick mshick wow, I'm dumb 8e7e3d9
Commits on Sep 16, 2014
@mshick mshick adding explicit multilevel connect, changing config syntax slightly f…
…or better mongo parity
b57c787
@mshick mshick Merge remote-tracking branch 'upstream/master' a296448
@mshick mshick garbage code 6e9f7ee
@mshick mshick fix id prop ccbb0df
@mshick mshick adding tests for level/multilevel adapter features 82ccabc
@mshick mshick fixing some issues revealed by tests 0335e49
Commits on Sep 17, 2014
@mde mde Disable Riak tests 8d91bf3
@mshick mshick update test, remove 0.8 unsafe method 6327ca9
Commits on Sep 18, 2014
@mshick mshick attempting to close out tableDrops correctly so that we can disconnect 45ce399
@mshick mshick Merge remote-tracking branch 'upstream/master' cf78771
@mshick mshick small version bump for the level/multilevel adapter changes 381fbf0
@mshick mshick Merge pull request #230 from mshick/master
Explicit connect / disconnect in level adapter. Multilevel updates, cleanup, and adding tests. Changing dropTable() behavior in Level adapter.
d272691
Commits on Oct 21, 2014
@mde mde Added id-range and date-range test 409ccc0
@mde mde Removed support for Node 0.8 f187877
@mde mde Remove Riak tests temporarily be800de
Commits on Nov 14, 2014
@SimonDegraeve SimonDegraeve Fix failing require with webpack 874b742
Commits on Nov 15, 2014
@mde mde Merge pull request #234 from SimonDegraeve/fix-failing-require
Fix failing require with webpack
b602437
Commits on Nov 29, 2014
Ondrej Brinkel Merge remote-tracking branch 'origin' into rest-adapter
Conflicts:
	Jakefile
	package.json
	test/config.js
a05f0a5
Ondrej Brinkel fixed tests for rest adapter 92d7b5e
Commits on Dec 02, 2014
@der-On der-On Merge pull request #236 from geddy/rest-adapter
Rest adapter
0eacba4
Commits on Dec 08, 2014
@der-On der-On added info about the new REST-Adapter 01b7b7c
Commits on Dec 12, 2014
Ondrej Brinkel fixes #237 and #241:
MySql and Postgres generators now use different auto increment column definitions
17dfbdd
Commits on Dec 13, 2014
@OscarGodson OscarGodson Add clearer error message when a model can't be found 0ef9de0
Commits on Dec 14, 2014
@mde mde Merge branch 'v6' 53317de
@mde mde Merge branch 'master' of github.com:geddy/model c46657c
@OscarGodson OscarGodson Merge pull request #242 from geddy/oscar/error-message-when-forgettin…
…g-model

Add clearer error message when a model can't be found
38eae6a
Commits on Jan 29, 2015
@der-On der-On added rest adapter entries to adapters/index.js 63833b6
Commits on Feb 12, 2015
Ondrej Brinkel added camelize option to rest adapter:
if it is set to true request payload will contain a camelized instead of a snakeized model name
04f99c8
Ondrej Brinkel Merge remote-tracking branch 'origin/master' de344f7
Commits on Feb 13, 2015
Ondrej Brinkel rest adapter now also inserts non-property data into the models to fo…
…r example get foreign keys too that are not defined as properties on the model
b56f20d
Commits on Feb 16, 2015
Ondrej Brinkel now throwing error when trying to validate an unknown datatype 99fad57
Commits on Feb 20, 2015
Ondrej Brinkel fixed offset + limit query combination for mysql aa5e620
Ondrej Brinkel reverted wrong limit + offset for mysql e8c1b7c
Ondrej Brinkel fixed typo dc35e49
Commits on Mar 22, 2015
Ondrej Brinkel fixes #254: count queries with sort now include a group-by 40abf5b
Commits on Mar 26, 2015
Ondrej Brinkel reverted to LIMIT + OFFSET instead of LIMIT x,y for sql adapters 04b7444
Commits on Apr 08, 2015
Ondrej Brinkel fixes #260: added instance cache lifetime for rest adapter 8537540
Ondrej Brinkel Merge branch 'rest-adapter' 9b90e3e
Ondrej Brinkel added docs about how to use the rest adapter in the browser 23f2107
Ondrej Brinkel Merge branch 'rest-adapter' b7c285e
Commits on Apr 10, 2015
Ondrej Brinkel updated dependent sql modules to latest versions
3fc5e25
@der-On der-On Merge pull request #261 from geddy/update-sql-modules
updated dependent sql modules to latest versions
e954137