Comparing version 0.1.10 to 0.1.11
{ | ||
"name": "remult", | ||
"version": "0.1.10", | ||
"version": "0.1.11", | ||
"description": "remult core lib", | ||
@@ -5,0 +5,0 @@ "homepage": "https://remult.github.io/", |
@@ -27,6 +27,6 @@ import { SqlDatabase, SqlCommand, SqlImplementation, EntityMetadata, FieldMetadata } from '../'; | ||
verifyStructureOfAllEntities(): Promise<void>; | ||
createIfNotExist(e: EntityMetadata, s: EntitySqlMetadata): Promise<void>; | ||
createIfNotExist(e: EntityMetadata): Promise<void>; | ||
private addColumnSqlSyntax; | ||
addColumnIfNotExist<T extends EntityMetadata>(e: T, c: ((e: T) => FieldMetadata), s: EntitySqlMetadata): Promise<void>; | ||
verifyAllColumns<T extends EntityMetadata>(e: T, s: EntitySqlMetadata): Promise<void>; | ||
verifyAllColumns<T extends EntityMetadata>(e: T): Promise<void>; | ||
additionalWhere: string; | ||
@@ -33,0 +33,0 @@ constructor(pool: SqlDatabase, schema?: string); |
@@ -158,6 +158,6 @@ "use strict"; | ||
if (!(sql.dbName.toLowerCase().indexOf('from ') < 0)) return [3 /*break*/, 7]; | ||
return [4 /*yield*/, this.createIfNotExist(metadata, sql)]; | ||
return [4 /*yield*/, this.createIfNotExist(metadata)]; | ||
case 5: | ||
_b.sent(); | ||
return [4 /*yield*/, this.verifyAllColumns(metadata, sql)]; | ||
return [4 /*yield*/, this.verifyAllColumns(metadata)]; | ||
case 6: | ||
@@ -190,5 +190,5 @@ _b.sent(); | ||
}; | ||
PostgresSchemaBuilder.prototype.createIfNotExist = function (e, s) { | ||
PostgresSchemaBuilder.prototype.createIfNotExist = function (e) { | ||
return tslib_1.__awaiter(this, void 0, void 0, function () { | ||
var c; | ||
var c, s; | ||
var _this = this; | ||
@@ -199,2 +199,5 @@ return tslib_1.__generator(this, function (_a) { | ||
c = this.pool.createCommand(); | ||
return [4 /*yield*/, e.getEntitySqlMetadata()]; | ||
case 1: | ||
s = _a.sent(); | ||
return [4 /*yield*/, c.execute("select 1 from information_Schema.tables where table_name=" + c.addParameterAndReturnSqlToken(s.dbName.toLowerCase()) + this.additionalWhere).then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { | ||
@@ -242,3 +245,3 @@ var result, _a, _b, x, sql; | ||
}); })]; | ||
case 1: | ||
case 2: | ||
_a.sent(); | ||
@@ -309,5 +312,5 @@ return [2 /*return*/]; | ||
}; | ||
PostgresSchemaBuilder.prototype.verifyAllColumns = function (e, s) { | ||
PostgresSchemaBuilder.prototype.verifyAllColumns = function (e) { | ||
return tslib_1.__awaiter(this, void 0, void 0, function () { | ||
var cmd, cols, _a, _b, col, sql, e_3_1, err_4; | ||
var cmd, s, cols, _a, _b, col, sql, e_3_1, err_4; | ||
var e_3, _c; | ||
@@ -317,32 +320,35 @@ return tslib_1.__generator(this, function (_d) { | ||
case 0: | ||
_d.trys.push([0, 10, , 11]); | ||
_d.trys.push([0, 11, , 12]); | ||
cmd = this.pool.createCommand(); | ||
return [4 /*yield*/, e.getEntitySqlMetadata()]; | ||
case 1: | ||
s = _d.sent(); | ||
return [4 /*yield*/, cmd.execute("select column_name \n FROM information_schema.columns \n WHERE table_name=" + cmd.addParameterAndReturnSqlToken(s.dbName.toLocaleLowerCase()) + " " + this.additionalWhere)]; | ||
case 1: | ||
case 2: | ||
cols = (_d.sent()).rows.map(function (x) { return x.column_name; }); | ||
_d.label = 2; | ||
case 2: | ||
_d.trys.push([2, 7, 8, 9]); | ||
_a = tslib_1.__values(e.fields), _b = _a.next(); | ||
_d.label = 3; | ||
case 3: | ||
if (!!_b.done) return [3 /*break*/, 6]; | ||
_d.trys.push([3, 8, 9, 10]); | ||
_a = tslib_1.__values(e.fields), _b = _a.next(); | ||
_d.label = 4; | ||
case 4: | ||
if (!!_b.done) return [3 /*break*/, 7]; | ||
col = _b.value; | ||
if (!(!col.dbReadOnly && !col.isServerExpression)) return [3 /*break*/, 5]; | ||
if (!!cols.includes(s.getFieldSqlName(col).toLocaleLowerCase())) return [3 /*break*/, 5]; | ||
if (!(!col.dbReadOnly && !col.isServerExpression)) return [3 /*break*/, 6]; | ||
if (!!cols.includes(s.getFieldSqlName(col).toLocaleLowerCase())) return [3 /*break*/, 6]; | ||
sql = "alter table " + s.dbName + " add column " + this.addColumnSqlSyntax(col, s.getFieldSqlName(col)); | ||
console.log(sql); | ||
return [4 /*yield*/, this.pool.execute(sql)]; | ||
case 4: | ||
case 5: | ||
_d.sent(); | ||
_d.label = 5; | ||
case 5: | ||
_d.label = 6; | ||
case 6: | ||
_b = _a.next(); | ||
return [3 /*break*/, 3]; | ||
case 6: return [3 /*break*/, 9]; | ||
case 7: | ||
return [3 /*break*/, 4]; | ||
case 7: return [3 /*break*/, 10]; | ||
case 8: | ||
e_3_1 = _d.sent(); | ||
e_3 = { error: e_3_1 }; | ||
return [3 /*break*/, 9]; | ||
case 8: | ||
return [3 /*break*/, 10]; | ||
case 9: | ||
try { | ||
@@ -353,8 +359,8 @@ if (_b && !_b.done && (_c = _a.return)) _c.call(_a); | ||
return [7 /*endfinally*/]; | ||
case 9: return [3 /*break*/, 11]; | ||
case 10: | ||
case 10: return [3 /*break*/, 12]; | ||
case 11: | ||
err_4 = _d.sent(); | ||
console.log(err_4); | ||
return [3 /*break*/, 11]; | ||
case 11: return [2 /*return*/]; | ||
return [3 /*break*/, 12]; | ||
case 12: return [2 /*return*/]; | ||
} | ||
@@ -379,6 +385,6 @@ }); | ||
s = _a.sent(); | ||
return [4 /*yield*/, new PostgresSchemaBuilder(sql).createIfNotExist(e.metadata, s)]; | ||
return [4 /*yield*/, new PostgresSchemaBuilder(sql).createIfNotExist(e.metadata)]; | ||
case 2: | ||
_a.sent(); | ||
return [4 /*yield*/, new PostgresSchemaBuilder(sql).verifyAllColumns(e.metadata, s)]; | ||
return [4 /*yield*/, new PostgresSchemaBuilder(sql).verifyAllColumns(e.metadata)]; | ||
case 3: | ||
@@ -385,0 +391,0 @@ _a.sent(); |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
560349
8427