Merge remote-tracking branch 'upstream/master' (#2)

* ignore unexported fields that are not embedded structs

* fix #74 [BREAKING CHANGE] Select#GroupBy and Select#OrderBy behavior change.

Previous, GroupBy and OrderBy only keep the columns in the last call. Now, all columns are kept.

* fix #75 add Struct#Columns/ColumnsForTag and Struct#Values/ValuesForTag

* remove a call to StructField.IsExported as it is not in go1.13

* refs #78 add new `fieldas` tag to set AS name for SELECT

* update docs

* fix #81 refactory struct field parser to make fieldas correct in all cases

* Add Gitter badge

* Fix insert ignore for postgres and sqlite.

* fix test

Co-authored-by: Michał Dobaczewski <[email protected]>
Co-authored-by: Huan Du <[email protected]>
Co-authored-by: The Gitter Badger <[email protected]>
Co-authored-by: Zhong Ren <[email protected]>

Author: 5 people

README.md

@@ -3,7 +3,7 @@
 [![Go](https://github.com/huandu/go-sqlbuilder/workflows/Go/badge.svg)](https://github.com/huandu/go-sqlbuilder/actions)
 [![GoDoc](https://godoc.org/github.com/huandu/go-sqlbuilder?status.svg)](https://pkg.go.dev/github.com/huandu/go-sqlbuilder)
 [![Go Report](https://goreportcard.com/badge/github.com/huandu/go-sqlbuilder)](https://goreportcard.com/report/github.com/huandu/go-sqlbuilder)
-[![Coverage Status](https://coveralls.io/repos/github/huandu/go-sqlbuilder/badge.svg?branch=master)](https://coveralls.io/github/huandu/go-sqlbuilder?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/huandu/go-sqlbuilder/badge.svg?branch=master)](https://coveralls.io/github/huandu/go-sqlbuilder?branch=master) [![Join the chat at https://gitter.im/go-sqlbuilder/community](https://badges.gitter.im/go-sqlbuilder/community.svg)](https://gitter.im/go-sqlbuilder/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 - [Install](#install)
 - [Usage](#usage)
@@ -134,8 +134,9 @@ We can define a struct type and use field tags to let `Struct` know how to creat
 type ATable struct {
     Field1     string                                    // If a field doesn't has a tag, use "Field1" as column name in SQL.
     Field2     int    `db:"field2"`                      // Use "db" in field tag to set column name used in SQL.
-    Field3     int64  `db:"field3" fieldtag:"foo,bar"`   // Set fieldtag to a field. We can use methods like `Struct#SelectForTag` to use it.
-    Field4     int64  `db:"field4" fieldtag:"foo"`       // If we use `s.SelectForTag(table, "foo")`, columnes of SELECT are field3 and field4.
+    Field3     int64  `db:"field3" fieldtag:"foo,bar"`   // Set fieldtag to a field. We can call `WithTag` to change default tag or call methods like `Struct#SelectForTag` to set tag explicitly.
+    Field4     int64  `db:"field4" fieldtag:"foo"`       // If we use `s.WithTag("foo").Select(table)`, columnes of SELECT are field3 and field4.
+    Field5     string `db:"field5" fieldas:"f5_alias"`   // Use "fieldas" in field tag to set a column alias (AS) used in SELECT.
     Ignored    int32  `db:"-"`                           // If we set field name as "-", Struct will ignore it.
     unexported int                                       // Unexported field is not visible to Struct.
     Quoted     string `db:"quoted" fieldopt:"withquote"` // Add quote to the field using back quote or double quote. See `Flavor#Quote`.

flavor.go

@@ -138,3 +138,27 @@ func (f Flavor) Quote(name string) string {
 
 	return name
 }
+
+// PrepareInsertIgnore prepares the insert builder to build insert ignore SQL statement based on the sql flavor
+func (f Flavor) PrepareInsertIgnore(table string, ib *InsertBuilder) {
+	switch ib.args.Flavor {
+	case MySQL:
+		ib.verb = "INSERT IGNORE"
+	case PostgreSQL:
+		// see https://www.postgresql.org/docs/current/sql-insert.html
+		ib.verb = "INSERT"
+		// add sql statement at the end after values, i.e. INSERT INTO ... ON CONFLICT DO NOTHING
+		ib.marker = insertMarkerAfterValues
+		ib.SQL("ON CONFLICT DO NOTHING")
+	case SQLite:
+		// see https://www.sqlite.org/lang_insert.html
+		ib.verb = "INSERT OR IGNORE"
+	default:
+		// panic if the db flavor is not supported
+		panic(fmt.Errorf("unsupported db flavor: %s", ib.args.Flavor.String()))
+	}
+
+	// Set the table and reset the marker right after insert into
+	ib.table = Escape(table)
+	ib.marker = insertMarkerAfterInsertInto
+}

go.mod

@@ -1,6 +1,6 @@
 module github.com/huandu/go-sqlbuilder
 
-go 1.12
+go 1.13
 
 require (
 	github.com/huandu/go-assert v1.1.5

insert.go

@@ -64,9 +64,7 @@ func InsertIgnoreInto(table string) *InsertBuilder {
 
 // InsertIgnoreInto sets table name in INSERT IGNORE.
 func (ib *InsertBuilder) InsertIgnoreInto(table string) *InsertBuilder {
-	ib.verb = "INSERT IGNORE"
-	ib.table = Escape(table)
-	ib.marker = insertMarkerAfterInsertInto
+	ib.args.Flavor.PrepareInsertIgnore(table, ib)
 	return ib
 }
 

insert_test.go

@@ -81,6 +81,38 @@ func ExampleInsertBuilder_insertIgnore() {
 	// [1 Huan Du 1 2 Charmy Liu 1 1234567890]
 }
 
+func ExampleInsertBuilder_insertIgnore_postgres() {
+	ib := PostgreSQL.NewInsertBuilder()
+	ib.InsertIgnoreInto("demo.user")
+	ib.Cols("id", "name", "status", "created_at")
+	ib.Values(1, "Huan Du", 1, Raw("UNIX_TIMESTAMP(NOW())"))
+	ib.Values(2, "Charmy Liu", 1, 1234567890)
+
+	sql, args := ib.Build()
+	fmt.Println(sql)
+	fmt.Println(args)
+
+	// Output:
+	// INSERT INTO demo.user (id, name, status, created_at) VALUES ($1, $2, $3, UNIX_TIMESTAMP(NOW())), ($4, $5, $6, $7) ON CONFLICT DO NOTHING
+	// [1 Huan Du 1 2 Charmy Liu 1 1234567890]
+}
+
+func ExampleInsertBuilder_insertIgnore_sqlite() {
+	ib := SQLite.NewInsertBuilder()
+	ib.InsertIgnoreInto("demo.user")
+	ib.Cols("id", "name", "status", "created_at")
+	ib.Values(1, "Huan Du", 1, Raw("UNIX_TIMESTAMP(NOW())"))
+	ib.Values(2, "Charmy Liu", 1, 1234567890)
+
+	sql, args := ib.Build()
+	fmt.Println(sql)
+	fmt.Println(args)
+
+	// Output:
+	// INSERT OR IGNORE INTO demo.user (id, name, status, created_at) VALUES (?, ?, ?, UNIX_TIMESTAMP(NOW())), (?, ?, ?, ?)
+	// [1 Huan Du 1 2 Charmy Liu 1 1234567890]
+}
+
 func ExampleInsertBuilder_replaceInto() {
 	ib := NewInsertBuilder()
 	ib.ReplaceInto("demo.user")

select.go

@@ -153,14 +153,14 @@ func (sb *SelectBuilder) Having(andExpr ...string) *SelectBuilder {
 
 // GroupBy sets columns of GROUP BY in SELECT.
 func (sb *SelectBuilder) GroupBy(col ...string) *SelectBuilder {
-	sb.groupByCols = col
+	sb.groupByCols = append(sb.groupByCols, col...)
 	sb.marker = selectMarkerAfterGroupBy
 	return sb
 }
 
 // OrderBy sets columns of ORDER BY in SELECT.
 func (sb *SelectBuilder) OrderBy(col ...string) *SelectBuilder {
-	sb.orderByCols = col
+	sb.orderByCols = append(sb.orderByCols, col...)
 	sb.marker = selectMarkerAfterOrderBy
 	return sb
 }