remult 0.22.6-exp.1 → 0.22.6-exp.2

package/esm/remult-duckdb.js

@@ -33,13 +33,13 @@ export class DuckDBDataProvider extends SqliteCoreDataProvider {
             .join(',')})`;
         sql +=
             'create table if not exists ' + e.$entityName + ' (' + result + '\r\n)';
-        return sql;
+        return [sql];
     }
     addColumnSqlSyntax(x, dbName, isAlterColumn) {
         let result = dbName;
         var allowNull = x.allowNull;
-        if (allowNull && isAlterColumn) {
-            allowNull = false;
+        if (!allowNull && isAlterColumn) {
+            allowNull = true;
             console.log('DuckDB does not support altering columns to allow null on existing tables');
         }
         if (x.valueType == Number) {
@@ -49,7 +49,7 @@ export class DuckDBDataProvider extends SqliteCoreDataProvider {
                 result +=
                     ' ' +
                         x.valueConverter.fieldTypeInDb +
-                        (x.allowNull || isAlterColumn ? '' : ' default 0 not null');
+                        (allowNull ? '' : ' default 0 not null');
         }
         else if (x.valueType == Date) {
             if (!x.valueConverter.fieldTypeInDb)
@@ -61,20 +61,15 @@ export class DuckDBDataProvider extends SqliteCoreDataProvider {
                 result += ' ' + x.valueConverter.fieldTypeInDb;
         }
         else if (x.valueType == Boolean)
-            result +=
-                ' boolean' +
-                    (x.allowNull || isAlterColumn ? '' : ' default false not null');
+            result += ' boolean' + (allowNull ? '' : ' default false not null');
         else if (x.valueConverter.fieldTypeInDb) {
             result += ' ' + x.valueConverter.fieldTypeInDb;
-            if (!(x.allowNull || isAlterColumn) &&
-                x.valueConverter.fieldTypeInDb == 'integer') {
+            if (!allowNull && x.valueConverter.fieldTypeInDb == 'integer') {
                 result += ' default 0 not null';
             }
         }
         else
-            result +=
-                ' varchar' +
-                    (x.allowNull || isAlterColumn ? '' : " default '' not null");
+            result += ' varchar' + (allowNull ? '' : " default '' not null");
         return result;
     }
 }

package/esm/remult-sqlite-core.js

@@ -21,7 +21,7 @@ export class SqliteCoreDataProvider {
         let self = this;
         return {
             createTable: async (entity) => {
-                builder.addSql(await self.getCreateTableSql(entity));
+                await (await self.getCreateTableSql(entity)).map(builder.addSql);
             },
             addColumn: async (entity, field) => {
                 let e = await dbNamesOf(entity, this.wrapIdentifier);
@@ -45,6 +45,27 @@ export class SqliteCoreDataProvider {
     async ensureSchema(entities) {
         for (const entity of entities) {
             await this.createTableIfNotExist(entity);
+            await this.verifyAllColumns(entity);
+        }
+    }
+    async verifyAllColumns(entity) {
+        try {
+            let cmd = this.createCommand();
+            let e = await dbNamesOf(entity, this.wrapIdentifier);
+            let cols = (await cmd.execute(`PRAGMA table_info(${e.$entityName})`)).rows.map((x) => this.wrapIdentifier(x.name.toLocaleLowerCase()));
+            for (const col of entity.fields) {
+                if (!shouldNotCreateField(col, e)) {
+                    let colName = e.$dbNameOf(col).toLocaleLowerCase();
+                    if (!cols.includes(colName)) {
+                        let sql = `ALTER table ${e.$entityName} ` +
+                            `add column ${this.addColumnSqlSyntax(col, e.$dbNameOf(col), true)}`;
+                        await this.createCommand().execute(sql);
+                    }
+                }
+            }
+        }
+        catch (err) {
+            console.error(err);
         }
     }
     async dropTable(entity) {
@@ -73,9 +94,9 @@ export class SqliteCoreDataProvider {
     }
     async createTableIfNotExist(entity) {
         let sql = await this.getCreateTableSql(entity);
-        if (SqlDatabase.LogToConsole)
-            console.log(sql);
-        await this.createCommand().execute(sql);
+        for (const element of sql) {
+            await this.createCommand().execute(element);
+        }
     }
     supportsJsonColumnType;
     async getCreateTableSql(entity) {
@@ -99,7 +120,14 @@ export class SqliteCoreDataProvider {
                 }
             }
         }
-        let sql = 'create table if not exists ' + e.$entityName + ' (' + result + '\r\n)';
+        let sql = [
+            'create table if not exists ' + e.$entityName + ' (' + result + '\r\n)',
+        ];
+        if (entity.idMetadata.fields.length > 1) {
+            sql.push(`create unique index ${this.wrapIdentifier(entity.dbName + '_primary_key')} on ${e.$entityName}  (${entity.idMetadata.fields
+                .map((x) => e.$dbNameOf(x))
+                .join(',')})`);
+        }
         return sql;
     }
     wrapIdentifier(name) {