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

Fix build and regression #3667

Merged
merged 6 commits into from May 7, 2015

Conversation

2 participants
@BridgeAR
Contributor

BridgeAR commented May 7, 2015

This fixes the regression introduced in 2.1.2 and fixes the build script to use iojs 1.0 as long as travis can't install the proper nan version (needed for pg-native).
I also inserted missing changelog entries and fixed a deprecation message in a test.

@@ -1630,7 +1630,7 @@ module.exports = (function() {
}
});
} else {
options.fields = _.intersection(Object.keys(values), Object.keys(this.tableAttributes));
options.fields = Object.keys(this.tableAttributes);

This comment has been minimized.

@mickhansen

mickhansen May 7, 2015

Contributor

That's not exactly a proper fix, the old behaviour was very wrong aswell, updatedAt needs to be added to fields like we do in instance.save() i guess.

This comment has been minimized.

@BridgeAR

BridgeAR May 7, 2015

Contributor

I agree

.travis.yml Outdated
@@ -3,7 +3,8 @@ language: node_js
node_js:
- "0.10"
- "0.12"
- "iojs"
- "iojs-v1.0.0"

This comment has been minimized.

@mickhansen

mickhansen May 7, 2015

Contributor

possible to test vs a higher version? 1.6/1.8?

@BridgeAR

This comment has been minimized.

Contributor

BridgeAR commented May 7, 2015

I also fixed an still outstanding issue with transactions not rolling back if no thenable was provided.

.travis.yml Outdated
@@ -32,7 +33,6 @@ script:
branches:
only:
- master
- 1.7.0

This comment has been minimized.

@mickhansen

mickhansen May 7, 2015

Contributor

We're still running tests on 1.7 for the oddball PR.

@mickhansen

This comment has been minimized.

Contributor

mickhansen commented May 7, 2015

Just the last comment and everything looks good.

@BridgeAR

This comment has been minimized.

Contributor

BridgeAR commented May 7, 2015

Done

mickhansen added a commit that referenced this pull request May 7, 2015

@mickhansen mickhansen merged commit 0878230 into sequelize:master May 7, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment