|
@@ -2,7 +2,6 @@ package db_operations
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
"database/sql"
|
|
"database/sql"
|
|
|
- "git.sxidc.com/service-supports/ds-sdk/db_operations/dberr"
|
|
|
|
|
"git.sxidc.com/service-supports/fslog"
|
|
"git.sxidc.com/service-supports/fslog"
|
|
|
"github.com/mitchellh/mapstructure"
|
|
"github.com/mitchellh/mapstructure"
|
|
|
"gorm.io/gorm"
|
|
"gorm.io/gorm"
|
|
@@ -182,7 +181,7 @@ func (op *Operations) Create(tableRow *TableRow) error {
|
|
|
err := op.processDB.Create(tableRow.ToMap()).Error
|
|
err := op.processDB.Create(tableRow.ToMap()).Error
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
if strings.Contains(err.Error(), "SQLSTATE 23505") {
|
|
if strings.Contains(err.Error(), "SQLSTATE 23505") {
|
|
|
- return dberr.ErrDBRecordHasExist
|
|
|
|
|
|
|
+ return ErrDBRecordHasExist
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return err
|
|
return err
|
|
@@ -200,7 +199,7 @@ func (op *Operations) CreateBatch(tableRows []TableRow) error {
|
|
|
err := op.processDB.Create(tableRowMaps).Error
|
|
err := op.processDB.Create(tableRowMaps).Error
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
if strings.Contains(err.Error(), "SQLSTATE 23505") {
|
|
if strings.Contains(err.Error(), "SQLSTATE 23505") {
|
|
|
- return dberr.ErrDBRecordHasExist
|
|
|
|
|
|
|
+ return ErrDBRecordHasExist
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return err
|
|
return err
|
|
@@ -217,7 +216,7 @@ func (op *Operations) Updates(newTableRow *TableRow) error {
|
|
|
err := op.processDB.Updates(newTableRow.ToMap()).Error
|
|
err := op.processDB.Updates(newTableRow.ToMap()).Error
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
if strings.Contains(err.Error(), "SQLSTATE 23505") {
|
|
if strings.Contains(err.Error(), "SQLSTATE 23505") {
|
|
|
- return dberr.ErrDBRecordHasExist
|
|
|
|
|
|
|
+ return ErrDBRecordHasExist
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return err
|
|
return err
|
|
@@ -267,7 +266,7 @@ func (op *Operations) Row() (*TableRow, error) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if valueMap == nil || len(valueMap) == 0 {
|
|
if valueMap == nil || len(valueMap) == 0 {
|
|
|
- return nil, dberr.ErrDBRecordNotExist
|
|
|
|
|
|
|
+ return nil, ErrDBRecordNotExist
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return NewTableRowFromMap(valueMap), nil
|
|
return NewTableRowFromMap(valueMap), nil
|