From f2f98e1d168fefc1168c6c114a2de5c2fcb26e91 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 6 Jun 2020 14:38:05 +0800 Subject: [PATCH] rename testing file names for package gdb --- database/gdb/gdb_structure.go | 6 +-- ..._z_driver_test.go => gdb_z_driver_test.go} | 0 database/gdb/gdb_z_example_test.go | 40 +++++++++++++++++++ ...b_unit_init_test.go => gdb_z_init_test.go} | 0 ...asic_test.go => gdb_z_mysql_basic_test.go} | 0 ...l_test.go => gdb_z_mysql_internal_test.go} | 0 ...hod_test.go => gdb_z_mysql_method_test.go} | 0 ...odel_test.go => gdb_z_mysql_model_test.go} | 0 ...uct_test.go => gdb_z_mysql_struct_test.go} | 0 ..._time_test.go => gdb_z_mysql_time_test.go} | 0 ...est.go => gdb_z_mysql_transaction_test.go} | 0 ...ypes_test.go => gdb_z_mysql_types_test.go} | 0 12 files changed, 43 insertions(+), 3 deletions(-) rename database/gdb/{gdb_unit_z_driver_test.go => gdb_z_driver_test.go} (100%) create mode 100644 database/gdb/gdb_z_example_test.go rename database/gdb/{gdb_unit_init_test.go => gdb_z_init_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_basic_test.go => gdb_z_mysql_basic_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_internal_test.go => gdb_z_mysql_internal_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_method_test.go => gdb_z_mysql_method_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_model_test.go => gdb_z_mysql_model_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_struct_test.go => gdb_z_mysql_struct_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_time_test.go => gdb_z_mysql_time_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_transaction_test.go => gdb_z_mysql_transaction_test.go} (100%) rename database/gdb/{gdb_unit_z_mysql_types_test.go => gdb_z_mysql_types_test.go} (100%) diff --git a/database/gdb/gdb_structure.go b/database/gdb/gdb_structure.go index 09748c4f2..664c4c3e8 100644 --- a/database/gdb/gdb_structure.go +++ b/database/gdb/gdb_structure.go @@ -41,8 +41,7 @@ func (c *Core) convertValue(fieldValue []byte, fieldType string) interface{} { "smallint", "medium_int", "mediumint", - "serial", - "smallmoney": + "serial": if gstr.ContainsI(fieldType, "unsigned") { gconv.Uint(string(fieldValue)) } @@ -65,7 +64,8 @@ func (c *Core) convertValue(fieldValue []byte, fieldType string) interface{} { "double", "decimal", "money", - "numeric": + "numeric", + "smallmoney": return gconv.Float64(string(fieldValue)) case "bit": diff --git a/database/gdb/gdb_unit_z_driver_test.go b/database/gdb/gdb_z_driver_test.go similarity index 100% rename from database/gdb/gdb_unit_z_driver_test.go rename to database/gdb/gdb_z_driver_test.go diff --git a/database/gdb/gdb_z_example_test.go b/database/gdb/gdb_z_example_test.go new file mode 100644 index 000000000..17b523d5d --- /dev/null +++ b/database/gdb/gdb_z_example_test.go @@ -0,0 +1,40 @@ +// Copyright 2018 gf Author(https://github.com/gogf/gf). All Rights Reserved. +// +// This Source Code Form is subject to the terms of the MIT License. +// If a copy of the MIT was not distributed with this file, +// You can obtain one at https://github.com/gogf/gf. + +package gdb_test + +import ( + "github.com/gogf/gf/database/gdb" + "github.com/gogf/gf/frame/g" +) + +func Example_transaction() { + db.Transaction(func(tx *gdb.TX) error { + // user + result, err := tx.Insert("user", g.Map{ + "passport": "john", + "password": "12345678", + "nickname": "JohnGuo", + }) + if err != nil { + return err + } + // user_detail + id, err := result.LastInsertId() + if err != nil { + return err + } + _, err = tx.Insert("user_detail", g.Map{ + "uid": id, + "site": "https://johng.cn", + "true_name": "GuoQiang", + }) + if err != nil { + return err + } + return nil + }) +} diff --git a/database/gdb/gdb_unit_init_test.go b/database/gdb/gdb_z_init_test.go similarity index 100% rename from database/gdb/gdb_unit_init_test.go rename to database/gdb/gdb_z_init_test.go diff --git a/database/gdb/gdb_unit_z_mysql_basic_test.go b/database/gdb/gdb_z_mysql_basic_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_basic_test.go rename to database/gdb/gdb_z_mysql_basic_test.go diff --git a/database/gdb/gdb_unit_z_mysql_internal_test.go b/database/gdb/gdb_z_mysql_internal_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_internal_test.go rename to database/gdb/gdb_z_mysql_internal_test.go diff --git a/database/gdb/gdb_unit_z_mysql_method_test.go b/database/gdb/gdb_z_mysql_method_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_method_test.go rename to database/gdb/gdb_z_mysql_method_test.go diff --git a/database/gdb/gdb_unit_z_mysql_model_test.go b/database/gdb/gdb_z_mysql_model_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_model_test.go rename to database/gdb/gdb_z_mysql_model_test.go diff --git a/database/gdb/gdb_unit_z_mysql_struct_test.go b/database/gdb/gdb_z_mysql_struct_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_struct_test.go rename to database/gdb/gdb_z_mysql_struct_test.go diff --git a/database/gdb/gdb_unit_z_mysql_time_test.go b/database/gdb/gdb_z_mysql_time_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_time_test.go rename to database/gdb/gdb_z_mysql_time_test.go diff --git a/database/gdb/gdb_unit_z_mysql_transaction_test.go b/database/gdb/gdb_z_mysql_transaction_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_transaction_test.go rename to database/gdb/gdb_z_mysql_transaction_test.go diff --git a/database/gdb/gdb_unit_z_mysql_types_test.go b/database/gdb/gdb_z_mysql_types_test.go similarity index 100% rename from database/gdb/gdb_unit_z_mysql_types_test.go rename to database/gdb/gdb_z_mysql_types_test.go