Skip to content

Commit 4158aaa

Browse files
committedApr 29, 2016
Fix SQL
- for strict mode
1 parent 697e456 commit 4158aaa

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed
 

‎database/sql_migrations/v0.0.0.sql

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
create table user (
22
`id` int(11) not null auto_increment primary key,
3-
`created` datetime not null default NOW(),
3+
`created` datetime not null,
44
`username` varchar(255) not null comment "Username, unique",
55
`name` varchar(255) not null comment "Full name",
66
`email` varchar(255) not null comment "Email, unique",
@@ -12,7 +12,7 @@ create table user (
1212

1313
create table project (
1414
`id` int(11) not null auto_increment primary key,
15-
`created` datetime not null default NOW() comment "Created timestamp",
15+
`created` datetime not null comment "Created timestamp",
1616
`name` varchar(255) not null comment "Project name"
1717
) ENGINE=InnoDB CHARSET=utf8;
1818

@@ -104,7 +104,7 @@ create table task (
104104
create table task__output (
105105
`task_id` int(11) not null,
106106
`task` varchar(255) not null,
107-
`time` datetime not null default NOW(),
107+
`time` datetime not null,
108108
`output` longtext not null,
109109

110110
unique key `id` (`task_id`, `time`),

‎database/sql_migrations/v1.2.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
create table `user__token` (
22
`id` varchar(32) not null primary key,
3-
`created` datetime not null default NOW(),
3+
`created` datetime not null,
44
`expired` tinyint(1) not null default 0,
55
`user_id` int(11) not null,
66

‎database/sql_migrations/v1.4.0.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ CREATE TABLE `event` (
99
KEY `created` (`created`)
1010
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1111

12-
alter table task add `created` datetime not null default CURRENT_TIMESTAMP,
12+
alter table task add `created` datetime not null,
1313
add `start` datetime null,
1414
add `end` datetime null;

‎routes/projects/projects.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func AddProject(c *gin.Context) {
3838
panic(err)
3939
}
4040

41-
if _, err := database.Mysql.Exec("insert into project__user set project_id=?, user_id=?, admin=1", body.ID, user.ID); err != nil {
41+
if _, err := database.Mysql.Exec("insert into project__user set project_id=?, user_id=?, admin=1, created=NOW()", body.ID, user.ID); err != nil {
4242
panic(err)
4343
}
4444

‎routes/users.go

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package routes
22

33
import (
44
"database/sql"
5+
"time"
56

67
"github.com/ansible-semaphore/semaphore/database"
78
"github.com/ansible-semaphore/semaphore/models"
@@ -25,6 +26,8 @@ func addUser(c *gin.Context) {
2526
return
2627
}
2728

29+
user.Created = time.Now()
30+
2831
if err := database.Mysql.Insert(&user); err != nil {
2932
panic(err)
3033
}

0 commit comments

Comments
 (0)
Please sign in to comment.