Skip to content

Commit 65378da

Browse files
authored
Merge pull request #402 from go-gorp/nulltime-fix
Fix gorp's NullTime and test logic for recent versions of go
2 parents 95866f2 + 11ba757 commit 65378da

30 files changed

Lines changed: 142 additions & 339 deletions

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ env:
1717
global:
1818
- secure: RriLxF6+2yMl67hdVv8ImXlu0h62mhcpqjaOgYNU+IEbUQ7hx96CKY6gkpYubW3BgApvF5RH6j3+HKvh2kGp0XhDOYOQCODfBSaSipZ5Aa5RKjsEYLtuVIobvJ80awR9hUeql69+WXs0/s72WThG0qTbOUY4pqHWfteeY235hWM=
1919

20+
install:
21+
- go get -t -d
22+
- go get -t -d -tags integration
23+
2024
before_script:
2125
- mysql -e "CREATE DATABASE gorptest;"
2226
- mysql -u root -e "GRANT ALL ON gorptest.* TO gorptest@localhost IDENTIFIED BY 'gorptest'"
@@ -28,6 +32,5 @@ before_script:
2832
- go get github.com/go-sql-driver/mysql
2933
- go get golang.org/x/tools/cmd/cover
3034
- go get github.com/mattn/goveralls
31-
- go get github.com/onsi/ginkgo/ginkgo
3235

3336
script: ./test_all.sh

column.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
11-
125
package gorp
136

147
import "reflect"

gorp_go18_test.go renamed to context_test.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
11-
//
12-
13-
// +build go1.8
5+
// +build integration
146

157
package gorp_test
168

db.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
11-
125
package gorp
136

147
import (

db_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
5+
// +build integration
116

127
package gorp_test
138

dialect.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
11-
125
package gorp
136

147
import (

dialect_mysql.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
11-
125
package gorp
136

147
import (

dialect_mysql_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
5+
// +build !integration
116

127
package gorp_test
138

dialect_oracle.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
11-
125
package gorp
136

147
import (

dialect_postgres.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
// Package gorp provides a simple way to marshal Go structs to and from
6-
// SQL databases. It uses the database/sql package, and should work with any
7-
// compliant database/sql driver.
8-
//
9-
// Source code and project home:
10-
// https://github.com/go-gorp/gorp
11-
125
package gorp
136

147
import (

0 commit comments

Comments
 (0)