typeorm 0.3.6-dev.4687be8 → 0.3.6-dev.49cbe23

package/driver/cockroachdb/CockroachQueryRunner.js

@@ -383,6 +383,30 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 downQueries.push(this.dropIndexSql(table, index));
             });
         }
+        // if table have column with generated type, we must add the expression to the metadata table
+        const generatedColumns = table.columns.filter((column) => column.generatedType && column.asExpression);
+        for (const column of generatedColumns) {
+            const currentSchema = await this.getCurrentSchema();
+            let { schema } = this.driver.parseTableName(table);
+            if (!schema) {
+                schema = currentSchema;
+            }
+            const insertQuery = this.insertTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            upQueries.push(insertQuery);
+            downQueries.push(deleteQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -420,6 +444,30 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(new Query_1.Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
             downQueries.push(new Query_1.Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
         });
+        // if table had columns with generated type, we must remove the expression from the metadata table
+        const generatedColumns = table.columns.filter((column) => column.generatedType && column.asExpression);
+        for (const column of generatedColumns) {
+            const currentSchema = await this.getCurrentSchema();
+            let { schema } = this.driver.parseTableName(table);
+            if (!schema) {
+                schema = currentSchema;
+            }
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            const insertQuery = this.insertTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            upQueries.push(deleteQuery);
+            downQueries.push(insertQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -547,6 +595,28 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
         }
+        if (column.generatedType && column.asExpression) {
+            const currentSchema = await this.getCurrentSchema();
+            let { schema } = this.driver.parseTableName(table);
+            if (!schema) {
+                schema = currentSchema;
+            }
+            const insertQuery = this.insertTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            upQueries.push(insertQuery);
+            downQueries.push(deleteQuery);
+        }
         // create column index
         const columnIndex = clonedTable.indices.find((index) => index.columnNames.length === 1 &&
             index.columnNames[0] === column.name);
@@ -631,7 +701,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (!oldColumn)
             throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
         if (oldColumn.type !== newColumn.type ||
-            oldColumn.length !== newColumn.length) {
+            oldColumn.length !== newColumn.length ||
+            oldColumn.generatedType !== newColumn.generatedType ||
+            oldColumn.asExpression !== newColumn.asExpression) {
             // To avoid data conversion, we just recreate column
             await this.dropColumn(table, oldColumn);
             await this.addColumn(table, newColumn);
@@ -904,6 +976,28 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(new Query_1.Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
             downQueries.push(new Query_1.Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
         }
+        if (column.generatedType && column.asExpression) {
+            const currentSchema = await this.getCurrentSchema();
+            let { schema } = this.driver.parseTableName(table);
+            if (!schema) {
+                schema = currentSchema;
+            }
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            const insertQuery = this.insertTypeormMetadataSql({
+                schema: schema,
+                table: table.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            upQueries.push(deleteQuery);
+            downQueries.push(insertQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.removeColumn(column);
         this.replaceCachedTable(table, clonedTable);
@@ -1338,12 +1432,14 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             return `("table_schema" = '${table_schema}' AND "table_name" = '${table_name}')`;
         })
             .join(" OR ");
-        const columnsSql = `
-            SELECT
-                *,
-                pg_catalog.col_description(('"' || table_catalog || '"."' || table_schema || '"."' || table_name || '"')::regclass::oid, ordinal_position) as description
-            FROM "information_schema"."columns"
-            WHERE "is_hidden" = 'NO' AND ` + columnsCondiiton;
+        const columnsSql = `SELECT "columns".*, "attr"."attgenerated" as "generated_type", ` +
+            `pg_catalog.col_description(('"' || table_catalog || '"."' || table_schema || '"."' || table_name || '"')::regclass::oid, ordinal_position) as description ` +
+            `FROM "information_schema"."columns" ` +
+            `LEFT JOIN "pg_class" AS "cls" ON "cls"."relname" = "table_name" ` +
+            `LEFT JOIN "pg_namespace" AS "ns" ON "ns"."oid" = "cls"."relnamespace" AND "ns"."nspname" = "table_schema" ` +
+            `LEFT JOIN "pg_attribute" AS "attr" ON "attr"."attrelid" = "cls"."oid" AND "attr"."attname" = "column_name" AND "attr"."attnum" = "ordinal_position" ` +
+            `WHERE "is_hidden" = 'NO' AND ` +
+            columnsCondiiton;
         const constraintsCondition = dbTables
             .map(({ table_name, table_schema }) => {
             return `("ns"."nspname" = '${table_schema}' AND "t"."relname" = '${table_name}')`;
@@ -1512,6 +1608,27 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             tableColumn.default.replace(/^(-?[\d\.]+)$/, "($1)");
                     }
                 }
+                if (dbColumn["is_generated"] === "YES" &&
+                    dbColumn["generation_expression"]) {
+                    tableColumn.generatedType =
+                        dbColumn["generated_type"] === "s"
+                            ? "STORED"
+                            : "VIRTUAL";
+                    // We cannot relay on information_schema.columns.generation_expression, because it is formatted different.
+                    const asExpressionQuery = await this.selectTypeormMetadataSql({
+                        schema: dbTable["table_schema"],
+                        table: dbTable["table_name"],
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: tableColumn.name,
+                    });
+                    const results = await this.query(asExpressionQuery.query, asExpressionQuery.parameters);
+                    if (results[0] && results[0].value) {
+                        tableColumn.asExpression = results[0].value;
+                    }
+                    else {
+                        tableColumn.asExpression = "";
+                    }
+                }
                 tableColumn.comment =
                     dbColumn["description"] == null
                         ? undefined
@@ -1904,10 +2021,15 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         if (!column.isGenerated)
             c += " " + this.connection.driver.createFullType(column);
-        if (column.charset)
-            c += ' CHARACTER SET "' + column.charset + '"';
-        if (column.collation)
-            c += ' COLLATE "' + column.collation + '"';
+        if (column.asExpression) {
+            c += ` AS (${column.asExpression}) ${column.generatedType ? column.generatedType : "VIRTUAL"}`;
+        }
+        else {
+            if (column.charset)
+                c += ' CHARACTER SET "' + column.charset + '"';
+            if (column.collation)
+                c += ' COLLATE "' + column.collation + '"';
+        }
         if (!column.isNullable)
             c += " NOT NULL";
         if (!column.isGenerated &&