renamed CreateConnectionParameters to CreateConnectionOptions

This commit is contained in:
Umed Khudoiberdiev 2016-03-23 17:29:30 +05:00
parent c353401e96
commit ee30e118a0
15 changed files with 42 additions and 42 deletions

View File

@ -1,7 +1,7 @@
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Post} from "./entity/Post";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,11 +1,11 @@
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostDetails} from "./entity/PostDetails";
import {Image} from "./entity/Image";
import {Cover} from "./entity/Cover";
import {Category} from "./entity/Category";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,4 +1,4 @@
import {CreateConnectionParameters, createConnection} from "../../src/typeorm";
import {CreateConnectionOptions, createConnection} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostDetails} from "./entity/PostDetails";
import {PostCategory} from "./entity/PostCategory";
@ -7,7 +7,7 @@ import {PostImage} from "./entity/PostImage";
import {PostInformation} from "./entity/PostInformation";
import {PostAuthor} from "./entity/PostAuthor";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,4 +1,4 @@
import {CreateConnectionParameters, createConnection} from "../../src/typeorm";
import {CreateConnectionOptions, createConnection} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostDetails} from "./entity/PostDetails";
import {PostCategory} from "./entity/PostCategory";
@ -7,7 +7,7 @@ import {PostImage} from "./entity/PostImage";
import {PostInformation} from "./entity/PostInformation";
import {PostAuthor} from "./entity/PostAuthor";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,8 +1,8 @@
import {CreateConnectionParameters, createConnection} from "../../src/typeorm";
import {CreateConnectionOptions, createConnection} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostDetails} from "./entity/PostDetails";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,11 +1,11 @@
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostCategory} from "./entity/PostCategory";
import {PostAuthor} from "./entity/PostAuthor";
import {EverythingSubscriber} from "./subscriber/EverythingSubscriber";
// first create a connection
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,10 +1,10 @@
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostCategory} from "./entity/PostCategory";
import {PostAuthor} from "./entity/PostAuthor";
import {Blog} from "./entity/Blog";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,9 +1,9 @@
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostCategory} from "./entity/PostCategory";
import {PostAuthor} from "./entity/PostAuthor";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,7 +1,7 @@
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Category} from "./entity/Category";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,9 +1,9 @@
import {CreateConnectionParameters, createConnection} from "../../src/typeorm";
import {CreateConnectionOptions, createConnection} from "../../src/typeorm";
import {Post} from "./entity/Post";
import {PostCategory} from "./entity/PostCategory";
import {PostAuthor} from "./entity/PostAuthor";
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -13,7 +13,7 @@ export const connectionManager = new ConnectionManager();
/**
* All options to help to create a new connection.
*/
export interface CreateConnectionParameters {
export interface CreateConnectionOptions {
/**
* Driver type. Mysql is the only driver supported at this moment.
@ -54,30 +54,30 @@ export interface CreateConnectionParameters {
/**
* Creates a new connection with the database.
*/
export function createConnection(parameters: CreateConnectionParameters): Promise<Connection> {
export function createConnection(options: CreateConnectionOptions): Promise<Connection> {
let connection: Connection;
switch (parameters.driver) {
switch (options.driver) {
case "mysql":
connection = connectionManager.createConnection(parameters.connectionName, new MysqlDriver(mysql));
connection = connectionManager.createConnection(options.connectionName, new MysqlDriver(mysql));
break;
default:
throw new Error(`Wrong driver ${parameters.driver} given. Supported drivers are: "mysql"`);
throw new Error(`Wrong driver ${options.driver} given. Supported drivers are: "mysql"`);
}
if (parameters.entityDirectories && parameters.entityDirectories.length > 0)
connectionManager.importEntitiesFromDirectories(parameters.connectionName, parameters.entityDirectories);
if (options.entityDirectories && options.entityDirectories.length > 0)
connectionManager.importEntitiesFromDirectories(options.connectionName, options.entityDirectories);
if (parameters.entities)
connectionManager.importEntities(parameters.connectionName, parameters.entities);
if (options.entities)
connectionManager.importEntities(options.connectionName, options.entities);
if (parameters.subscriberDirectories && parameters.subscriberDirectories.length > 0)
connectionManager.importSubscribersFromDirectories(parameters.connectionName, parameters.subscriberDirectories);
if (options.subscriberDirectories && options.subscriberDirectories.length > 0)
connectionManager.importSubscribersFromDirectories(options.connectionName, options.subscriberDirectories);
if (parameters.subscribers)
connectionManager.importSubscribers(parameters.subscribers);
if (options.subscribers)
connectionManager.importSubscribers(options.subscribers);
return connection
.connect(parameters.connectionOptions)
.connect(options.connectionOptions)
.then(() => connection);
}

View File

@ -1,7 +1,7 @@
import * as chai from "chai";
import {expect} from "chai";
import {Connection} from "../../src/connection/Connection";
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Repository} from "../../src/repository/Repository";
import {SchemaCreator} from "../../src/schema-creator/SchemaCreator";
import {Post} from "../../sample/sample1-simple-entity/entity/Post";
@ -13,7 +13,7 @@ describe("insertion", function() {
// Configuration
// -------------------------------------------------------------------------
const parameters: CreateConnectionParameters = {
const parameters: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,7 +1,7 @@
import * as chai from "chai";
import {expect} from "chai";
import {Connection} from "../../src/connection/Connection";
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Repository} from "../../src/repository/Repository";
import {SchemaCreator} from "../../src/schema-creator/SchemaCreator";
import {PostDetails} from "../../sample/sample2-one-to-one/entity/PostDetails";
@ -19,7 +19,7 @@ describe("one-to-one", function() {
// Configuration
// -------------------------------------------------------------------------
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,7 +1,7 @@
import * as chai from "chai";
import {expect} from "chai";
import {Connection} from "../../src/connection/Connection";
import {createConnection, CreateConnectionParameters} from "../../src/typeorm";
import {createConnection, CreateConnectionOptions} from "../../src/typeorm";
import {Repository} from "../../src/repository/Repository";
import {SchemaCreator} from "../../src/schema-creator/SchemaCreator";
import {PostDetails} from "../../sample/sample3-many-to-one/entity/PostDetails";
@ -19,7 +19,7 @@ describe("many-to-one", function() {
// Configuration
// -------------------------------------------------------------------------
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",

View File

@ -1,7 +1,7 @@
import * as chai from "chai";
import {expect} from "chai";
import {Connection} from "../../src/connection/Connection";
import {CreateConnectionParameters, createConnection} from "../../src/typeorm";
import {CreateConnectionOptions, createConnection} from "../../src/typeorm";
import {Repository} from "../../src/repository/Repository";
import {SchemaCreator} from "../../src/schema-creator/SchemaCreator";
import {PostDetails} from "../../sample/sample4-many-to-many/entity/PostDetails";
@ -17,7 +17,7 @@ describe("many-to-many", function() {
// Configuration
// -------------------------------------------------------------------------
const options: CreateConnectionParameters = {
const options: CreateConnectionOptions = {
driver: "mysql",
connectionOptions: {
host: "192.168.99.100",