Skip to content

Commit 0ce142c

Browse files
1414C1414C
committed
update dependencies + test mariadb, postgres, sqlite
1 parent 17a18b7 commit 0ce142c

File tree

5 files changed

+81
-48
lines changed

5 files changed

+81
-48
lines changed

‎a_sqac_test.go

+13-14
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ var (
2424
Handle sqac.PublicDB
2525
)
2626

27-
//============================================================================================================================
27+
// ============================================================================================================================
2828
// GetEntities test artifacts
29-
//============================================================================================================================
29+
// ============================================================================================================================
3030
type DepotGetEntities2 struct {
3131
DepotNum int `json:"depot_num" db:"depot_num" sqac:"primary_key:inc;start:90000000"`
3232
DepotBay int `json:"depot_bay" db:"depot_bay" sqac:"primary_key:"`
@@ -94,15 +94,17 @@ func TestMain(m *testing.M) {
9494
case "postgres":
9595
cs = "host=127.0.0.1 user=godev dbname=sqactst sslmode=disable password=gogogo123"
9696
case "mysql":
97-
cs = "godev:gogogo123@tcp(127.0.0.1:3306)/sqlx?charset=utf8&parseTime=True&loc=Local"
97+
cs = "godev:gogogo123@tcp(localhost:3306)/sqactst?charset=utf8&parseTime=True&loc=Local"
9898
case "sqlite":
9999
cs = "testdb.sqlite"
100100
case "mssql":
101101
cs = "sqlserver://SA:gogogo123@localhost:1433?database=sqlx"
102102
case "db2":
103103
cs = ""
104104
case "hdb":
105-
cs = "hdb://godev:[email protected]:30015"
105+
cs = "hdb://SYSTEM:[email protected]:39017"
106+
//cs = "hdb://hxeadm:[email protected]:39017"
107+
//cs = "hdb://godev:[email protected]:30015"
106108
default:
107109
cs = ""
108110
}
@@ -166,8 +168,8 @@ func TestExistsTableNegative(t *testing.T) {
166168
// Create table depot via CreateTables(i ...interface{})
167169
// Verify table creation via ExistsTable(tn string)
168170
// Perform negative validation be checking for non-existent
169-
// table "abcdefg" via ExistsTable(tn string)
170171
//
172+
// table "abcdefg" via ExistsTable(tn string)
171173
func TestCreateTableBasic(t *testing.T) {
172174

173175
type Depot struct {
@@ -195,7 +197,6 @@ func TestCreateTableBasic(t *testing.T) {
195197
// TestDropTablesBasic
196198
//
197199
// Drop table depot via DropTables(i ...interface{})
198-
//
199200
func TestDropTablesBasic(t *testing.T) {
200201

201202
type Depot struct {
@@ -286,8 +287,8 @@ func TestCreateTableCompoundKey(t *testing.T) {
286287
// Create table depot via CreateTables(i ...interface{})
287288
// Verify table creation via ExistsTable(tn string)
288289
// Perform negative validation be checking for non-existent
289-
// table "abcdefg" via ExistsTable(tn string)
290290
//
291+
// table "abcdefg" via ExistsTable(tn string)
291292
func TestCreateTableNonIncKey(t *testing.T) {
292293

293294
type Depot struct {
@@ -328,8 +329,8 @@ func TestCreateTableNonIncKey(t *testing.T) {
328329
// Create table depot via CreateTables(i ...interface{})
329330
// Verify table creation via ExistsTable(tn string)
330331
// Perform negative validation be checking for non-existent
331-
// table "abcdefg" via ExistsTable(tn string)
332332
//
333+
// table "abcdefg" via ExistsTable(tn string)
333334
func TestCreateTableNoKey(t *testing.T) {
334335

335336
type Depot struct {
@@ -370,8 +371,8 @@ func TestCreateTableNoKey(t *testing.T) {
370371
// Create table depot via CreateTables(i ...interface{})
371372
// Verify table creation via ExistsTable(tn string)
372373
// Perform negative validation be checking for non-existent
373-
// table "abcdefg" via ExistsTable(tn string)
374374
//
375+
// table "abcdefg" via ExistsTable(tn string)
375376
func TestCreateTableWithAlterSequence(t *testing.T) {
376377

377378
type Depot struct {
@@ -425,7 +426,6 @@ func TestCreateTableWithAlterSequence(t *testing.T) {
425426
// Create table equipment via CreateTables(i ...interface{})
426427
// and verify that flat structs can be included in the
427428
// table creation.
428-
//
429429
func TestCreateTablesWithInclude(t *testing.T) {
430430

431431
// type Triplet struct {
@@ -866,10 +866,9 @@ func TestExistsColumn(t *testing.T) {
866866
//
867867
// Alter table depot via AlterTables(i ...interface{})
868868
// Add three columns:
869-
// - NewColumn1 string `db:"new_column1" sqac:"nullable:false"`
870-
// - NewColumn2 int64 `db:"new_column2" sqac:"nullable:false;default:0"`
871-
// - NewColumn3 float64 `db:"new_column3" sqac:"nullable:false;default:0.0"`
872-
//
869+
// - NewColumn1 string `db:"new_column1" sqac:"nullable:false"`
870+
// - NewColumn2 int64 `db:"new_column2" sqac:"nullable:false;default:0"`
871+
// - NewColumn3 float64 `db:"new_column3" sqac:"nullable:false;default:0.0"`
873872
func TestAlterTables(t *testing.T) {
874873

875874
type Depot struct {

‎base_flavor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ func (bf *BaseFlavor) GetEntities(ents interface{}) (interface{}, error) {
10091009
// GetEntities2 attempts to retrieve all entities based on the internal implementation
10101010
// of interface GetEnt.
10111011
// GetEnt exposes a single method (Exec(handle PublicDB)error) to execute the request.
1012-
// All this because go can only go so far with meta-type programming in go before being
1012+
// All this because go can only go so far with meta-type programming before being
10131013
// buried in reflection. ge allows you to pass a sqac handle into the method so you
10141014
// can code directly against the desired struct/table with no reflection.
10151015
// GetEntities2 has been replaced by GetEntitiesWithCommands, but can be used if you

‎go.mod

+15-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
module github.com/1414C/sqac
22

3-
go 1.14
3+
go 1.22
44

55
require (
6-
github.com/SAP/go-hdb v0.14.1
7-
github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73
8-
github.com/go-sql-driver/mysql v1.4.1
9-
github.com/jmoiron/sqlx v1.2.0
10-
github.com/lib/pq v1.2.0
11-
github.com/mattn/go-sqlite3 v2.0.1+incompatible
12-
google.golang.org/appengine v1.6.5 // indirect
6+
github.com/SAP/go-hdb v1.8.11
7+
github.com/denisenkom/go-mssqldb v0.12.3
8+
github.com/go-sql-driver/mysql v1.8.1
9+
github.com/jmoiron/sqlx v1.3.5
10+
github.com/lib/pq v1.10.9
11+
github.com/mattn/go-sqlite3 v1.14.22 // v2.0.1+incompatible
12+
)
13+
14+
require (
15+
filippo.io/edwards25519 v1.1.0 // indirect
16+
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
17+
github.com/golang-sql/sqlexp v0.1.0 // indirect
18+
golang.org/x/crypto v0.21.0 // indirect
19+
golang.org/x/text v0.14.0 // indirect
1320
)

‎go.sum

+51-24
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,57 @@
1-
github.com/SAP/go-hdb v0.14.1 h1:hkw4ozGZ/i4eak7ZuGkY5e0hxiXFdNUBNhr4AvZVNFE=
2-
github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo=
3-
github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73 h1:OGNva6WhsKst5OZf7eZOklDztV3hwtTHovdrLHV+MsA=
4-
github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
5-
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
6-
github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
7-
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
8-
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
1+
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
2+
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
3+
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
4+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
5+
github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
6+
github.com/SAP/go-hdb v1.8.11 h1:CfzNLy9ymcwMbAMWYpkd8NezbVKYQcNxpRqOPfBNHAE=
7+
github.com/SAP/go-hdb v1.8.11/go.mod h1:AjSrmLmZEZcX17tS41J9/bFYvAKqLFuZ28v5h79Yn1c=
8+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
10+
github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw=
11+
github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo=
12+
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
13+
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
14+
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
15+
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
916
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
10-
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
11-
github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
12-
github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
13-
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
14-
github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
17+
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
18+
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
19+
github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
20+
github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
21+
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
22+
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
1523
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
16-
github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
17-
github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw=
18-
github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
24+
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
25+
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
26+
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
27+
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
28+
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
29+
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
30+
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
31+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
32+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
33+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1934
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
20-
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
21-
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
22-
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
35+
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
36+
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
37+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
38+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
39+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
40+
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
41+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
2342
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
24-
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
43+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
44+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
45+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
46+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
47+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
2548
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
26-
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
27-
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
49+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
50+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
51+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
2852
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
29-
google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
30-
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
53+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
54+
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
55+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
56+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
57+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/jmoiron/sqlx/reflectx"
99

10-
_ "github.com/SAP/go-hdb/driver" // needed
10+
//_ "github.com/SAP/go-hdb/driver" // needed
1111
"github.com/jmoiron/sqlx"
1212
)
1313

0 commit comments

Comments
 (0)