Skip to content

Commit db5bd7d

Browse files
authored
Merge pull request astaxie#977 from GeorgeYan/master
Fix: database define column different with query column
2 parents c610e8c + ad25a54 commit db5bd7d

21 files changed

+42
-42
lines changed

de/05.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In the following sections, I'll use the same database table structure for differ
2323
CREATE TABLE `userinfo` (
2424
`uid` INT(10) NOT NULL AUTO_INCREMENT,
2525
`username` VARCHAR(64) NULL DEFAULT NULL,
26-
`departname` VARCHAR(64) NULL DEFAULT NULL,
26+
`department` VARCHAR(64) NULL DEFAULT NULL,
2727
`created` DATE NULL DEFAULT NULL,
2828
PRIMARY KEY (`uid`)
2929
);
@@ -43,7 +43,7 @@ The following example shows how to operate on a database based on the `database/
4343
checkErr(err)
4444

4545
// insert
46-
stmt, err := db.Prepare("INSERT userinfo SET username=?,departname=?,created=?")
46+
stmt, err := db.Prepare("INSERT userinfo SET username=?,department=?,created=?")
4747
checkErr(err)
4848

4949
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

de/05.3.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We create the following SQL:
1919
CREATE TABLE `userinfo` (
2020
`uid` INTEGER PRIMARY KEY AUTOINCREMENT,
2121
`username` VARCHAR(64) NULL,
22-
`departname` VARCHAR(64) NULL,
22+
`department` VARCHAR(64) NULL,
2323
`created` DATE NULL
2424
);
2525

@@ -39,7 +39,7 @@ An example:
3939
checkErr(err)
4040

4141
// insert
42-
stmt, err := db.Prepare("INSERT INTO userinfo(username, departname, created) values(?,?,?)")
42+
stmt, err := db.Prepare("INSERT INTO userinfo(username, department, created) values(?,?,?)")
4343
checkErr(err)
4444

4545
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

de/05.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ We create the following SQL:
2020
(
2121
uid serial NOT NULL,
2222
username character varying(100) NOT NULL,
23-
departname character varying(500) NOT NULL,
23+
department character varying(500) NOT NULL,
2424
Created date,
2525
CONSTRAINT userinfo_pkey PRIMARY KEY (uid)
2626
)
@@ -53,7 +53,7 @@ An example:
5353
fmt.Println("# Inserting values")
5454

5555
var lastInsertId int
56-
err = db.QueryRow("INSERT INTO userinfo(username,departname,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
56+
err = db.QueryRow("INSERT INTO userinfo(username,department,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
5757
checkErr(err)
5858
fmt.Println("last inserted id =", lastInsertId)
5959

en/05.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In the following sections, I'll use the same database table structure for differ
2222
CREATE TABLE `userinfo` (
2323
`uid` INT(10) NOT NULL AUTO_INCREMENT,
2424
`username` VARCHAR(64) NULL DEFAULT NULL,
25-
`departname` VARCHAR(64) NULL DEFAULT NULL,
25+
`department` VARCHAR(64) NULL DEFAULT NULL,
2626
`created` DATE NULL DEFAULT NULL,
2727
PRIMARY KEY (`uid`)
2828
);
@@ -42,7 +42,7 @@ The following example shows how to operate on a database based on the `database/
4242
checkErr(err)
4343

4444
// insert
45-
stmt, err := db.Prepare("INSERT userinfo SET username=?,departname=?,created=?")
45+
stmt, err := db.Prepare("INSERT userinfo SET username=?,department=?,created=?")
4646
checkErr(err)
4747

4848
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

