fixed bug with query builder join without on condition + fixed errors…

… of missing deps
typeorm · Jun 23, 2016 · f5999cd · f5999cd
1 parent a7e5236
commit f5999cd
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typeorm",
   "private": true,
-  "version": "0.0.2-alpha.42",
+  "version": "0.0.2-alpha.43",
   "description": "Data-mapper ORM for Typescript",
   "license": "Apache-2.0",
   "readmeFilename": "README.md",

diff --git a/src/persistment/EntityPersistOperationsBuilder.ts b/src/persistment/EntityPersistOperationsBuilder.ts
@@ -33,7 +33,6 @@ import {JunctionRemoveOperation} from "./operation/JunctionRemoveOperation";
  * if relation has "insert" it can insert a new entity
  * if relation has "update" it can only update related entity
  * if relation has "remove" it can only remove related entity
- * @internal
  */
 export class EntityPersistOperationBuilder {
 

diff --git a/src/persistment/PersistOperationExecutor.ts b/src/persistment/PersistOperationExecutor.ts
@@ -14,7 +14,6 @@ import {RelationMetadata} from "../metadata/RelationMetadata";
 
 /**
  * Executes PersistOperation in the given connection.
- * @internal
  */
 export class PersistOperationExecutor {
 

diff --git a/src/persistment/operation/InsertOperation.ts b/src/persistment/operation/InsertOperation.ts
@@ -1,5 +1,4 @@
 /**
- * @internal
  */
 export class InsertOperation {
 

diff --git a/src/persistment/operation/JunctionInsertOperation.ts b/src/persistment/operation/JunctionInsertOperation.ts
@@ -1,7 +1,6 @@
 import {EntityMetadata} from "../../metadata/EntityMetadata";
 
 /**
- * @internal
  */
 export class JunctionInsertOperation {
     constructor(public metadata: EntityMetadata,

diff --git a/src/persistment/operation/JunctionRemoveOperation.ts b/src/persistment/operation/JunctionRemoveOperation.ts
@@ -1,7 +1,6 @@
 import {EntityMetadata} from "../../metadata/EntityMetadata";
 
 /**
- * @internal
  */
 export class JunctionRemoveOperation {
     constructor(public metadata: EntityMetadata,

diff --git a/src/persistment/operation/PersistOperation.ts b/src/persistment/operation/PersistOperation.ts
@@ -7,7 +7,6 @@ import {UpdateByRelationOperation} from "./UpdateByRelationOperation";
 import {UpdateByInverseSideOperation} from "./UpdateByInverseSideOperation";
 
 /**
- * @internal
  */
 export interface EntityWithId {
     id: any;
@@ -16,7 +15,6 @@ export interface EntityWithId {
 }
 
 /**
- * @internal
  */
 export class PersistOperation {
 

diff --git a/src/persistment/operation/RemoveOperation.ts b/src/persistment/operation/RemoveOperation.ts
@@ -2,7 +2,6 @@ import {RelationMetadata} from "../../metadata/RelationMetadata";
 import {EntityMetadata} from "../../metadata/EntityMetadata";
 
 /**
- * @internal
  */
 export class RemoveOperation {
     constructor(public target: Function|string, // todo: probably should be metadata here

diff --git a/src/persistment/operation/UpdateByInverseSideOperation.ts b/src/persistment/operation/UpdateByInverseSideOperation.ts
@@ -1,7 +1,6 @@
 import {RelationMetadata} from "../../metadata/RelationMetadata";
 
 /**
- * @internal
  */
 export class UpdateByInverseSideOperation {
     constructor(public entityTarget: Function|string, // todo: probably must be entity metadata here?

diff --git a/src/persistment/operation/UpdateByRelationOperation.ts b/src/persistment/operation/UpdateByRelationOperation.ts
@@ -2,7 +2,6 @@ import {InsertOperation} from "./InsertOperation";
 import {RelationMetadata} from "../../metadata/RelationMetadata";
 
 /**
- * @internal
  */
 export class UpdateByRelationOperation {
     constructor(public entityTarget: Function|string, // todo: probably must be entity metadata here?

diff --git a/src/persistment/operation/UpdateOperation.ts b/src/persistment/operation/UpdateOperation.ts
@@ -2,7 +2,6 @@ import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 import {RelationMetadata} from "../../metadata/RelationMetadata";
 
 /**
- * @internal
  */
 export class UpdateOperation {
     constructor(public target: Function|string,

diff --git a/src/query-builder/QueryBuilder.ts b/src/query-builder/QueryBuilder.ts
@@ -892,7 +892,7 @@ export class QueryBuilder<Entity> {
 
             const parentAlias = join.alias.parentAliasName;
             if (!parentAlias) {
-                return " " + joinType + " JOIN " + joinTableName + " " + join.alias.name + " " + join.conditionType + " " + join.condition;
+                return " " + joinType + " JOIN " + joinTableName + " " + join.alias.name + " " + (join.condition ? ( join.conditionType + " " + join.condition ) : "");
             }
 
             const foundAlias = this.aliasMap.findAliasByName(parentAlias);

diff --git a/src/query-builder/alias/Alias.ts b/src/query-builder/alias/Alias.ts
@@ -1,7 +1,6 @@
 import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 
 /**
- * @internal
  */
 export class Alias {
     isMain: boolean;

diff --git a/src/query-builder/transformer/PlainObjectToDatabaseEntityTransformer.ts b/src/query-builder/transformer/PlainObjectToDatabaseEntityTransformer.ts
@@ -13,8 +13,6 @@ interface LoadMap {
 /**
  * Transforms plain old javascript object
  * Entity is constructed based on its entity metadata.
- *
- * @internal
  */
 export class PlainObjectToDatabaseEntityTransformer<Entity extends ObjectLiteral> {
 

diff --git a/src/query-builder/transformer/PlainObjectToNewEntityTransformer.ts b/src/query-builder/transformer/PlainObjectToNewEntityTransformer.ts
@@ -4,8 +4,6 @@ import {ObjectLiteral} from "../../common/ObjectLiteral";
 /**
  * Transforms plain old javascript object
  * Entity is constructed based on its entity metadata.
- *
- * @internal
  */
 export class PlainObjectToNewEntityTransformer {