Comparing version 2.0.5 to 2.0.6
@@ -459,10 +459,11 @@ var schemaUtil = require(__dirname+'/schema.js'); | ||
if ((util.isPlainObject(model) === false) || (model._joins[key] === undefined)) { // We do not copy joined documents | ||
if ((schema !== undefined) && (type.isVirtual(schema._schema[key]) === true)) { | ||
if ((schema !== undefined) && (schema._schema !== undefined) && (type.isVirtual(schema._schema[key]) === true)) { | ||
// We do not copy virtual | ||
} | ||
else if (((schema === undefined) || (schema._schema[key] === undefined)) && (localOptions !== undefined) && (localOptions.enforce_extra === "remove")) { | ||
else if (((schema === undefined) || (schema._schema === undefined) || (schema._schema[key] === undefined)) && | ||
(localOptions !== undefined) && (localOptions.enforce_extra === "remove")) { | ||
// We do not copy fields if enfroce_extra is "remove" | ||
} | ||
else { | ||
if (schema !== undefined) { | ||
if ((schema !== undefined) && (schema._schema !== undefined)) { | ||
nextSchema = schema._schema[key]; | ||
@@ -469,0 +470,0 @@ } |
{ | ||
"name": "thinky", | ||
"version": "2.0.5", | ||
"version": "2.0.6", | ||
"description": "RethinkDB ORM for Node.js", | ||
@@ -5,0 +5,0 @@ "main": "lib/thinky.js", |
@@ -18,2 +18,3 @@ # Thinky | ||
var thinky = require('thinky')(); | ||
var type = thinky.type; | ||
@@ -31,3 +32,3 @@ // Create a model - the table is automatically created | ||
id: type.string(), // a normal string | ||
name: type.string().min(2) // a string of at least two characters | ||
name: type.string().min(2), // a string of at least two characters | ||
email: type.string().email() // a string that is a valid email | ||
@@ -98,7 +99,13 @@ }); | ||
### Docs | ||
### Documentation | ||
http://thinky.io | ||
[https://thinky.io](https://thinky.io) | ||
### Help | ||
No SLA, but a few developers hang out there and may be able to help: | ||
- [irc://irc.freenode.org/rethinkdb](irc://irc.freenode.org/rethinkdb) | ||
- [https://gitter.im/neumino/thinky](https://gitter.im/neumino/thinky) | ||
### Run the tests | ||
@@ -135,23 +142,9 @@ | ||
- [nikaspran](https://github.com/nikaspran) | ||
- [rasapetter](https://github.com/rasapetter) | ||
- [simonratner](https://github.com/simonratner) | ||
- [wezs](https://github.com/wezs) | ||
### License | ||
Copyright (c) 2013-2014 Michel Tu <orphee@gmail.com> | ||
Permission is hereby granted, free of charge, to any person obtaining a copy of this | ||
software and associated documentation files (the 'Software'), to deal in the Software | ||
without restriction, including without limitation the rights to use, copy, modify, merge, | ||
publish, distribute, sublicense, and/or sell copies of the Software, and to permit | ||
persons to whom the Software is furnished to do so, subject to the following conditions: | ||
The above copyright notice and this permission notice shall be included in all copies or | ||
substantial portions of the Software. | ||
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, | ||
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR | ||
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 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. | ||
MIT, see the [LICENSE](https://github.com/neumino/thinky/blob/master/LICENSE) file |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
216303
25
5853
147