en/05.3.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We create the following SQL:
1919
CREATE TABLE `userinfo` (
2020
`uid` INTEGER PRIMARY KEY AUTOINCREMENT,
2121
`username` VARCHAR(64) NULL,
22-
`departname` VARCHAR(64) NULL,
22+
`department` VARCHAR(64) NULL,
2323
`created` DATE NULL
2424
);
2525
```
@@ -39,7 +39,7 @@ An example:
3939
checkErr(err)
4040

4141
// insert
42-
stmt, err := db.Prepare("INSERT INTO userinfo(username, departname, created) values(?,?,?)")
42+
stmt, err := db.Prepare("INSERT INTO userinfo(username, department, created) values(?,?,?)")
4343
checkErr(err)
4444

4545
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

en/05.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ We create the following SQL:
2020
(
2121
uid serial NOT NULL,
2222
username character varying(100) NOT NULL,
23-
departname character varying(500) NOT NULL,
23+
department character varying(500) NOT NULL,
2424
Created date,
2525
CONSTRAINT userinfo_pkey PRIMARY KEY (uid)
2626
)
@@ -53,7 +53,7 @@ An example:
5353
fmt.Println("# Inserting values")
5454

5555
var lastInsertId int
56-
err = db.QueryRow("INSERT INTO userinfo(username,departname,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
56+
err = db.QueryRow("INSERT INTO userinfo(username,department,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
5757
checkErr(err)
5858
fmt.Println("last inserted id =", lastInsertId)
5959

es/05.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ En las siguientes secciones usaré las misma estructura de tablas para diferente
2222
CREATE TABLE `userinfo` (
2323
`uid` INT(10) NOT NULL AUTO_INCREMENT,
2424
`username` VARCHAR(64) NULL DEFAULT NULL,
25-
`departname` VARCHAR(64) NULL DEFAULT NULL,
25+
`department` VARCHAR(64) NULL DEFAULT NULL,
2626
`created` DATE NULL DEFAULT NULL,
2727
PRIMARY KEY (`uid`)
2828
);
@@ -42,7 +42,7 @@ El siguiente ejemplo muestra como operar en bases de datos con los estándares d
4242
checkErr(err)
4343
4444
// insertar
45-
stmt, err := db.Prepare("INSERT userinfo SET username=?,departname=?,created=?")
45+
stmt, err := db.Prepare("INSERT userinfo SET username=?,department=?,created=?")
4646
checkErr(err)
4747
4848
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

es/05.3.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Crearemos el siguiente SQL:
1919
CREATE TABLE `userinfo` (
2020
`uid` INTEGER PRIMARY KEY AUTOINCREMENT,
2121
`username` VARCHAR(64) NULL,
22-
`departname` VARCHAR(64) NULL,
22+
`department` VARCHAR(64) NULL,
2323
`created` DATE NULL
2424
);
2525
```
@@ -39,7 +39,7 @@ Un ejemplo:
3939
checkErr(err)
4040
4141
// insertar
42-
stmt, err := db.Prepare("INSERT INTO userinfo(username, departname, created) values(?,?,?)")
42+
stmt, err := db.Prepare("INSERT INTO userinfo(username, department, created) values(?,?,?)")
4343
checkErr(err)
4444
4545
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

