Merge pull request #86 from IzikLisbon/master

OptimisticLocking property: number --> number|string

Author: RobinBuschmann

lib/interfaces/IDefineOptions.ts

@@ -4,7 +4,9 @@ export interface IDefineOptions extends DefineOptions<any> {
   modelName?: string;
 
   /**
-   * To enable optimistic locking.
+   * Enable optimistic locking.  When enabled, sequelize will add a version count attribute
+   * to the model and throw an OptimisticLockingError error when stale instances are saved.
+   * Set to true or a string with the attribute name you want to use to enable.
    */
-  version?: boolean;
+  version?: boolean | string;
 }

lib/models/Model.d.ts

@@ -469,7 +469,7 @@ export declare class Model<T> extends Hooks {
   /**
    * version number automatically created by sequelize if table options.version is true
    */
-  version?: number;
+  version?: number|any;
 
   /**
    * Returns true if this instance has not yet been persisted to the database