xardao 1.4.1 → 1.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/xardao.js +35 -19
- package/package.json +1 -1
package/lib/xardao.js
CHANGED
|
@@ -102,8 +102,10 @@ exports.Connection = Connection
|
|
|
102
102
|
exports.express = {}
|
|
103
103
|
exports.express.usingDBConnection = function usingDBConnection(connSpec, page ) {
|
|
104
104
|
|
|
105
|
+
|
|
106
|
+
|
|
105
107
|
return function(req, res, next) {
|
|
106
|
-
|
|
108
|
+
|
|
107
109
|
if (typeof(connSpec) == "object") connInfo = connSpec
|
|
108
110
|
else if (typeof(connSpec) == "string" ){
|
|
109
111
|
if ( req.appconfig ) connInfo = req.appconfig[connSpec]
|
|
@@ -114,25 +116,39 @@ exports.express.usingDBConnection = function usingDBConnection(connSpec, page )
|
|
|
114
116
|
else throw "Invalid database specification"
|
|
115
117
|
|
|
116
118
|
if (typeof(connInfo) == 'string') {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
119
|
+
let db = new Connection(connInfo)
|
|
120
|
+
db.debugMode = connSpec.debugMode || false
|
|
121
|
+
db.openCB(undefined,
|
|
122
|
+
function (err) {
|
|
123
|
+
if (err) { next(err) }
|
|
124
|
+
else {
|
|
125
|
+
res.on("finish",
|
|
126
|
+
function() {
|
|
127
|
+
db.close()
|
|
128
|
+
} )
|
|
129
|
+
req.conn=db
|
|
130
|
+
page(req, res, next)
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
)
|
|
134
|
+
} else if (typeof(connInfo) == "object"){
|
|
135
|
+
let db = Connection(connInfo.driver)
|
|
136
|
+
db.debugMode = connInfo.debugMode || false
|
|
137
|
+
db.openCB(connInfo.dbInfo,
|
|
138
|
+
function (err) {
|
|
139
|
+
if (err) { next(err) }
|
|
140
|
+
else {
|
|
141
|
+
res.on("finish",
|
|
142
|
+
function() {
|
|
143
|
+
db.close()
|
|
144
|
+
} )
|
|
145
|
+
req.conn=db
|
|
146
|
+
page(req, res, next)
|
|
147
|
+
}
|
|
148
|
+
} )
|
|
149
|
+
} else {
|
|
150
|
+
throw "Invalid database specification"
|
|
133
151
|
}
|
|
134
|
-
)
|
|
135
|
-
|
|
136
152
|
}
|
|
137
153
|
}
|
|
138
154
|
|