typeorm 1.0.0-beta.1 → 1.0.0-beta.2

package/browser/query-builder/InsertQueryBuilder.d.ts

@@ -21,12 +21,14 @@ export declare class InsertQueryBuilder<Entity extends ObjectLiteral> extends Qu
     execute(): Promise<InsertResult>;
     /**
      * Specifies INTO which entity's table insertion will be executed.
+     *
      * @param entityTarget
      * @param columns
      */
     into<T extends ObjectLiteral>(entityTarget: EntityTarget<T>, columns?: string[]): InsertQueryBuilder<T>;
     /**
      * Values needs to be inserted into table.
+     *
      * @param values
      */
     values(values: QueryDeepPartialEntity<Entity> | QueryDeepPartialEntity<Entity>[]): this;
@@ -72,17 +74,20 @@ export declare class InsertQueryBuilder<Entity extends ObjectLiteral> extends Qu
      * Indicates if entity must be updated after insertion operations.
      * This may produce extra query or use RETURNING / OUTPUT statement (depend on database).
      * Enabled by default.
+     *
      * @param enabled
      */
     updateEntity(enabled: boolean): this;
     /**
      * Adds additional ignore statement supported in databases.
+     *
      * @param statement
      */
     orIgnore(statement?: string | boolean): this;
     /**
      * Adds an "upsert" clause to the insert query — when a row with the same
      * conflict target already exists the listed columns are updated instead.
+     *
      * @param overwrite - Column names to overwrite on conflict.
      * @param conflictTarget - Column name(s) or constraint name used to detect
      *   conflicts. When an array is given the columns form a composite key;
@@ -113,6 +118,7 @@ export declare class InsertQueryBuilder<Entity extends ObjectLiteral> extends Qu
     protected getValueSets(): ObjectLiteral[];
     /**
      * Checks if column is an auto-generated primary key, but the current insertion specifies a value for it.
+     *
      * @param column
      */
     protected isOverridingAutoIncrementBehavior(column: ColumnMetadata): boolean;
@@ -122,16 +128,19 @@ export declare class InsertQueryBuilder<Entity extends ObjectLiteral> extends Qu
     protected createMergeExpression(): string;
     /**
      * Creates list of values needs to be inserted in the VALUES expression.
+     *
      * @param mergeSourceAlias
      */
     protected createMergeIntoSourceExpression(mergeSourceAlias: string): string;
     /**
      * Creates list of values needs to be inserted in the VALUES expression.
+     *
      * @param mergeSourceAlias
      */
     protected createMergeIntoInsertValuesExpression(mergeSourceAlias: string): string;
     /**
      * Create upsert search condition expression.
+     *
      * @param mainTableOrAlias
      */
     protected createUpsertConditionExpression(mainTableOrAlias: string): string;

package/browser/query-builder/InsertQueryBuilder.js

@@ -160,6 +160,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     // -------------------------------------------------------------------------
     /**
      * Specifies INTO which entity's table insertion will be executed.
+     *
      * @param entityTarget
      * @param columns
      */
@@ -169,11 +170,12 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             : entityTarget;
         const mainAlias = this.createFromAlias(entityTarget);
         this.expressionMap.setMainAlias(mainAlias);
-        this.expressionMap.insertColumns = columns || [];
+        this.expressionMap.insertColumns = columns ?? [];
         return this;
     }
     /**
      * Values needs to be inserted into table.
+     *
      * @param values
      */
     values(values) {
@@ -183,6 +185,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Specifies a SELECT query to use as the source of values for the INSERT.
      * This creates an INSERT INTO ... SELECT FROM statement.
+     *
      * @param queryBuilderOrFactory
      */
     valuesFromSelect(queryBuilderOrFactory) {
@@ -200,6 +203,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Optional returning/output clause.
+     *
      * @param output
      */
     output(output) {
@@ -207,6 +211,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Optional returning/output clause.
+     *
      * @param returning
      */
     returning(returning) {
@@ -221,6 +226,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Indicates if entity must be updated after insertion operations.
      * This may produce extra query or use RETURNING / OUTPUT statement (depend on database).
      * Enabled by default.
+     *
      * @param enabled
      */
     updateEntity(enabled) {
@@ -229,6 +235,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Adds additional ignore statement supported in databases.
+     *
      * @param statement
      */
     orIgnore(statement = true) {
@@ -238,6 +245,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Adds an "upsert" clause to the insert query — when a row with the same
      * conflict target already exists the listed columns are updated instead.
+     *
      * @param overwrite - Column names to overwrite on conflict.
      * @param conflictTarget - Column name(s) or constraint name used to detect
      *   conflicts. When an array is given the columns form a composite key;
@@ -672,6 +680,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Checks if column is an auto-generated primary key, but the current insertion specifies a value for it.
+     *
      * @param column
      */
     isOverridingAutoIncrementBehavior(column) {
@@ -835,6 +844,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Creates list of values needs to be inserted in the VALUES expression.
+     *
      * @param mergeSourceAlias
      */
     createMergeIntoSourceExpression(mergeSourceAlias) {
@@ -971,6 +981,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Creates list of values needs to be inserted in the VALUES expression.
+     *
      * @param mergeSourceAlias
      */
     createMergeIntoInsertValuesExpression(mergeSourceAlias) {
@@ -1009,6 +1020,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Create upsert search condition expression.
+     *
      * @param mainTableOrAlias
      */
     createUpsertConditionExpression(mainTableOrAlias) {
@@ -1064,12 +1076,6 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         let expression = "";
         // extract real value from the entity
         let value = column.getEntityValue(valueSet);
-        // if column is relational and value is an object then get real referenced column value from this object
-        // for example column value is { question: { id: 1 } }, value will be equal to { id: 1 }
-        // and we extract "1" from this object
-        /*if (column.referencedColumn && value instanceof Object && !(typeof value === "function")) { // todo: check if we still need it since getEntityValue already has similar code
-            value = column.referencedColumn.getEntityValue(value);
-        }*/
         if (!(typeof value === "function")) {
             // make sure our value is normalized by a driver
             value = this.dataSource.driver.preparePersistentValue(value, column);
@@ -1184,7 +1190,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         "::STGeomFromText(" +
                         paramName +
                         ", " +
-                        (column.srid || "0") +
+                        (column.srid ?? "0") +
                         ")";
             }
             else if (DriverUtils_1.DriverUtils.isSQLiteFamily(this.dataSource.driver)) {