@@ -17,10 +17,6 @@ import (
1717 "go.mongodb.org/mongo-driver/bson/primitive"
1818)
1919
20- type StringInterface interface {
21- String () string
22- }
23-
2420var (
2521 ErrNullValue = fmt .Errorf ("null value" )
2622)
@@ -44,16 +40,6 @@ var DateTimeFormats = []string{
4440
4541var GeospatialTypes = []string {"geometry" , "point" , "polygon" , "linestring" , "multi" }
4642
47- func getFirstNotNullType (datatypes []types.DataType ) types.DataType {
48- for _ , datatype := range datatypes {
49- if datatype != types .Null {
50- return datatype
51- }
52- }
53-
54- return types .Null
55- }
56-
5743func ReformatRecord (fields Fields , record types.Record ) error {
5844 for key , val := range record {
5945 field , found := fields [key ]
@@ -70,10 +56,6 @@ func ReformatRecord(fields Fields, record types.Record) error {
7056 return nil
7157}
7258
73- func ReformatValueOnDataTypes (datatypes []types.DataType , v any ) (any , error ) {
74- return ReformatValue (getFirstNotNullType (datatypes ), v )
75- }
76-
7759func ReformatValue (dataType types.DataType , v any ) (any , error ) {
7860 if v == nil {
7961 return v , nil
@@ -96,7 +78,7 @@ func ReformatValue(dataType types.DataType, v any) (any, error) {
9678 case uint , uint8 , uint16 , uint32 , uint64 :
9779 return fmt .Sprintf ("%d" , v ), nil
9880 case float32 , float64 :
99- // Fixed float string conversion (%v) for v> 6; older versions retain %d for backward compatibility
81+ // Fixed float string conversion (%v) for version > 6; older versions retain %d for backward compatibility
10082 if constants .LoadedStateVersion > 6 {
10183 return fmt .Sprintf ("%v" , v ), nil
10284 }
@@ -149,7 +131,7 @@ func ReformatBool(v interface{}) (bool, error) {
149131 return false , nil
150132 }
151133 case int , int16 , int32 , int64 , int8 :
152- // Fixed int8/int16/int32/int64 bool handling for v >6; older versions keep strict comparison
134+ // Fixed int8/int16/int32/int64 bool handling for version >6; older versions keep strict comparison
153135 if constants .LoadedStateVersion > 6 {
154136 switch reflect .ValueOf (booleanValue ).Int () {
155137 case 1 :
@@ -159,15 +141,14 @@ func ReformatBool(v interface{}) (bool, error) {
159141 default :
160142 return false , fmt .Errorf ("found to be boolean, but value is not boolean : %v" , v )
161143 }
162- } else {
163- switch booleanValue {
164- case 1 :
165- return true , nil
166- case 0 :
167- return false , nil
168- default :
169- return false , fmt .Errorf ("found to be boolean, but value is not boolean : %v" , v )
170- }
144+ }
145+ switch booleanValue {
146+ case 1 :
147+ return true , nil
148+ case 0 :
149+ return false , nil
150+ default :
151+ return false , fmt .Errorf ("found to be boolean, but value is not boolean : %v" , v )
171152 }
172153 default :
173154 return false , fmt .Errorf ("found to be boolean, but value is not boolean : %v" , v )
@@ -543,39 +524,6 @@ func ReformatFloat32(v interface{}) (float32, error) {
543524 return float32 (0 ), fmt .Errorf ("failed to change %v (type:%T) to float32" , v , v )
544525}
545526
546- func ReformatByteArraysToString (data map [string ]any ) map [string ]any {
547- for key , value := range data {
548- switch value := value .(type ) {
549- case map [string ]any :
550- data [key ] = ReformatByteArraysToString (value )
551- case []byte :
552- data [key ] = string (value )
553- case []map [string ]any :
554- decryptedArray := []map [string ]any {}
555- for _ , element := range value {
556- decryptedArray = append (decryptedArray , ReformatByteArraysToString (element ))
557- }
558-
559- data [key ] = decryptedArray
560- case []any :
561- decryptedArray := []any {}
562- for _ , element := range value {
563- switch element := element .(type ) {
564- case map [string ]any :
565- decryptedArray = append (decryptedArray , ReformatByteArraysToString (element ))
566- case []byte :
567- decryptedArray = append (decryptedArray , string (element ))
568- default :
569- decryptedArray = append (decryptedArray , element )
570- }
571- }
572-
573- data [key ] = decryptedArray
574- }
575- }
576- return data
577- }
578-
579527func ReformatGeoType (v any ) (any , error ) {
580528 if v == nil {
581529 return nil , ErrNullValue
0 commit comments