renamed metadata args

This commit is contained in:
Umed Khudoiberdiev 2016-05-25 00:05:45 +05:00
parent 290204f573
commit fc7def3934
11 changed files with 51 additions and 44 deletions

View File

@ -1,5 +1,10 @@
# TypeORM
ColumnRecord
ColumnLayout
ColumnAttribute
ColumnProperty
ColumnParameter
ColumnArgument
> Note: docs are not always up to date because orm is in active development.
> Samples are more up to date, try to find your questions there.
> Otherwise create a github issue.

View File

@ -6,7 +6,7 @@ import {ConnectionOptions} from "./connection/ConnectionOptions";
import {ConnectionManager} from "./connection-manager/ConnectionManager";
import {Connection} from "./connection/Connection";
import {MysqlDriver} from "./driver/MysqlDriver";
import {MetadataArgsStorage} from "./metadata-storage/MetadataStorage";
import {MetadataArgsStorage} from "./metadata-storage/MetadataArgsStorage";
import {CreateConnectionOptions} from "./connection-manager/CreateConnectionOptions";
// -------------------------------------------------------------------------

View File

@ -49,13 +49,13 @@ export class CompositeIndexMetadata extends TargetMetadata {
// Constructor
// ---------------------------------------------------------------------
constructor(metadata: CompositeIndexMetadataArgs) {
super(metadata.target);
this._columns = metadata.columns;
if (metadata.name)
this._name = metadata.name;
if (metadata.options && metadata.options.unique)
this.isUnique = metadata.options.unique;
constructor(args: CompositeIndexMetadataArgs) {
super(args.target);
this._columns = args.columns;
if (args.name)
this._name = args.name;
if (args.options && args.options.unique)
this.isUnique = args.options.unique;
}
// ---------------------------------------------------------------------

View File

@ -20,9 +20,9 @@ export class EntityListenerMetadata extends PropertyMetadata {
// Constructor
// ---------------------------------------------------------------------
constructor(metadata: EntityListenerMetadataArgs) {
super(metadata.target, metadata.propertyName);
this.type = metadata.type;
constructor(args: EntityListenerMetadataArgs) {
super(args.target, args.propertyName);
this.type = args.type;
}

View File

@ -1,12 +1,13 @@
import {TargetMetadata} from "./TargetMetadata";
import {EventSubscriberMetadataArgs} from "./args/EventSubscriberMetadataArgs";
/**
* Contains metadata information about ORM event subscribers.
*/
export class EventSubscriberMetadata extends TargetMetadata {
constructor(metadata: EventSubscriberMetadata) {
super(metadata.target);
constructor(args: EventSubscriberMetadataArgs) {
super(args.target);
}
}

View File

@ -4,6 +4,7 @@ import {IndexMetadataArgs} from "./args/IndexMetadataArgs";
/**
* This metadata interface contains all information about some index on a field.
* @deprecated
*/
export class IndexMetadata extends PropertyMetadata {
@ -29,10 +30,10 @@ export class IndexMetadata extends PropertyMetadata {
// Constructor
// ---------------------------------------------------------------------
constructor(metadata: IndexMetadataArgs) {
super(metadata.target, metadata.propertyName);
constructor(args: IndexMetadataArgs) {
super(args.target, args.propertyName);
if (metadata.name)
if (args.name)
this.name = name; // todo: if there is no name, then generate it (using naming strategy?)
}

View File

@ -36,13 +36,13 @@ export class JoinColumnMetadata extends PropertyMetadata {
// Constructor
// ---------------------------------------------------------------------
constructor(metadata: JoinColumnMetadataArgs) {
super(metadata.target, metadata.propertyName);
constructor(args: JoinColumnMetadataArgs) {
super(args.target, args.propertyName);
if (metadata.options.name)
this._name = metadata.options.name;
if (metadata.options.referencedColumnName)
this._referencedColumnName = metadata.options.referencedColumnName;
if (args.options.name)
this._name = args.options.name;
if (args.options.referencedColumnName)
this._referencedColumnName = args.options.referencedColumnName;
}
// ---------------------------------------------------------------------

View File

@ -49,24 +49,24 @@ export class JoinTableMetadata extends PropertyMetadata {
// Constructor
// ---------------------------------------------------------------------
constructor(metadata: JoinTableMetadataArgs) {
super(metadata.target, metadata.propertyName);
constructor(args: JoinTableMetadataArgs) {
super(args.target, args.propertyName);
if (metadata.options.name)
this._name = metadata.options.name;
if (args.options.name)
this._name = args.options.name;
if (metadata.options.joinColumn) {
if (metadata.options.joinColumn.name)
this._joinColumnName = metadata.options.joinColumn.name;
if (metadata.options.joinColumn.referencedColumnName)
this._joinColumnReferencedColumnName = metadata.options.joinColumn.referencedColumnName;
if (args.options.joinColumn) {
if (args.options.joinColumn.name)
this._joinColumnName = args.options.joinColumn.name;
if (args.options.joinColumn.referencedColumnName)
this._joinColumnReferencedColumnName = args.options.joinColumn.referencedColumnName;
}
if (metadata.options.inverseJoinColumn) {
if (metadata.options.inverseJoinColumn.name)
this._inverseJoinColumnName = metadata.options.inverseJoinColumn.name;
if (metadata.options.inverseJoinColumn.referencedColumnName)
this._inverseJoinColumnReferencedColumnName = metadata.options.inverseJoinColumn.referencedColumnName;
if (args.options.inverseJoinColumn) {
if (args.options.inverseJoinColumn.name)
this._inverseJoinColumnName = args.options.inverseJoinColumn.name;
if (args.options.inverseJoinColumn.referencedColumnName)
this._inverseJoinColumnReferencedColumnName = args.options.inverseJoinColumn.referencedColumnName;
}
}

View File

@ -19,9 +19,9 @@ export class NamingStrategyMetadata extends TargetMetadata {
// Constructor
// ---------------------------------------------------------------------
constructor(metadata: NamingStrategyMetadataArgs) {
super(metadata.target);
this.name = metadata.name;
constructor(args: NamingStrategyMetadataArgs) {
super(args.target);
this.name = args.name;
}
}

View File

@ -40,17 +40,17 @@ export class TableMetadata extends TargetMetadata {
// ---------------------------------------------------------------------
constructor(target: Function|undefined, name: string, type: TableType);
constructor(metadata: TableMetadataArgs);
constructor(metadataOrTarget: TableMetadataArgs|Function|undefined, name?: string, type?: TableType) {
constructor(args: TableMetadataArgs);
constructor(argsOrTarget: TableMetadataArgs|Function|undefined, name?: string, type?: TableType) {
if (arguments.length === 1) {
const metadata = metadataOrTarget as TableMetadataArgs;
const metadata = argsOrTarget as TableMetadataArgs;
super(metadata.target);
this.tableType = metadata.type;
if (metadata.name)
this._name = metadata.name;
} else {
super(metadataOrTarget as Function);
super(argsOrTarget as Function);
if (name)
this._name = name;
if (type)