summaryrefslogtreecommitdiff
path: root/app/server
diff options
context:
space:
mode:
Diffstat (limited to 'app/server')
-rw-r--r--app/server/db/bookshelf.js4
-rw-r--r--app/server/db/model.js2
-rw-r--r--app/server/db/models.js10
3 files changed, 15 insertions, 1 deletions
diff --git a/app/server/db/bookshelf.js b/app/server/db/bookshelf.js
index 545b574..2f90c9a 100644
--- a/app/server/db/bookshelf.js
+++ b/app/server/db/bookshelf.js
@@ -2,6 +2,7 @@ require('dotenv').config()
const knex = require('knex')({
client: 'mysql2',
+ // debug: true,
connection: {
host : process.env.DB_HOST,
user : process.env.DB_USER,
@@ -19,6 +20,9 @@ const knex = require('knex')({
})
const bookshelf = require('bookshelf')(knex)
+const jsonColumns = require('bookshelf-json-columns')
+
+bookshelf.plugin(jsonColumns)
module.exports = {
bookshelf: bookshelf,
diff --git a/app/server/db/model.js b/app/server/db/model.js
index d84f138..18ce28c 100644
--- a/app/server/db/model.js
+++ b/app/server/db/model.js
@@ -147,7 +147,7 @@ module.exports = function modelScope(type, db_model, _props) {
valid[key] = data[key]
}
})
- // console.log(valid)
+ console.log(valid)
return valid
},
diff --git a/app/server/db/models.js b/app/server/db/models.js
index 5e1cf6e..8ce0de8 100644
--- a/app/server/db/models.js
+++ b/app/server/db/models.js
@@ -5,22 +5,32 @@ let bookshelf = require("./bookshelf").bookshelf
let Folder = bookshelf.Model.extend({
tableName: 'folders',
hasTimestamps: true,
+}, {
+ jsonColumns: ['opt'],
})
let File = bookshelf.Model.extend({
tableName: 'files',
hasTimestamps: true,
+}, {
+ jsonColumns: ['opt'],
})
let Task = bookshelf.Model.extend({
tableName: 'tasks',
hasTimestamps: true,
+}, {
+ jsonColumns: ['opt'],
})
let User = bookshelf.Model.extend({
tableName: 'user',
hasTimestamps: true,
+}, {
+ jsonColumns: ['profile'],
})
let Dataset = bookshelf.Model.extend({
tableName: 'datasets',
hasTimestamps: true,
+}, {
+ jsonColumns: ['opt'],
})
module.exports = {