doix-db 1.0.69 → 1.0.71

package/README.md

@@ -9,4 +9,8 @@
 * [DbMigrationPlan](https://github.com/do-/node-doix-db/wiki/DbMigrationPlan) — a `DbModel` based deployment automation tool;
 * [DbLang](https://github.com/do-/node-doix-db/wiki/DbLang) — a set of SQL generating functions for miscellaneous application tasks.
 
-* More information is available at https://github.com/do-/node-doix-db/wiki
+Has backends for 
+* [PostgreSQL](https://github.com/do-/node-doix-db-postgresql),
+* [ClickHouse](https://github.com/do-/node-doix-db-clickhouse).
+
+More information is available at https://github.com/do-/node-doix-db/wiki

package/lib/DbLang.js

@@ -456,7 +456,9 @@ class DbLang {
 
 	genColumnDefault (column) {
 	
-		const def = column.default; if (def === 'NULL') return 'NULL'
+		const def = column.default; 
+		
+		if (def === 'NULL' || def.indexOf ('(') !== -1) return def
 
 		return this.quoteLiteral (def)
 

package/lib/migration/DbMigrationPlan.js

@@ -56,11 +56,41 @@ class DbMigrationPlan extends EventEmitter {
 			action, column)
 		)
 
-	}		
+		{
+
+			const action = 'drop-column'
+
+			this.on (action, (relation, column) => add (
+				this.asIs.get (relation.name).toDo, 
+				action, column)
+			)
+
+		}
+
+	}
 
 	compareRelation (asIs, toBe) {
 
-		const {lang} = this, {columns} = toBe, existingColumns = asIs.columns
+		const {lang} = this, {columns, columnsToDrop} = toBe, existingColumns = asIs.columns
+
+		for (const name of columnsToDrop) {
+
+			if (name in existingColumns) {
+
+				this.emit ('drop-column', asIs, name)
+
+				delete existingColumns [name]
+
+			}
+			else {
+
+				this.emit ('no-column-to-drop', asIs, name)
+
+			}
+
+		}
+			
+			
 
 		for (const [name, column] of Object.entries (columns)) {
 

package/lib/model/DbRelation.js

@@ -14,17 +14,25 @@ class DbRelation extends DbObject {
 
 		const {columns} = this; if (typeof columns !== 'object') throw Error (`columns must be specified as an object`)
 
+		this.columnsToDrop = []
+
 		for (const [name, src] of Object.entries (columns)) {
 
-			const column = new DbColumn (src)
-					
-			column.name = name
-			column.relation = this
+			if (src === null) this.columnsToDrop.push (name); else {
+
+				const column = new DbColumn (src)
+						
+				column.name = name
+				column.relation = this
 
-			columns [name] = column
+				columns [name] = column
+
+			}
 
 		}
-		
+
+		for (const name of this.columnsToDrop) delete columns [name]
+
 		if (this.pk == null) {
 
 			this.pk = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/do-/node-doix-db#readme",
   "peerDependencies": {
-    "doix": "^1.0.44"
+    "doix": "^1.0.51"
   },
   "devDependencies": {
     "jest": "^29.6.1"