Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
c0d7e16e
Commit
c0d7e16e
authored
May 27, 2019
by
Nick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: asset data type for mysql + mariadb
parent
241825eb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
1 deletion
+28
-1
admin-system.vue
client/components/admin/admin-system.vue
+5
-0
config.sample.yml
config.sample.yml
+1
-1
kernel.js
server/core/kernel.js
+1
-0
2.0.0-beta.148.js
server/db/migrations/2.0.0-beta.148.js
+21
-0
yarn.lock
yarn.lock
+0
-0
No files found.
client/components/admin/admin-system.vue
View file @
c0d7e16e
...
...
@@ -90,6 +90,8 @@
v-list-tile-content
v-list-tile-title(v-html='dbVersion')
v-list-tile-sub-title
{{
info
.
dbHost
}}
v-alert.mt-3(:value='isDbLimited', color='deep-orange', icon='warning') Your database version is not fully supported. Some functionality may be limited or not work as expected.
</
template
>
<
script
>
...
...
@@ -127,6 +129,9 @@ export default {
default
:
return
''
}
},
isDbLimited
()
{
return
this
.
info
.
dbType
===
'MySQL'
&&
this
.
dbVersion
.
indexOf
(
'5.'
)
===
0
}
},
methods
:
{
...
...
config.sample.yml
View file @
c0d7e16e
...
...
@@ -15,7 +15,7 @@ port: 3000
# ---------------------------------------------------------------------
# Supported Database Engines:
# - postgres = PostgreSQL 9.5 or later
# - mysql = MySQL
5.7.8
# - mysql = MySQL
8.0 or later (5.7.8 partially supported, refer to docs)
# - mariadb = MariaDB 10.2.7 or later
# - mssql = MS SQL Server 2012 or later
# - sqlite = SQLite 3.9 or later
...
...
server/core/kernel.js
View file @
c0d7e16e
...
...
@@ -8,6 +8,7 @@ module.exports = {
WIKI
.
logger
.
info
(
'======================================='
)
WIKI
.
logger
.
info
(
`= Wiki.js
${
_
.
padEnd
(
WIKI
.
version
+
' '
,
29
,
'='
)}
`
)
WIKI
.
logger
.
info
(
'======================================='
)
WIKI
.
logger
.
info
(
'Initializing...'
)
WIKI
.
models
=
require
(
'./db'
).
init
()
...
...
server/db/migrations/2.0.0-beta.148.js
0 → 100644
View file @
c0d7e16e
exports
.
up
=
knex
=>
{
const
dbCompat
=
{
blobLength
:
(
WIKI
.
config
.
db
.
type
===
`mysql`
||
WIKI
.
config
.
db
.
type
===
`mariadb`
)
}
return
knex
.
schema
.
table
(
'assetData'
,
table
=>
{
if
(
dbCompat
.
blobLength
)
{
table
.
dropColumn
(
'data'
)
}
})
.
table
(
'assetData'
,
table
=>
{
if
(
dbCompat
.
blobLength
)
{
table
.
specificType
(
'data'
,
'LONGBLOB'
).
notNullable
()
}
})
}
exports
.
down
=
knex
=>
{
return
knex
.
schema
.
table
(
'assetData'
,
table
=>
{})
}
yarn.lock
View file @
c0d7e16e
This diff was suppressed by a .gitattributes entry.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment