Comparing version 0.1.7-alpha.8 to 0.1.7-alpha.10
@@ -22,2 +22,6 @@ const { DatabaseMapper } = require('./DatabaseMapper') | ||
getSchema () { | ||
return this.props.schema | ||
} | ||
planDisconnect () { | ||
@@ -46,2 +50,3 @@ this.cancelDisconnectPlan() | ||
await this.connectDb() | ||
this.connected = true | ||
this.connecting = false | ||
@@ -65,2 +70,3 @@ debug(`Connected to ${this.props.driver} database`) | ||
await this.disconnectDb() | ||
this.connected = false | ||
debug(`Disconnected from ${this.props.driver} database`) | ||
@@ -67,0 +73,0 @@ } |
@@ -13,2 +13,4 @@ const { DatabaseModelBase } = require('./DatabaseModelBase') | ||
const nonEmpty = item => Boolean(item) | ||
class DatabaseModel extends DatabaseModelBase { | ||
@@ -37,3 +39,8 @@ static NotFound = ObjectNotFound | ||
static get table () { | ||
return this.tableName || getModelName(this).toLowerCase() | ||
return [ | ||
this.db.getSchema(), | ||
this.tableName || getModelName(this).toLowerCase() | ||
] | ||
.filter(nonEmpty) | ||
.join('.') | ||
} | ||
@@ -40,0 +47,0 @@ |
{ | ||
"name": "djorm", | ||
"version": "0.1.7-alpha.8", | ||
"version": "0.1.7-alpha.10", | ||
"description": "Django like ORM framework", | ||
@@ -38,3 +38,3 @@ "author": "Pavel Žák <pavel@zak.global>", | ||
}, | ||
"gitHead": "23c5a43bbbeb9b024dcd4cafe24e91e2df10f519" | ||
"gitHead": "0178f837a5727b3cf20d870d69b3a96f1a9ffbed" | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
61865
2209