Commit Graph

1763 Commits

Author SHA1 Message Date
Raymond Feng fd308362b9 Merge branch 'release/2.10.2' into production 2014-10-21 13:17:00 -07:00
Raymond Feng 354b843bf0 Bump version 2014-10-21 10:58:32 -07:00
Raymond Feng 5eed64db90 Merge pull request #332 from strongloop/feature/fix-memory-automigrate
Fix the automigrate issue
2014-10-21 08:58:11 -07:00
Fabien Franzen 4e20128945 Tiny fix: default __persisted to false 2014-10-19 18:52:18 +02:00
Fabien Franzen e7a108efdb Don't apply defaults when fields are specified 2014-10-19 18:47:27 +02:00
Raymond Feng 455743167a Fix the automigrate issue
See https://github.com/strongloop/loopback-example-relations-basic/issues/6
2014-10-16 12:04:16 -07:00
Raymond Feng 6fd8fe481a Merge tag 'v2.10.1'
2.10.1
2014-10-15 09:20:29 -07:00
Raymond Feng 4a339522e3 Merge branch 'release/2.10.1' into production 2014-10-15 09:20:22 -07:00
Raymond Feng 0335d0a7b9 Bump version 2014-10-15 09:19:36 -07:00
Fabien Franzen 5662d9f0c2 Merge pull request #329 from fabien/feature/include-scope
Enable include scope for belongsTo
2014-10-15 18:08:42 +02:00
Fabien Franzen ded292d79a Merge pull request #327 from fabien/fix/call-scope-method
Call relation methods in the right context
2014-10-15 18:08:10 +02:00
Fabien Franzen 55d116ec3f Enable include scope for belongsTo 2014-10-14 22:47:59 +02:00
Raymond Feng e93b5d761b Merge tag 'v2.10.0'
2.10.0
2014-10-13 16:10:28 -07:00
Raymond Feng 9807f2dbb7 Merge branch 'release/2.10.0' into production 2014-10-13 16:10:17 -07:00
Raymond Feng f2ed39cb2d Bump version 2014-10-13 08:34:24 -07:00
Raymond Feng 07993d2e1f Merge pull request #324 from fabien/feature/include-scope
Include scope
2014-10-13 08:33:26 -07:00
Fabien Franzen 58a6c924b3 Call relation methods in the right context
Before this change, it was impossible to override 'build' and other
(custom) relation/scope methods; only the original prototype method was
ever called.
2014-10-12 22:00:13 +02:00
Miroslav Bajtoš d69b515c29 Merge pull request #323 from strongloop/feature/do-not-inherit-base-model-option
Don't inherit settings.base when extending a model
2014-10-10 19:52:43 +02:00
Miroslav Bajtoš 14d178bf69 Don't inherit settings.base when extending a model
Fix the bug in `ModelClass.extend` where the `base` option used
in the new class was inherited from ModelClass. As a result
the extended model was incorrectly based on ModelClass's parent.

