doix-db 1.0.57 → 1.0.59

package/lib/model/DbColumn.js

@@ -1,5 +1,3 @@
-const DbQueryColumn = require ('../query/DbQueryColumn.js')
-
 const DbReference = require ('./DbReference.js')
 
 const CH_ROUND_OPEN = '('.charCodeAt (0)
@@ -33,24 +31,6 @@ class DbColumn {
 
 	}
 
-	toQueryColumn (queryTable) {
-
-		const c = new DbQueryColumn (
-
-			queryTable.query,
-			
-			queryTable.qName + '.' + this.qName, 
-			
-			queryTable.isFirst ? this.name : queryTable.alias + '.' + this.name
-
-		)
-		
-		c.table = queryTable
-		
-		return c
-
-	}
-	
 	parse () {
 	
 		const {src} = this, pos = src.lastIndexOf ('//')

package/lib/model/DbObjectMerger.js

@@ -1,5 +1,5 @@
 const util = require ('util')
-const {ObjectMerger} = require ('doix')
+const {ObjectMerger} = require ('require-sliced')
 
 class DbObjectMerger extends ObjectMerger {
 	

package/lib/model/DbSchemaSource.js

@@ -1,4 +1,4 @@
-const {ModuleLoader} = require ('doix')
+const {ModuleLoader} = require ('require-sliced')
 const DbObjectMerger = require ('./DbObjectMerger')
 
 class DbSchemaSource extends Map {

package/lib/query/DbQueryTable.js

@@ -1,4 +1,5 @@
 const DbQueryTableColumnComparison = require ('./DbQueryTableColumnComparison.js')
+const DbQueryColumn = require ('./DbQueryColumn.js')
 
 const JOIN_TYPES_ALOWED = ['LEFT', 'INNER', 'CROSS']
 
@@ -24,7 +25,7 @@ class DbQueryTable {
 			
 			const names = o.columns || Object.keys (columns)
 
-			this.columns = names.map (name => columns [name].toQueryColumn (this))
+			this.columns = names.map (name => this.toQueryColumn (columns [name]))
 
 		}
 		else {
@@ -70,6 +71,24 @@ class DbQueryTable {
 
 	}
 
+	toQueryColumn (column) {
+
+		const c = new DbQueryColumn (
+
+			this.query,
+			
+			this.qName + '.' + column.qName, 
+			
+			this.isFirst ? column.name : this.alias + '.' + column.name
+
+		)
+		
+		c.table = this
+		
+		return c
+
+	}
+
 	createColumnComparison (name, op, value) {
 
 		if (value == null && !this.lang.isUnaryOperator (op)) return null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.57",
+  "version": "1.0.59",
   "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.27"
+    "doix": "^1.0.31"
   },
   "devDependencies": {
     "jest": "^29.6.1"