closes #118, closes #124, closes #146 and closes #149

Author: RobinBuschmann

lib/interfaces/IFindOptions.ts

@@ -1,5 +1,5 @@
 import {WhereOptions, LoggingOptions, SearchPathOptions, col, and, or, FindOptionsAttributesArray,
-  literal} from 'sequelize';
+  literal, fn} from 'sequelize';
 import {Model} from "../models/Model";
 import {IIncludeOptions} from "./IIncludeOptions";
 
@@ -41,8 +41,8 @@ export interface IFindOptions extends LoggingOptions, SearchPathOptions {
    * first element is the column / function to order by, the second is the direction. For example:
    * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
    */
-  order?: string | col | literal | Array<string | number | typeof Model | { model: typeof Model, as?: string }> |
-    Array<string | col | literal | Array<string | number | typeof Model | { model: typeof Model, as?: string }>>;
+  order?: string | col | fn | literal | Array<string | number | typeof Model | { model: typeof Model, as?: string }> |
+    Array<string | col | fn | literal | Array<string | number | typeof Model | { model: typeof Model, as?: string }>>;
 
   /**
    * Limit the results

lib/models/Model.d.ts

@@ -22,10 +22,7 @@ import {ICountOptions} from '../interfaces/ICountOptions';
 /* tslint:disable:max-line-length */
 /* tslint:disable:max-classes-per-file */
 
-/**
- * Creates override for sequelize model to make the food
- */
-export declare class Model<T> extends Hooks {
+export declare abstract class Model<T> extends Hooks {
 
   constructor(values?: any, options?: IBuildOptions);
 
@@ -411,6 +408,11 @@ export declare class Model<T> extends Hooks {
    */
   static unscoped(): typeof Model;
 
+  /**
+   * A reference to the sequelize instance
+   */
+  static sequelize: Sequelize;
+
   /**
    * Adds relation between specified instances and source instance
    */

lib/models/Sequelize.d.ts

@@ -7,6 +7,7 @@ import {ISequelizeValidationOnlyConfig} from "../interfaces/ISequelizeValidation
 export declare class Sequelize extends SequelizeOrigin {
 
   _: {[modelName: string]: (typeof Model)};
+  connectionManager: any;
 
   constructor(config: SequelizeConfig | ISequelizeValidationOnlyConfig);
   constructor(uri: string);

lib/models/v3/Sequelize.ts

@@ -18,6 +18,7 @@ export class Sequelize extends SequelizeOrigin implements BaseSequelize {
   init: (config: SequelizeConfig) => void;
   addModels: (models: Array<typeof Model> | string[]) => void;
   associateModels: (models: Array<typeof Model>) => void;
+  connectionManager: any;
 
   constructor(config: SequelizeConfig | string) {
     if (typeof config === "string") {

lib/models/v4/Sequelize.ts

@@ -14,6 +14,7 @@ export class Sequelize extends OriginSequelize implements BaseSequelize {
   init: (config: SequelizeConfig) => void;
   addModels: (models: Array<typeof Model> | string[]) => void;
   associateModels: (models: Array<typeof Model>) => void;
+  connectionManager: any;
 
   constructor(config: SequelizeConfig | string) {
     if (typeof config === "string") {