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
c6966bb5
authored
Mar 15, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
minor errors fixed
parent
c1ed8c7e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
sails/install.sh
sails/roles/database/files/pictodb-schema.sql
sails/src/node_modules/sails-mysql/lib/sql.js
sails/src/node_modules/sails-mysql/lib/utils.js
sails/install.sh
View file @
c6966bb5
...
@@ -7,7 +7,7 @@ export LANG=en_US.UTF-8
...
@@ -7,7 +7,7 @@ export LANG=en_US.UTF-8
echo
"-- Installing build-essentials and g++"
echo
"-- Installing build-essentials and g++"
sudo
apt-get update
sudo
apt-get update
sudo
apt-get install build-essential g++
sudo
apt-get install
-y
build-essential g++
# installing ansible
# installing ansible
echo
"-- Installing ansible"
echo
"-- Installing ansible"
...
...
sails/roles/database/files/pictodb-schema.sql
View file @
c6966bb5
...
@@ -55,7 +55,7 @@ CREATE TABLE `catexp` (
...
@@ -55,7 +55,7 @@ CREATE TABLE `catexp` (
`exp`
varchar
(
30
)
NOT
NULL
,
`exp`
varchar
(
30
)
NOT
NULL
,
PRIMARY
KEY
(
`id`
),
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`exp`
(
`exp`
,
`lang`
)
UNIQUE
KEY
`exp`
(
`exp`
,
`lang`
)
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
27958
DEFAULT
CHARSET
=
u
r
f8
COMMENT
=
'Stores the expressions available in several languages for a given category (id_cat)'
;
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
27958
DEFAULT
CHARSET
=
u
t
f8
COMMENT
=
'Stores the expressions available in several languages for a given category (id_cat)'
;
-- --------------------------------------------------------
-- --------------------------------------------------------
--
--
...
...
sails/src/node_modules/sails-mysql/lib/sql.js
View file @
c6966bb5
...
@@ -468,7 +468,7 @@ function sqlTypeCast(attr) {
...
@@ -468,7 +468,7 @@ function sqlTypeCast(attr) {
break
;
break
;
case
'datetime'
:
case
'datetime'
:
expandedType
=
'DATETIME
(3)
'
;
expandedType
=
'DATETIME'
;
break
;
break
;
case
'time'
:
case
'time'
:
...
@@ -499,8 +499,7 @@ function toSqlDate(date) {
...
@@ -499,8 +499,7 @@ function toSqlDate(date) {
(
'00'
+
date
.
getDate
()).
slice
(
-
2
)
+
' '
+
(
'00'
+
date
.
getDate
()).
slice
(
-
2
)
+
' '
+
(
'00'
+
date
.
getHours
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getHours
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getMinutes
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getMinutes
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
)
+
'.'
+
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
);
(
'00'
+
date
.
getMilliseconds
()).
slice
(
-
3
);
return
date
;
return
date
;
}
}
...
...
sails/src/node_modules/sails-mysql/lib/utils.js
View file @
c6966bb5
...
@@ -242,8 +242,7 @@ utils.toSqlDate = function toSqlDate(date) {
...
@@ -242,8 +242,7 @@ utils.toSqlDate = function toSqlDate(date) {
(
'00'
+
date
.
getDate
()).
slice
(
-
2
)
+
' '
+
(
'00'
+
date
.
getDate
()).
slice
(
-
2
)
+
' '
+
(
'00'
+
date
.
getHours
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getHours
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getMinutes
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getMinutes
()).
slice
(
-
2
)
+
':'
+
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
)
+
"."
+
(
'00'
+
date
.
getSeconds
()).
slice
(
-
2
);
(
'00'
+
date
.
getMilliseconds
()).
slice
(
-
3
);
return
date
;
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