Modify `modelBuilder.define` to normalize the property name storing
the name of the base model to `settings.base`.
2014-10-10 18:35:18 +02:00
Fabien Franzen 8d6e3adaab Allow include syntax without scope param 2014-10-10 17:17:36 +02:00
Fabien Franzen 771d9505cc Allow 'rel' and 'relation' 2014-10-10 14:33:26 +02:00
Fabien Franzen 0c28ccedac Refactored inclusion
The syntax is now consistent, regardless of using [] or {} for the
include param.
2014-10-10 14:24:25 +02:00
Fabien Franzen ca0b3399c8 Implement include scopes 2014-10-10 12:28:39 +02:00
Raymond Feng 0859fc4c21 Merge pull request #296 from fabien/feature/default-scope
Default scope
2014-10-09 16:10:48 -07:00
Fabien Franzen 2838158139 Fix failing test 2014-10-09 18:18:04 +02:00
Fabien Franzen 0e49dc94ec Allow `attributes` as an alias for `properties` (for LDL) 2014-10-09 18:14:04 +02:00
Fabien Franzen ec05d0b5a8 Cleanup, consistency: allow properties to be a function
Also, pass along the current instance, for any instance method as a
context (save, updateAttributes).
2014-10-09 18:14:04 +02:00
Fabien Franzen beeb7c46c9 applyProperties => properties (object/false) 2014-10-09 18:14:04 +02:00
Fabien Franzen 702796a486 Test default scope with relations 2014-10-09 18:14:04 +02:00
Fabien Franzen 49e2b8b8dc Allow default scope to be a function 2014-10-09 18:14:04 +02:00
Fabien Franzen b136a8fce7 Full test CRUD suite for default scope 2014-10-09 18:14:04 +02:00
Fabien Franzen ad55681d69 Properly reset Memory connector cache on automigrate 2014-10-09 18:13:58 +02:00
Fabien Franzen 8352ed3afc Implemented collection setting for Memory connector 2014-10-09 18:13:57 +02:00
Fabien Franzen 610866bd7c Extract mergeQuery and setScopeValuesFromWhere
Related to #274 - in preparation of default scope
2014-10-09 18:13:40 +02:00
Ryan Graham d3b30c3071 Add contribution guidelines
Uses https://cla.strongloop.com
2014-10-01 17:55:02 -07:00
Raymond Feng 43e0f0f6fa Merge pull request #301 from strongloop/feature/allow-base-for-discovery
Tidy up model building from data sources
2014-09-23 16:38:17 -07:00
Raymond Feng b5cebd75a7 Merge pull request #303 from khashayar/feature/test-improvement
Test improvement, shows _targetClass camelCase bug
2014-09-23 16:37:59 -07:00
Khashayar Hajian c3df513712 Fix camel-case issue where relation is 'hasAndBelongsToMany' #304
Signed-off-by: Khashayar Hajian <me@khashayar.me>
2014-09-19 16:23:39 +02:00
Khashayar Hajian 28a661a81a Test improvement, shows _targetClass camelCase bug
There is an issue where setting _targetClass on hasAndBelongsToMany
relations with a camel-case model name, fails.

Signed-off-by: Khashayar Hajian <me@khashayar.me>
2014-09-17 17:28:40 +02:00
Raymond Feng eca27ce0c6 Merge tag 'v2.9.0'
2.9.0
2014-09-12 23:29:01 -07:00
Raymond Feng fd68cae20b Merge branch 'release/2.9.0' into production 2014-09-12 22:53:08 -07:00
Raymond Feng 8ad25a179a Bump version 2014-09-12 22:49:59 -07:00
Raymond Feng dd887426ed Merge pull request #300 from fabien/fix/embeds-many
Fix to handle new isNewRecord implementation
2014-09-12 15:26:57 -07:00
Fabien Franzen 7f155966ab Fix to handle new isNewRecord implementation 2014-09-13 00:03:08 +02:00
Raymond Feng fe74c8019c Tidy up model building from data sources
See https://github.com/strongloop/loopback/issues/560
2014-09-12 14:25:35 -07:00
Raymond Feng 3655107334 Merge pull request #295 from fabien/fix/embeds-many
Various improvements to embedded relations
2014-09-12 10:31:49 -07:00
Raymond Feng af40505703 Merge pull request #290 from fabien/feature/enforce-id
Enforce id (prevent user-set value), fix isNewRecord
2014-09-12 10:31:10 -07:00
Raymond Feng 6903253471 Merge pull request #288 from fabien/fix/relation-tests
Test sync (cached) relation getters
2014-09-12 10:29:42 -07:00
Fabien Franzen d1a08ef6b3 Add test case for Numeric ids (with optional forceId) 2014-09-07 20:54:11 +02:00
Fabien Franzen e441924fa3 Allow embedsOne to use auto-generated id (from connector)
If the connector has a `generateId` method - like Transient - it can be
used to set the id (when the property has been set to `generated:
true`).
2014-09-07 13:24:05 +02:00