Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
02145ed4
authored
Mar 10, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
restored milliseconds support in sails-mysql
parent
1d4910a9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
sails/src/config/pictogram.js
sails/src/node_modules/sails-mysql/lib/sql.js
sails/src/node_modules/sails-mysql/lib/utils.js
sails/src/config/pictogram.js
View file @
02145ed4
...
...
@@ -5,7 +5,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
var
UPLOAD_PATH
=
path
.
join
(
__dirname
,
'..'
,
'..'
,
'upload'
);
module
.
exports
.
pictogram
=
{
version
:
"1.
0
"
,
// actual version of the server, to be checked by the client
version
:
"1.
1
"
,
// actual version of the server, to be checked by the client
admin
:
{
email
:
'amontejo@ujaen.es'
,
password
:
'$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq'
//y00ttaa!!
...
...
sails/src/node_modules/sails-mysql/lib/sql.js
View file @
02145ed4
...
...
@@ -468,7 +468,7 @@ function sqlTypeCast(attr) {
break
;
case
'datetime'
:
expandedType
=
'DATETIME'
;
expandedType
=
'DATETIME
(3)
'
;
break
;
case
'time'
:
...
...
@@ -499,7 +499,8 @@ function toSqlDate(date) {
(
'00'
+
date
.
getDate
()).
slice
(
-
2
)
+
' '
+
(
'00'
+
date
.
getHours
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getMinutes
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
);
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
)
+
'.'
+
(
'00'
+
date
.
getMilliseconds
()).
slice
(
-
3
);
return
date
;
}
...
...
sails/src/node_modules/sails-mysql/lib/utils.js
View file @
02145ed4
...
...
@@ -242,7 +242,8 @@ utils.toSqlDate = function toSqlDate(date) {
(
'00'
+
date
.
getDate
()).
slice
(
-
2
)
+
' '
+
(
'00'
+
date
.
getHours
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getMinutes
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
);
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
)
+
"."
+
(
'00'
+
date
.
getMilliseconds
()).
slice
(
-
3
);
return
date
;
};
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