Skip to content

Commit 2f38157

Browse files
committed
remove circular dependency between driver and session
1 parent 81d1686 commit 2f38157

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

src/driver.js

+1-12
Original file line numberDiff line numberDiff line change
@@ -275,17 +275,6 @@ class Driver {
275275
})
276276
}
277277

278-
/**
279-
* @protected
280-
*/
281-
static _validateSessionMode (rawMode) {
282-
const mode = rawMode || WRITE
283-
if (mode !== ACCESS_MODE_READ && mode !== ACCESS_MODE_WRITE) {
284-
throw newError('Illegal session mode ' + mode)
285-
}
286-
return mode
287-
}
288-
289278
/**
290279
* @private
291280
*/
@@ -296,7 +285,7 @@ class Driver {
296285
reactive,
297286
fetchSize
298287
}) {
299-
const sessionMode = Driver._validateSessionMode(defaultAccessMode)
288+
const sessionMode = Session._validateSessionMode(defaultAccessMode)
300289
const connectionProvider = this._getOrCreateConnectionProvider()
301290
const bookmark = bookmarkOrBookmarks
302291
? new Bookmark(bookmarkOrBookmarks)

src/session.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import Transaction from './transaction'
2222
import { newError } from './error'
2323
import { validateQueryAndParameters } from './internal/util'
2424
import ConnectionHolder from './internal/connection-holder'
25-
import Driver from './driver'
2625
import { ACCESS_MODE_READ, ACCESS_MODE_WRITE } from './internal/constants'
2726
import TransactionExecutor from './internal/transaction-executor'
2827
import Bookmark from './internal/bookmark'
@@ -205,7 +204,7 @@ class Session {
205204
)
206205
}
207206

208-
const mode = Driver._validateSessionMode(accessMode)
207+
const mode = Session._validateSessionMode(accessMode)
209208
const connectionHolder = this._connectionHolderWithMode(mode)
210209
connectionHolder.initializeConnection()
211210
this._hasTx = true
@@ -323,6 +322,17 @@ class Session {
323322
_onCompleteCallback (meta) {
324323
this._updateBookmark(new Bookmark(meta.bookmark))
325324
}
325+
326+
/**
327+
* @protected
328+
*/
329+
static _validateSessionMode (rawMode) {
330+
const mode = rawMode || ACCESS_MODE_WRITE
331+
if (mode !== ACCESS_MODE_READ && mode !== ACCESS_MODE_WRITE) {
332+
throw newError('Illegal session mode ' + mode)
333+
}
334+
return mode
335+
}
326336
}
327337

328338
function _createTransactionExecutor (config) {

0 commit comments

Comments
 (0)