Skip to content

Commit 12ef36f

Browse files
committed
add support for export, testcases next
Signed-off-by: Doug Davis <[email protected]>
1 parent 00d9259 commit 12ef36f

File tree

7 files changed

+261
-144
lines changed

7 files changed

+261
-144
lines changed

registry/entity.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ func (e *Entity) SetPP(pp *PropPath, val any) error {
555555
// This will save a single property/value in the DB. This assumes
556556
// the caller is traversing the Object and splitting it into individual props
557557
func (e *Entity) SetDBProperty(pp *PropPath, val any) error {
558-
log.VPrintf(3, ">Enter: SetDBProperty(%s=%v)", pp.UI(), val)
558+
log.VPrintf(3, ">Enter: SetDBProperty(%s=%v)", pp, val)
559559
defer log.VPrintf(3, "<Exit SetDBProperty")
560560

561561
PanicIf(pp.UI() == "", "pp is empty")
@@ -656,8 +656,8 @@ func (e *Entity) SetDBProperty(pp *PropPath, val any) error {
656656

657657
err = DoOneTwo(e.tx, `
658658
REPLACE INTO Props(
659-
RegistrySID, EntitySID, PropName, PropValue, PropType)
660-
VALUES( ?,?,?,?,? )`,
659+
RegistrySID, EntitySID, PropName, PropValue, PropType, Export)
660+
VALUES( ?,?,?,?,?, true )`,
661661
e.Registry.DbSID, e.DbSID, name, dbVal, propType)
662662
}
663663

@@ -1917,7 +1917,7 @@ func (e *Entity) GetBaseAttributes() Attributes {
19171917
// structures to 'obj' to materialize PropPath and set the appropriate
19181918
// fields to 'val'
19191919
func ObjectSetProp(obj map[string]any, pp *PropPath, val any) error {
1920-
log.VPrintf(4, "ObjectSetProp(%s=%v)", pp.UI(), val)
1920+
log.VPrintf(4, "ObjectSetProp(%s=%v)", pp, val)
19211921
if pp.Len() == 0 && IsNil(val) {
19221922
// A bit of a special case, not 100% sure if this is ok.
19231923
// Treat nil val as a request to delete all properties.
@@ -1934,7 +1934,7 @@ func ObjectSetProp(obj map[string]any, pp *PropPath, val any) error {
19341934
}
19351935

19361936
func MaterializeProp(current any, pp *PropPath, val any, prev *PropPath) (any, error) {
1937-
log.VPrintf(4, ">Enter: MaterializeProp(%s)", pp.UI())
1937+
log.VPrintf(4, ">Enter: MaterializeProp(%s)", pp)
19381938
log.VPrintf(4, "<Exit: MaterializeProp")
19391939

19401940
// current is existing value, used for adding to maps/arrays
@@ -2030,7 +2030,7 @@ func (e *Entity) Validate() error {
20302030
// been removed - such as collections
20312031
func (e *Entity) ValidateObject(val any, origAttrs Attributes, path *PropPath) error {
20322032

2033-
log.VPrintf(3, ">Enter: ValidateObject(path: %s)", path.UI())
2033+
log.VPrintf(3, ">Enter: ValidateObject(path: %s)", path)
20342034
defer log.VPrintf(3, "<Exit: ValidateObject")
20352035

20362036
if log.GetVerbose() > 2 {
@@ -2228,7 +2228,7 @@ func (e *Entity) ValidateObject(val any, origAttrs Attributes, path *PropPath) e
22282228
}
22292229

22302230
func (e *Entity) ValidateAttribute(val any, attr *Attribute, path *PropPath) error {
2231-
log.VPrintf(3, ">Enter: ValidateAttribute(%s)", path.UI())
2231+
log.VPrintf(3, ">Enter: ValidateAttribute(%s)", path)
22322232
defer log.VPrintf(3, "<Exit: ValidateAttribute")
22332233

22342234
if log.GetVerbose() > 2 {
@@ -2263,7 +2263,7 @@ func (e *Entity) ValidateAttribute(val any, attr *Attribute, path *PropPath) err
22632263
}
22642264

22652265
func (e *Entity) ValidateMap(val any, item *Item, path *PropPath) error {
2266-
log.VPrintf(3, ">Enter: ValidateMap(%s)", path.UI())
2266+
log.VPrintf(3, ">Enter: ValidateMap(%s)", path)
22672267
defer log.VPrintf(3, "<Exit: ValidateMap")
22682268

22692269
if log.GetVerbose() > 2 {
@@ -2302,7 +2302,7 @@ func (e *Entity) ValidateMap(val any, item *Item, path *PropPath) error {
23022302
}
23032303

23042304
func (e *Entity) ValidateArray(val any, item *Item, path *PropPath) error {
2305-
log.VPrintf(3, ">Enter: ValidateArray(%s)", path.UI())
2305+
log.VPrintf(3, ">Enter: ValidateArray(%s)", path)
23062306
defer log.VPrintf(3, "<Exit: ValidateArray")
23072307

23082308
if log.GetVerbose() > 2 {
@@ -2338,7 +2338,7 @@ func (e *Entity) ValidateArray(val any, item *Item, path *PropPath) error {
23382338

23392339
func (e *Entity) ValidateScalar(val any, attr *Attribute, path *PropPath) error {
23402340
if log.GetVerbose() > 2 {
2341-
log.VPrintf(0, ">Enter: ValidateScalar(%s:%s)", path.UI(), ToJSON(val))
2341+
log.VPrintf(0, ">Enter: ValidateScalar(%s:%s)", path, ToJSON(val))
23422342
defer log.VPrintf(3, "<Exit: ValidateScalar")
23432343
}
23442344

0 commit comments

Comments
 (0)