es/05.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Crearemos el siguiente SQL:
2020
(
2121
uid serial NOT NULL,
2222
username character varying(100) NOT NULL,
23-
departname character varying(500) NOT NULL,
23+
department character varying(500) NOT NULL,
2424
Created date,
2525
CONSTRAINT userinfo_pkey PRIMARY KEY (uid)
2626
)
@@ -53,7 +53,7 @@ Un ejemplo:
5353
fmt.Println("# Inserting values")
5454
5555
var lastInsertId int
56-
err = db.QueryRow("INSERT INTO userinfo(username,departname,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
56+
err = db.QueryRow("INSERT INTO userinfo(username,department,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
5757
checkErr(err)
5858
fmt.Println("last inserted id =", lastInsertId)
5959

ja/05.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ GoではMySQLをサポートしたドライバが現在比較的多く、以下
2020
CREATE TABLE `userinfo` (
2121
`uid` INT(10) NOT NULL AUTO_INCREMENT,
2222
`username` VARCHAR(64) NULL DEFAULT NULL,
23-
`departname` VARCHAR(64) NULL DEFAULT NULL,
23+
`department` VARCHAR(64) NULL DEFAULT NULL,
2424
`created` DATE NULL DEFAULT NULL,
2525
PRIMARY KEY (`uid`)
2626
)
@@ -48,7 +48,7 @@ GoではMySQLをサポートしたドライバが現在比較的多く、以下
4848
checkErr(err)
4949

5050
//データの挿入
51-
stmt, err := db.Prepare("INSERT userinfo SET username=?,departname=?,created=?")
51+
stmt, err := db.Prepare("INSERT userinfo SET username=?,department=?,created=?")
5252
checkErr(err)
5353

5454
res, err := stmt.Exec("astaxie", "研究開発部門", "2012-12-09")

ja/05.3.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Goがサポートするsqliteのドライバも比較的多いのですが、大
1717
CREATE TABLE `userinfo` (
1818
`uid` INTEGER PRIMARY KEY AUTOINCREMENT,
1919
`username` VARCHAR(64) NULL,
20-
`departname` VARCHAR(64) NULL,
20+
`department` VARCHAR(64) NULL,
2121
`created` DATE NULL
2222
);
2323

@@ -44,7 +44,7 @@ Goがサポートするsqliteのドライバも比較的多いのですが、大
4444
checkErr(err)
4545

4646
//データの挿入
47-
stmt, err := db.Prepare("INSERT INTO userinfo(username, departname, created) values(?,?,?)")
47+
stmt, err := db.Prepare("INSERT INTO userinfo(username, department, created) values(?,?,?)")
4848
checkErr(err)
4949

5050
res, err := stmt.Exec("astaxie", "研究開発部門", "2012-12-09")

ja/05.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GoはPostgreSQLをサポートしたドライバも非常に多く実装され
2222
(
2323
uid serial NOT NULL,
2424
username character varying(100) NOT NULL,
25-
departname character varying(500) NOT NULL,
25+
department character varying(500) NOT NULL,
2626
Created date,
2727
CONSTRAINT userinfo_pkey PRIMARY KEY (uid)
2828
)
@@ -51,7 +51,7 @@ package main
5151
checkErr(err)
5252

5353
//データの挿入
54-
stmt, err := db.Prepare("INSERT INTO userinfo(username,departname,created) VALUES($1,$2,$3) RETURNING uid")
54+
stmt, err := db.Prepare("INSERT INTO userinfo(username,department,created) VALUES($1,$2,$3) RETURNING uid")
5555
checkErr(err)
5656

5757
res, err := stmt.Exec("astaxie", "研究開発部門", "2012-12-09")

pt-br/05.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ In the following sections, I'll use the same database table structure for differ
2323
CREATE TABLE `userinfo` (
2424
`uid` INT(10) NOT NULL AUTO_INCREMENT,
2525
`username` VARCHAR(64) NULL DEFAULT NULL,
26-
`departname` VARCHAR(64) NULL DEFAULT NULL,
26+
`department` VARCHAR(64) NULL DEFAULT NULL,
2727
`created` DATE NULL DEFAULT NULL,
2828
PRIMARY KEY (`uid`)
2929
);
@@ -43,7 +43,7 @@ The following example shows how to operate on a database based on the `database/
4343
checkErr(err)
4444

4545
// insert
46-
stmt, err := db.Prepare("INSERT userinfo SET username=?,departname=?,created=?")
46+
stmt, err := db.Prepare("INSERT userinfo SET username=?,department=?,created=?")
4747
checkErr(err)
4848

4949
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

pt-br/05.3.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We create the following SQL:
1919
CREATE TABLE `userinfo` (
2020
`uid` INTEGER PRIMARY KEY AUTOINCREMENT,
2121
`username` VARCHAR(64) NULL,
22-
`departname` VARCHAR(64) NULL,
22+
`department` VARCHAR(64) NULL,
2323
`created` DATE NULL
2424
);
2525

@@ -39,7 +39,7 @@ An example:
3939
checkErr(err)
4040

4141
// insert
42-
stmt, err := db.Prepare("INSERT INTO userinfo(username, departname, created) values(?,?,?)")
42+
stmt, err := db.Prepare("INSERT INTO userinfo(username, department, created) values(?,?,?)")
4343
checkErr(err)
4444

4545
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

pt-br/05.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ We create the following SQL:
2020
(
2121
uid serial NOT NULL,
2222
username character varying(100) NOT NULL,
23-
departname character varying(500) NOT NULL,
23+
department character varying(500) NOT NULL,
2424
Created date,
2525
CONSTRAINT userinfo_pkey PRIMARY KEY (uid)
2626
)
@@ -53,7 +53,7 @@ An example:
5353
fmt.Println("# Inserting values")
5454

5555
var lastInsertId int
56-
err = db.QueryRow("INSERT INTO userinfo(username,departname,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
56+
err = db.QueryRow("INSERT INTO userinfo(username,department,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
5757
checkErr(err)
5858
fmt.Println("last inserted id =", lastInsertId)
5959

ru/05.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
CREATE TABLE `userinfo` (
2424
`uid` INT(10) NOT NULL AUTO_INCREMENT,
2525
`username` VARCHAR(64) NULL DEFAULT NULL,
26-
`departname` VARCHAR(64) NULL DEFAULT NULL,
26+
`department` VARCHAR(64) NULL DEFAULT NULL,
2727
`created` DATE NULL DEFAULT NULL,
2828
PRIMARY KEY (`uid`)
2929
);
@@ -44,7 +44,7 @@
4444
checkErr(err)
4545

4646
// вставка
47-
stmt, err := db.Prepare("INSERT userinfo SET username=?,departname=?,created=?")
47+
stmt, err := db.Prepare("INSERT userinfo SET username=?,department=?,created=?")
4848
checkErr(err)
4949

5050
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

ru/05.3.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SQLite это открытая встраиваемая реляционная
1919
CREATE TABLE `userinfo` (
2020
`uid` INTEGER PRIMARY KEY AUTOINCREMENT,
2121
`username` VARCHAR(64) NULL,
22-
`departname` VARCHAR(64) NULL,
22+
`department` VARCHAR(64) NULL,
2323
`created` DATE NULL
2424
);
2525

@@ -39,7 +39,7 @@ SQLite это открытая встраиваемая реляционная
3939
checkErr(err)
4040

4141
// вставка
42-
stmt, err := db.Prepare("INSERT INTO userinfo(username, departname, created) values(?,?,?)")
42+
stmt, err := db.Prepare("INSERT INTO userinfo(username, department, created) values(?,?,?)")
4343
checkErr(err)
4444

4545
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

ru/05.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PostgreSQL - свободная объектно-реляционная сист
2020
(
2121
uid serial NOT NULL,
2222
username character varying(100) NOT NULL,
23-
departname character varying(500) NOT NULL,
23+
department character varying(500) NOT NULL,
2424
Created date,
2525
CONSTRAINT userinfo_pkey PRIMARY KEY (uid)
2626
)
@@ -54,7 +54,7 @@ PostgreSQL - свободная объектно-реляционная сист
5454
fmt.Println("# Inserting values")
5555

5656
var lastInsertId int
57-
err = db.QueryRow("INSERT INTO userinfo(username,departname,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
57+
err = db.QueryRow("INSERT INTO userinfo(username,department,created) VALUES($1,$2,$3) returning uid;", "astaxie", "研发部门", "2012-12-09").Scan(&lastInsertId)
5858
checkErr(err)
5959
fmt.Println("last inserted id =", lastInsertId)
6060

zh/05.2.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Go中支持MySQL的驱动目前比较多,有如下几种,有些是支持data
2121
CREATE TABLE `userinfo` (
2222
`uid` INT(10) NOT NULL AUTO_INCREMENT,
2323
`username` VARCHAR(64) NULL DEFAULT NULL,
24-
`departname` VARCHAR(64) NULL DEFAULT NULL,
24+
`department` VARCHAR(64) NULL DEFAULT NULL,
2525
`created` DATE NULL DEFAULT NULL,
2626
PRIMARY KEY (`uid`)
2727
);
@@ -51,7 +51,7 @@ func main() {
5151
checkErr(err)
5252

5353
//插入数据
54-
stmt, err := db.Prepare("INSERT userinfo SET username=?,departname=?,created=?")
54+
stmt, err := db.Prepare("INSERT userinfo SET username=?,department=?,created=?")
5555
checkErr(err)
5656

5757
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

zh/05.3.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Go支持sqlite的驱动也比较多,但是好多都是不支持database/sql接
1818
CREATE TABLE `userinfo` (
1919
`uid` INTEGER PRIMARY KEY AUTOINCREMENT,
2020
`username` VARCHAR(64) NULL,
21-
`departname` VARCHAR(64) NULL,
21+
`department` VARCHAR(64) NULL,
2222
`created` DATE NULL
2323
);
2424

@@ -47,7 +47,7 @@ func main() {
4747
checkErr(err)
4848

4949
//插入数据
50-
stmt, err := db.Prepare("INSERT INTO userinfo(username, departname, created) values(?,?,?)")
50+
stmt, err := db.Prepare("INSERT INTO userinfo(username, department, created) values(?,?,?)")
5151
checkErr(err)
5252

5353
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

zh/05.4.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CREATE TABLE userinfo
2323
(
2424
uid serial NOT NULL,
2525
username character varying(100) NOT NULL,
26-
departname character varying(500) NOT NULL,
26+
department character varying(500) NOT NULL,
2727
Created date,
2828
CONSTRAINT userinfo_pkey PRIMARY KEY (uid)
2929
)
@@ -56,7 +56,7 @@ func main() {
5656
checkErr(err)
5757

5858
//插入数据
59-
stmt, err := db.Prepare("INSERT INTO userinfo(username,departname,created) VALUES($1,$2,$3) RETURNING uid")
59+
stmt, err := db.Prepare("INSERT INTO userinfo(username,department,created) VALUES($1,$2,$3) RETURNING uid")
6060
checkErr(err)
6161

6262
res, err := stmt.Exec("astaxie", "研发部门", "2012-12-09")

0 commit comments

Comments
 (0)