Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit 65c0a284 by Sascha Depold
Options

added charset definition + set to latin1 in tests

1 parent 485cf460
Inline Side-by-side
Showing with 32 additions and 23 deletions
changelog.md
...@@ -113,3 +113,7 @@ ...@@ -113,3 +113,7 @@
- [FEATURE] getModel for modelManager for getting a model without storing it in a variable; use it via sequelize.modelManager.getModel('User') - [FEATURE] getModel for modelManager for getting a model without storing it in a variable; use it via sequelize.modelManager.getModel('User')
- [TEST] test suite refactoring for jasmine - [TEST] test suite refactoring for jasmine
# v1.2.1 #
- [REFACTORING] renamed the global options for sync, query and define on sequelize; before: options.queryOptions; now: options.query
- [FEATURE] allow definition of charset via global define option in sequelize or via an option in sequelize.define
- [TEST] force latin1 charset for travis
lib/sequelize/model-definition.js
...@@ -68,7 +68,7 @@ ModelDefinition.prototype.query = function() { ...@@ -68,7 +68,7 @@ ModelDefinition.prototype.query = function() {
} }
ModelDefinition.prototype.sync = function(options) { ModelDefinition.prototype.sync = function(options) {
options = options || {} options = Utils.merge(options || {}, this.options)
var self = this var self = this
var doQuery = function() { var doQuery = function() {
......
lib/sequelize/sequelize.js
...@@ -7,7 +7,9 @@ var Utils = require("./utils") ...@@ -7,7 +7,9 @@ var Utils = require("./utils")
var Sequelize = module.exports = function(database, username, password, options) { var Sequelize = module.exports = function(database, username, password, options) {
options = options || {} options = options || {}
Utils._.reject(options, function(_, key) { return ["host", "port", "disableTableNameModification"].indexOf(key) > -1 }) Utils._.reject(options, function(_, key) {
return ["host", "port", "disableTableNameModification"].indexOf(key) > -1
})
this.options = options this.options = options
this.config = { this.config = {
...@@ -27,7 +29,8 @@ var instanceMethods = { ...@@ -27,7 +29,8 @@ var instanceMethods = {
define: function(modelName, attributes, options) { define: function(modelName, attributes, options) {
options = options || {} options = options || {}
if(this.options.defineOptions) options = Sequelize.Utils.merge(options, this.options.defineOptions) if(this.options.define)
options = Sequelize.Utils.merge(options, this.options.define)
var model = this.modelManager.addModel(new ModelDefinition(modelName, attributes, options)) var model = this.modelManager.addModel(new ModelDefinition(modelName, attributes, options))
...@@ -42,7 +45,8 @@ var instanceMethods = { ...@@ -42,7 +45,8 @@ var instanceMethods = {
query: function(sql, callee, options) { query: function(sql, callee, options) {
options = options || {} options = options || {}
if(this.options.queryOptions) options = Sequelize.Utils.merge(options, this.options.queryOptions) if(this.options.query)
options = Sequelize.Utils.merge(options, this.options.query)
options.logging = this.options.hasOwnProperty('logging') ? this.options.logging : true options.logging = this.options.hasOwnProperty('logging') ? this.options.logging : true
...@@ -52,7 +56,8 @@ var instanceMethods = { ...@@ -52,7 +56,8 @@ var instanceMethods = {
sync: function(options) { sync: function(options) {
options = options || {} options = options || {}
if(this.options.syncOptions) options = Sequelize.Utils.merge(options, this.options.syncOptions) if(this.options.sync)
options = Sequelize.Utils.merge(options, this.options.sync)
var self = this var self = this
var eventEmitter = new Utils.CustomEventEmitter(function() { var eventEmitter = new Utils.CustomEventEmitter(function() {
......
test/ConnectorManager/idle.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'it should work correctly after being idle': function(exit) { 'it should work correctly after being idle': function(exit) {
......
test/Model/add-remove-association.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
var initialize = function(options, callback) { var initialize = function(options, callback) {
......
test/Model/belongs-to.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'it should correctly add the foreign id': function() { 'it should correctly add the foreign id': function() {
......
test/Model/build.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
var initUsers = function(num, callback) { var initUsers = function(num, callback) {
var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT }) var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT })
......
test/Model/count.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'it should correctly count all objects': function(exit) { 'it should correctly count all objects': function(exit) {
......
test/Model/create.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
var initUsers = function(num, callback) { var initUsers = function(num, callback) {
return sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT }) return sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT })
......
test/Model/destroy.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'destroy should delete a saved record from the database': function(exit) { 'destroy should delete a saved record from the database': function(exit) {
......
test/Model/equals.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, { logging: false, define: { charset: 'latin1' } })
module.exports = { module.exports = {
'it should correctly determine equal objects': function(exit) { 'it should correctly determine equal objects': function(exit) {
......
test/Model/find-findAll-all.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
var initUsers = function(num, callback) { var initUsers = function(num, callback) {
var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT }) var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT })
......
test/Model/has-many.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'it should correctly add the foreign id - monodirectional': function() { 'it should correctly add the foreign id - monodirectional': function() {
......
test/Model/has-one.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'it should correctly add the foreign id': function() { 'it should correctly add the foreign id': function() {
......
test/Model/is-new-record.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
var initUsers = function(num, callback) { var initUsers = function(num, callback) {
var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT }) var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT })
......
test/Model/save.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'save should add a record to the database': function(exit) { 'save should add a record to the database': function(exit) {
......
test/Model/sync-drop.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
, User = sequelize.define('User', { name: Sequelize.STRING, bio: Sequelize.TEXT }) , User = sequelize.define('User', { name: Sequelize.STRING, bio: Sequelize.TEXT })
module.exports = { module.exports = {
......
test/Model/update-attributes.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
, User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT }) , User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT })
module.exports = { module.exports = {
......
test/Model/values.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
var initUsers = function(num, callback) { var initUsers = function(num, callback) {
var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT }, {timestamps:false}) var User = sequelize.define('User' + config.rand(), { name: Sequelize.STRING, bio: Sequelize.TEXT }, {timestamps:false})
......
test/Sequelize/import.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'the import should work correctly': function() { 'the import should work correctly': function() {
......
test/Sequelize/sync.js
var assert = require("assert") var assert = require("assert")
, config = require("./../config") , config = require("./../config")
, Sequelize = require("./../../index") , Sequelize = require("./../../index")
, sequelize = new Sequelize(config.database, config.username, config.password, {logging: false}) , sequelize = new Sequelize(config.database, config.username, config.password, {logging: false, define: { charset: 'latin1' }})
module.exports = { module.exports = {
'it should sync all models - so instances can be created and saved to the database without failures': function(exit) { 'it should sync all models - so instances can be created and saved to the database without failures': function(exit) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!