doix-db 1.0.12 → 1.0.13

package/lib/DbLang.js

@@ -267,9 +267,11 @@ class DbLang {
 			
 		if (!Array.isArray (params)) params = [params]
 
-		const {map} = this.model || {}; if (map && map.has (sqlOrName)) {
+		const {model} = this
 
-			const {qName, pk, columns} = map.get (sqlOrName)
+		const relation = model ? model.find (sqlOrName) : undefined; if (relation) {
+
+			const {qName, pk, columns} = relation
 
 			let filter = ''; for (const name of pk) {
 
@@ -296,9 +298,9 @@ class DbLang {
 
 		const {model} = this; if (!model) throw Error ('Model not set')
 
-		const {map} = model; if (!map.has (name)) throw Error ('Entity not defined: ' + name)
+		const table = model.find (name); if (!table) throw Error ('Entity not defined: ' + name)
 
-		const {pk, columns, qName} = map.get (name)
+		const {columns, qName} = table
 
 		let sql = '', params = []
 		
@@ -308,7 +310,7 @@ class DbLang {
 
 			if (!(k in columns)) continue
 
-			const {qName, nullable} = columns [k]
+			const {qName} = columns [k]
 			
 			if (sql.length !== 0) sql += ','
 
@@ -345,9 +347,9 @@ class DbLang {
 
 		const {model} = this; if (!model) throw Error ('Model not set')
 
-		const {map} = model; if (!map.has (name)) throw Error ('Entity not defined: ' + name)
+		const table = model.find (name); if (!table) throw Error ('Entity not defined: ' + name)
 		
-		const {pk, columns, qName} = map.get (name)
+		const {pk, columns, qName} = table
 
 		const sql = ['', ''], params = []
 		

package/lib/migration/DbMigrationPlan.js

@@ -33,7 +33,10 @@ class DbMigrationPlan extends EventEmitter {
 		this.db    = db
 		this.lang  = db.lang
 		this.model = db.model
-		this.toBe  = db.model.map
+
+		this.toBe = new Map (); for (const {prefix, map} of db.model.schemata.values ())
+			for (const [k, v] of map.entries ())
+				this.toBe.set (prefix + k, v)
 
 		db.lang.migrationPlan = this
 
@@ -148,7 +151,7 @@ class DbMigrationPlan extends EventEmitter {
 	
 		const methodName = `getStreamOfExisting${type.name.slice (2)}s`
 
-		const {db, asIs, toBe} = this, s = await db [methodName] ()
+		const {db, toBe} = this, s = await db [methodName] ()
 
 		return new Promise ((ok, fail) => {
 		

package/lib/model/DbModel.js

@@ -74,12 +74,6 @@ class DbModel extends EventEmitter {
 		return this.schemata.get (null)
 
 	}
-
-	get map () {
-
-		return this.defaultSchema.map
-
-	}
 	
 	loadModules () {
 
@@ -91,13 +85,13 @@ class DbModel extends EventEmitter {
 
 	find (name) {
 
-		if (this.map.has (name)) return this.map.get (name)
+		if (typeof name !== 'string') return undefined
 
-		const dot = name.indexOf ('.'); if (dot < 1) return undefined
+		const dot = name.indexOf ('.'); if (dot === -1) return this.defaultSchema.map.get (name)
 
-		const schema = this.getSchema (name.slice (0, dot)); if (!schema) return undefined
+		const schema = this.schemata.get (name.slice (0, dot))
 
-		return schema.map.get (name.slice (dot + 1)) || undefined
+		return schema ? schema.map.get (name.slice (dot + 1)) : undefined
 
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [