less strict unique tracking

fixes #25

Author: Jeff Wendling

ir/helpers.go

@@ -119,15 +119,15 @@ func queryUnique(targets []*Model, joins []*Join, wheres []*Where) (out bool) {
 		}
 	}
 
-	// if any table from the set of targets is unique, then only one row would
+	// if all tables from the set of targets is unique, then only one row would
 	// ever be returned, so it is a "unique" query.
 	for _, target := range targets {
-		if unique[target.Name] {
-			return true
+		if !unique[target.Name] {
+			return false
 		}
 	}
 
-	return false
+	return true
 }
 
 func SortModels(models []*Model) (sorted []*Model, err error) {

run_test.go

@@ -43,12 +43,6 @@ func testRunFile(t *testutil.T, dbx_file string) {
 	t.Context("dbx", linedSource(dbx_source))
 	d := loadDirectives(t, dbx_source)
 
-	ext := filepath.Ext(dbx_file)
-	go_file := dbx_file[:len(dbx_file)-len(ext)] + ".go"
-	go_source, err := ioutil.ReadFile(go_file)
-	t.AssertNoError(err)
-	t.Context("go", linedSource(go_source))
-
 	dir, err := ioutil.TempDir("", "dbx")
 	t.AssertNoError(err)
 	defer os.RemoveAll(dir)
@@ -64,6 +58,12 @@ func testRunFile(t *testutil.T, dbx_file string) {
 		t.AssertNoError(err)
 	}
 
+	ext := filepath.Ext(dbx_file)
+	go_file := dbx_file[:len(dbx_file)-len(ext)] + ".go"
+	go_source, err := ioutil.ReadFile(go_file)
+	t.AssertNoError(err)
+	t.Context("go", linedSource(go_source))
+
 	t.Logf("[%s] copying go source...", dbx_file)
 	t.AssertNoError(ioutil.WriteFile(
 		filepath.Join(dir, filepath.Base(go_file)), go_source, 0644))

testdata/build/unique_checking.dbx

@@ -0,0 +1,33 @@
+model a (
+	key   id
+	field id serial64
+)
+
+model b (
+	key   id
+	field id   serial64
+	field a_id a.id     restrict
+)
+
+model c (
+	key    id
+	unique b_id
+	field  id   serial64
+	field  lat  float
+	field  lon  float
+	field  b_id b.id     restrict
+)
+
+read all (
+	select a b c
+
+	join a.id = b.a_id
+	join b.id = c.b_id
+
+	where a.id  = ?
+	where c.lat < ?
+	where c.lat > ?
+	where c.lon < ?
+	where c.lon > ?
+)
+

testdata/run/unique_checking.dbx

@@ -0,0 +1,39 @@
+model a (
+	table a
+	key   id
+	field id serial64
+)
+
+model b (
+	table b
+	key   id
+	field id   serial64
+	field a_id a.id     restrict
+)
+
+model c (
+	table  c
+	key    id
+	unique b_id
+	field  id   serial64
+	field  lat  float
+	field  lon  float
+	field  b_id b.id     restrict
+)
+
+create a ()
+create b ()
+create c ()
+
+read all (
+	select a b c
+
+	join a.id = b.a_id
+	join b.id = c.b_id
+
+	where a.id  = ?
+	where c.lat < ?
+	where c.lat > ?
+	where c.lon < ?
+	where c.lon > ?
+)

testdata/run/unique_checking.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"context"
+)
+
+func erre(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
+func assert(x bool) {
+	if !x {
+		panic("assertion failed")
+	}
+}
+
+var ctx = context.Background()
+
+func main() {
+	db, err := Open("sqlite3", ":memory:")
+	erre(err)
+	defer db.Close()
+
+	_, err = db.Exec(db.Schema())
+	erre(err)
+
+	a, err := db.Create_A(ctx)
+	erre(err)
+
+	b1, err := db.Create_B(ctx, B_AId(a.Id))
+	erre(err)
+	c1, err := db.Create_C(ctx, C_Lat(0.0), C_Lon(0.0), C_BId(b1.Id))
+	erre(err)
+
+	b2, err := db.Create_B(ctx, B_AId(a.Id))
+	erre(err)
+	c2, err := db.Create_C(ctx, C_Lat(1.0), C_Lon(1.0), C_BId(b2.Id))
+	erre(err)
+
+	rows, err := db.All_A_B_C_By_A_Id_And_C_Lat_Less_And_C_Lat_Greater_And_C_Lon_Less_And_C_Lon_Greater(ctx,
+		A_Id(a.Id),
+		C_Lat(10.0), C_Lat(-10.0),
+		C_Lon(10.0), C_Lon(-10.0))
+	erre(err)
+
+	assert(len(rows) == 2)
+
+	assert(rows[0].A.Id == a.Id)
+	assert(rows[0].B.Id == b1.Id)
+	assert(rows[0].C.Id == c1.Id)
+	assert(rows[0].C.Lat == 0)
+	assert(rows[0].C.Lon == 0)
+
+	assert(rows[1].A.Id == a.Id)
+	assert(rows[1].B.Id == b2.Id)
+	assert(rows[1].C.Id == c2.Id)
+	assert(rows[1].C.Lat == 1)
+	assert(rows[1].C.Lon == 1)
+}