fix sql delete bug

Signed-off-by: Doug Davis <[email protected]>

README.md

@@ -134,16 +134,15 @@ TODOs:
 - add "validation" attribute - schema
 - error w/o ?nested + children
 - Add content-disposition header for hasdoc resources
-- make sure ID only has valid chars
 - inline=model, requires ?nested. Make sure /meta requires ?nested too
 - add "compatibility" to resources
 - multi-delete must ignore all attributes except id and epoch
 - fix init.sql, it's too slow due to latest xref stuff in commit 9c583e7
 - add support for inline=endpoints.*
 - support ETag/If-Match
 - update epoch/modifiedat of parent when nested entity is added/removed
-- ?nested isn't needed to update `model` or `meta` attributes
 - test to ensure meta epoch changes as versions are added/removed
+- ?nested isn't needed to update `model` or `meta` attributes
 - test the timestamps in meta. Should change as versions are added/removed.
 - remove entities from cache upon delete
 - test creating a resource + lots of versions w/o ?defaultversionid-should fail

registry/entity.go

@@ -284,6 +284,14 @@ func (e *Entity) Query(query string, args ...any) ([][]any, error) {
 	}
 
 	data := ([][]any)(nil)
+	/*
+		Ks := make([]string, len(results.colTypes))
+
+		for i, t := range results.colTypes {
+			Ks[i] = t.Kind().String()
+		}
+	*/
+
 	for row := results.NextRow(); row != nil; row = results.NextRow() {
 		if data == nil {
 			data = [][]any{}
@@ -292,6 +300,20 @@ func (e *Entity) Query(query string, args ...any) ([][]any, error) {
 		r := make([]any, len(row))
 		for i, d := range row {
 			r[i] = d
+			/*
+				k := Ks[i]
+				if k == "slice" {
+					r[i] = NotNilString(d)
+				} else if k == "int64" || k == "uint64" {
+					r[i] = NotNilInt(d)
+				} else {
+					log.Printf("%v", reflect.ValueOf(*d).Type().String())
+					log.Printf("%v", reflect.ValueOf(*d).Type().Kind().String())
+					log.Printf("Ks: %v", Ks)
+					log.Printf("i: %d", i)
+					panic("help")
+				}
+			*/
 		}
 		data = append(data, r)
 	}

registry/init.sql

@@ -43,7 +43,7 @@ CREATE TABLE Registries (
 CREATE TRIGGER RegistryTrigger BEFORE DELETE ON Registries
 FOR EACH ROW
 BEGIN
-    DELETE FROM Props    WHERE EntitySID=OLD.SID @
+    DELETE FROM Props    WHERE RegistrySID=OLD.SID @
     DELETE FROM "Groups" WHERE RegistrySID=OLD.SID @
     DELETE FROM Models   WHERE RegistrySID=OLD.SID @
 END ;

registry/utils.go

@@ -85,7 +85,7 @@ func NotNilString(val *any) string {
 	}
 
 	if reflect.ValueOf(*val).Kind() != reflect.Slice {
-		panic("Not a slice")
+		panic(fmt.Sprintf("Not a slice: %T (%#v)", *val, *val))
 	}
 
 	b := (*val).([]byte)

tests/http1_test.go

@@ -4720,6 +4720,7 @@ func TestHTTPEpochTimesAddRemove(t *testing.T) {
 }
 `)
 }
+
 func TestHTTPEnum(t *testing.T) {
 	reg := NewRegistry("TestHTTPEnum")
 	defer PassDeleteReg(t, reg)

tests/multireg_test.go

@@ -86,5 +86,4 @@ func TestMultiReg(t *testing.T) {
   "versionscount": 1
 }
 `)
-
 }

tests/utils_test.go

@@ -93,6 +93,14 @@ func PassDeleteReg(t *testing.T, reg *registry.Registry) {
 			// We do this to make sure that we can support more than
 			// one registry in the DB at a time
 			reg.Delete()
+
+			/*
+				rows, err := reg.Query("select * from Props")
+				if err != nil || len(rows) != 0 {
+					fmt.Printf("Rows: %s", ToJSON(rows))
+					panic(fmt.Sprintf("Props left around: %s / %d", err, len(rows)))
+				}
+			*/
 		}
 		registry.DefaultRegDbSID = ""
 	}