diff --git a/cmd/entc/entc.go b/cmd/entc/entc.go index bc290e84a..3a483ec81 100644 --- a/cmd/entc/entc.go +++ b/cmd/entc/entc.go @@ -205,10 +205,7 @@ const ( // default schema package path. defaultSchema = "ent/schema" // ent/generate.go file used for "go generate" command. - genFile = `package ent - -//go:generate go run github.com/facebookincubator/ent/cmd/entc generate ./schema -` + genFile = "package ent\n\n//go:generate go run github.com/facebookincubator/ent/cmd/entc generate ./schema\n" ) func failOnErr(err error) { diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go index 32617ec67..4d2c7881a 100644 --- a/entc/gen/internal/bindata.go +++ b/entc/gen/internal/bindata.go @@ -204,7 +204,7 @@ func templateBuilderMutationTmpl() (*asset, error) { return a, nil } -var _templateBuilderQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x5a\x6d\x6f\xdb\x46\xf2\x7f\x4d\x7d\x8a\xa9\xe0\x1a\x52\xa0\x50\x49\xde\xfd\xfd\x87\x0f\x70\xe3\xe4\x20\xa0\x48\xaf\x49\x80\x16\x08\x82\x96\x26\x87\xd2\x36\xd4\x2e\xbb\xbb\x94\x6d\xe8\xf4\xdd\x0f\x33\xbb\x7c\x10\x49\x59\x94\xed\xeb\xf5\x95\x44\x72\x76\x76\x67\xe6\x37\xbf\xd9\xa7\xed\x76\xfe\x62\xf4\x56\xe5\xf7\x5a\x2c\x57\x16\xde\xbc\x7a\xfd\x7f\x2f\x73\x8d\x06\xa5\x85\xf7\x51\x8c\x37\x4a\x7d\x83\x85\x8c\x43\xb8\xca\x32\x60\x21\x03\xf4\x5d\x6f\x30\x09\x47\x9f\x57\xc2\x80\x51\x85\x8e\x11\x62\x95\x20\x08\x03\x99\x88\x51\x1a\x4c\xa0\x90\x09\x6a\xb0\x2b\x84\xab\x3c\x8a\x57\x08\x6f\xc2\x57\xe5\x57\x48\x55\x21\x93\x91\x90\xfc\xfd\xc7\xc5\xdb\x77\x1f\x3e\xbd\x83\x54\x64\x08\xfe\x9d\x56\xca\x42\x22\x34\xc6\x56\xe9\x7b\x50\x29\xd8\x46\x67\x56\x23\x86\xa3\x17\xf3\xdd\x6e\x34\xda\x6e\x21\xc1\x54\x48\x84\xf1\x9f\x05\xea\xfb\x31\xec\x76\xf4\xf2\x2c\xff\xb6\x84\x8b\x4b\xb8\x89\x0c\xc2\x59\xf8\x56\xc9\x54\x2c\xc3\x7f\x45\xf1\xb7\x68\x89\xe0\x5b\x5a\x5c\xe7\x59\x64\x11\xc6\x2b\x8c\x12\xd4\x63\x38\xeb\x7e\x12\xeb\x5c\x69\x5b\x7e\x72\x4f\x30\x19\x05\xdb\xed\x4b\xd0\x91\x5c\x22\x9c\xe5\x91\x5d\x51\x67\x67\xe1\x27\x71\x93\x09\xb9\x5c\xb0\x94\xa1\x16\x41\x30\xe6\xe1\x90\xc8\x6e\x37\x76\xed\x50\x26\xf4\x6d\x3a\xe2\xbe\xce\x6e\x0a\x91\x91\xbb\x58\xc5\xcf\x64\xc6\x87\x68\x8d\xa5\x25\x1a\x63\x14\x1b\xf7\xb9\xfa\x5f\xb5\xa1\x41\xcd\xe7\xd0\x54\xb3\xdb\x51\x28\xc8\x8f\xe5\x9b\x54\x69\x60\xf7\x08\xb9\x24\xd1\x3c\x32\x71\x94\xc1\x59\xe8\xfb\x01\x94\x56\x58\x81\x26\x1c\xd9\xfb\x1c\xdb\xda\x8c\xd5\x45\x6c\x61\x3b\x0a\x62\xf6\xe3\x28\xc8\xc4\x5a\xd8\x20\x78\x21\xa4\x1d\x05\x2a\x4d\x0d\xd6\x4f\x3a\x41\x1d\x04\x5f\xbe\xfe\x44\x7f\x46\x41\x21\xc5\x9f\x05\xd2\x0b\x63\xb5\x90\xcb\x51\x90\x6b\x4c\x44\x1c\x59\x34\x10\x7c\xf9\x5a\x3d\x85\xd4\x6b\x39\x22\xe7\xa7\x5b\x61\x57\x70\x16\xbe\x4b\x96\xe8\x9d\x39\x9f\x03\x46\x4b\xd4\x2f\x33\x15\x25\x64\x0d\xd2\xb7\x70\x14\x34\xe3\x81\xe4\xaa\xd0\x35\x08\x48\x47\xc3\x64\xac\x6c\x7e\x41\xfd\x61\xf8\xf9\x3e\xc7\x7d\xa7\x07\xcd\x18\x75\xfe\xcf\x5f\xc0\x55\x92\x08\x2b\x94\x8c\x32\x48\x05\x66\x89\x01\xab\x20\x4a\x12\xfa\x69\xb8\x3d\x04\xc6\x28\xb7\x3a\xb3\xeb\x3c\xa3\x61\xe5\x5a\x48\x9b\xc2\x38\x11\x51\x86\xb1\x9d\x7f\x6f\xe6\x1c\x99\xb9\xd3\x34\x26\x10\x59\xa5\x3d\x4a\xb9\xad\x48\x61\x15\x99\xcf\x25\x22\x9d\xaa\x6a\x9c\x77\x76\xff\x43\xd8\x19\xf5\x7c\x0e\x42\x5a\xd4\x6b\x4c\x04\xc9\x71\x7f\x21\xc9\xec\x75\x06\xcd\xe7\xf0\x87\x1a\x5f\x0e\x61\xbf\xac\x50\x23\x59\x69\x20\x02\x89\xb7\x50\x05\x8e\xe1\xd5\xb4\x7b\x94\x16\x32\x86\xc9\x1e\x78\x4b\x87\xd7\xb0\x9a\x3a\x95\x93\xdc\x40\x18\x86\xfd\x30\x98\xb6\x1b\x11\x08\x9b\x7a\x77\xbb\xb0\x01\xa7\x4b\x88\xf2\x1c\x65\xd2\xee\xba\x21\x33\x83\xdc\x84\x61\x38\x1d\x05\x1a\x6d\xa1\x25\xb4\x44\xbd\xb5\x3f\x12\xc0\x4b\x6b\x19\xed\x60\x2c\xe6\x65\x84\xbd\x0b\x07\xda\xc9\xca\x26\x4e\x8b\x90\xf6\xa8\x51\x34\x62\x27\x7d\x09\xe7\xfc\xe7\xc8\x68\x7f\xe2\x0c\xf4\xc3\x95\xe0\x12\xf2\x09\x03\x76\xfa\x26\x5e\xcf\xd0\x21\x7b\xf1\x4b\x38\x77\xff\x8e\x0d\x9a\xf8\xa1\x1e\x33\x3f\x3d\x61\xc8\xd4\x7e\xa2\x08\x4a\xfc\x77\xd8\x88\xb9\xd3\x83\xa8\xe1\xcf\x33\x50\xc7\xf0\x42\x85\xd4\x55\x28\xae\x83\xab\xc8\x80\x11\x6b\x91\x45\x5a\xd8\x7b\x47\x62\x44\x53\x6c\x91\x40\x43\x55\x2e\xce\x04\x4a\x1b\x72\xc6\x32\x4b\x6c\xb7\x25\x7b\xfd\x36\xf3\x0c\xd6\x24\x3e\xe6\xaa\x64\x89\xbf\x35\x6a\x05\x53\x09\x4c\x6a\x66\x63\x2a\xa3\xcc\x99\xc2\xf8\xe7\xaa\x1a\x52\xfe\xf3\x53\x2f\x0b\xc6\xab\x48\x48\x57\x2d\xe2\x42\x6b\xaa\xfd\xec\x78\x50\xae\x14\x3b\x92\xac\xea\x44\xb2\xc4\x70\x14\x0c\x8c\xc9\xc1\x5e\x27\x3e\x3a\x7b\x16\xb9\x10\x05\xae\xf7\x8b\x4b\x38\xef\x91\xd8\xba\x02\x74\xd1\x8e\x42\xe8\xde\x97\x9c\xe8\x5c\x7e\x67\x89\x01\xcf\x60\xfc\xd1\x0b\x8e\x1b\x6d\xc6\xe4\xdb\x31\x79\xfa\xa5\xab\x13\xa4\xf1\x28\x49\x53\x19\x6f\x53\xf4\x43\x34\x5c\xf1\xb0\xeb\xc4\x43\x88\x75\x8d\x02\x0e\xba\x27\x69\x4a\x88\xf7\x42\x1b\x0b\x4e\xc6\x45\x24\xe5\x37\x4d\x42\x74\x95\xfa\xbe\x9c\x28\xb9\x1c\x81\x8f\xbe\xcd\x8b\x0f\xca\xbe\xa7\xc9\xd5\x3b\xad\x95\x86\xdb\x15\x4a\x90\x8a\x14\x64\xea\x96\x66\x0d\x95\x9a\xdb\xc8\xb8\x69\xd8\xe0\x04\xe3\xd1\x4d\x62\x7b\x07\xb1\x92\x16\xef\x2c\x4d\xaa\xe8\x77\x0a\x93\x17\xcd\x21\xce\x00\xa9\xf7\xa9\x4f\xb8\x3c\x2b\x34\xcf\x35\x3e\xd6\xda\x59\x84\x1c\xdd\x0e\xa3\x63\xca\xd7\xd3\xf0\x2a\xcb\xa8\xaf\xe9\x28\x10\x29\x0b\x7f\x77\x09\x52\x64\x8c\x10\xef\x45\x29\x32\xd6\x43\x8e\x24\xa9\x0c\xe5\xe4\x40\x7f\x53\xb8\xbc\x84\x57\x9d\xc6\xe7\x7b\xee\xda\x3a\x47\xd7\x73\xc4\xf0\xc7\xe8\x06\xb3\x1d\xeb\xaf\x93\xbf\x4f\xff\x97\x57\x5f\x67\xa4\x72\xd4\x08\xe4\xaf\x6e\x3e\xfc\x0d\xdd\xe3\x0c\x6e\x0a\x0b\x79\x24\x45\x6c\xa8\xa2\x47\xd2\xb9\x09\x54\x1c\x17\xda\x9c\x16\x86\x5f\xfb\xe3\xb0\x17\x86\x92\xef\x06\xf9\xbd\x0a\x6e\xc7\xe1\xe7\xe7\xf0\xdd\xc2\x94\x8e\x9a\xa0\x76\x81\x0d\xd8\x12\x7e\x6c\xf9\x67\xaf\xc3\xa6\x43\x16\xd7\xc7\xb0\x2d\x92\xd3\x70\x2d\x92\xc7\xe2\x78\x71\x7d\x00\xc9\x22\x71\x43\x5a\x5c\x33\x9b\x56\x3e\xab\x21\xbd\x89\x34\x88\xc4\xc0\x97\xaf\x2d\x41\xf6\x9c\x48\x8c\x6b\xf0\x00\xb6\x17\xd7\x86\x5d\xfd\xff\xfd\xc0\x6e\xe2\x59\x24\xa6\x81\x5d\xa7\x77\x28\x6a\x9b\xea\x7c\x78\x44\x62\x7a\xa1\xba\xb8\xde\x07\xeb\xe2\xfa\x79\xe1\x7a\xc8\xdd\x2d\x0f\x92\x91\x22\x79\x18\xa4\x4e\xd5\x13\x61\x2a\x92\x72\x0e\x22\xb3\xfb\x3d\x54\x2a\x7a\x71\x8c\x70\x67\x55\x93\xca\x2d\x22\x05\xa9\x2c\xe0\x5d\x14\xdb\x8c\x8a\x27\x96\x0d\x09\xa1\x4e\x1c\x87\x83\x94\xc6\xf5\xd7\x70\xed\x9b\xd3\xb9\xd6\xdc\x0a\x1b\xaf\x1e\xe6\x5b\x5a\x2b\xd2\xd2\xfb\xf5\x45\xad\xe4\x18\x79\xba\x16\xaf\x2e\x1e\xc9\xd2\x09\xa6\x51\x91\xd9\xbe\xe6\x9f\x84\x5c\x16\x59\xa4\x8f\xf2\x7c\x8d\x8a\x9a\xbe\xe9\xe9\xb9\xd2\x81\x35\x3f\x37\x79\x97\x60\xe9\x0d\xe0\x49\x3c\x4d\x9a\x5a\x34\xdd\x4d\x88\x16\x4b\x0f\x4b\x06\x4f\xd5\x8f\x4a\x84\xff\x1d\x59\xbf\x19\x46\xd6\x8d\x84\x60\xc2\xde\x03\xbf\x48\xe0\xd2\x13\x6f\x13\xe1\xa7\x71\x79\x03\xdb\x75\xc3\xc1\xa8\x2e\xc7\xda\x40\x77\x83\xf1\x9d\x8b\x9f\x15\xe1\xcf\xc3\xf7\x75\xec\x4f\x40\x76\x45\xed\x57\x59\x06\x78\x87\x71\x61\xd1\xd4\x68\x85\x48\x26\x35\x60\x21\x13\xc6\x82\x4a\xf7\xa8\xc9\xe3\x7c\xb0\xc5\x9e\x3e\x7b\xf0\xf9\xe5\xeb\x41\xb2\xee\x5f\x4c\x86\xad\x2d\x99\x8a\x99\x2b\x93\x6a\x5a\xba\xca\xb2\xe7\x8a\x19\xe9\xed\x37\xa1\x65\xc1\x63\xca\xcc\x43\xd5\xe5\x20\x39\xf5\xf5\xe0\x9d\xb0\xb8\x36\x27\xc5\xb5\x49\x5c\xc3\x5d\xe2\xd3\xbe\x37\xa8\x7d\x9c\x33\x88\x6f\x0e\x78\xe8\x13\xd2\x22\x73\xd2\xce\xdf\xf7\x02\xb3\x64\x71\x3d\x0d\x3f\xc5\x91\xa4\xc1\xcc\xe0\x9c\xe8\xe5\x00\x13\xed\xd7\xe8\x7a\xc2\xd7\x9c\xed\x2d\xae\x4d\x0d\xa0\xc5\xb5\x79\x2e\x00\x91\xde\x43\x00\xea\xcd\x79\x73\x10\x2e\x25\xdf\x9e\x92\xf1\xc6\x9b\xf7\x56\x15\x72\x7f\x01\x1d\xf3\x1b\x3e\x3f\x40\x58\x8a\x0d\xca\x13\xb7\x95\x58\xe5\xa1\xf2\x23\xed\xe9\x29\x5d\x29\x9c\x36\x07\x5d\x47\x85\x1f\x9f\x2b\x2e\x4e\x77\xff\xf0\x85\xf4\x3b\xfa\x85\x37\xa3\x2f\x1a\x8d\xd1\x0e\x8e\x07\x6b\xf4\xc6\xbd\xbb\x13\xcd\x2d\x0d\x5d\x20\x99\x53\x67\xed\x2a\x32\x80\x19\xae\x51\x5a\x53\xce\x2a\x96\x3a\xca\x57\x83\x4d\xe4\x1e\x0e\x04\xe8\x46\xa9\xec\xf4\x08\x55\x1a\xa7\x4d\x23\xea\x08\xf1\xe3\x73\x45\xc8\xe9\xee\x1f\x3f\x0d\x9f\x86\x8d\xae\xc3\x03\x21\x6a\x0c\x77\x70\x88\x58\x63\x89\xbf\x8c\xe6\x67\x35\x75\x26\x45\x9e\xb9\x6d\x7d\xd5\x8c\x94\x1f\xf4\x0c\x84\x8c\xb3\x82\x8f\x5e\xa2\x2c\x83\xc8\x18\x15\x8b\xc8\x62\xc2\x7b\xb7\x26\x84\x85\x85\x38\x92\x70\x83\xa4\xbc\x30\xc8\xa7\x22\xb9\xc6\x3c\xd2\x94\x8f\xeb\xb5\x92\xfb\x2a\x0d\x73\x77\x61\x90\x7a\x5b\x43\x22\xd2\x14\x35\x4a\x9a\x39\x46\xa9\xf5\xa7\x88\x31\x8f\x52\x18\x58\x47\x09\x0e\xc7\x3f\xb5\x9a\xf4\x6e\x05\x7b\x4f\x9c\xef\x7f\x21\x97\x95\x5b\x8c\x9d\xdd\x62\xf7\x61\x36\x0a\xdc\xf1\xd7\x05\x04\xfd\xbb\xf6\x24\xe1\x76\xc0\x7b\x94\xb8\x0f\x2c\xa2\x13\xd4\xa4\xc4\xef\x3e\xfb\x13\xb3\xed\x6e\xd6\x89\x31\x8b\x86\x61\x38\xa5\x76\xee\x40\xed\x02\xea\x76\xee\x60\xad\xaf\xa1\x93\x2d\x5b\xd6\xa7\x20\x17\x50\x35\xee\x3f\x78\xe9\x53\x56\x37\x2f\x15\xce\xe7\x65\x60\xfa\xce\x97\xda\x07\x4c\xdd\x5d\xdb\x96\x40\xe8\xe3\x35\xf3\x4b\xb1\xf6\x91\x5e\x67\x43\xbc\x79\x70\xda\x7b\x92\x37\x9f\x03\xfc\x72\xe8\x00\xd0\x62\x96\x35\xa6\x10\x2f\x4b\x6d\x56\x35\xce\x18\x9d\x80\x54\x09\xcf\x36\x22\x0b\x0e\xc6\x52\x62\x6c\x19\xdb\xdc\x09\xc9\x8c\xf7\xb6\xca\xc7\x6e\xaf\x1c\x3e\xd3\x1a\x2a\xf7\xa7\x85\x91\x5e\x16\x8e\xeb\xca\xc4\x70\x98\x2a\x34\x76\x53\xad\xcc\xbf\xd3\xf6\xdc\x0f\x59\x3b\x51\xb9\xe5\x83\x36\xd2\xe3\x36\x11\xb0\xd1\xae\x37\x47\xda\x7b\xf1\x27\xed\xc3\xa7\x4a\xc3\x6f\x33\xb2\x9d\x0f\xae\x39\x8c\x3c\x06\x52\x1c\xa8\xdc\x4e\x58\xfb\x74\x14\x04\xbb\x51\x37\x93\x0e\x1e\xdb\x5e\x96\xdb\xe7\x87\x0e\x64\x78\x5f\xbd\x3a\xfd\xe4\x23\xf4\xa5\x56\x45\xfe\x43\xe3\xe4\x64\xef\xfc\xfb\xdf\xd5\x7e\xff\xf7\xe6\x9f\x2c\xe9\x0e\x4e\x88\xc0\xfc\x73\x15\x2f\xd6\x04\x1b\xd4\x56\xc4\x68\xe0\xc6\xad\x6e\x95\x86\xb5\xd2\xe8\x4f\x83\xe7\xb1\xca\x8a\xb5\x34\x21\x4f\xb9\x2c\xb1\x96\x4a\x2d\x4a\xa7\x84\xcf\x26\xa2\xe5\x52\xe3\x92\xcf\x4e\x0b\x19\x13\x3a\xcc\x8c\xab\x0b\x7b\xf4\x0f\x25\x24\x4c\xbe\xe1\xbd\xa9\x05\xa7\x30\x9e\xc1\x98\xd7\x25\xd5\x09\x47\x86\x12\xce\xdc\x3c\xd1\xb8\xdb\x02\x2f\xe1\x2c\x25\x03\x85\x4c\xf0\xae\xfe\xf6\x8a\xbe\xce\xe7\xae\x98\x45\xeb\x3c\xc3\x0b\xf7\xc8\x13\xd6\x0d\x30\x85\xb8\x23\xfe\xf9\xdc\xc5\x22\x0d\x3f\xf1\x2b\xd6\x50\x9e\x0e\xa7\xd5\x2c\xee\xf7\xa6\xcc\xe7\x68\x09\xbb\xdd\xef\xdc\xd6\xcd\xc1\x68\x72\xf1\xfb\x1f\x46\xc9\x8b\xb1\x9b\x60\xa8\xb5\xb0\xb8\xce\xed\xfd\x98\xc5\xfc\x68\x02\x7f\x0c\xd6\x73\x25\xc1\x25\xf2\x64\x1a\xb2\x56\x1f\x86\xce\x1c\xd9\x8d\xe2\xad\x92\xc6\x46\xd2\x12\x90\x9d\xfc\x55\xe9\x36\x6e\x91\x7f\x5b\xd6\x93\x99\xa9\x17\x69\xcc\xaa\x37\x53\x1a\x4e\x03\x34\x03\x73\xad\x1c\x15\x87\x1d\x1c\x0b\xcf\xca\x2b\x01\x61\x18\xba\x37\x3e\xb5\xf6\x30\xe8\xf2\xcb\x81\xa9\x4c\xaf\x96\xc0\xf1\x14\xe3\x06\xa1\xef\xee\x12\xda\xe5\x80\x3f\xec\xca\xf1\xb8\x33\x4c\xd7\xa4\x45\xbb\x3d\xdb\x1f\x2d\x09\x1f\x8b\xaa\x6a\xb2\x9a\x91\x4f\x2e\xc3\xcb\x97\x41\xd9\xe5\x56\x3a\x55\x72\xb9\xc7\x9e\x0c\x82\x54\xab\x75\x77\xce\xfe\x77\x06\xfe\xa9\x88\x3e\xb0\xe8\x3b\x04\xe8\x67\x40\xab\xef\x71\x10\x58\xf7\x63\xea\xd0\xea\xde\x29\x5d\x01\xb6\x2d\x74\x1c\xb1\xa5\x8a\xd3\x40\x5b\xb5\x7a\x32\x6e\x4b\x4d\x1e\xba\xad\x63\x62\x6f\xc9\xb8\x76\xdb\xd8\x47\x66\x5c\x72\xc8\x68\xd0\x31\x71\xf7\x12\x4f\xff\xf1\x70\xe3\xf8\x97\xaf\x10\x70\x5a\xdd\xd4\x13\x80\xea\x8a\x9b\xe3\x86\x8f\xbd\x17\xc1\x5a\xb4\x51\xdd\x06\x6b\xf3\x4d\xcf\x95\x30\x16\x79\x79\x73\x3f\xf4\x4a\x58\x5b\x65\xf7\x5e\x98\x8f\x6b\x7d\xd7\x2b\x95\x06\x00\xe0\xcb\xd7\x8a\x91\x9f\x76\x1f\xa9\xda\x06\xaa\xf4\xb9\x1b\x24\x35\x57\x94\x15\x53\x28\x59\x17\xd7\xf2\x4e\x49\x65\x71\x67\x17\x60\xdf\xc3\x65\xfe\xb4\x2c\x9e\xd6\xdd\x4e\xc8\xb2\x30\x0c\xaf\xea\x02\x7d\x88\xe6\xfb\xd4\x87\xd4\x7c\xef\xe2\x49\x9f\xc4\x0c\x52\xd9\xbd\xad\xd4\x96\xf4\x1e\x21\x8a\x20\x85\x99\xf0\x1b\x63\xfb\xc6\xf2\x2a\xcb\x90\x0c\xdf\xb0\x44\x53\x64\x5c\xa7\x55\xc3\x77\x9b\x28\x2b\xf0\x11\x5e\x29\xd9\xa9\xbd\x86\x9d\xc1\xc6\x85\x3a\x8d\x62\xdc\xee\xa6\x7e\x8d\xbc\x7d\xd0\x9c\x76\x12\xd7\xd4\xb7\x99\x36\x4c\xad\x17\xe4\xf4\x74\xc2\x7a\xfc\x04\x9b\x7a\x17\xe6\x1d\xa3\xb6\xed\xcd\xbd\x8e\x45\x4d\x13\x3a\xdb\x77\xfb\x4b\x74\x97\xf0\x8d\xab\x40\xd6\x33\xcd\x5a\x58\xb1\x69\x2c\x7e\xd2\x66\xa9\xb5\x54\x66\xdd\x9e\xa9\x5f\xf6\x38\x91\xdd\xae\x5a\xd9\xf7\x6c\x75\x53\x7d\x71\xa5\xb6\x84\x4a\x58\xce\x57\x25\xad\xbe\xb3\x4c\xdd\xd2\x8c\x75\x55\x96\x60\x5a\xf5\x57\xa8\x62\xf6\xa4\xda\xcd\x49\xbf\xb7\x42\x19\xe8\xe2\x72\x8c\x0f\xee\xb4\xda\xd6\x16\x6b\xe3\xaa\x47\x4f\xce\x30\xff\x4c\xe1\x1f\xf0\xda\xad\x33\x5a\x7b\xa3\x4a\x9b\xf0\x03\xde\x4e\xc6\xf5\xb4\xf0\xa2\x8f\xda\xc2\xca\x7d\xc2\xf0\x59\x56\x14\xaf\x04\x6e\xa2\x9b\x0c\x9d\x3b\x58\x9e\xdc\xc1\xb3\x16\xbb\x8a\x24\xbc\x76\x8e\x18\x97\x2b\x9a\x72\x86\x51\x1a\xe1\x86\x3e\x0c\x26\xe7\x3d\x38\xe9\xee\xf3\x06\x8d\x3b\x45\x1b\x7f\x86\xba\x1b\xed\x85\xbf\xce\x92\xf2\xcd\xd1\x4c\x79\x7c\x1c\x1f\xdc\x03\xb6\xe5\xa2\x72\x33\x7b\xd0\x09\x4d\x50\x4c\x6b\x9f\x35\x1d\xd1\xcc\x98\x3d\x1f\xb4\xee\x54\x3d\x54\xe2\xdb\x65\xf3\x58\x61\x67\xf9\xc7\x16\x76\x37\xef\xe8\xa9\xeb\xee\x43\x7f\x61\x6f\x4f\xaf\xaa\xca\xde\x99\x9c\xf5\x94\x76\xdf\xa3\xaf\xc7\x3e\xed\x07\x94\xf8\x8e\xee\x01\x35\xbe\xaf\x9e\xb3\xd6\x13\x2a\x7a\x6f\x01\xab\x66\x9c\x8f\x2f\x60\x2d\x07\x97\x10\x6e\x9b\xf9\xc4\x12\xd6\xe9\xe5\xbf\x5d\xc3\x4e\x32\xeb\x91\x55\xac\x6b\xd4\xdf\xbe\x8c\x55\x2b\x85\x83\x65\xcc\x49\x10\x71\xf7\x57\xae\xc1\x8e\x7d\x72\xed\xea\xba\xf7\xd1\xc5\xab\x3d\xba\xa3\xd5\xab\xf6\xc2\x13\xca\xd7\x43\xf8\xf8\x9b\xd4\xaf\x93\xa3\xf9\x98\x0a\xd6\x9f\xfc\x7f\x41\x09\xeb\x14\x88\x63\x35\xcc\xf8\xed\x97\x47\x14\xb1\xf2\xef\x7f\x02\x00\x00\xff\xff\xc6\x62\x81\xd8\x34\x36\x00\x00") +var _templateBuilderQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x5a\x6f\x6f\xdb\x38\xd2\x7f\x6d\x7f\x8a\x59\x23\x1b\xd8\x81\x2b\xb7\x7d\xf7\xe4\x41\x0e\xc8\x36\xed\xc1\xc0\xa2\xbb\xdb\xf6\xb0\x0b\x14\xc5\x2e\x23\x8d\x6c\x6e\x65\x52\x4b\x52\x4e\x82\x9c\xbf\xfb\x81\x43\x52\x92\xf5\x27\x96\x93\x60\xaf\xb8\x57\xb6\x24\x72\x48\xce\xfc\xe6\x37\x43\x0e\xef\xef\x17\x67\xe3\x37\x32\xbf\x53\x7c\xb5\x36\xf0\xfa\xe5\xab\xff\x7b\x91\x2b\xd4\x28\x0c\xbc\x63\x31\x5e\x4b\xf9\x15\x96\x22\x8e\xe0\x32\xcb\x80\x1a\x69\xb0\xdf\xd5\x16\x93\x68\xfc\x69\xcd\x35\x68\x59\xa8\x18\x21\x96\x09\x02\xd7\x90\xf1\x18\x85\xc6\x04\x0a\x91\xa0\x02\xb3\x46\xb8\xcc\x59\xbc\x46\x78\x1d\xbd\x0c\x5f\x21\x95\x85\x48\xc6\x5c\xd0\xf7\x1f\x97\x6f\xde\xbe\xff\xf8\x16\x52\x9e\x21\xf8\x77\x4a\x4a\x03\x09\x57\x18\x1b\xa9\xee\x40\xa6\x60\x6a\x83\x19\x85\x18\x8d\xcf\x16\xbb\xdd\x78\x7c\x7f\x0f\x09\xa6\x5c\x20\x4c\xfe\x2a\x50\xdd\x4d\x60\xb7\xb3\x2f\x4f\xf2\xaf\x2b\x38\xbf\x80\x6b\xa6\x11\x4e\xa2\x37\x52\xa4\x7c\x15\xfd\xcc\xe2\xaf\x6c\x85\xe0\x7b\x1a\xdc\xe4\x19\x33\x08\x93\x35\xb2\x04\xd5\x04\x4e\xda\x9f\xf8\x26\x97\xca\x84\x4f\xee\x09\xa6\xe3\xd1\xfd\xfd\x0b\x50\x4c\xac\x10\x4e\x72\x66\xd6\x76\xb0\x93\xe8\x23\xbf\xce\xb8\x58\x2d\xa9\x95\xb6\x3d\x46\xa3\x09\x4d\xc7\x36\xd9\xed\x26\xae\x1f\x8a\xc4\x7e\x9b\x8d\x69\xac\x93\xeb\x82\x67\x56\x5d\x24\xe2\x17\xbb\x8c\xf7\x6c\x83\x61\x25\x0a\x63\xe4\x5b\xf7\xb9\xfc\x5f\xf6\xb1\x93\x5a\x2c\xa0\x2e\x66\xb7\xb3\xa6\xb0\x7a\x0c\x6f\x52\xa9\x80\xd4\xc3\xc5\xca\x36\xcd\x99\x8e\x59\x06\x27\x91\x1f\x07\x50\x18\x6e\x38\xea\x68\x6c\xee\x72\x6c\x4a\xd3\x46\x15\xb1\x81\xfb\xf1\x28\x26\x3d\x8e\x47\x19\xdf\x70\x33\x1a\x9d\x71\x61\xc6\x23\x99\xa6\x1a\xab\x27\x95\xa0\x1a\x8d\x3e\x7f\xf9\xc9\xfe\x19\x8f\x0a\xc1\xff\x2a\xd0\xbe\xd0\x46\x71\xb1\x1a\x8f\x72\x85\x09\x8f\x99\x41\x0d\xa3\xcf\x5f\xca\xa7\xc8\x8e\x1a\x66\xe4\xf4\x74\xc3\xcd\x1a\x4e\xa2\xb7\xc9\x0a\xbd\x32\x17\x0b\x40\xb6\x42\xf5\x22\x93\x2c\xb1\xab\x41\xfb\x2d\x1a\x8f\xea\xf6\x40\xab\xaa\xc8\x75\x18\x59\x19\xb5\x25\x63\xb9\xe6\x33\x3b\x1e\x46\x9f\xee\x72\xdc\x57\xfa\xa8\x6e\xa3\xd6\xff\xc5\x19\x5c\x26\x09\x37\x5c\x0a\x96\x41\xca\x31\x4b\x34\x18\x09\x2c\x49\xec\x4f\x4d\xed\x11\x10\x46\xa9\xd7\x89\xd9\xe4\x99\x9d\x56\xae\xb8\x30\x29\x4c\x12\xce\x32\x8c\xcd\xe2\x7b\xbd\x20\xcb\x2c\x9c\xa4\x89\x05\x91\x91\xca\xa3\x94\xfa\xf2\x14\xd6\x4c\x7f\x0a\x88\x74\xa2\xca\x79\xde\x9a\xfd\x0f\x51\x6b\xd6\x8b\x05\x70\x61\x50\x6d\x30\xe1\xb6\x1d\x8d\x07\x53\x1e\x61\x04\x46\xb1\x2d\x2a\xcd\x32\xb0\x08\x9d\x45\xb6\xe7\xde\x14\xa0\xfe\x1c\xfd\x50\xa1\x6e\x44\x90\x4e\x0b\x11\x4f\x63\x29\x0c\xde\x1a\xeb\x65\xf6\x77\x06\xd3\x9e\x4e\x73\x40\xa5\xa4\x9a\x8d\x1d\x68\x7f\x5d\xa3\x42\xab\x38\x0d\x0c\x04\xde\x40\x89\x05\x42\x6c\x5d\x95\x63\x3b\x90\x93\x5b\xfa\x40\xb0\x61\x85\xd4\x99\x13\x39\xcd\x35\x44\x51\xd4\x8d\xac\x59\xb3\x93\xc5\x75\x5d\xee\x6e\x17\xd5\x10\x7a\x01\x2c\xcf\x51\x24\xcd\xa1\x6b\x6d\xe6\x90\xeb\x28\x8a\x66\xe3\x91\x42\x53\x28\x01\x8d\xa6\x7e\xb5\x3f\x5a\x9f\x09\xab\x25\x07\x02\x6d\x30\x0f\xa0\x21\xab\x0c\x5e\x27\x09\x9b\x3a\x29\x5c\x98\x83\x8b\xb2\x33\x76\xad\x2f\xe0\x94\xfe\x1c\x98\xed\x4f\xe4\xd4\x7e\xba\x02\x9c\x8f\x3f\x61\xc2\x4e\xde\xd4\xcb\x19\x3a\x65\xdf\xfc\x02\x4e\xdd\xbf\x43\x93\xb6\x94\x53\xcd\x99\x9e\x9e\x30\x65\xdb\x7f\x2a\x2d\x94\xe8\xef\xb0\x19\xd3\xa0\xbd\xa8\xa1\xcf\x73\x90\x87\xf0\x62\x63\xb3\x0b\x7a\x14\x5a\xd7\x4c\x83\xe6\x1b\x9e\x31\xc5\xcd\x9d\xe3\x45\xcb\x7c\xb4\x22\x8e\xda\x06\xce\x38\xe3\x28\x4c\x44\x24\x40\xc4\x73\x7f\x1f\x08\xf1\xf7\xb9\x27\xc5\x3a\x97\x12\xfd\x25\x2b\xfc\xbd\x16\x7e\x88\x9d\x60\x5a\x91\x25\xb1\xa3\xf5\x9c\x19\x4c\x7e\x29\x03\xac\xa5\x14\x7a\xea\x24\xd6\x78\xcd\xb8\x70\x01\x28\x2e\x94\xb2\xe9\x84\xa3\x1c\xe9\xa2\xbb\xe3\xdd\x32\xf4\x24\x2b\x8c\xc6\xa3\x81\x36\xe9\x1d\x75\xea\xad\xb3\xb7\x22\x67\xa2\x91\x1b\xfd\xfc\x02\x4e\x3b\x5a\xdc\xbb\x98\x76\xde\xb4\x42\xe4\xde\xef\x42\xff\x88\xf8\xee\xc2\x33\x9e\xb9\x85\x36\xeb\xa5\x4a\x6e\xfe\xd5\x47\x98\xc4\x7d\x9e\xff\x68\x56\x23\x9e\xd2\xab\xf3\x8b\xd6\xd0\xb9\xc2\x9c\x29\xa4\xc5\xda\xb1\x66\xff\x4f\x2d\xbf\xbb\x00\xc1\x33\xd7\x39\x60\x47\xf0\x8c\x24\xdb\x77\x14\xef\xca\xb8\x89\xb7\xc6\x46\x80\x13\x98\x7c\xf0\xa2\x27\xb5\x51\x26\x16\x08\x13\x0b\x8b\xc9\x32\x41\x61\x26\x30\xa1\xe9\x4f\xe0\x85\x8b\x9b\x84\x8f\x83\x51\xcb\x2a\xa5\x19\xb3\x46\x0f\x05\xa6\x2a\xb8\xfa\x71\xfc\x3a\x68\xf0\xb9\x5d\xce\xd8\x2d\xc4\xbf\xa7\x61\xc6\x23\x42\xb3\x0f\x68\xd6\xd3\xdf\x71\xa5\x0d\xb8\x36\x0e\x6a\x29\xbd\xa9\x33\xbd\xcb\x6a\xee\x42\x52\xe9\xac\x08\x1f\x7c\x9f\xb3\xf7\xd2\xbc\xb3\x89\xe8\x5b\x6b\x12\xb8\x59\xa3\x00\x21\xad\x80\x4c\xde\xd8\x0c\xab\x14\x73\xc3\xb4\x4b\x59\x07\x33\x07\xcd\xae\x07\x24\x67\xf5\x29\xce\x6b\x80\xb0\xa8\xce\x0a\x45\x79\xd9\x87\x4a\xfa\xbc\x0f\x24\x2e\x04\xbc\x9a\x45\x97\x59\x46\x20\x19\x07\x44\xd5\x70\xd2\x42\xc9\x8e\x5a\x65\x28\xa6\x3d\xe3\xcd\xe0\xe2\x02\x5e\xb6\x3a\x9f\xee\xa9\xeb\xde\x29\xba\xca\xa7\xa3\x1f\xd9\x35\x66\x3b\x92\x5f\xb1\x5a\x97\xfc\xcf\x2f\xbf\x38\x33\xd7\x0c\xf9\x9b\xdb\x3b\x7c\x45\xf7\x38\x87\xeb\xc2\x40\xce\x04\x8f\xb5\xcd\x7e\x98\x70\x6a\x02\x19\xc7\x85\xd2\xc7\x99\xe1\xb7\x6e\x3b\xec\x99\x21\x10\xf9\x20\xbd\x97\xc6\x6d\x29\xfc\xf4\x14\xbe\x5b\xea\xa0\xa8\x29\x2a\xef\xe9\xb4\x12\x7a\x6c\xe8\x67\x6f\xc0\xba\x42\x96\x57\x87\xb0\xcd\x93\xe3\x70\xcd\x93\xc7\xe2\x78\x79\xd5\x83\x64\x9e\xb8\x29\x2d\xaf\x28\x4c\x74\x70\xdc\x96\x29\xe0\x89\x86\xcf\x5f\x1a\x0d\x49\x73\x3c\xd1\xae\xc3\x03\xd8\x5e\x5e\xe9\x6e\x02\x74\xea\xa9\xe3\x99\x27\xba\x86\x5d\x27\x77\x28\x6a\xeb\xe2\xbc\x79\x78\xa2\x3b\xa1\xba\xbc\xda\x07\xeb\xf2\xea\x79\xe1\xda\xa7\xee\x86\x06\xed\x22\x79\xf2\x30\x48\x9d\xa8\x27\xc2\x94\x27\x21\xb9\x12\xd9\xdd\x1e\x2a\xa5\x7d\x71\x88\x70\xe7\x65\x97\x52\x2d\x3c\x05\x21\x0d\xe0\x2d\x8b\x4d\x66\xb3\x02\x0c\x1d\x2d\x42\x5d\x73\x1c\x0e\x52\x3b\xaf\xbf\x87\x6b\x5f\x1f\xcf\xb5\xfa\x86\x9b\x78\xfd\x30\xdf\xda\x7d\x35\xd3\x08\xaf\xce\x2b\x21\x87\xc8\xd3\xf5\x78\x79\xfe\x48\x96\x4e\x30\x65\x45\x66\xba\xba\x7f\xe4\x62\x55\x64\x4c\x1d\xe4\xf9\x0a\x15\x15\x7d\xdb\xa7\xe7\x72\x07\x92\xfc\xdc\xe4\x1d\xc0\xd2\x69\xc0\xa3\x78\xda\x4a\x6a\xd0\x74\xdb\x21\x1a\x2c\x3d\xcc\x19\x3c\x55\x3f\xca\x11\xfe\x7b\x64\xfd\x7a\x18\x59\xd7\x1c\x82\x08\x7b\x0f\xfc\x3c\x81\x0b\x4f\xbc\x75\x84\x1f\xc7\xe5\x35\x6c\x57\x1d\x07\xa3\x3a\xcc\xb5\x86\xee\x1a\xe3\x3b\x15\x3f\x2b\xc2\x9f\x87\xef\x2b\xdb\x1f\x81\xec\x92\xda\x2f\xb3\x0c\xf0\x16\xe3\xc2\xa0\xae\xd0\x0a\x4c\x24\x15\x60\x21\xe3\xda\x80\x4c\xf7\xa8\xc9\xe3\x7c\xf0\x8a\x3d\x7d\x76\xe0\xf3\xf3\x97\x5e\xb2\x7e\xca\x3e\xa9\x8b\x93\xbb\x77\xdd\x51\xe3\xe0\xab\x64\xfa\x52\x45\x15\xcd\x5d\x66\xd9\x73\x61\xc0\xca\xed\x56\x49\x43\x23\x8f\x09\x5b\x0f\x45\xab\x5e\xb2\xeb\x1a\xc1\x2b\x61\x79\xa5\x8f\xc2\x49\x9d\x08\x87\xab\xc4\xd3\x48\x27\x48\xba\x38\x6c\x10\x7f\xf5\x68\xe8\x23\xda\xfd\xec\xb4\xc9\x07\xef\x38\x66\xc9\xf2\x6a\x16\x7d\x8c\x99\xb0\x93\x99\xc3\xa9\xa5\xab\x63\xf0\x45\x8c\x59\x65\x8f\xcb\x2b\x5d\x01\x68\x79\xa5\x9f\x0b\x40\x56\x6e\x1f\x80\x3a\x39\x44\xf7\xc2\x25\xf0\xf7\x31\x0c\xa2\xfd\xf2\xde\xc8\x42\xec\x6f\xc8\x63\x7a\x43\xb5\x1b\x84\x15\xdf\xa2\x38\xf2\xfc\x8d\x44\xf6\x85\x33\x61\x9e\x99\x22\x5e\x1e\x4b\x10\xe5\xf4\x66\x75\x15\x54\x36\xa6\xc7\xe7\xb2\xb2\x93\xdd\xad\x0c\x2e\x7c\x6d\xa6\xf0\x4a\xe9\xd2\x43\x6d\xb6\x83\xad\x4b\x12\xfd\xe2\xde\xde\xf2\xfa\x81\x8b\x2a\xd0\x2e\xa7\xe2\x80\x35\xd3\x80\x19\x6e\x50\x18\x1d\x72\x9e\x95\x62\xf9\x7a\xf0\x12\x69\x84\x1e\x73\x5f\x4b\x99\x3d\xb3\xbd\x53\x96\x69\x3c\xd6\xe6\xe5\x1c\x67\x75\xb5\x54\x36\xa7\xc7\xe7\xb2\xb9\x93\xdd\xad\x11\xab\x10\xbb\x1a\x74\x03\xf6\x28\xa3\x36\xdd\xc1\x46\x27\x89\x01\xd1\x99\xcd\x47\x2b\x6a\x4f\x8a\x3c\x73\xf5\x19\x59\xb7\xbd\x9f\xf4\x1c\xb8\x88\xb3\x82\xca\x72\x2c\xcb\x80\x69\x2d\x63\xce\x0c\x26\x74\x08\xaf\x23\x58\x1a\x88\x99\x80\x6b\xb4\xc2\x0b\x8d\x54\x31\xf3\x16\x83\x58\x6e\x36\x52\xec\x8b\xd4\x14\x5b\x0a\x8d\x76\xb4\x0d\x24\x3c\x4d\x51\xa1\xb0\x99\x32\x4b\x8d\xaf\x30\xc7\x34\x4b\xae\x61\xc3\x12\x1c\xee\x51\xb6\xd7\xb4\xf3\x4c\xdf\x6b\xe2\x74\xff\x8b\x55\x59\x38\x2b\x6e\x1d\xfb\xbb\x0f\xf3\xf1\xc8\x95\x46\xcf\x61\xd4\x5d\x7e\xb1\x2d\x5c\x29\xa3\x43\x88\xfb\x40\x4d\x54\x82\xca\x0a\xf1\x65\x04\x5f\x4d\xbd\xdf\xcd\x5b\x36\xa6\xa6\x51\x14\xcd\x6c\x3f\x57\x6c\x3d\x87\xaa\x9f\x2b\xba\x76\x75\x74\x6d\x43\xcf\xaa\x9c\x75\x0e\x65\xe7\xee\x0a\x5a\x97\xb0\xaa\x7b\x10\xb8\x58\x04\xc3\xb4\x6a\x8f\xae\x5c\xbb\xe7\x58\xed\xe3\xf7\x46\x83\xc8\xdb\x8b\xe6\xca\xcc\xba\xdd\xc1\xbe\x9d\xfb\x8d\x69\xb3\x18\xdc\xaa\x7b\xd4\x4b\xee\x9d\x35\xe0\xc5\x02\xe0\xd7\xbe\xd2\xb1\xc1\x2c\xab\x25\x40\x2f\x82\x34\x23\x6b\xd5\x69\xd7\x40\xc8\x84\x72\x25\x66\xc0\x81\x5c\x08\x8c\x0d\x21\x9f\x06\xb1\x6d\x26\x7b\x15\x91\x89\x2b\x89\xc0\x27\xbb\xa3\xcc\x7d\x9d\x99\xa9\x55\xe1\xb8\x35\xb8\x8d\x43\x5c\xa1\xb0\xed\x88\xc1\x3b\x8f\x2b\xad\xf4\xad\x76\x2a\x73\x43\xf5\x54\xaa\x7c\x9c\xed\xa9\x6f\xb7\x9b\x75\x7a\x50\xb3\xe4\x72\x54\xb9\x25\x95\x0a\x7e\x9f\xdb\xb5\xd3\x95\x07\x32\x23\xcd\x81\x0a\x1f\x32\x37\x53\x92\x3e\xf3\x85\x82\xa6\xa0\xde\x82\xff\x45\x28\x26\xf4\xd5\xdd\xa8\xca\x50\xd6\xcd\xe9\xf2\xc5\x4a\xc9\x22\xff\xa1\x56\x20\xdb\xbb\x39\xf1\xef\xb2\x30\xf2\xbd\xfe\x27\xb5\x74\xf5\x31\x4b\x6f\xfe\xb9\xb4\x17\x49\x82\x2d\x2a\xc3\x63\xd4\x70\xed\xf6\xfa\x52\xc1\x46\x2a\xf4\xf7\x08\x16\xb1\xcc\x8a\x8d\xd0\x11\x25\x8c\xc6\x72\x9a\x4c\x0d\x0a\x27\x84\xaa\x3a\x6c\xb5\x52\xb8\xa2\x12\x79\x21\x62\x8b\x0e\x3d\xa7\xd8\x43\x1a\xfd\x53\x72\x01\xd3\xaf\x78\xa7\xab\x86\x33\x98\xcc\x61\x42\xbb\xb4\xb2\x36\x94\xa1\x80\x13\x97\xe5\x6a\x77\xcf\xe4\x05\x9c\xa4\x76\x81\x5c\x24\x78\x5b\x7d\x7b\x69\xbf\x2e\x16\x2e\xd4\xb1\x4d\x9e\xe1\xb9\x7b\xa4\x74\x7b\x0b\x44\x30\xee\x72\xc8\x62\xe1\x6c\x91\x46\x1f\xe9\x15\x49\x08\x37\x08\xd2\x32\x07\xfd\xa3\xde\xe6\x13\x5b\xc1\x6e\xf7\x07\xf5\x75\x19\xa4\x4d\x66\xfe\xf8\x53\x4b\x71\x3e\x71\x09\x8d\xdc\x70\x83\x9b\xdc\xdc\x4d\xa8\x99\x9f\xcd\xc8\x57\x3b\x3b\x2e\xb3\x38\x47\x9e\xce\x22\x92\xea\xcd\xd0\xca\xf0\xdd\x2c\xde\x48\xa1\x0d\x13\xc6\x02\xd9\xb5\xbf\x0c\x6a\xa3\x1e\xf9\xd7\x55\x95\x3c\xcd\x7c\x93\xda\x9e\x60\x3b\xb3\xd3\xa9\x81\x66\xa0\xaf\x85\x59\x91\xd9\xc1\x71\xf4\x3c\x5c\x26\x89\xa2\xc8\xbd\xf1\xae\xb5\x87\x41\xe7\x5f\x0e\x4c\xc1\xbd\x1a\x0d\x0e\xbb\x18\x75\x88\xfc\x70\x17\xd0\x0c\x16\xf4\x61\x17\xe6\xe3\x4a\xd5\xae\xcb\xe1\x1a\x68\xae\x70\x3b\xb8\x04\xfa\xa4\x0a\x68\xbb\x00\xba\xeb\x75\xed\x66\x34\xf1\x10\xf1\x67\xa9\x55\xf2\x43\xab\x1c\x7b\xdf\xd7\xb4\x37\x1c\xe4\xfc\x6e\x1b\x59\xfa\xbe\x7b\xec\x70\x70\x2a\x73\xb6\x37\x44\xdf\xb2\x5f\x1e\xeb\x70\x3d\x3b\xea\x3e\x7f\x7b\x06\x67\xf2\x23\x0e\xf2\xa5\x7d\x9b\x3a\x67\x72\xef\xa4\x2a\xfd\xa9\xd9\xe8\xb0\x43\x05\x11\xc7\xf9\x54\xd9\xeb\x7f\xdd\xad\xc2\x42\xad\x67\x0d\x34\x6a\x73\xa6\x6d\x9d\xb8\x3d\x95\xdb\x0c\x76\xe5\x82\x7b\x5b\x1d\x85\xdb\xde\x5d\x92\x6d\xec\x37\x49\x1d\xbb\xa4\x72\x5f\x54\xea\xe2\x80\x12\xe0\xc2\x4e\x7e\x4b\xeb\x5f\x2c\xe0\x67\xc5\xb7\x2c\x76\x87\x64\x2e\x2b\x8a\xd7\x18\x7f\xd5\xb0\x92\xb0\x46\x65\x13\xb4\x4a\xe5\x9e\x7a\x1a\xf7\x37\xbc\xa9\x27\x95\x86\x26\xde\xb3\x26\x21\x44\x8d\x07\x5d\xd7\x68\xdf\x2e\xec\xbe\xa5\x51\xbb\x6b\x41\x17\x91\x88\x16\xaf\xab\xfc\xb2\xbc\x7b\xeb\x42\xcf\x87\xce\x1b\xaa\x8d\xa8\x54\x5e\x53\x6d\x86\xb3\x8e\xbb\xaa\xd4\xe4\xc5\xf5\xdd\xd0\xbb\xaa\x4d\x91\xed\x0b\xab\xde\x2f\xab\x4b\xa8\xa9\xd0\x00\x00\x9f\xbf\x94\x01\xff\x1b\xbe\x28\x59\xce\xd1\xdd\x6d\xab\xe2\x47\x48\xf2\xb8\x14\x55\x3e\x18\x6e\xbb\x95\x5a\x6c\x1d\xbb\xed\x5b\x2d\xb8\x5f\x43\x8b\xb3\x6a\xd8\xa9\xd5\x56\x14\x45\x97\x55\x4e\xd9\x97\x99\x74\x89\x8f\x6c\xf7\xbd\x2b\x71\x5d\x2d\xe6\x90\x8a\xf6\x3d\xca\x66\x4b\xaf\x11\x1b\x36\xac\xc0\x8c\xfb\x93\xe8\xfd\xc5\x92\xb7\x69\xdb\x86\xae\x93\xa3\x2e\x32\x4a\x2d\x65\x4d\x77\x5b\x96\x15\xf8\x08\xad\x84\x88\xd5\x64\xa4\x39\x6c\x1d\x7c\x52\x16\xe3\xfd\xae\x46\x50\xbe\xf6\x57\xa3\x9f\xd6\xfa\x6b\x1c\xd4\x5b\x58\x0e\x47\x55\x9d\x02\xda\x24\xe4\x37\x3b\x0f\xe8\xb2\xd9\xa9\x8a\xc5\xdb\x59\x4d\xcf\xd5\xf1\x96\x7d\x3a\xe2\x74\xeb\x08\x85\x76\x1e\x73\xb5\x34\xda\x3a\xf9\x6b\xad\xa8\xbe\x84\x56\x6c\xdb\x3f\xf0\x72\x0c\x56\xbb\x21\x69\x3c\x75\x6e\xb8\xe1\xdb\xda\x61\x41\x5a\xcf\xfd\x8c\xcd\xfb\x5c\x85\xc4\x1f\x13\xb8\x26\xbb\x5d\x79\x4e\xd6\x51\x28\xb3\x09\x8f\xcb\xfd\x02\x4e\xa3\xb0\xbf\x13\xd9\x1d\xb0\x2c\x93\x37\x76\x87\xb7\x0e\x39\x21\x17\xab\x0a\xd2\x14\x0e\x6c\x32\x49\x2c\xb6\xb7\xa3\x1f\xa8\xe2\x30\xc7\x07\xeb\x2a\xa6\x51\x50\xa9\x5d\x14\xeb\x70\x58\x22\xd4\x19\xfc\x03\x5e\x75\xe6\x0d\x52\xe9\xe8\x3d\xde\x4c\x27\xd5\x36\xea\xbc\x8b\xab\xa3\x52\x7d\x5c\x53\x25\x9c\xc5\x6b\x8e\x5b\x76\x9d\xa1\x53\x07\xb5\xb7\xea\xa0\x34\xda\xac\x99\x80\x57\x4e\x11\x93\x70\x02\x10\x52\xde\xb0\x88\x56\x0a\xf4\x00\x4c\x4e\x3b\x70\xf2\x70\x0e\xb4\x2d\xd3\x9b\x3d\xf3\x57\x5e\x12\xde\x1c\xf4\x94\xc7\xdb\xf1\xc1\x8a\x8f\x09\x87\x30\xdb\x87\x39\xa7\x0e\x8a\x9e\xdc\xa7\xee\x31\x7b\x3a\x68\xdc\xc8\x7c\x28\x67\x69\xe6\x01\x87\x32\x15\x6a\xff\xd8\x4c\xc5\x65\x9a\x1d\x89\x8a\xfb\xd0\x9d\xa9\x34\xf3\xfd\x32\x55\x69\xed\x16\x3a\x72\x15\x3f\xa2\x4f\x30\xbc\xdb\x0f\xc8\x59\x5a\xb2\x07\x24\x2d\xdf\x66\x82\xd2\x19\x8f\xcb\x4d\xd5\xe3\xe3\x71\xc3\x64\xc1\x29\x9a\x8a\x7b\x9e\x88\xdc\x1a\xec\xe8\x90\xdc\x96\x30\x24\x26\x1f\xec\xf5\xdc\x41\xf9\x28\xad\x3e\x32\x2c\xb7\x17\xf5\xcd\xc7\xe5\x72\x2f\xde\x1b\x97\x5d\x0b\x1b\x89\xba\x43\xf1\x60\xc5\x3e\x39\x18\xb7\xd5\xfb\xe8\x68\xdc\x9c\xdd\xc1\x70\x5c\x69\xe1\x09\xf1\xf8\x21\x7c\x7c\x23\x01\xf9\x68\x6b\x3e\x26\x24\x77\x3b\xff\xdf\x10\x93\x5b\x11\xef\x50\x50\xd6\xfe\x80\xf3\x11\x51\x39\xfc\xfd\x4f\x00\x00\x00\xff\xff\x01\x3a\x11\x79\x6f\x3c\x00\x00") func templateBuilderQueryTmplBytes() ([]byte, error) { return bindataRead( @@ -219,7 +219,7 @@ func templateBuilderQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/query.tmpl", size: 13876, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/builder/query.tmpl", size: 15471, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -264,7 +264,7 @@ func templateBuilderUpdateTmpl() (*asset, error) { return a, nil } -var _templateClientTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x59\xdf\x6f\xdb\x38\xf2\x7f\xb6\xfe\x8a\xf9\x0a\x69\xbf\x52\xe0\x50\x7b\x7d\x3b\x1f\xf2\x50\x24\xbd\xdd\x00\xb7\x49\xef\x9a\xc5\x2d\x50\x14\x5b\x86\x1a\xc9\xbc\xc8\xa4\x4a\x51\x89\x03\x9f\xff\xf7\xc3\x90\xd4\x2f\xdb\x71\xb3\xd9\x7d\x49\x2c\xfe\x98\xf9\x70\xe6\x33\xc3\x19\x69\xb3\xc9\x4e\xa3\x0b\x5d\x3f\x19\x59\x2e\x2d\xbc\xfb\xe1\x2f\x7f\x3d\xab\x0d\x36\xa8\x2c\xfc\x9d\x0b\xbc\xd3\xfa\x1e\xae\x94\x60\xf0\xbe\xaa\xc0\x2d\x6a\x80\xe6\xcd\x03\xe6\x2c\xba\x5d\xca\x06\x1a\xdd\x1a\x81\x20\x74\x8e\x20\x1b\xa8\xa4\x40\xd5\x60\x0e\xad\xca\xd1\x80\x5d\x22\xbc\xaf\xb9\x58\x22\xbc\x63\x3f\x74\xb3\x50\xe8\x56\xe5\x91\x54\x6e\xfe\x1f\x57\x17\x1f\xae\x3f\x7d\x80\x42\x56\x08\x61\xcc\x68\x6d\x21\x97\x06\x85\xd5\xe6\x09\x74\x01\x76\xa4\xcc\x1a\x44\x16\x9d\x66\xdb\x6d\x14\x6d\x36\x90\x63\x21\x15\x42\x2c\x2a\x89\xca\xc6\x10\x86\x4f\xea\xfb\x12\x16\xe7\x70\xc7\x1b\x84\x13\x76\xa1\x55\x21\x4b\xf6\x91\x8b\x7b\x5e\x22\x2d\xda\x6c\xc0\xe2\xaa\xae\xb8\x45\x88\x97\xc8\x73\x34\x31\x9c\xb8\xed\x72\x55\x6b\x63\x21\x89\x66\x71\xa5\xcb\x38\x8a\x66\x31\x49\xdc\x17\x92\xad\x64\x69\xb8\xc5\x38\x9a\x6d\x36\x60\xb8\x2a\x11\x4e\x7e\x9b\xc3\x89\x22\xd5\x27\xec\x5a\xe7\xd8\x90\xc8\x99\x97\xa0\x0e\x88\xf0\xe3\xc3\x80\x93\x75\x06\xa8\x72\x87\x65\x16\x97\xd2\x2e\xdb\x3b\x26\xf4\x2a\x2b\x82\x5b\xa4\x12\xed\x1d\xb7\xda\x64\xa8\x6c\x96\x4b\x5e\xa1\xb0\x7b\x20\xc2\x31\x1c\x92\x4f\x56\x1b\x5e\x22\xbb\x72\x63\x0d\x9c\x0d\xa0\xc2\xb2\xa0\xd9\x29\xa6\xd9\x34\x8a\xb2\x0c\x2e\x9c\x55\xc9\xb7\xe4\x18\x6f\x63\xb0\x4b\x6e\x61\xa9\xab\xbc\x01\x5e\x55\x40\x43\x77\xad\xac\x72\x34\x0d\x8b\xec\x53\x8d\xdd\xb6\xc6\x9a\x56\x58\xd8\x44\x33\xe1\xce\xed\x8f\x26\x0b\x02\xd4\xd6\xa4\xf6\x67\x6f\x40\x6f\xa3\x2c\x83\x4f\x62\x89\x2b\xbe\xa3\xaf\xd0\x06\x84\x41\x6e\xa5\x2a\xe7\xe0\x6d\x2e\x55\x09\x5c\xe5\x90\x1b\x5d\xd7\xf4\xd0\xb8\x9d\x2c\x9a\xcd\x82\x8c\xd3\xe0\x1c\xe6\x9f\x27\x66\x75\xbf\x83\xa9\xf6\x7d\x95\x65\xe0\xbd\x72\xcd\x57\x04\xed\x00\x1c\xa9\x2c\x1a\x2e\x1c\x8c\x47\x69\x97\x6e\x7e\xba\x69\x30\xc9\x6c\x36\x9d\x39\x9d\x3c\x7a\x5b\xed\xc2\x1b\x91\xd3\xab\xcd\x0a\x89\x55\xde\x64\x3c\xcf\xa5\x95\x5a\xf1\x2a\xd0\x75\xeb\x1c\x75\x8d\x8f\xc1\xe8\xce\x52\xd8\x00\x07\x85\x8f\x1d\x66\x6f\xff\xd6\x60\x3e\xc0\x2d\xe5\x03\x2a\xd0\x35\x49\x6b\x58\x54\xb4\x4a\x0c\x62\x12\x5d\xdb\x06\x18\x63\x37\x6e\x3e\x85\xd3\x20\x9e\x9c\x59\xb8\xd0\xf2\x32\x37\x95\x2e\x17\x50\xe9\x92\x7d\x34\x52\xd9\x4a\xcd\x61\xa9\xf5\x7d\xb3\x80\xb7\xee\xff\x86\xce\x23\x8a\x92\x05\x45\x4e\x30\x63\x2c\x8d\x66\x01\xdb\xe2\x1c\xde\x7a\xe1\x1b\x2f\x72\x01\xa2\x28\xb7\xdd\x3c\x93\x4a\xda\x24\x8d\x66\x06\x6d\x6b\x54\x38\x11\x1d\xdb\x21\x4e\x44\x07\x2d\x05\xbf\x92\x20\x1e\xe5\x99\x08\x94\x80\x73\xe8\x38\x72\x8d\x8f\x7e\x2c\x11\x2c\x37\xf2\x01\x4d\xfa\x62\xc2\x00\x00\xcc\x04\x9b\xfa\xf8\x1c\xc8\x96\x07\x1c\x9d\x08\xe6\x4f\x39\x55\xe0\xbd\x78\x53\x3b\x8f\xa0\x22\xf7\x09\xad\x14\x0a\x32\x1a\x58\xed\x3c\x96\x73\xcb\x5d\x42\x6b\x6a\x14\xb2\x90\x98\xc3\xdd\x93\x9f\x71\x98\x41\x91\x26\x0a\x0b\x4e\xd2\xfc\xe0\x59\x58\x2c\xdc\xf6\x2e\x8b\xd2\xca\xb9\x5b\xea\xcd\xba\xc3\x17\x6e\x2d\xe5\xed\x9c\x34\x4b\xcb\x3c\x36\x4f\x3b\xa8\xb9\xe1\x2b\xb4\x68\x1a\x10\x5c\xc1\x1d\x02\xcf\x73\xcc\x7d\x98\x06\x9e\x51\x5c\x0c\x21\x13\xc8\x45\xa7\x4b\x3c\xa8\x6b\xa7\x9e\x00\x7d\x72\x78\x9c\x89\x1a\x6b\x5c\x84\x07\xa6\x8c\xd9\x97\x04\x1f\xcf\x01\x8d\xd1\xc6\xf9\xb8\x79\x94\x56\x2c\x61\x10\xe8\xb8\x49\xe6\xd9\x6c\xe0\x3f\x5a\xaa\x51\xde\xbb\xf4\x39\xb2\x81\x78\x0e\x74\x47\x2c\x5c\x50\x9e\xc1\x89\x5d\xd5\x15\xf9\xb3\x26\xf2\x16\x10\x87\x64\x9a\xbd\x69\xb2\x10\x77\xe4\x8e\x78\x10\x15\x52\x27\x6d\x5e\xf7\x31\xea\xc5\x30\x3f\x97\x63\xc1\xdb\xca\x92\x8a\x40\x59\x25\xab\x39\x14\x2b\xcb\x3e\x10\xf8\x22\x89\x5b\xd5\x78\x5e\x62\x1e\xf0\x2f\xe0\xcd\xb7\x78\x3e\x3a\x4c\x1a\xcd\x3a\x56\xdc\xae\x77\x9c\x64\x0d\x57\x0d\x17\xc1\x1f\x13\x1b\x8f\xc3\xe1\x76\x9d\x08\xbb\x26\x9f\x58\x5c\x5b\xba\x7b\xe8\x3f\x19\xf3\x76\x3d\x36\xa4\x2c\xe0\xb7\x39\xe8\x7b\x17\xd4\x81\xfe\x2c\x39\xb5\xeb\x4b\x1f\x09\x7f\xa3\xb9\xcd\x91\xe3\x74\xf7\xed\x76\xbb\x20\x4a\x28\x4d\xa9\x9f\x1b\x0b\x7c\x0c\xd5\x65\x1e\xa9\xa6\x83\xb1\x3b\xe7\xcc\x7a\x40\x84\x40\xe1\xa3\x07\x3e\x87\x51\x2c\xca\xc2\xcd\xff\xdf\x39\x69\x7f\x31\x18\x87\xc2\x5d\x15\x63\x9d\x0b\x78\xf3\x10\x3b\x7d\x5e\xf9\x34\x9f\x75\xfe\x20\x00\x2e\xb7\x09\x56\xe9\x72\x0e\x39\xde\xb5\xee\xc9\xfd\xe8\xb3\x9c\x60\xee\xc7\xb6\xcf\x4f\x6f\x6f\xd7\x04\x6f\x94\xca\xe6\xfe\x06\x78\xae\x3e\xf0\x84\x9a\xde\x11\x8b\x67\xb3\x47\x51\xa6\x41\x5e\x77\x53\xcf\xb6\x73\xb2\x42\x20\xcb\x25\xa1\xdb\xe1\x8b\x43\x7c\x16\x78\x02\x57\xf6\xff\x1b\x68\x1b\x1f\xdc\x25\x5a\x78\x40\x73\xa7\x1b\xa4\xd3\x96\x64\x2c\xad\xa0\xcf\x19\xba\x46\xba\x6d\xdd\x0d\x91\x65\x51\x96\x75\x59\xd9\xe9\x49\x52\x1a\x75\x68\x12\xa9\x72\x5c\xf7\x87\xfa\x21\xed\x80\xfb\x15\xff\x6c\xd1\x3c\x75\xcb\x2f\x74\x4b\x47\xb1\xeb\x94\x64\xee\xf1\x36\x88\x1e\x5f\x39\xb2\xe8\x0c\x3f\xf6\xbd\x38\xe2\xbe\x10\xc8\x01\x67\xc7\xa4\xb9\xf7\x66\x7a\xd0\xb5\xd6\xb4\x78\xc0\xaf\x7f\xf4\x9a\x72\x65\x14\xd9\x57\xd0\xdf\x66\x9a\xc9\x47\x49\x9e\x92\x71\x6d\xf0\x01\x95\x6d\x9c\xdb\xbe\xb5\x68\x24\x36\x50\x18\xbd\xea\xa9\x7c\x20\xce\x9d\xf4\x24\xf5\x11\x4d\xf6\xe9\x20\x74\xb1\x1c\x16\x04\x30\xbf\x34\x2e\x63\x7b\x20\xab\xd6\x3a\xf7\xfa\x63\x13\x23\xa8\xa4\xa3\x19\x54\x56\xda\xa7\x70\x0e\xe7\x7d\xb8\x52\xa0\x8d\xab\xec\x35\x49\x18\xed\x19\x08\x23\x42\x9e\x16\xbc\xaa\x16\xf0\x35\x18\x87\x48\xc1\x7e\x69\x30\xa1\x9b\xff\xeb\x81\x33\xd0\x9c\x17\xc7\x18\xfb\x49\xeb\xfb\xfe\x1a\x3f\x5a\x56\xef\x5c\xbb\xac\x17\xe3\x2b\x8c\xe9\x05\x1b\x1d\x2f\xd2\x49\xd2\xe0\x6b\x77\x21\xf4\xa2\xe3\x8b\xa1\xbd\x08\xe5\x61\x58\xea\xcb\x43\x3e\x2e\x0e\xf7\x6b\xc1\xae\x38\x75\xc5\xf1\x74\xf3\x5e\x8d\x1c\xfa\x17\x83\xc2\xe1\x53\xec\x5f\x28\xd0\xdd\xee\xdb\xed\x66\x43\x55\x0d\x7e\xf3\xd3\xb1\x88\xfd\x98\x7b\x1a\xee\xb0\x37\xec\x5d\x13\xf7\xea\xff\x0b\x95\x7e\xec\x76\x77\x6d\x85\xaf\x18\xa7\x48\x86\x9c\x71\xf4\x2c\x8e\x8d\x43\xfd\xe8\x51\x0f\xe5\xe3\x44\x66\x22\xc2\x7c\xea\x8b\xde\x41\xd9\xc0\xd2\xb7\x93\x89\x21\xb6\xb6\xbb\x74\xe5\x50\xc9\xc6\x52\x3b\xb8\x4f\x5a\xc2\xe3\x1f\x1a\xcb\xc5\xbd\x63\xeb\x7b\xc7\x41\x9a\xfd\x4a\xb4\x28\xe6\x40\x59\x3b\xfd\x0a\xf8\xad\xe5\x95\xdb\xf6\x75\xb7\xfb\x72\xd4\x6b\x92\x22\x29\x93\x65\x92\xa6\xe9\x84\xab\x13\xa0\xcf\x51\x36\xe4\x8d\xbd\x72\x90\xd7\x35\xaa\x3c\x39\x38\x1d\x92\x8e\xe3\x6c\x48\x18\xae\x88\x1f\xbb\xc4\x0f\x84\xa6\xc2\xb9\x66\xca\xfc\x67\x61\x7a\x51\x49\xba\xdb\x76\x78\x81\x9b\x68\xd6\x5b\xd3\x5f\xbe\x7e\xd5\xcf\x61\x30\xac\xee\xab\xd6\x39\xdc\xd4\x7e\x6b\x3a\xf5\xe0\x8e\xe0\xc1\x8f\xfd\xc6\x3e\xb1\x7a\x1b\xa7\xf3\xde\x8f\x8b\xfe\x57\xef\xf4\x3a\x9f\x9c\x5f\x41\xeb\x47\x5e\x61\x00\x2f\x6b\xcf\x00\x41\xc5\x6b\x0c\xe0\xb7\x3e\x67\x00\x3f\xfb\xa7\x18\xe0\x46\x7d\xcf\x06\x43\x20\xfa\x7c\xfd\x3d\x33\xdc\x28\x4c\xba\x8c\xb1\xd7\x8a\x1e\x36\x11\x81\x18\x5f\x2a\xfd\xe8\xd5\xe5\x48\x14\xbb\xba\x4c\x77\xb1\x5f\x5d\xbe\x18\xbd\xcc\x5f\x80\xfc\xea\x32\x91\x79\x70\xfb\xd5\x25\xbb\xa5\x6c\xfa\x1d\xd4\xaf\xf4\xed\x8d\x22\xf7\x76\x9b\x99\xcc\xe1\x1c\xde\xca\xfc\xa8\xc7\x6f\xd4\x1f\x75\xfa\x25\x56\x38\x89\xfa\xdc\x0f\xbc\x82\xf4\x5e\xd4\x1e\xe9\x83\x86\xd7\x18\xc6\x6f\x7d\x8e\xf4\x7e\xf6\x4f\x39\xff\x84\xf4\x87\x4c\xf0\x72\xce\xf7\x02\x5f\xce\xf9\x01\xc3\x98\xf3\xfd\xe8\x73\x9c\x1f\x2d\x78\x29\xf8\x63\x94\x1f\xeb\x7b\x01\xe5\x27\xa0\x3b\x6d\xae\x9b\xeb\x78\xc0\xfe\xbd\x44\xe3\xcd\x30\xb9\xef\x9c\xfc\x34\xed\x77\xb1\x03\x9c\xdf\x9b\xd2\x35\x9c\xf7\x8c\xb8\x51\x78\x94\x13\x14\x16\x41\xc2\xf6\xb9\xdb\x8d\x2a\xdd\xa7\xd7\xd0\x3c\xb4\x15\x3b\xe6\x70\xa3\xbb\x25\xc6\x74\x76\x8f\xa9\x1d\xb6\x1f\xd1\x8e\x80\x4d\x6f\xf1\x50\x12\xdf\x3d\x81\xb4\xcd\x51\xff\xfd\x88\xf6\x50\xef\x3d\x87\x83\xce\x4c\x4e\x77\xca\x81\xa1\x37\xef\x19\xd8\x35\x50\xc7\xfd\xc8\x6e\x54\xf5\xe4\x3b\xab\xfe\x38\xbf\xfa\x57\xf3\xf7\x48\x0f\x73\xb8\x6b\x2d\xd4\x5c\x49\xd1\x50\x2d\xc9\x55\x68\x1b\xb4\x10\xad\x69\x8e\x9e\xe8\xd7\xdf\x71\xa4\xe9\x89\x7c\x2d\xdf\x85\x4d\xdf\xea\x0b\x16\xec\x44\x42\x0e\x36\xf9\x0e\x68\xd2\x77\xea\xc1\x1a\x83\xa8\x50\x2d\x8f\xaa\x7a\x0c\x55\xf3\x87\xbc\x1c\xca\xfa\x51\x48\x9c\xa0\x03\xe9\xed\x19\xe0\x91\xa1\x3c\x2b\x36\x50\xf3\x46\xf0\x8a\x96\x75\xd8\xbb\x36\xac\x2b\x85\x87\x19\xcc\x4b\xa4\x7a\x94\xff\x2e\xba\x1e\x52\xf2\xdd\xfc\xd4\x9d\xc0\xdb\xd2\xc7\x0b\x75\xa4\xd3\xb9\x03\xac\x76\x3d\x90\x7b\xe7\x8b\x6b\x4b\xe5\xff\x89\x82\xb8\x6b\x29\xe2\xd0\x48\x90\xb1\x62\xb2\x5d\x78\xb7\x75\xf4\xbd\x98\x53\x9e\x51\x1b\x30\x7e\x2d\xf6\xbd\xb7\x62\xe3\x97\xa9\xc1\x8d\x4e\x50\xe4\x3c\x34\xea\x4b\xdc\x3d\xd1\x87\xe0\xe8\xbd\xbb\xaf\x91\x9f\xb5\x6d\xb8\x5f\xe0\xf3\x17\xfa\x35\x7a\x09\xac\x8d\x33\x67\xbb\xf2\x92\x4f\x14\xfb\x89\x37\x1f\x75\x25\xc5\x93\x47\xed\x8b\x78\xc7\xc7\x03\xc5\xf9\xf0\xba\x21\x94\xf0\x6e\xcd\xe7\x45\x85\xca\xff\x4c\x47\x3f\xbf\xcc\xe1\x70\x4b\xf1\x79\xf1\x65\xd4\x92\x56\xcd\x54\xf2\x33\x8a\xa7\xed\xeb\x60\xa6\x91\xc1\x36\x9b\xec\x14\xde\x0f\x5f\x0b\xdc\xb7\x99\xf0\x5a\x56\x3f\xa0\x31\x32\xc7\x1c\xe4\x4e\xe3\x3e\x7c\x44\x00\xff\x59\xa1\xeb\xa1\x42\xbb\xee\xbe\xae\xed\x7d\x5c\x3b\xf4\x09\x82\xba\x4a\x54\x39\x41\xf9\x5f\x00\x00\x00\xff\xff\x03\x1a\x89\x10\x51\x1c\x00\x00") +var _templateClientTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x59\xdd\x73\xdb\xb8\x11\x7f\x16\xff\x8a\x2d\xc7\x49\x49\x8f\x0c\xa5\x79\xab\x3a\x7e\x48\xed\xf4\xce\x33\x3d\x3b\x6d\x7c\xed\xcd\x64\x32\x09\x0c\x2e\x29\xd4\x14\xc0\x80\xa0\x2d\x8f\xaa\xff\xfd\x66\x01\xf0\x4b\x5f\xf1\xf9\xee\xc5\x16\xf1\xb1\xfb\xdb\xdd\x1f\x16\xbb\xe4\x7a\x3d\x3b\x8d\x2e\x74\xf5\x64\x64\xb1\xb0\xf0\xf6\xcd\x5f\xfe\x7a\x56\x19\xac\x51\x59\xf8\x07\x17\x78\xa7\xf5\x3d\x5c\x29\xc1\xe0\x5d\x59\x82\x5b\x54\x03\xcd\x9b\x07\xcc\x58\x74\xbb\x90\x35\xd4\xba\x31\x02\x41\xe8\x0c\x41\xd6\x50\x4a\x81\xaa\xc6\x0c\x1a\x95\xa1\x01\xbb\x40\x78\x57\x71\xb1\x40\x78\xcb\xde\xb4\xb3\x90\xeb\x46\x65\x91\x54\x6e\xfe\x9f\x57\x17\xef\xaf\x3f\xbe\x87\x5c\x96\x08\x61\xcc\x68\x6d\x21\x93\x06\x85\xd5\xe6\x09\x74\x0e\x76\xa0\xcc\x1a\x44\x16\x9d\xce\x36\x9b\x28\x5a\xaf\x21\xc3\x5c\x2a\x84\x58\x94\x12\x95\x8d\x21\x0c\x9f\x54\xf7\x05\xcc\xcf\xe1\x8e\xd7\x08\x27\xec\x42\xab\x5c\x16\xec\x03\x17\xf7\xbc\x40\x5a\xb4\x5e\x83\xc5\x65\x55\x72\x8b\x10\x2f\x90\x67\x68\x62\x38\x71\xdb\xe5\xb2\xd2\xc6\x42\x12\x4d\xe2\x52\x17\x71\x14\x4d\x62\x92\xb8\x2b\x64\xb6\x94\x85\xe1\x16\xe3\x68\xb2\x5e\x83\xe1\xaa\x40\x38\xf9\x32\x85\x13\x45\xaa\x4f\xd8\xb5\xce\xb0\x26\x91\x13\x2f\x41\xed\x11\xe1\xc7\xfb\x01\x27\xeb\x0c\x50\x65\x0e\xcb\x24\x2e\xa4\x5d\x34\x77\x4c\xe8\xe5\x2c\x0f\x61\x91\x4a\x34\x77\xdc\x6a\x33\x43\x65\x67\x99\xe4\x25\x0a\xbb\x03\x22\x98\xe1\x90\x7c\xb4\xda\xf0\x02\xd9\x95\x1b\xab\xe1\xac\x07\x15\x96\x05\xcd\x4e\x31\xcd\xa6\x51\x34\x9b\xc1\x85\xf3\x2a\xc5\x96\x02\xe3\x7d\x0c\x76\xc1\x2d\x2c\x74\x99\xd5\xc0\xcb\x12\x68\xe8\xae\x91\x65\x86\xa6\x66\x91\x7d\xaa\xb0\xdd\x56\x5b\xd3\x08\x0b\xeb\x68\x22\x9c\xdd\xde\x34\x99\x13\xa0\xa6\x22\xb5\x3f\x79\x07\x7a\x1f\xcd\x66\xf0\x51\x2c\x70\xc9\xb7\xf4\xe5\xda\x80\x30\xc8\xad\x54\xc5\x14\xbc\xcf\xa5\x2a\x80\xab\x0c\x32\xa3\xab\x8a\x1e\x6a\xb7\x93\x45\x93\x49\x90\x71\x1a\x82\xc3\xfc\xf3\xc8\xad\xee\x77\x70\xd5\x6e\xac\x66\x33\xf0\x51\xb9\xe6\x4b\x82\xb6\x07\x8e\x54\x16\x0d\x17\x0e\xc6\xa3\xb4\x0b\x37\x3f\xde\xd4\xbb\x64\x32\x19\xcf\x9c\x8e\x1e\xbd\xaf\xb6\xe1\x0d\xc8\xe9\xd5\xce\x72\x89\x65\x56\xcf\x78\x96\x49\x2b\xb5\xe2\x65\xa0\xeb\xc6\x05\xea\x1a\x1f\x83\xd3\x9d\xa7\xb0\x06\x0e\x0a\x1f\x5b\xcc\xde\xff\x8d\xc1\xac\x87\x5b\xc8\x07\x54\xa0\x2b\x92\x56\xb3\x28\x6f\x94\xe8\xc5\x24\xba\xb2\x35\x30\xc6\x6e\xdc\x7c\x0a\xa7\x41\x3c\x05\x33\x77\x47\xcb\xcb\x5c\x97\xba\x98\x43\xa9\x0b\xf6\xc1\x48\x65\x4b\x35\x85\x85\xd6\xf7\xf5\x1c\x5e\xbb\xff\x6b\xb2\x47\xe4\x05\x0b\x8a\x9c\x60\xc6\x58\x1a\x4d\x02\xb6\xf9\x39\xbc\xf6\xc2\xd7\x5e\xe4\x1c\x44\x5e\x6c\xda\x79\x26\x95\xb4\x49\x1a\x4d\x0c\xda\xc6\xa8\x60\x11\x99\xed\x10\x27\xa2\x85\x96\x82\x5f\x49\x10\x8f\xf2\x4c\x04\x4a\xc0\x39\xb4\x1c\xb9\xc6\x47\x3f\x96\x08\x96\x19\xf9\x80\x26\x7d\x36\x61\x00\x00\x26\x82\x8d\x63\x7c\x0e\xe4\xcb\x3d\x81\x4e\x04\xf3\x56\x8e\x15\xf8\x28\xde\x54\x2e\x22\xa8\x28\x7c\x42\x2b\x85\x82\x9c\x06\x56\xbb\x88\x65\xdc\x72\x97\xd0\xea\x0a\x85\xcc\x25\x66\x70\xf7\xe4\x67\x1c\x66\x50\xa4\x89\x8e\x05\x27\x69\x7e\xf0\x2c\x2c\x16\x6e\x7b\x9b\x45\x69\xe5\xd4\x2d\xf5\x6e\xdd\xe2\x0b\xb7\x96\xf2\x76\x46\x9a\xa5\x65\x1e\x9b\xa7\x1d\x54\xdc\xf0\x25\x5a\x34\x35\x08\xae\xe0\x0e\x81\x67\x19\x66\xfe\x98\x06\x9e\xd1\xb9\xe8\x8f\x4c\x20\x17\x59\x97\x78\x50\xd7\x4e\x3d\x01\xfa\xe8\xf0\x38\x17\xd5\xd6\xb8\x13\x1e\x98\x32\x64\x5f\x12\x62\x3c\x05\x34\x46\x1b\x17\xe3\xfa\x51\x5a\xb1\x80\x5e\xa0\xe3\x26\xb9\x67\xbd\x86\xff\x69\xa9\x06\x79\xef\xd2\xe7\xc8\x1a\xe2\x29\xd0\x1d\x31\x77\x87\xf2\x0c\x4e\xec\xb2\x2a\x29\x9e\x15\x91\x37\x87\x38\x24\xd3\xd9\xab\x7a\x16\xce\x1d\x85\x23\xee\x45\x85\xd4\x49\x9b\x57\xdd\x19\xf5\x62\x98\x9f\xcb\x30\xe7\x4d\x69\x49\x45\xa0\xac\x92\xe5\x14\xf2\xa5\x65\xef\x09\x7c\x9e\xc4\x8d\xaa\x3d\x2f\x31\x0b\xf8\xe7\xf0\xea\x5b\x3c\x1d\x18\x93\x46\x93\x96\x15\xb7\xab\xad\x20\x59\xc3\x55\xcd\x45\x88\xc7\xc8\xc7\xc3\xe3\x70\xbb\x4a\x84\x5d\x51\x4c\x2c\xae\x2c\xdd\x3d\xf4\x9f\x9c\x79\xbb\x1a\x3a\x52\xe6\xf0\x65\x0a\xfa\xde\x1d\xea\x40\x7f\x96\x9c\xda\xd5\xa5\x3f\x09\x7f\xa3\xb9\xf5\x11\x73\xda\xfb\x76\xb3\x99\x13\x25\x94\xa6\xd4\xcf\x8d\x05\x3e\x84\xea\x32\x8f\x54\xe3\xc1\xd8\xd9\x39\xb1\x1e\x10\x21\x50\xf8\xe8\x81\x4f\x61\x70\x16\x65\xee\xe6\xff\x74\x4e\xda\x9f\x0d\xc6\xa1\x70\x57\xc5\x50\xe7\x1c\x5e\x3d\xc4\x4e\x9f\x57\x3e\xce\x67\x6d\x3c\x08\x80\xcb\x6d\x82\x95\xba\x98\x42\x86\x77\x8d\x7b\x72\x3f\xba\x2c\x27\x98\xfb\xb1\xe9\xf2\xd3\xeb\xdb\x15\xc1\x1b\xa4\xb2\xa9\xbf\x01\x0e\xd5\x07\x9e\x50\xe3\x3b\x62\x7e\x30\x7b\xe4\x45\x1a\xe4\xb5\x37\xf5\x64\x33\x25\x2f\x04\xb2\x5c\x12\xba\x2d\xbe\x38\xc4\x67\x81\x27\x70\x65\xff\x5c\x43\x53\xfb\xc3\x5d\xa0\x85\x07\x34\x77\xba\x46\xb2\xb6\x20\x67\x69\x05\x5d\xce\xd0\x15\xd2\x6d\xeb\x6e\x88\xd9\x2c\x9a\xcd\xda\xac\xec\xf4\x24\x29\x8d\x3a\x34\x89\x54\x19\xae\x3a\xa3\xde\xa4\x2d\x70\xbf\xe2\x5f\x0d\x9a\xa7\x76\xf9\x85\x6e\xc8\x14\xbb\x4a\x49\xe6\x0e\x6f\x83\xe8\xe1\x95\x23\xf3\xd6\xf1\xc3\xd8\x8b\x23\xe1\x0b\x07\x39\xe0\x6c\x99\x34\xf5\xd1\x4c\xf7\x86\xd6\x9a\x06\xf7\xc4\xf5\xf7\x5e\x53\xae\x8c\x22\xff\x0a\xfa\x5b\x8f\x33\xf9\x20\xc9\x53\x32\xae\x0c\x3e\xa0\xb2\xb5\x0b\xdb\xb7\x06\x8d\xc4\x1a\x72\xa3\x97\x1d\x95\xf7\x9c\x73\x27\x3d\x49\xfd\x89\x26\xff\xb4\x10\xda\xb3\x1c\x16\x04\x30\x3f\xd7\x2e\x63\x7b\x20\xcb\xc6\xba\xf0\x7a\xb3\x89\x11\x54\xd2\xd1\x0c\x2a\x2b\xed\x53\xb0\xc3\x45\x1f\xae\x14\x68\xe3\x2a\x7b\x4d\x12\x06\x7b\x7a\xc2\x88\x90\xa7\x05\x2f\xcb\x39\x7c\x0d\xce\x21\x52\xb0\x9f\x6b\x4c\xe8\xe6\xff\xba\xc7\x06\x9a\xf3\xe2\x18\x63\x3f\x6a\x7d\xdf\x5d\xe3\x47\xcb\xea\xad\x6b\x97\x75\x62\x7c\x85\x31\xbe\x60\xa3\xe3\x45\x3a\x49\xea\x63\xed\x2e\x84\x4e\x74\x7c\xd1\xb7\x17\xa1\x3c\x0c\x4b\x7d\x79\xc8\x87\xc5\xe1\x6e\x2d\xd8\x16\xa7\xae\x38\x1e\x6f\xde\xa9\x91\x43\xff\x62\x50\x38\x7c\x8a\xfd\x1b\x05\xba\xdb\x7d\xb3\x59\xaf\xa9\xaa\xc1\x6f\x7e\x3a\x16\xb1\x1f\x73\x4f\xfd\x1d\xf6\x8a\xbd\xad\xe3\x4e\xfd\xff\xa1\xd4\x8f\xed\xee\xb6\xad\xf0\x15\xe3\x18\x49\x9f\x33\x8e\xda\xe2\xd8\xd8\xd7\x8f\x1e\x75\x5f\x3e\x8e\x64\x26\x22\xcc\xa7\xbe\xe8\xed\x95\xf5\x2c\x7d\x3d\x9a\xe8\xcf\xd6\x66\x9b\xae\x1c\x4a\x59\x5b\x6a\x07\x77\x49\x4b\x78\xfc\x43\x6d\xb9\xb8\x77\x6c\x7d\xe7\x38\x48\xb3\x5f\x89\x16\xf9\x14\x28\x6b\xa7\x5f\x01\xbf\x35\xbc\x74\xdb\xbe\x6e\x77\x5f\x8e\x7a\x75\x92\x27\x45\xb2\x48\xd2\x34\x1d\x71\x75\x04\xf4\x10\x65\x43\xde\xd8\x29\x07\x79\x55\xa1\xca\x92\xbd\xd3\x21\xe9\x38\xce\x86\x84\xe1\x8a\xf8\x61\x48\xfc\x40\x68\x2a\x5c\x68\xc6\xcc\x3f\x08\xd3\x8b\x4a\xd2\xed\xb6\xc3\x0b\x5c\x47\x93\xce\x9b\xfe\xf2\xf5\xab\x7e\x0a\x83\x61\x75\x57\xb5\x4e\xe1\xa6\xf2\x5b\xd3\x71\x04\xb7\x04\xf7\x71\xec\x36\x76\x89\xd5\xfb\x38\x9d\x76\x71\x9c\x77\xbf\xba\xa0\x57\xd9\xc8\x7e\x05\x8d\x1f\x79\x81\x03\xbc\xac\x1d\x07\x04\x15\x2f\x71\x80\xdf\x7a\xc8\x01\x7e\xf6\x0f\x71\xc0\x8d\xfa\x9e\x0f\xfa\x83\xe8\xf3\xf5\xf7\xdc\x70\xa3\x30\x69\x33\xc6\x4e\x2b\xba\xdf\x45\x04\x62\x78\xa9\x74\xa3\x57\x97\x03\x51\xec\xea\x32\xdd\xc6\x7e\x75\xf9\x6c\xf4\x32\x7b\x06\xf2\xab\xcb\x44\x66\x21\xec\x57\x97\xec\x96\xb2\xe9\x77\x50\xbf\x30\xb6\x37\x8a\xc2\xdb\x6e\x66\x32\x83\x73\x78\x2d\xb3\xa3\x11\xbf\x51\xbf\x37\xe8\x97\x58\xe2\xe8\xd4\x67\x7e\xe0\x05\xa4\xf7\xa2\x76\x48\x1f\x34\xbc\xc4\x31\x7e\xeb\x21\xd2\xfb\xd9\x3f\xc4\xfe\x11\xe9\xf7\xb9\xe0\xf9\x9c\xef\x04\x3e\x9f\xf3\x3d\x86\x21\xe7\xbb\xd1\x43\x9c\x1f\x2c\x78\x2e\xf8\x63\x94\x1f\xea\x7b\x06\xe5\x47\xa0\x5b\x6d\xae\x9b\x6b\x79\xc0\xfe\xbb\x40\xe3\xdd\x30\xba\xef\x9c\xfc\x34\xed\x76\xb1\x3d\x9c\xdf\x99\xd2\x15\x9c\x77\x8c\xb8\x51\x78\x94\x13\x74\x2c\x82\x84\xcd\xa1\xdb\x8d\x2a\xdd\xa7\x97\xd0\x3c\xb4\x15\x5b\xee\x70\xa3\xdb\x25\xc6\x78\x76\x87\xa9\x2d\xb6\x1f\xd0\x0e\x80\x8d\x6f\xf1\x50\x12\xdf\x3d\x81\xb4\xf5\xd1\xf8\xfd\x80\x76\x5f\xef\x3d\x85\xbd\xc1\x4c\x4e\xb7\xca\x81\xbe\x37\xef\x18\xd8\x36\x50\xc7\xe3\xc8\x6e\x54\xf9\xe4\x3b\xab\xce\x9c\x5f\xfc\xab\xf9\x7b\xa4\x87\x29\xdc\x35\x16\x2a\xae\xa4\xa8\xa9\x96\xe4\x2a\xb4\x0d\x5a\x88\xc6\xd4\x47\x2d\xfa\xe5\x37\x98\x34\xb6\xc8\xd7\xf2\xed\xb1\xe9\x5a\x7d\xc1\x82\x9f\x48\xc8\xde\x26\xdf\x01\x4d\xba\x4e\x3d\x78\xa3\x17\x15\xaa\xe5\x41\x55\x8f\xa1\x6a\x7e\x9f\x15\x7d\x59\x3f\x38\x12\x27\xe8\x40\x7a\x7f\x06\x78\xe4\x28\xcf\x8a\x35\x54\xbc\x16\xbc\xa4\x65\x2d\xf6\xb6\x0d\x6b\x4b\xe1\x7e\x06\xb3\x02\xa9\x1e\xe5\xbf\x89\xae\xfb\x94\x7c\x37\x3f\xb5\x16\x78\x5f\xfa\xf3\x42\x1d\xe9\x78\x6e\x0f\xab\xfd\x5a\x56\x71\xbb\x80\x73\x20\x60\x07\x5e\x0a\x51\x5d\xff\x1f\x67\x48\xf7\xd6\xec\xef\x9d\xe0\x29\x7c\x19\x90\xd2\xf5\x55\xee\x3d\x32\xae\x2c\xb5\x14\x27\x0a\xe2\xb6\x4d\x89\x43\x73\x42\x01\x88\x29\x1e\xf1\x55\xe6\x5a\xa7\xd8\x69\x88\xa1\x7f\xdd\x71\xe4\xe5\x9b\x43\x3d\xa3\x1d\xc3\x77\x6f\xed\xd6\x83\xef\xde\xba\x8e\xcf\x3f\x05\xbe\x38\xc5\xfe\x25\xc9\x80\x45\x4e\x45\xe4\x08\x32\x68\x8b\xdc\x35\xd5\x65\x80\xc1\x6b\x7f\x5f\xa2\x1f\x0c\x6d\xb8\xde\xe0\xd3\x67\xfa\x35\x78\x07\xad\x8d\x8b\x66\xb3\xf4\x92\x4f\x14\xfb\x91\xd7\x1f\x74\x29\xc5\x93\xb7\xc7\xf7\x10\xee\x38\xec\xe9\x0d\x7a\x2b\x42\x07\xe1\xd6\x7c\x9a\x97\xa8\xfc\xcf\x74\xf0\xf3\xf3\x14\xf6\x77\x34\x9f\xe6\x9f\x07\x1d\x71\x59\x8f\x25\x1f\x50\x3c\xee\x9e\x7b\x37\x0d\x1c\xb6\x5e\xcf\x4e\xe1\x5d\xff\xb1\xc2\x7d\x1a\x0a\x6f\x85\xf5\x03\x1a\x23\x33\xcc\x40\x6e\xbd\x37\xe8\xbf\x61\x80\xff\xaa\xd1\xb6\x70\xe1\x6d\x81\xfb\xb8\xb7\xf3\x6d\x6f\xdf\x17\x10\x6a\x6a\x51\x65\x04\xe5\xd7\x00\x00\x00\xff\xff\x62\x4b\x89\x70\xd0\x1c\x00\x00") func templateClientTmplBytes() ([]byte, error) { return bindataRead( @@ -279,7 +279,7 @@ func templateClientTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/client.tmpl", size: 7249, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/client.tmpl", size: 7376, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -524,7 +524,7 @@ func templateDialectGremlinPredicateTmpl() (*asset, error) { return a, nil } -var _templateDialectGremlinQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x56\x5d\x4f\x23\x37\x14\x7d\xce\xfc\x8a\xdb\x15\x42\x33\x69\xd6\xa1\xf4\xa9\x8b\xa8\x04\xd9\xac\x1a\x89\x85\x96\x45\xbc\x54\x55\x65\xec\x3b\x13\x6b\x1d\x7b\xd6\xf6\x64\x83\xa2\xf9\xef\x95\x3f\x26\x0c\x1f\x81\x6c\x25\x78\x62\xb8\xbe\xf7\x9c\x7b\x8f\x8f\xed\xac\xd7\xe3\x61\x36\xd1\xf5\xad\x11\xd5\xdc\xc1\xe1\xc1\x2f\xbf\xbd\xaf\x0d\x5a\x54\x0e\x3e\x51\x86\x37\x5a\x7f\x85\x99\x62\x04\x4e\xa4\x84\x90\x64\xc1\xaf\x9b\x25\x72\x92\x5d\xcd\x85\x05\xab\x1b\xc3\x10\x98\xe6\x08\xc2\x82\x14\x0c\x95\x45\x0e\x8d\xe2\x68\xc0\xcd\x11\x4e\x6a\xca\xe6\x08\x87\xe4\xa0\x5b\x85\x52\x37\x8a\x67\x42\x85\xf5\xb3\xd9\x64\x7a\xfe\x65\x0a\xa5\x90\x08\x29\x66\xb4\x76\xc0\x85\x41\xe6\xb4\xb9\x05\x5d\x82\xeb\x91\x39\x83\x48\xb2\xe1\xb8\x6d\xb3\x6c\xbd\x06\x8e\xa5\x50\x08\xef\xb8\xa0\x12\x99\x1b\x57\x06\x17\x52\xa8\xf1\xb7\x06\xcd\xed\x3b\x68\x5b\x9f\xb4\x77\xd3\x08\xe9\x5b\xfa\x70\x0c\x35\xb5\x8c\x4a\xd8\x23\x5f\x98\xae\x91\x9c\xa6\x95\x94\x68\x90\xa1\x58\xc6\xcc\xcd\xf7\xa6\xdc\x73\x96\x8d\x62\x90\xdf\xcb\x6d\x5b\x18\xf6\x59\xda\xb6\x80\xd4\xc7\x89\x94\x39\x73\x2b\x60\x5a\x39\x5c\x39\x32\x89\x7f\x0b\xc8\xff\xfe\x27\xd4\x90\x73\xba\x40\x68\xdb\x11\xa0\x31\xda\x14\xb0\xce\x06\x06\xad\xe7\xdf\x4f\x18\xe4\x12\x6d\xad\x95\xc5\x75\x9b\x0d\xc2\x5c\x23\xb8\x11\x8a\x0b\x55\x85\xbc\x07\xbd\x90\x54\xf6\x97\xcf\xcc\x0b\x72\x4d\x65\x83\x9f\x69\x9d\x3b\xd3\x60\x41\x52\x38\x1b\x88\xd2\x53\x3e\x05\xc0\x8d\xff\x22\xd3\x15\x32\xdf\xfc\x08\x1e\x90\x8e\xbc\x0f\x8a\xa3\x50\xfe\xd3\x31\x28\x21\x7d\xd7\x03\x83\xae\x31\xca\xff\x1b\x86\xc9\x06\x6d\x36\x58\x52\xe3\xe1\x6b\xd9\x98\x20\xfa\x65\x4f\xb3\x7e\x3c\xa8\xe0\xf5\xbd\xdf\xd6\x53\x75\xe4\x93\xd1\x8b\x4e\x92\x7c\xe7\x4e\xb6\xa1\x31\xad\x4a\x51\x3d\xdc\xd0\x14\x2e\xb2\x0e\x6b\x4b\xf9\xc8\x93\x64\x3f\x6c\x8b\x89\x6e\x94\xdb\x62\x0c\xa1\xdc\xeb\x99\x21\x12\xbf\x81\x0b\x0e\xee\x94\x4f\x11\x83\x96\x5c\x22\xe5\x33\xdf\xc0\x8f\x4b\x36\x5d\x09\xbb\x4d\xb2\x1b\xad\xe5\xeb\x69\xf6\x07\xb5\xe7\xb8\x7a\x13\xd5\x4a\x2a\x2d\x6e\x55\xee\x54\x6b\xf9\x7f\xa4\x4b\x6d\xc3\x90\x5b\x49\xae\x0c\x5d\xa2\xb1\x34\xf0\x2e\xfd\x08\x15\xb9\x8e\x53\x9e\xd1\x1b\x94\x01\x95\xfc\x49\xd9\x57\x5a\xf9\x8b\x89\x84\x68\x9c\x79\x8b\x50\xfd\x41\x96\xb0\x55\x4f\x32\x91\x5a\xa1\x97\xaf\xcd\x06\xa5\x36\xf0\xef\x08\xea\x70\xd1\x52\x55\xe1\xa3\xaa\xda\x20\x17\x8c\x3a\xb4\x01\xb8\xce\x97\xb1\x52\x94\x20\x51\x3d\x3a\xb0\xda\x70\x34\x05\xfc\x0e\x07\xb1\x0f\x72\xe1\x03\x9e\x6d\x07\xae\x50\x1c\xea\x12\x8f\x27\x6a\xb3\x81\xfd\x2e\x1c\x9b\x83\x14\x0b\xe1\x46\xa0\xcb\xd2\xa2\x7b\x6a\xd7\x53\xc2\x23\xd8\x50\x70\xe4\x81\x19\xb5\x18\x71\x3a\xb5\xf6\xf7\x3b\xc0\x18\xf8\x10\xba\xbe\xf4\xfd\xe5\xc3\xb8\x32\x82\xf4\x01\x3f\xc3\x30\x14\x17\x09\xe9\xe5\xca\x05\x75\x73\xf2\x99\xae\x66\xca\xfd\x7a\x58\x3c\xd1\x40\xac\x3a\xf3\x91\x7c\x03\x1e\xf5\x6d\x94\xf8\xd6\xe0\x53\x83\xc6\x95\xa3\xb0\x03\xf1\xbb\x80\xe3\xe3\x8d\xe6\x1f\x91\x37\x75\xda\xe1\x64\xde\x65\x16\x5e\x56\x54\x1c\xe2\x93\x3d\x1e\xc6\x33\x31\xae\xa9\x9b\xa7\xf7\xdb\x86\x87\x3f\x84\xa1\x42\x85\x86\x3a\xa1\x15\xf8\x8d\x0b\x59\xba\x04\x0a\x95\x58\xa2\x02\xe4\x15\x12\x08\xef\xff\x4b\xcf\x7f\x60\x08\xbf\x01\x06\xeb\xf5\x7b\xd8\x0b\x13\x75\x0f\xff\x94\x07\x7b\x43\x68\xc8\xb3\x7b\x60\xf8\x8e\xa0\x10\x39\x38\x1d\xfa\xa8\x0c\x75\x18\x56\x43\x1b\x4e\x27\xe6\x88\xd7\xff\xb1\xd0\xc1\xf6\xde\x86\x6c\xd0\x9d\x8f\x17\xef\x98\x08\x28\x4a\xd8\x43\x72\x2a\xb8\x08\xd5\xf1\xaa\xda\x1c\xb2\xe3\xee\x38\x93\x53\xed\xe6\x8f\x8e\xa9\xff\x1f\xe3\x61\x9d\x68\x65\x1d\x55\xce\xdf\x01\x11\x19\xa5\xc5\x04\x3f\xb3\x33\xe5\x2f\x00\x7c\x9e\x63\xa6\xa6\x79\x84\xbc\xba\xad\x71\x07\x22\x72\xd1\xb8\xeb\xbc\xcf\xf7\x2c\xfe\x45\xe3\xa6\xbb\xce\x40\x66\xea\x0e\x39\xfa\xa8\xe7\xa8\xbe\xa5\x4a\xa3\x17\x2f\x5b\x8a\x46\x17\xa5\xc5\x50\xd3\xb9\x4b\x69\xbe\xb3\xbb\x7c\x61\xcf\x5d\x61\x9b\xf7\xee\x59\xca\xa3\x79\x4b\x59\x47\x8d\xeb\xf5\xe3\x2b\xef\x39\xe9\xad\x9d\xb9\xa3\xdf\xc8\xf5\xa3\x6b\x76\xf6\xb1\xb8\xf3\x9f\x7a\x0d\x03\x6e\x21\x7d\x35\x43\x6e\xe1\xdb\x18\x74\x97\x21\x9f\x75\xe8\x7f\x01\x00\x00\xff\xff\x37\x57\x29\x5a\x6a\x0d\x00\x00") +var _templateDialectGremlinQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x5f\x4f\x23\xb7\x17\x7d\xce\x7c\x8a\xfb\x5b\x21\x34\x93\x5f\x70\x28\x7d\xea\x22\x2a\x41\x36\xab\x46\x62\xa1\x65\x11\x2f\x55\x55\x19\xfb\xce\xc4\x5a\xc7\x9e\xb5\x3d\xd9\xa0\x68\xbe\x7b\xe5\x3f\x03\x03\x24\x90\xad\xc4\xaa\x4f\x99\x5c\xdf\x7b\xce\xbd\xc7\xc7\xe3\x59\xaf\xc7\xc3\x6c\xa2\xeb\x3b\x23\xaa\xb9\x83\xa3\xc3\x9f\x7e\x39\xa8\x0d\x5a\x54\x0e\x3e\x52\x86\xb7\x5a\x7f\x81\x99\x62\x04\x4e\xa5\x84\x90\x64\xc1\xaf\x9b\x25\x72\x92\x5d\xcf\x85\x05\xab\x1b\xc3\x10\x98\xe6\x08\xc2\x82\x14\x0c\x95\x45\x0e\x8d\xe2\x68\xc0\xcd\x11\x4e\x6b\xca\xe6\x08\x47\xe4\xb0\x5b\x85\x52\x37\x8a\x67\x42\x85\xf5\xf3\xd9\x64\x7a\xf1\x79\x0a\xa5\x90\x08\x29\x66\xb4\x76\xc0\x85\x41\xe6\xb4\xb9\x03\x5d\x82\xeb\x91\x39\x83\x48\xb2\xe1\xb8\x6d\xb3\x6c\xbd\x06\x8e\xa5\x50\x08\xef\xb8\xa0\x12\x99\x1b\x57\x06\x17\x52\xa8\xf1\xd7\x06\xcd\xdd\x3b\x68\x5b\x9f\xb4\x77\xdb\x08\xe9\x5b\x7a\x7f\x02\x35\xb5\x8c\x4a\xd8\x23\x9f\x99\xae\x91\x9c\xa5\x95\x94\x68\x90\xa1\x58\xc6\xcc\xfb\xe7\xfb\x72\xcf\x59\x36\x8a\x41\xfe\x28\xb7\x6d\x61\xd8\x67\x69\xdb\x02\x52\x1f\xa7\x52\xe6\xcc\xad\x80\x69\xe5\x70\xe5\xc8\x24\xfe\x16\x90\xff\xf9\x57\xa8\x21\x17\x74\x81\xd0\xb6\x23\x40\x63\xb4\x29\x60\x9d\x0d\x0c\x5a\xcf\xbf\x9f\x30\xc8\x15\xda\x5a\x2b\x8b\xeb\x36\x1b\x84\xb9\x46\x70\x2b\x14\x17\xaa\x0a\x79\x4f\x7a\x21\xa9\xec\x0f\x9f\x99\x17\xe4\x86\xca\x06\x3f\xd1\x3a\x77\xa6\xc1\x82\xa4\x70\x36\x10\xa5\xa7\xdc\x04\xc0\x8d\x7f\x22\xd3\x15\x32\xdf\xfc\x08\x9e\x90\x8e\xbc\x0f\x8a\xe3\x50\xfe\xbf\x13\x50\x42\xfa\xae\x07\x06\x5d\x63\x94\xff\x1b\x86\xc9\x06\x6d\x36\x58\x52\xe3\xe1\x6b\xd9\x98\x20\xfa\x55\x4f\xb3\x7e\x3c\xa8\xe0\xf5\x7d\xdc\xd6\xa6\x3a\xf2\xd1\xe8\x45\x27\x49\xbe\x73\x27\xdb\xd0\x98\x56\xa5\xa8\x9e\x6e\x68\x0a\x17\x59\x87\xb5\xa5\x7c\xe4\x49\xb2\xef\xb6\xc5\x44\x37\xca\x6d\x31\x86\x50\xee\xed\xcc\x10\x89\x7f\x80\x0b\x0e\x1f\x94\x4f\x11\x83\x96\x5c\x21\xe5\x33\xdf\xc0\xf7\x4b\x36\x5d\x09\xbb\x4d\xb2\x5b\xad\xe5\xdb\x69\xf6\x1b\xb5\x17\xb8\xfa\x21\xaa\x95\x54\x5a\xdc\xaa\xdc\x99\xd6\xf2\xdf\x48\x97\xda\x86\x21\xb7\x92\x5c\x1b\xba\x44\x63\x69\xe0\x5d\xfa\x11\x2a\x72\x13\xa7\x3c\xa7\xb7\x28\x03\x2a\xf9\x9d\xb2\x2f\xb4\xf2\x2f\x26\x12\xa2\x71\xe6\x2d\x42\xf5\x07\x59\xc2\x56\x3d\xc9\x44\x6a\x85\x5e\xbe\x36\x1b\x94\xda\xc0\xdf\x23\xa8\xc3\x8b\x96\xaa\x0a\x9f\x55\xd5\x06\xb9\x60\xd4\xa1\x0d\xc0\x75\xbe\x8c\x95\xa2\x04\x89\xea\xd9\x81\xd5\x86\xa3\x29\xe0\x57\x38\x8c\x7d\x90\x4b\x1f\xf0\x6c\x3b\x70\x85\xe2\x50\x97\x78\x3c\x51\x9b\x0d\xec\x37\xe1\xd8\x1c\xa4\x58\x08\x37\x02\x5d\x96\x16\xdd\xa6\x5d\x4f\x09\xcf\x60\x43\xc1\xb1\x07\x66\xd4\x62\xc4\xe9\xd4\xda\xdf\xef\x00\x63\xe0\x7d\xe8\xfa\xca\xf7\x97\x0f\xe3\xca\x08\xd2\x03\xfc\x1f\x86\xa1\xb8\x48\x48\xaf\x57\x2e\xa8\x9b\x93\x4f\x74\x35\x53\xee\xe7\xa3\x62\x43\x03\xb1\xea\xdc\x47\xf2\x7b\xf0\xa8\x6f\xa3\xc4\xd7\x06\x37\x0d\x1a\x57\x8e\xc3\x0e\xc4\xe7\x02\x4e\x4e\xee\x35\xff\x80\xbc\xa9\xd3\x0e\x27\xf3\x2e\xb3\x70\xb3\xa2\xe2\x10\xaf\xec\xf1\x30\x9e\x89\x71\x4d\xdd\x3c\xdd\xdf\x36\x5c\xfc\x21\x0c\x15\x2a\x34\xd4\x09\xad\xc0\x6f\x5c\xc8\xd2\x25\x50\xa8\xc4\x12\x15\x20\xaf\x90\x40\xb8\xff\x5f\xbb\xfe\x03\x43\xf8\x06\x18\xac\xd7\x07\xb0\x17\x26\xea\x2e\xfe\x29\x0f\xf6\x86\xd0\x90\x67\xf7\xc0\xf0\x0d\x41\x21\x72\x70\x3a\xf4\x51\x19\xea\x30\xac\x86\x36\x9c\x4e\xcc\x11\xaf\xff\xb1\xd0\xc1\xf6\xee\x86\x94\x25\xb8\xff\xa4\xea\xa5\xcc\x42\xc0\xaf\x77\xe7\xe7\xd5\x77\x50\x84\x12\x25\xec\x21\x39\x13\x5c\x84\x6a\x7f\xa5\x25\xf4\xb6\x85\x93\xee\xb4\x93\x33\xed\xe6\xcf\x4e\xb1\xff\x8f\xf1\x2c\x4f\xb4\xb2\x8e\x86\xaa\x04\x8c\xd2\x62\x42\x9f\xd9\x99\xf2\xef\x07\x7c\x91\x62\xa6\xa6\x79\x44\xbc\xbe\xab\x71\x07\x1e\x72\xd9\xb8\x9b\xbc\x4f\xf7\x12\xfc\x65\xe3\xa6\xbb\x4e\x40\x66\xea\x01\x38\x9a\xac\x67\xb7\xbe\xdf\x4a\xa3\x17\xaf\xfb\x8d\x46\x8b\xa5\xc5\x50\xd3\x59\x4f\x69\xbe\xb3\xf5\x7c\x61\xcf\x7a\x61\x8f\xf7\x1e\xf9\xcd\xa3\x79\xbf\x59\x47\x8d\xeb\xf5\xe3\x2b\x1f\xd9\xec\x3f\x65\xdb\x03\xaf\xea\x4e\x6e\x24\x37\xcf\xde\xd1\xb3\x0f\xc5\x83\x3b\xd5\x1b\xd8\x73\x0b\xe7\x5b\xd9\x75\x0b\xdd\xbd\x7d\x77\x19\xf1\x45\xff\xfe\x13\x00\x00\xff\xff\x09\x18\xe3\x6b\xa5\x0d\x00\x00") func templateDialectGremlinQueryTmplBytes() ([]byte, error) { return bindataRead( @@ -539,7 +539,7 @@ func templateDialectGremlinQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/query.tmpl", size: 3434, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/query.tmpl", size: 3493, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -784,7 +784,7 @@ func templateDialectSqlPredicateTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1a\x5d\x6f\xdb\xc8\xf1\x99\xfa\x15\x73\x84\x7b\x90\x0c\x99\x76\xd2\xa2\x40\x15\xb8\x80\x1b\x27\x80\x90\xbb\x5c\x7a\xce\xdd\x3d\x08\xc2\x1d\x43\x0e\xe5\x85\xa8\x25\x43\xae\x1c\x07\x0a\xff\x7b\x31\xb3\x1f\x5c\x8a\x94\xec\xe4\x7a\x69\x0b\xf4\x21\xb1\xb4\x3b\xb3\x33\x3b\xdf\x33\xab\xdd\xee\xfc\x74\xf4\xbc\x28\x3f\x56\x62\x75\xab\xe0\xe9\xc5\x93\xbf\x9d\x95\x15\xd6\x28\x15\xbc\x8c\x13\x7c\x57\x14\x6b\x98\xcb\x24\x82\xab\x3c\x07\x06\xaa\x81\xf6\xab\x3b\x4c\xa3\xd1\xdb\x5b\x51\x43\x5d\x6c\xab\x04\x21\x29\x52\x04\x51\x43\x2e\x12\x94\x35\xa6\xb0\x95\x29\x56\xa0\x6e\x11\xae\xca\x38\xb9\x45\x78\x1a\x5d\xd8\x5d\xc8\x8a\xad\x4c\x47\x42\xf2\xfe\x77\xf3\xe7\x2f\x5e\xdf\xbc\x80\x4c\xe4\x08\x66\xad\x2a\x0a\x05\xa9\xa8\x30\x51\x45\xf5\x11\x8a\x0c\x94\x47\x4c\x55\x88\xd1\xe8\xf4\xbc\x69\x46\x23\xba\x03\x5c\xa5\xa9\x50\xa2\x90\x71\x0e\x99\xc0\x3c\xad\x21\x2b\x34\xf1\x77\x5b\x91\xa7\x58\x45\xc0\xd0\xbb\x1d\xa4\x98\x09\x89\x10\xa6\x22\xce\x31\x51\xe7\xf5\xfb\xfc\xfc\xfd\x16\xab\x8f\xe7\x1a\x33\x84\xa6\x19\x05\xbb\xdd\x19\x7c\x10\xea\x16\x4e\xa2\x97\x45\x85\x62\x25\x5f\xe1\xc7\x9a\xb7\x02\x5a\x7f\xf9\xaa\x86\x77\x45\x91\x6b\x48\x94\x29\xf0\xe9\xee\xe3\x51\x4a\xa1\x06\x86\x93\x72\xbd\x82\xd9\x25\x9c\x44\x37\x49\x51\x62\xf4\x26\x4e\xd6\xf1\x0a\xed\xae\x61\x9d\x20\xca\xb8\x4e\xe2\xdc\x01\xfe\xc3\xec\x18\xc0\x0a\x13\x14\x77\x1a\xd2\x7d\x76\xe8\xc4\x4d\xb6\x95\x09\x8c\x3b\xb0\x4d\x03\xa7\x3e\x95\xa6\x99\x40\xfd\x3e\xbf\xca\xf3\x71\xa2\xee\x21\x29\xa4\xc2\x7b\x15\x3d\xd7\x7f\x27\x30\x5e\x2c\x19\x3e\x7a\x1d\x6f\x88\xc5\x29\x60\x55\x15\xd5\x04\x76\xa3\xe0\x2e\xae\x60\x3c\x0a\x02\x59\xa4\x58\xc3\x25\xec\x81\xee\x48\x6a\xc7\x24\xea\x44\x7a\x09\x7b\x3c\x46\x66\xc7\x1c\x60\xa4\x1b\x04\xbf\xd6\x25\x26\x03\xe0\x2c\xdf\x9b\x12\x93\xf1\xa4\x4b\xf3\x45\xba\x42\x4b\x2d\x2f\xe2\x14\xd3\xb7\x1f\x4b\xcd\xec\x6e\x07\x39\x4a\x88\xa0\x69\x96\xa4\xd3\x1d\xc1\x30\x6e\x15\xcb\x15\xc2\x09\x92\x60\x23\x83\x4c\x3b\x7d\x16\x77\x3b\xa7\x23\xb4\xd7\x86\x6f\x2e\x41\x8a\x7c\xea\x8e\x73\xdc\x07\xcd\xde\x7d\x26\xc7\x2d\xae\xb3\xf9\xca\xbf\x4a\x20\x32\x92\x81\x61\x54\x4c\x3d\x66\x77\x3b\x10\x19\xac\x14\x9c\x08\xb8\x20\x76\x3e\x7d\x22\x50\x4d\xf2\x33\xef\xe0\xf0\x40\x0b\xc7\x53\x98\xaa\xb6\xc8\x6b\x8e\xd1\xf6\x9a\x22\x03\x0b\xa8\xf1\x58\x6d\xd1\xeb\x22\xc5\xe8\x79\x91\x6f\x37\x92\x4e\x88\xcb\x12\x65\x3a\xee\xef\x4d\x59\xbd\x9e\x5b\xf8\x92\x89\xa2\x68\x62\x44\xe9\x13\xd5\xa7\xdc\x24\xb1\xfc\x39\xce\xb7\xac\x60\x32\xfe\xf1\x04\x16\x4b\x21\x15\x56\x59\x9c\xe0\x4e\xdf\x83\xcc\x95\xa4\xf5\x6d\xc7\x58\x93\x42\x66\x62\x35\xeb\x99\x96\x5e\x6f\x3c\x33\x37\x8c\xf3\xd7\x29\xd0\x1f\xe2\xe8\x4e\xd3\x9d\x5d\xf2\x4a\x54\x3b\x56\xf6\x4d\xb2\xaf\xe6\x9e\xbc\xee\xec\x1d\x0c\x29\xfd\x5d\xd3\x8a\xb2\xb5\x3d\xd7\x93\x45\x57\x03\x15\xaa\x6d\x25\x41\xa3\x8d\x02\x27\x9f\xab\xba\x16\x2b\x69\x65\x63\xa8\x44\x51\xe4\x49\x68\xa2\xfd\x9b\x19\x11\x19\x79\x88\xbe\xe8\x04\x2e\x2f\xe1\x42\xf3\x67\x8e\xcf\x36\x2a\x7a\x41\xc0\xd9\x38\xb4\x61\xad\x69\x66\x60\xa8\x24\x71\x9e\x63\xca\x37\x2b\xb6\x8a\xbf\x0a\xb9\x82\x56\x47\x21\x31\xdf\x78\x0a\x61\x42\x8b\x96\xe4\xd9\x93\xe5\x61\x6f\x66\x59\xf0\x42\xd4\x75\x6c\xef\xdb\x01\xb9\x30\x6a\xcc\x5c\x1a\x51\x6a\x51\x68\x79\x36\x23\xba\x38\x56\x1c\x57\xeb\xf7\xf9\xaa\x8a\xcb\xdb\xe8\x9f\x14\x61\xc8\x4a\x6b\x8a\x93\xd3\x9e\x99\xa4\x15\x7d\x9a\x02\x0b\x7a\xf2\x8c\xf1\xb5\x13\xb1\xcc\x2c\x65\x91\x73\x00\xb5\x54\x86\xc4\xeb\x31\x49\x2a\x17\xf9\xc8\x1a\xbb\x1f\x97\x3a\xc2\x70\x22\xc2\x7b\x45\x97\x3d\x81\xf0\x47\x4c\x42\x8f\xc3\x90\xa0\x43\xc2\xb5\x91\x05\x14\x6e\xca\x3c\x56\x83\x39\x11\xe3\x15\x56\x24\x48\x21\x57\xa1\x8d\x81\xbe\x28\xfd\xcf\x7d\x86\x3f\x2b\xf5\x3c\x2f\xb6\x52\x1d\x48\x3e\x42\x2a\x3f\xe1\xe8\xf0\x3f\x7b\x20\xfe\x1b\x7e\x9c\xea\x98\xc0\xa3\x55\xf7\x79\xcc\xbf\xb8\x17\xf5\x21\xe6\x29\xa9\xf8\xdc\xcb\xa9\xb5\xaa\x7d\x0e\x7c\x29\x4c\x9c\xf9\xf5\xcd\x27\x8b\xf3\x1a\xa7\x07\x1d\x2f\xb9\xc5\x64\x0d\x48\x2c\xa1\x4c\x70\x06\x7f\xba\x0b\x99\xa6\xb6\x6a\xab\x27\xf8\x3b\x5c\x7c\xae\x9e\x3c\x01\xc3\x69\xd7\x29\x68\xb5\xa3\x9c\x6f\xfb\xfb\x74\x07\xd2\xc0\xcc\xdb\xa4\xef\x76\x2f\x78\x1b\xbf\xcb\x71\xd6\x0b\xfc\xbc\xcc\x99\xd4\xe4\x86\x3e\x88\x4d\x1a\x04\x34\xbf\xf6\x09\xbc\xa4\xc2\xce\x51\x08\x28\x22\xcc\x74\x9d\x18\xf1\x21\xf3\xeb\x88\xd6\x48\x63\xb5\xb2\xe5\x0d\x83\xea\x33\xfb\xb4\x2c\x1a\x63\xc4\x52\x59\x04\xfe\x9f\xff\x7b\x59\x15\x9b\x7e\x0e\xa9\xdf\x73\x39\xf0\x93\x14\xef\xb7\x38\xe3\xdc\x39\xb5\x21\xa0\xac\x87\x2c\xa2\xac\x30\x15\x49\xac\xb0\x7e\xc6\x41\xa2\xac\x27\xa4\x36\x36\x06\x1d\xcb\xdf\x58\x08\x1b\xce\x6b\xcc\xb9\x6c\x66\xfd\x44\x37\xe6\xdb\x44\x87\x6c\xaa\x8b\x05\x17\x8a\x1c\x43\x4a\x9b\x69\xca\x7a\x21\x96\x0e\xd5\x65\x93\xc6\x05\x28\xb1\x11\x6a\x88\x41\xde\x78\x66\xf6\x3d\x4b\xd5\xcc\x7d\xc7\xcb\x97\x70\xca\xfb\xf6\xb0\x22\xcb\x6a\x1c\x3c\x4d\xef\x3c\xb3\x10\xbd\xf3\x7e\xd0\xeb\x97\x70\xaa\x21\x8e\x0b\xaf\xa8\x52\xac\x0e\xc9\xed\x07\xda\xfc\xe3\x64\x66\x9c\x8c\x69\x7d\x5e\x28\x61\x67\x31\xee\xe5\x58\x21\x92\x5e\x43\x40\x5b\xd7\x3a\x5a\xef\x9f\x69\xc2\x98\xdb\x9e\x4c\x46\x81\x7a\x42\x48\xb6\x17\x62\x67\x1a\x0f\xba\xd8\x64\x14\x38\x51\x78\x18\x9a\x8b\xb1\x7a\x62\xbd\xac\x87\x6d\xd6\x29\x73\xf2\x3f\xb2\xff\xb1\x7a\xa2\x83\xd8\x80\x1b\xf8\xaa\x75\x14\x07\x03\xa2\x07\x60\xf9\x70\xdf\x1f\xc9\x0d\x2b\x84\xb4\xf8\xeb\x14\xca\x56\x91\x87\x7d\x8d\xd9\x2a\x7d\xd5\x3e\xea\x00\xb6\xb7\x41\xdc\x2f\x34\xfa\xf3\x73\xe3\x58\xa2\x86\x4d\x2c\xd3\x98\xbb\x61\x62\xc4\xc0\x26\x79\xbc\xad\x31\x82\x5f\x10\x6a\x15\x57\x4a\xe3\x70\x09\x90\x62\x16\x6f\x73\xa5\x8b\xbf\x29\xc4\x32\x85\xe2\x0e\xab\x4a\x50\xa3\xae\xe0\x1d\xe6\xc5\x07\xea\x10\x24\x62\x4a\xdd\xbc\x27\x66\xed\x65\x63\xe3\x63\x13\xed\xc5\xe3\x4d\xac\x6e\xa3\xef\xe3\xfb\xb9\x54\x7f\x7e\x3a\xf9\xe2\xc0\xe0\xa8\xe8\x53\x75\x64\xe8\x24\x26\x0b\x31\xe2\xf6\xb6\xed\xa8\xcf\x4f\x75\xfa\x39\x2f\x63\x7d\x3f\x21\xb1\xe6\x2e\x9f\x97\x61\x85\x12\xab\x58\x89\x42\xb2\x88\x18\xaa\xc8\x20\x86\x95\xb8\x43\x09\x98\xae\xf0\x31\x73\x00\xc2\x6b\xa7\x00\x27\x92\xab\x2c\xee\x7d\x88\x03\x22\xc7\x75\xea\x07\x23\x72\x8f\x81\xac\x2a\x36\x86\x82\xc6\x45\xbf\xbd\xa7\xca\xab\x73\x0c\x31\x44\xc7\x90\x06\x40\x15\xcc\xff\xaa\xa2\x48\x4e\xbb\xcc\xbe\x2a\x3a\xe7\xf9\x9d\xbe\x3d\xf6\xc7\x56\xe6\xa3\xa0\x56\x58\x76\xca\xd5\xd7\xf8\xe1\x46\x61\x49\xdd\x79\x9b\x0f\xc9\x37\x49\x5d\xb2\x9f\x62\xa1\xb7\xae\x17\xf6\x92\xdd\x90\xa3\x9a\xb8\x35\x99\xfa\xb4\xde\x16\x4c\x09\x75\x86\x1d\x26\xd7\xdf\xf4\x56\xbb\x84\xbb\x87\x93\x44\xc7\xee\x9b\x46\xfa\x11\x73\x46\x74\x5c\x62\x34\xaf\xe7\xf2\x0e\xab\xba\x5d\xeb\x5d\x10\x35\x3f\xfb\xf9\x9c\x84\x2e\x32\xda\xfe\xfe\xe9\xf7\x70\x66\x7a\xee\x03\x27\xbc\x79\xe5\xa1\x47\x51\xe4\xfa\xe1\xbc\xc6\x87\x70\x75\xc0\xf2\xf0\xfd\x66\x5a\xe3\xd2\xd5\x27\xa3\x80\x2d\x8d\x23\xa8\xa7\xe5\x1b\x54\xaf\x51\xac\x6e\xdf\x15\x55\xfd\x60\x3e\x98\x02\x59\xc9\xe4\x80\x6f\x91\x0d\x3f\xec\x5b\xb1\x76\x27\xcf\xee\x9d\x9b\x71\x53\xf5\x98\x71\x5b\x55\x6c\xfe\x17\xdd\x8c\xb5\x21\xd2\xa1\x90\x37\xbf\xfe\x8a\x1e\x28\xd2\xff\x7b\xda\xd7\xf7\xb4\xdf\xe9\x66\x47\xfc\xa1\xdb\x6a\x1f\xb5\xed\xe3\x66\xca\x00\x22\x33\xce\x32\x60\xa6\x87\x86\x7d\xcf\x0c\x8a\x97\xac\xbb\x6a\xd1\xc2\xca\xd6\x5c\x6c\x6f\xe2\x35\x8e\x17\x4b\x73\xed\x9f\x75\x95\x71\x31\xf5\x46\x19\x5c\x11\x8b\xb4\x85\xde\xc4\xe5\xc2\xef\xb8\xa0\x69\xf6\x87\xca\x7b\xd8\xa6\xe6\xb2\x83\x21\x5d\x76\xe9\xf9\x9b\xae\xc1\x45\x5a\x2f\x38\xe2\xcc\xaf\x97\xa0\x27\x47\xbc\x4e\x4c\xba\xb1\x59\xb6\xb6\x33\xb3\xf9\xb5\x2b\xd3\xdd\xd4\x3a\x08\x28\x42\x10\x9f\x8b\x65\xd7\x1d\x0c\x8f\x0e\x86\x8e\xec\x5c\xa4\x07\xba\xdc\x1b\x7d\x33\x35\xfe\x6f\xa0\x2b\x26\x6d\x76\x3a\xe3\x20\xa0\xa5\xd9\x1e\x48\xbb\x1b\x18\xef\x9a\x0d\xb9\x9b\x86\x38\xd0\x3f\x1f\xf1\xbc\x23\x2d\xf5\x80\xb7\x69\x14\xf3\xc7\xb5\x9e\x33\xd3\x45\x0d\xb6\x4f\x41\x50\x47\xbf\xdc\x62\xc5\x01\x24\x9a\xdb\x51\xdb\x23\x88\x2d\xf4\x0c\x7b\xef\xa6\x4f\xc8\xa3\x72\xfe\x78\xe1\x9c\x6b\x39\x85\x6c\xcd\x05\xff\xc4\xe7\x90\x0e\x2d\xb6\x5c\x9f\x86\x44\xfd\xf5\x36\xcf\xe7\x52\xfd\xf5\x2f\xa1\x9b\x90\xb3\x35\xfe\x54\x63\x75\xcd\xae\x69\xa7\xe3\x84\x75\xa9\x37\x09\xc9\xe8\xb7\x75\x66\x7b\xba\x90\x47\x0f\x6f\x2d\xa4\x4f\x42\x48\xa2\xd0\x42\x1c\xa4\xd3\x8e\x4a\x67\x6e\x9a\xfd\xd4\x1f\x67\x1b\x39\x9b\xfa\x79\x6f\xef\x5b\x7b\x9d\xa6\xd9\x35\x53\x3d\xed\x16\x92\xbf\x35\xbe\xac\xf4\xb8\xd6\x50\x28\xb6\x6a\x0a\x42\xc2\x81\x89\x30\x39\x04\x83\x14\x6b\xba\x7e\xb1\x55\xd1\xf8\xb4\xa5\xa3\x75\x40\x41\xe8\x9b\x62\x0d\x9f\x3e\x01\xb2\x38\xdb\xb8\x12\x0c\x4f\x8f\xb7\x12\xef\x4b\x4c\x14\xa6\x20\x52\xdd\xb9\x70\xb9\x41\xce\x77\x56\x6c\x55\x68\x0e\x36\x2f\x31\x28\xa4\xe5\x40\x48\xc3\x00\xdf\xac\x4f\x9f\x64\xfd\xfb\xc8\x0b\xb9\x47\xbd\xd8\x2a\x56\x8a\x09\xb1\x7b\x73\xd7\xab\x6a\x15\x42\x48\xf7\x0e\x21\xe4\x09\x54\xc8\xd6\x04\xa1\x55\x73\xe8\xb4\xf2\xf8\x19\xec\xf9\xe6\xe9\x46\x0f\xac\x43\xfb\xc8\xe3\xd9\x49\x20\xe4\xc3\x1c\x09\xe9\x31\xe4\x8c\xaf\xc3\x96\xb6\x8e\x7f\x1b\x57\x14\x79\x9d\x9e\xd2\x7a\x61\x05\xb7\xec\x68\xe9\x71\x7a\xe1\x4c\x20\x52\x32\x4d\x8e\xc8\x66\xb6\x69\x8f\xdc\xb3\x0f\x13\xd7\x5d\x22\x30\x0b\x64\xd9\x3e\x38\x9f\xb4\x30\x6b\xcb\x2e\x78\xbb\xde\x3e\xf1\x04\xfe\x1c\xdf\x73\x21\xfb\x88\x33\xf8\x66\xc0\x63\xfa\x2f\x7a\x33\xe8\xbe\x1a\x78\x82\xf9\x4d\xe7\x6b\x9d\x9a\x42\x1d\x40\x4d\xe2\x09\x49\x30\xbf\xd9\xa1\xaf\x61\x4d\x57\x34\x3a\x16\x0f\x97\x83\xf3\xeb\xb9\xb4\x52\x72\xc1\x54\xda\x9a\xc7\xcd\xad\xf5\x41\xe6\xad\x78\xe2\xdd\xfa\x20\xd7\xfc\xd6\x61\xd8\xb0\x49\xdd\xcb\xe8\x96\x82\xc1\x34\x4f\x08\xda\x64\xb4\x16\xa8\x00\x5e\x8e\xfa\xf6\x72\x48\x34\x9e\xcd\xec\x49\x46\xdb\x90\xc6\xc3\x54\x8b\x49\xda\xca\xc0\x98\xce\xde\xc8\xcf\xaf\x38\x34\x73\x0b\xb1\x34\x8f\x4e\xfa\xf0\x1b\x55\x6d\x13\xc5\x6e\x45\xcd\x47\xf7\x71\xf0\x38\xf0\x14\xa4\x47\xda\x3d\xb0\x50\x86\xd3\x19\xe4\x87\x0f\xf2\xe5\x2b\xfb\x44\x98\xfa\xc5\xd7\x60\x0d\x32\x54\x85\xd1\xc7\xa1\x4a\xec\x71\x05\xcc\x11\x69\x88\x0c\xb2\x75\xfb\x66\x27\x96\xdd\x2b\xbe\xb2\x97\x7c\x46\x60\x1d\xeb\x08\x3a\x9e\xc9\x5e\x79\x9a\xad\x27\xad\x8c\x29\x54\x9c\x66\xeb\x65\x57\x98\x76\x75\xea\x28\xee\x09\xef\xb1\x56\xfe\x5f\x64\xe1\xf6\x5e\xbf\xc3\xc6\x33\xfd\x98\x7c\xb6\xc6\x8f\xd6\xde\xf7\x55\x10\xfe\xe1\x36\x2f\x0f\x98\xf1\x97\xf4\x0d\x87\x2c\xf6\x60\xef\xf0\x90\xa5\x0e\x77\x04\x7c\x29\x2b\x07\xa7\x87\x76\xc3\x36\x15\xf4\x75\xcf\xc2\xfa\xbf\x81\xf0\x2d\xcf\x0d\x93\xfd\x16\xdb\xb0\x3a\x3e\x56\x2d\x7f\x46\xb1\xdc\xeb\x65\xbb\x45\x70\xf3\x9f\x32\x6e\x13\x11\x0e\x84\x02\x2f\x6e\x74\x4b\xb2\x43\x66\xfe\x28\xdb\x16\x35\x1f\x45\xcc\x71\x7c\x1f\x34\x71\xbf\x12\xf1\x83\xc9\xd7\xf1\xb9\x3d\xe6\x4e\xb3\xf5\x30\x87\xc7\x9d\xcc\x35\x16\xfa\x15\x11\x9a\x46\xb6\x0d\x91\x17\x28\x1f\xc8\x38\x9d\x1a\x6d\xff\x55\xbf\xf9\xa2\xa9\x85\x5f\x06\xba\x21\x45\x5c\x75\x7e\xe3\x76\x55\xad\xda\x3d\x7e\x83\xf5\x77\x5b\x13\xd1\x33\xc1\x6d\x9e\x2b\xf2\x75\x0f\xc4\x6b\x92\x46\x76\x3c\x71\x1b\xd7\x6f\x2a\xcc\xc4\xbd\x87\x42\x1d\x59\x68\x06\x3a\x24\x03\xfd\xde\x6b\xb1\x35\x21\x66\xee\xcc\xfd\x8c\xa1\x9d\x1e\x69\x19\xcb\x42\x39\x3c\x91\xe7\xd4\x3c\x43\xd3\x9c\x76\x7e\x44\x15\x7b\xf7\xe9\xff\x0c\xf0\x5f\x01\x00\x00\xff\xff\xea\xb8\xb2\xe6\x61\x29\x00\x00") +var _templateDialectSqlQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\x6d\x6f\xdb\x46\xd2\x9f\xa9\x5f\x31\x25\xfc\x14\x92\xa1\xd0\x4e\x9e\xc3\x01\xa7\xc0\x07\xf8\xe2\x04\x10\xd2\xa6\xb9\x3a\x6d\x3f\x08\x42\xcb\x90\x43\x79\x21\x6a\xc9\x90\x2b\xc7\x81\xc2\xff\x7e\x98\xd9\x17\x2e\x45\x4a\xb6\x93\x6b\x7b\x38\xdc\x87\xc4\xd2\xee\xcc\xce\xec\xbc\xcf\xac\x76\xbb\xb3\xd3\xd1\x8b\xa2\xfc\x54\x89\xd5\x8d\x82\x67\xe7\x4f\xff\xf6\xa4\xac\xb0\x46\xa9\xe0\x55\x9c\xe0\xfb\xa2\x58\xc3\x5c\x26\x11\x5c\xe6\x39\x30\x50\x0d\xb4\x5f\xdd\x62\x1a\x8d\xde\xdd\x88\x1a\xea\x62\x5b\x25\x08\x49\x91\x22\x88\x1a\x72\x91\xa0\xac\x31\x85\xad\x4c\xb1\x02\x75\x83\x70\x59\xc6\xc9\x0d\xc2\xb3\xe8\xdc\xee\x42\x56\x6c\x65\x3a\x12\x92\xf7\xbf\x9b\xbf\x78\xf9\xe6\xfa\x25\x64\x22\x47\x30\x6b\x55\x51\x28\x48\x45\x85\x89\x2a\xaa\x4f\x50\x64\xa0\x3c\x62\xaa\x42\x8c\x46\xa7\x67\x4d\x33\x1a\xd1\x1d\xe0\x32\x4d\x85\x12\x85\x8c\x73\xc8\x04\xe6\x69\x0d\x59\xa1\x89\xbf\xdf\x8a\x3c\xc5\x2a\x02\x86\xde\xed\x20\xc5\x4c\x48\x84\x30\x15\x71\x8e\x89\x3a\xab\x3f\xe4\x67\x1f\xb6\x58\x7d\x3a\xd3\x98\x21\x34\xcd\x28\xd8\xed\x9e\xc0\x47\xa1\x6e\xe0\x24\x7a\x55\x54\x28\x56\xf2\x35\x7e\xaa\x79\x2b\xa0\xf5\x57\xaf\x6b\x78\x5f\x14\xb9\x86\x44\x99\x02\x9f\xee\x3e\x1e\xa5\x14\x6a\x60\x38\x29\xd7\x2b\x98\x5d\xc0\x49\x74\x9d\x14\x25\x46\x6f\xe3\x64\x1d\xaf\xd0\xee\x1a\xd6\x09\xa2\x8c\xeb\x24\xce\x1d\xe0\x3f\xcc\x8e\x01\xac\x30\x41\x71\xab\x21\xdd\x67\x87\x4e\xdc\x64\x5b\x99\xc0\xb8\x03\xdb\x34\x70\xea\x53\x69\x9a\x09\xd4\x1f\xf2\xcb\x3c\x1f\x27\xea\x0e\x92\x42\x2a\xbc\x53\xd1\x0b\xfd\x77\x02\xe3\xc5\x92\xe1\xa3\x37\xf1\x86\x58\x9c\x02\x56\x55\x51\x4d\x60\x37\x0a\x6e\xe3\x0a\xc6\xa3\x20\x90\x45\x8a\x35\x5c\xc0\x1e\xe8\x8e\xa4\x76\x4c\xa2\x4e\xa4\x17\xb0\xc7\x63\x64\x76\xcc\x01\x46\xba\x41\xf0\x6b\x5d\x62\x32\x00\xce\xf2\xbd\x2e\x31\x19\x4f\xba\x34\x5f\xa6\x2b\xb4\xd4\xf2\x22\x4e\x31\x7d\xf7\xa9\xd4\xcc\xee\x76\x90\xa3\x84\x08\x9a\x66\x49\x3a\xdd\x11\x0c\xe3\x56\xb1\x5c\x21\x9c\x20\x09\x36\x32\xc8\xb4\xd3\x67\x71\xb7\x73\x3a\x42\x7b\x6d\xf8\xe6\x02\xa4\xc8\xa7\xee\x38\xc7\x7d\xd0\xec\xdd\x67\x72\xdc\xe2\x3a\x9b\xaf\xfd\xab\x04\x22\x23\x19\x18\x46\xc5\xd4\x63\x76\xb7\x03\x91\xc1\x4a\xc1\x89\x80\x73\x62\xe7\xf3\x67\x02\xd5\x24\x1f\x79\x07\x87\x07\x5a\x38\x9e\xc2\x54\xb5\x45\x5e\x73\x8c\xb6\xd7\x14\x19\x58\x40\x8d\xc7\x6a\x8b\xde\x14\x29\x46\x2f\x8a\x7c\xbb\x91\x74\x42\x5c\x96\x28\xd3\x71\x7f\x6f\xca\xea\xf5\xdc\xc2\x97\x4c\x14\x45\x13\x23\x4a\x9f\xa8\x3e\xe5\x3a\x89\xe5\xcf\x71\xbe\x65\x05\x93\xf1\x8f\x27\xb0\x58\x0a\xa9\xb0\xca\xe2\x04\x77\xfa\x1e\x64\xae\x24\xad\x6f\x3b\xc6\x9a\x14\x32\x13\xab\x59\xcf\xb4\xf4\x7a\xe3\x99\xb9\x61\x9c\xbf\x4e\x81\xfe\x10\x47\xb7\x9a\xee\xec\x82\x57\xa2\xda\xb1\xb2\x6f\x92\x7d\x35\xf7\xe4\x75\x6b\xef\x60\x48\xe9\xef\x9a\x56\x94\xad\xed\xb9\x9e\x2c\xba\x1a\xa8\x50\x6d\x2b\x09\x1a\x6d\x14\x38\xf9\x5c\xd6\xb5\x58\x49\x2b\x1b\x43\x25\x8a\x22\x4f\x42\x13\xed\xdf\xcc\x88\xc8\xc8\x43\xf4\x45\x27\x70\x71\x01\xe7\x9a\x3f\x73\x7c\xb6\x51\xd1\x4b\x02\xce\xc6\xa1\x0d\x6b\x4d\x33\x03\x43\x25\x89\xf3\x1c\x53\xbe\x59\xb1\x55\xfc\x55\xc8\x15\xb4\x3a\x0a\x89\xf9\xc6\x53\x08\x13\x5a\xb4\x24\x9f\x3c\x5d\x1e\xf6\x66\x96\x05\x2f\x44\x5d\xc7\xf6\xbe\x1d\x90\x0b\xa3\xc6\xcc\xa5\x11\xa5\x16\x85\x96\x67\x33\xa2\x8b\x63\xc5\x71\xb5\xfe\x90\xaf\xaa\xb8\xbc\x89\xfe\x49\x11\x86\xac\xb4\xa6\x38\x39\xed\x99\x49\x5a\xd1\xa7\x29\xb0\xa0\x27\xcf\x19\x5f\x3b\x11\xcb\xcc\x52\x16\x39\x07\x50\x4b\x65\x48\xbc\x1e\x93\xa4\x72\x91\x8f\xac\xb1\xfb\x71\xa9\x23\x0c\x27\x22\xbc\x53\x74\xd9\x13\x08\x7f\xc4\x24\xf4\x38\x0c\x09\x3a\x24\x5c\x1b\x59\x40\xe1\xa6\xcc\x63\x35\x98\x13\x31\x5e\x61\x45\x82\x14\x72\x15\xda\x18\xe8\x8b\xd2\xff\xdc\x67\xf8\x51\xa9\xe7\x45\xb1\x95\xea\x40\xf2\x11\x52\xf9\x09\x47\x87\xff\xd9\x3d\xf1\xdf\xf0\xe3\x54\xc7\x04\x1e\xac\xba\xc7\x31\xff\xf2\x4e\xd4\x87\x98\xa7\xa4\xe2\x73\x2f\xa7\xd6\xaa\xf6\x39\xf0\xa5\x30\x71\xe6\xd7\x37\x9f\x2c\xce\x6b\x9c\x1e\x74\xbc\xe4\x06\x93\x35\x20\xb1\x84\x32\xc1\x19\xfc\xdf\x6d\xc8\x34\xb5\x55\x5b\x3d\xc1\xdf\xe1\xfc\xb1\x7a\xf2\x04\x0c\xa7\x5d\xa7\xa0\xd5\x8e\x72\xbe\xed\xef\xd3\x1d\x48\x03\x33\x6f\x93\xbe\xdb\xbd\xe0\x5d\xfc\x3e\xc7\x59\x2f\xf0\xf3\x32\x67\x52\x93\x1b\xfa\x20\x36\x69\x10\xd0\xfc\xca\x27\xf0\x8a\x0a\x3b\x47\x21\xa0\x88\x30\xd3\x75\x62\xc4\x87\xcc\xaf\x22\x5a\x23\x8d\xd5\xca\x96\x37\x0c\xaa\xcf\xec\xd3\xb2\x68\x8c\x11\x4b\x65\x11\xf8\x7f\xfe\xef\x55\x55\x6c\xfa\x39\xa4\xfe\xc0\xe5\xc0\x4f\x52\x7c\xd8\xe2\x8c\x73\xe7\xd4\x86\x80\xb2\x1e\xb2\x88\xb2\xc2\x54\x24\xb1\xc2\xfa\x39\x07\x89\xb2\x9e\x90\xda\xd8\x18\x74\x2c\x7f\x6b\x21\x6c\x38\xaf\x31\xe7\xb2\x99\xf5\x13\x5d\x9b\x6f\x13\x1d\xb2\xa9\x2e\x16\x5c\x28\x72\x0c\x29\x6d\xa6\x29\xeb\x85\x58\x3a\x54\x97\x4d\x1a\x17\xa0\xc4\x46\xa8\x21\x06\x79\xe3\xb9\xd9\xf7\x2c\x55\x33\xf7\x1d\x2f\x5f\xc0\x29\xef\xdb\xc3\x8a\x2c\xab\x71\xf0\x34\xbd\xf3\xdc\x42\xf4\xce\xfb\x41\xaf\x5f\xc0\xa9\x86\x38\x2e\xbc\xa2\x4a\xb1\x3a\x24\xb7\x1f\x68\xf3\xf7\x93\x99\x71\x32\xa6\xf5\xb8\x50\xc2\xce\x62\xdc\xcb\xb1\x42\x24\xbd\x86\x80\xb6\xae\x74\xb4\xde\x3f\xd3\x84\x31\xb7\x3d\x99\x8c\x02\xf5\x94\x90\x6c\x2f\xc4\xce\x34\x1e\x74\xb1\xc9\x28\x70\xa2\xf0\x30\x34\x17\x63\xf5\xd4\x7a\x59\x0f\xdb\xac\x53\xe6\xe4\x7f\x64\xff\x63\xf5\x54\x07\xb1\x01\x37\xf0\x55\xeb\x28\x0e\x06\x44\x0f\xc0\xf2\xe1\xbe\x3f\x90\x1b\x56\x08\x69\xf1\xd7\x29\x94\xad\x22\x0f\xfb\x1a\xb3\x55\xfa\xaa\x7d\xd0\x01\x6c\x6f\x83\xb8\x5f\x68\xf4\x67\x67\xc6\xb1\x44\x0d\x9b\x58\xa6\x31\x77\xc3\xc4\x88\x81\x4d\xf2\x78\x5b\x63\x04\xbf\x20\xd4\x2a\xae\x94\xc6\xe1\x12\x20\xc5\x2c\xde\xe6\x4a\x17\x7f\x53\x88\x65\x0a\xc5\x2d\x56\x95\xa0\x46\x5d\xc1\x7b\xcc\x8b\x8f\xd4\x21\x48\xc4\x94\xba\x79\x4f\xcc\xda\xcb\xc6\xc6\xc7\x26\xda\x8b\xc7\x9b\x58\xdd\x44\xdf\xc7\x77\x73\xa9\xfe\xff\xd9\xe4\x8b\x03\x83\xa3\xa2\x4f\xd5\x91\xa1\x93\x98\x2c\xc4\x88\xdb\xdb\xb6\xa3\x3e\x3b\xd5\xe9\xe7\xac\x8c\xf5\xfd\x84\xc4\x9a\xbb\x7c\x5e\x86\x15\x4a\xac\x62\x25\x0a\xc9\x22\x62\xa8\x22\x83\x18\x56\xe2\x16\x25\x60\xba\xc2\x87\xcc\x01\x08\xaf\x9d\x02\x9c\x48\xae\xb2\xb8\xf7\x21\x0e\x88\x1c\xd7\xa9\x1f\x8d\xc8\x3d\x06\xb2\xaa\xd8\x18\x0a\x1a\x17\xfd\xf6\x9e\x2a\xaf\xce\x31\xc4\x10\x1d\x43\x1a\x00\x55\x30\xff\xab\x8a\x22\x39\xed\x32\xfb\xaa\xe8\x9c\x27\x52\x94\xca\x3f\x73\xce\x0b\x4f\x1c\x80\x3f\x0a\xb0\x30\x3f\xb6\x4a\x19\x05\xb5\xc2\xb2\x53\xcf\xbe\xc1\x8f\xd7\x0a\x4b\x6a\xdf\xdb\x84\x49\xce\x4b\xfa\x94\xfd\x1c\x0c\xbd\x75\xbd\xb0\x97\x0d\x87\x3c\xd9\x04\xb6\xc9\xd4\xa7\xf5\xae\x60\x4a\xa8\x53\xf0\x30\xb9\xfe\xa6\xb7\xda\x25\xdc\x3d\x9c\x44\x3e\x76\xdf\x34\xd2\x8f\x98\x33\xa2\xe3\x12\xa3\x79\x3d\x97\xb7\x58\xd5\xed\x5a\xef\x82\xa8\xf9\xd9\x4f\xf8\x24\x74\x91\xd1\xf6\xf7\xcf\xbe\xd7\x7a\x30\x13\x82\x81\x13\xde\xbe\xf6\xd0\xa3\x28\x72\x0d\x73\x5e\xe3\x7d\xb8\x3a\xa2\x79\xf8\x7e\xb7\xad\x71\xe9\xea\x3c\x48\xb0\x76\xd2\x34\xe0\x29\xfa\x1a\xd5\x1b\x14\xab\x9b\xf7\x45\x55\xdf\x9b\x33\xa6\x40\x86\x32\x39\xe0\x7f\x64\xe7\xf7\xfb\x5f\xac\x5d\xce\xf3\x0d\xe7\x8a\xdc\x78\x3d\x64\x24\x57\x15\x9b\xff\x4a\x57\x64\x30\x91\x0e\xc5\xcd\xf9\xd5\x1f\xe8\xa5\x22\xfd\x9f\x37\xfe\x29\xde\xf8\x95\xae\x78\xc4\x67\xba\x2d\xfb\x51\xfb\x3f\x6e\xa9\x0c\x20\x32\xe3\x50\x03\x96\x7a\x68\x68\xf8\xdc\xa0\x78\x49\xbf\xab\x19\x2d\xaf\x6c\xcd\x45\xfb\x26\x5e\xe3\x78\xb1\x34\xd7\xfe\x59\x57\x2b\xe7\x53\x6f\x24\xc2\x95\xb5\x48\x5b\xe8\x4d\x5c\x2e\xfc\xce\x0d\x9a\x66\x7f\x38\xbd\x87\x6d\x6a\x37\x3b\x60\xd2\xe5\x9b\x9e\xe3\xe9\x5a\x5e\xa4\xf5\x82\xa3\xd2\xfc\x6a\x09\x7a\x02\xc5\xeb\xc4\xa4\x1b\xbf\x65\x6b\x3b\x7b\x9b\x5f\xb9\x72\xdf\x4d\xbf\x83\x80\xa2\x08\xf1\xb9\x58\x76\x3d\xc2\xf0\xe8\x60\xe8\xc8\xce\x45\x7a\xa0\xcb\xbd\x11\x3a\x53\xe3\xff\x06\xba\x6b\xd2\x66\xa7\xc3\x0e\x02\x5a\x9a\xed\x81\xb4\xbb\x81\x71\xb0\xd9\x90\xc7\x69\x88\x03\x7d\xf8\x11\xe7\x3b\xd2\x9a\x0f\x38\x9c\x46\x31\x7f\x5c\x0b\x3b\x33\xdd\xd8\x60\x1b\x16\x04\x75\xf4\xcb\x0d\x56\x1c\x43\xa2\xb9\x1d\xd9\x3d\x80\xd8\x42\xcf\xc2\xf7\x6e\xfa\x94\x3c\x2a\xe7\x8f\xe7\xce\xb9\x96\x53\xc8\xd6\xdc\x38\x4c\x7c\x0e\xe9\xd0\x62\xcb\xf1\x3e\x24\xea\x6f\xb6\x79\x3e\x97\xea\xaf\x7f\x09\xdd\xa4\x9d\xad\xf1\xa7\x1a\xab\x2b\x76\x4d\x3b\x65\x27\xac\x0b\xbd\x49\x48\x46\xbf\xad\x33\xdb\xd3\x85\x3c\x7a\x78\x6b\x21\x7d\x12\x42\x12\x85\x16\xe2\x20\x9d\x76\xe4\x3a\x73\x53\xf1\x67\xfe\x58\xdc\xc8\xd9\xd4\xe1\x7b\x7b\xdf\xda\xeb\x34\xcd\xae\x99\xea\xa9\xb9\x90\xfc\xad\xf1\x65\xa5\xc7\xbe\x86\x42\xb1\x55\x53\x10\x12\x0e\x4c\x96\xc9\x21\x18\xa4\x58\xd3\xf5\x8b\xad\x8a\xc6\xa7\x2d\x1d\xad\x03\x0a\x42\xdf\x14\x6b\xf8\xfc\x19\x90\xc5\xd9\xc6\x95\x60\x78\x0a\xbd\x95\x78\x57\x62\xa2\x30\x05\x91\xea\x0e\x88\x4b\x12\x72\xbe\x27\xc5\x56\x85\xe6\x60\xf3\xa2\x83\x42\x5a\x0e\x84\x34\x0c\xf0\xcd\xfa\xf4\x49\xd6\x5f\x47\x5e\xc8\x3d\xea\xc5\x56\xb1\x52\x4c\x88\xdd\x9b\xdf\x5e\x56\xab\x10\x42\xba\x77\x08\x21\x4f\xb2\x42\xb6\x26\x08\xad\x9a\x43\xa7\x95\x87\xcf\x72\xcf\x36\xcf\x36\x7a\xf0\x1d\xda\xc7\x22\xcf\x4e\x02\x21\xef\xe7\x48\x48\x8f\x21\x67\x7c\x1d\xb6\xb4\x75\xfc\xdb\xb8\xa2\xc8\xeb\xf4\x94\xd6\x0b\x2b\xb8\x65\x47\x4b\x0f\xd3\x0b\x67\x02\x91\x92\x69\x72\x44\x36\x33\x52\x7b\xe4\x9e\x7d\x98\xb8\xee\x12\x81\x59\x20\xcb\xf6\xc1\xf9\xa4\x85\x59\x5b\x76\xc1\xdb\xf5\xf6\xa9\x28\xf0\xdf\x03\x3c\x17\xb2\x8f\x41\x83\x6f\x0f\x3c\xee\xff\xa2\xb7\x87\xee\xeb\x83\x27\x98\xdf\x74\xbe\xd6\xa9\x29\xd4\x01\xd4\x24\x9e\x90\x04\xf3\x9b\x1d\x1e\x1b\xd6\x18\xdc\xc4\xe2\xe1\x8a\x70\x7e\x35\x97\x56\x4a\x2e\x98\x4a\x5b\xf3\xb8\xf9\xb7\x3e\xc8\xbc\x39\x4f\xbc\x5b\x1f\xe4\x9a\xdf\x4c\x0c\x1b\x36\xa9\x7b\x19\xdd\x52\x30\x98\xe6\x29\x42\x9b\x8c\xd6\x02\xd5\xc0\xcb\x51\xdf\x5e\x0e\x89\xc6\xb3\x99\x3d\xc9\x68\x1b\xd2\x78\x98\x6a\x31\x49\x5b\x19\x18\xd3\xd9\x1b\x1d\xfa\x15\x87\x66\x6e\x21\x96\xe6\xf1\x4a\x1f\x7e\xad\xaa\x6d\xa2\xd8\xad\x74\xc5\xe8\x3f\x32\x1e\x07\x9e\x82\xf4\x48\xbb\x87\x1a\xca\x70\x3a\x83\xfc\xf0\x51\xbe\x7a\x6d\x9f\x1a\x53\xbf\xf8\x1a\xac\x41\x86\xaa\x30\xfa\x38\x54\x89\x3d\xac\x80\x39\x22\x0d\x91\x41\xb6\x6e\xdf\xfe\xc4\xb2\x7b\xc5\xd7\xf6\x92\xcf\x09\xac\x63\x1d\x41\xc7\x33\xd9\x2b\x4f\xb3\xf5\xa4\x95\x31\x85\x8a\xd3\x6c\xbd\xec\x0a\xd3\xae\x4e\x1d\xc5\x3d\xe1\x3d\xd4\xca\xff\x83\x2c\xdc\xde\xeb\x2b\x6c\x3c\xd3\x8f\xd2\x4f\xd6\xf8\xc9\xda\xfb\xbe\x0a\xc2\xdf\xdd\xe6\xe5\x01\x33\xfe\x92\xbe\xe1\x90\xc5\x1e\xec\x1d\xee\xb3\xd4\xe1\x8e\x80\x2f\x65\xe5\xe0\xf4\xd0\x6e\xd8\xa6\x82\xbe\xee\x59\x58\xff\xb7\x14\xbe\xe5\xb9\xa1\xb4\xdf\x65\x1b\x56\xc7\xc7\xaa\xe5\x47\x14\xcb\xbd\x76\xb6\x5b\x04\x37\x7f\x96\x71\x9b\x88\x70\x20\x14\x78\x71\xa3\x5b\x92\x1d\x32\xf3\x07\xd9\xb6\xa8\xf9\x28\x62\x8e\xe3\xfb\xa0\x89\xfb\x95\x88\x1f\x4c\xfe\x18\x9f\xdb\x63\xee\x34\x5b\x0f\x73\x78\xdc\xc9\x5c\x63\xa1\x5f\x23\xa1\x69\x64\xdb\x10\x79\x81\xf2\x9e\x8c\xd3\xa9\xd1\xf6\x7f\x1d\xd0\x7c\xd1\xd4\xc2\x2f\x03\xdd\x90\x22\xae\x3a\xbf\x95\xbb\xac\x56\xed\x1e\xbf\xe5\xfa\xbb\xad\x89\xe8\xb9\xe1\x36\xcf\x15\xf9\xba\x07\xe2\x35\x49\x23\x3b\x9e\xb8\x89\xeb\xb7\x15\x66\xe2\xce\x43\xa1\x8e\x2c\x34\x33\x1d\x92\x81\x7e\x37\xb6\xd8\x9a\x10\x33\xe7\x26\x7f\xde\x00\x49\xcb\x58\x16\xca\xe1\x89\x3c\xa7\xe6\x19\x9a\xe6\xb4\xf3\x63\xac\xd8\xbb\x4f\xff\xe7\x84\xff\x0a\x00\x00\xff\xff\x8b\x13\x66\xeb\xa9\x29\x00\x00") func templateDialectSqlQueryTmplBytes() ([]byte, error) { return bindataRead( @@ -799,7 +799,7 @@ func templateDialectSqlQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 10593, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 10665, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/template/builder/query.tmpl b/entc/gen/template/builder/query.tmpl index 4373b1fec..f62ed2ab2 100644 --- a/entc/gen/template/builder/query.tmpl +++ b/entc/gen/template/builder/query.tmpl @@ -40,8 +40,9 @@ type {{ $builder }} struct { {{- if hasTemplate $tmpl }} {{- xtemplate $tmpl . }} {{- end }} - // intermediate query. + // intermediate query (i.e. traversal path). {{ $.Storage }} {{ $.Storage.Builder }} + path func(context.Context) ({{ $.Storage.Builder }}, error) } // Where adds a new predicate for the builder. @@ -74,10 +75,16 @@ func ({{ $receiver }} *{{ $builder }}) Order(o ...Order) *{{ $builder }} { // Query{{ pascal $e.Name }} chains the current query on the {{ $e.Name }} edge. func ({{ $receiver }} *{{ $builder }}) Query{{ pascal $e.Name }}() *{{ $edge_builder }} { query := &{{ $edge_builder }}{config: {{ $receiver }}.config} - {{- with extend $ "Receiver" $receiver "Edge" $e -}} - {{ $tmpl := printf "dialect/%s/query/path" $.Storage }} - {{- xtemplate $tmpl . }} - {{- end -}} + query.path = func(ctx context.Context) (fromU {{ $.Storage.Builder }}, err error) { + if err := {{ $receiver }}.prepareQuery(ctx); err != nil { + return nil, err + } + {{- with extend $ "Receiver" $receiver "Edge" $e "Ident" "fromU" -}} + {{ $tmpl := printf "dialect/%s/query/path" $.Storage }} + {{- xtemplate $tmpl . }} + {{- end -}} + return fromU, nil + } return query } {{ end }} @@ -178,6 +185,9 @@ func ({{ $receiver }} *{{ $builder }}) OnlyXID(ctx context.Context) {{ $.ID.Type // All executes the query and returns a list of {{ plural $.Name }}. func ({{ $receiver }} *{{ $builder }}) All(ctx context.Context) ([]*{{ $.Name }}, error) { + if err := {{ $receiver }}.prepareQuery(ctx); err != nil { + return nil, err + } return {{ $receiver }}.{{ $.Storage }}All(ctx) } @@ -210,6 +220,9 @@ func ({{ $receiver }} *{{ $builder }}) IDsX(ctx context.Context) []{{ $.ID.Type // Count returns the count of the given query. func ({{ $receiver }} *{{ $builder }}) Count(ctx context.Context) (int, error) { + if err := {{ $receiver }}.prepareQuery(ctx); err != nil { + return 0, err + } return {{ $receiver }}.{{ $.Storage }}Count(ctx) } @@ -224,6 +237,9 @@ func ({{ $receiver }} *{{ $builder }}) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func ({{ $receiver }} *{{ $builder }}) Exist(ctx context.Context) (bool, error) { + if err := {{ $receiver }}.prepareQuery(ctx); err != nil { + return false, err + } return {{ $receiver }}.{{ $.Storage }}Exist(ctx) } @@ -248,6 +264,7 @@ func ({{ $receiver }} *{{ $builder }}) Clone() *{{ $builder }} { predicates: append([]predicate.{{ $.Name }}{}, {{ $receiver }}.predicates...), // clone intermediate query. {{ $.Storage }}: {{ $receiver }}.{{ $.Storage }}.Clone(), + path: {{ $receiver }}.path, } } @@ -288,7 +305,12 @@ func ({{ $receiver }} *{{ $builder }}) Clone() *{{ $builder }} { func ({{ $receiver }} *{{ $builder }}) GroupBy(field string, fields ...string) *{{ $groupBuilder }} { group := &{{ $groupBuilder }}{config: {{ $receiver }}.config} group.fields = append([]string{field}, fields...) - group.{{ $.Storage }} = {{ $receiver }}.{{ $.Storage }}Query() + group.path = func(ctx context.Context) (prev {{ $.Storage.Builder }}, err error) { + if err := {{ $receiver }}.prepareQuery(ctx); err != nil { + return nil, err + } + return {{ $receiver }}.{{ $.Storage }}Query(), nil + } return group } @@ -312,10 +334,27 @@ func ({{ $receiver }} *{{ $builder }}) GroupBy(field string, fields ...string) * func ({{ $receiver }} *{{ $builder }}) Select(field string, fields ...string) *{{ $selectBuilder }} { selector := &{{ $selectBuilder }}{config: {{ $receiver }}.config} selector.fields = append([]string{field}, fields...) - selector.{{ $.Storage }} = {{ $receiver }}.{{ $.Storage }}Query() + selector.path = func(ctx context.Context) (prev {{ $.Storage.Builder }}, err error) { + if err := {{ $receiver }}.prepareQuery(ctx); err != nil { + return nil, err + } + return {{ $receiver }}.{{ $.Storage }}Query(), nil + } return selector } +func ({{ $receiver }} *{{ $builder }}) prepareQuery(ctx context.Context) error { + if {{ $receiver }}.path != nil { + prev, err := {{ $receiver }}.path(ctx) + if err != nil { + return err + } + {{ $receiver }}.{{ $.Storage }} = prev + } + // Privacy and query checks go here. + return nil +} + {{ with extend $ "Builder" $builder "Package" $pkg }} {{ $tmpl := printf "dialect/%s/query" $.Storage }} {{ xtemplate $tmpl . }} @@ -330,8 +369,9 @@ type {{ $groupBuilder }} struct { config fields []string fns []Aggregate - // intermediate query. - {{ $.Storage }} {{ $.Storage.Builder}} + // intermediate query (i.e. traversal path). + {{ $.Storage }} {{ $.Storage.Builder }} + path func(context.Context) ({{ $.Storage.Builder }}, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -342,6 +382,11 @@ func ({{ $groupReceiver }} *{{ $groupBuilder }}) Aggregate(fns ...Aggregate) *{{ // Scan applies the group-by query and scan the result into the given value. func ({{ $groupReceiver }} *{{ $groupBuilder }}) Scan(ctx context.Context, v interface{}) error { + query, err := {{ $groupReceiver }}.path(ctx) + if err != nil { + return err + } + {{ $groupReceiver }}.{{ $.Storage }} = query return {{ $groupReceiver }}.{{ $.Storage }}Scan(ctx, v) } @@ -389,13 +434,19 @@ func ({{ $groupReceiver }} *{{ $groupBuilder }}) ScanX(ctx context.Context, v in type {{ $selectBuilder }} struct { config fields []string - // intermediate queries. - {{ $.Storage }} {{ $.Storage.Builder}} + // intermediate query (i.e. traversal path). + {{ $.Storage }} {{ $.Storage.Builder }} + path func(context.Context) ({{ $.Storage.Builder }}, error) } // Scan applies the selector query and scan the result into the given value. func ({{ $selectReceiver }} *{{ $selectBuilder }}) Scan(ctx context.Context, v interface{}) error { + query, err := {{ $selectReceiver }}.path(ctx) + if err != nil { + return err + } + {{ $selectReceiver }}.{{ $.Storage }} = query return {{ $selectReceiver }}.{{ $.Storage }}Scan(ctx, v) } diff --git a/entc/gen/template/client.tmpl b/entc/gen/template/client.tmpl index d880be85f..d6344ad69 100644 --- a/entc/gen/template/client.tmpl +++ b/entc/gen/template/client.tmpl @@ -204,10 +204,13 @@ func (c *{{ $client }}) GetX(ctx context.Context, id {{ $n.ID.Type }}) *{{ $n.Na // Query{{ pascal $e.Name }} queries the {{ $e.Name }} edge of a {{ $n.Name }}. func (c *{{ $client }}) Query{{ pascal $e.Name }}({{ $rec }} *{{ $n.Name }}) *{{ $builder }} { query := &{{ $builder }}{config: c.config} - {{- with extend $n "Receiver" $rec "Edge" $e }} - {{ $tmpl := printf "dialect/%s/query/from" $.Storage }} - {{- xtemplate $tmpl . -}} - {{- end }} + query.path = func(ctx context.Context) (fromV {{ $.Storage.Builder }}, _ error) { + {{- with extend $n "Receiver" $rec "Edge" $e "Ident" "fromV" }} + {{ $tmpl := printf "dialect/%s/query/from" $.Storage }} + {{- xtemplate $tmpl . -}} + {{- end -}} + return fromV, nil + } return query } {{ end }} diff --git a/entc/gen/template/dialect/gremlin/query.tmpl b/entc/gen/template/dialect/gremlin/query.tmpl index 6c1255373..fb35dc400 100644 --- a/entc/gen/template/dialect/gremlin/query.tmpl +++ b/entc/gen/template/dialect/gremlin/query.tmpl @@ -73,13 +73,14 @@ func ({{ $receiver }} *{{ $builder }}) gremlinQuery() *dsl.Traversal { {{ define "dialect/gremlin/query/path" }} {{- $e := $.Scope.Edge }} {{/* the edge we need to genegrate the path to. */}} {{- $receiver := $.Scope.Receiver }} + {{- $ident := $.Scope.Ident }} gremlin := {{ $receiver }}.gremlinQuery() {{- if $e.Bidi }} - query.gremlin = gremlin.Both({{ $.Package }}.{{ $e.LabelConstant }}) + {{ $ident }} = gremlin.Both({{ $.Package }}.{{ $e.LabelConstant }}) {{- else if $e.IsInverse }} - query.gremlin = gremlin.InE({{ $e.Type.Package }}.{{ $e.LabelConstant }}).OutV() + {{ $ident }} = gremlin.InE({{ $e.Type.Package }}.{{ $e.LabelConstant }}).OutV() {{- else }} - query.gremlin = gremlin.OutE({{ $.Package }}.{{ $e.LabelConstant }}).InV() + {{ $ident }} = gremlin.OutE({{ $.Package }}.{{ $e.LabelConstant }}).InV() {{- end }} {{ end }} @@ -89,12 +90,13 @@ func ({{ $receiver }} *{{ $builder }}) gremlinQuery() *dsl.Traversal { {{- $n := $ }} {{/* the node we start the query from. */}} {{- $e := $.Scope.Edge }} {{/* the edge we need to genegrate the path to. */}} {{- $receiver := $.Scope.Receiver }} + {{- $ident := $.Scope.Ident -}} {{- if $e.Bidi }} - query.gremlin = g.V({{ $receiver }}.ID).Both({{ $n.Package }}.{{ $e.LabelConstant }}) + {{ $ident }} = g.V({{ $receiver }}.ID).Both({{ $n.Package }}.{{ $e.LabelConstant }}) {{- else if $e.IsInverse }} - query.gremlin = g.V({{ $receiver }}.ID).InE({{ $e.Type.Package }}.{{ $e.LabelConstant }}).OutV() + {{ $ident }} = g.V({{ $receiver }}.ID).InE({{ $e.Type.Package }}.{{ $e.LabelConstant }}).OutV() {{- else }} - query.gremlin = g.V({{ $receiver }}.ID).OutE({{ $n.Package }}.{{ $e.LabelConstant }}).InV() + {{ $ident }} = g.V({{ $receiver }}.ID).OutE({{ $n.Package }}.{{ $e.LabelConstant }}).InV() {{- end }} {{ end }} diff --git a/entc/gen/template/dialect/sql/query.tmpl b/entc/gen/template/dialect/sql/query.tmpl index 4be2fa096..186536d67 100644 --- a/entc/gen/template/dialect/sql/query.tmpl +++ b/entc/gen/template/dialect/sql/query.tmpl @@ -155,6 +155,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector { {{ define "dialect/sql/query/path" }} {{- $n := $ }} {{/* the node we start the query from. */}} {{- $e := $.Scope.Edge }} {{/* the edge we need to genegrate the path to. */}} + {{- $ident := $.Scope.Ident -}} {{- $receiver := $.Scope.Receiver }} step := sqlgraph.NewStep( sqlgraph.From({{ $n.Package }}.Table, {{ $n.Package }}.{{ $n.ID.Constant }}, {{ $receiver }}.sqlQuery()), @@ -167,13 +168,14 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector { {{- end -}} ), ) - query.sql = sqlgraph.SetNeighbors({{ $receiver }}.driver.Dialect(), step) + {{ $ident }} = sqlgraph.SetNeighbors({{ $receiver }}.driver.Dialect(), step) {{ end }} {{/* query/from defines the query generation for an edge query from a given node. */}} {{ define "dialect/sql/query/from" }} {{- $n := $ }} {{/* the node we start the query from. */}} {{- $e := $.Scope.Edge }} {{/* the edge we need to genegrate the path to. */}} + {{- $ident := $.Scope.Ident -}} {{- $receiver := $.Scope.Receiver -}} id := {{ $receiver }}.ID step := sqlgraph.NewStep( @@ -187,7 +189,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector { {{- end -}} ), ) - query.sql = sqlgraph.Neighbors({{ $receiver }}.driver.Dialect(), step) + {{ $ident }} = sqlgraph.Neighbors({{ $receiver }}.driver.Dialect(), step) {{ end }} {{ define "dialect/sql/query/eagerloading" }} diff --git a/entc/gen/type.go b/entc/gen/type.go index e15cbb809..8dfd9b710 100644 --- a/entc/gen/type.go +++ b/entc/gen/type.go @@ -15,7 +15,6 @@ import ( "unicode" "github.com/facebookincubator/ent" - "github.com/facebookincubator/ent/dialect/sql/schema" "github.com/facebookincubator/ent/entc/load" "github.com/facebookincubator/ent/schema/field" diff --git a/entc/integration/config/ent/user_query.go b/entc/integration/config/ent/user_query.go index 1de19c4bd..06c902c84 100644 --- a/entc/integration/config/ent/user_query.go +++ b/entc/integration/config/ent/user_query.go @@ -27,8 +27,9 @@ type UserQuery struct { order []Order unique []string predicates []predicate.User - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -229,7 +240,12 @@ func (uq *UserQuery) Clone() *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -237,10 +253,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -347,8 +380,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -359,6 +393,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -477,12 +516,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/customid/ent/blob_query.go b/entc/integration/customid/ent/blob_query.go index 7c54a3ea0..92f51d712 100644 --- a/entc/integration/customid/ent/blob_query.go +++ b/entc/integration/customid/ent/blob_query.go @@ -33,8 +33,9 @@ type BlobQuery struct { withParent *BlobQuery withLinks *BlobQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -64,24 +65,36 @@ func (bq *BlobQuery) Order(o ...Order) *BlobQuery { // QueryParent chains the current query on the parent edge. func (bq *BlobQuery) QueryParent() *BlobQuery { query := &BlobQuery{config: bq.config} - step := sqlgraph.NewStep( - sqlgraph.From(blob.Table, blob.FieldID, bq.sqlQuery()), - sqlgraph.To(blob.Table, blob.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, blob.ParentTable, blob.ParentColumn), - ) - query.sql = sqlgraph.SetNeighbors(bq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := bq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(blob.Table, blob.FieldID, bq.sqlQuery()), + sqlgraph.To(blob.Table, blob.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, blob.ParentTable, blob.ParentColumn), + ) + fromU = sqlgraph.SetNeighbors(bq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryLinks chains the current query on the links edge. func (bq *BlobQuery) QueryLinks() *BlobQuery { query := &BlobQuery{config: bq.config} - step := sqlgraph.NewStep( - sqlgraph.From(blob.Table, blob.FieldID, bq.sqlQuery()), - sqlgraph.To(blob.Table, blob.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, blob.LinksTable, blob.LinksPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(bq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := bq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(blob.Table, blob.FieldID, bq.sqlQuery()), + sqlgraph.To(blob.Table, blob.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, blob.LinksTable, blob.LinksPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(bq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -181,6 +194,9 @@ func (bq *BlobQuery) OnlyXID(ctx context.Context) uuid.UUID { // All executes the query and returns a list of Blobs. func (bq *BlobQuery) All(ctx context.Context) ([]*Blob, error) { + if err := bq.prepareQuery(ctx); err != nil { + return nil, err + } return bq.sqlAll(ctx) } @@ -213,6 +229,9 @@ func (bq *BlobQuery) IDsX(ctx context.Context) []uuid.UUID { // Count returns the count of the given query. func (bq *BlobQuery) Count(ctx context.Context) (int, error) { + if err := bq.prepareQuery(ctx); err != nil { + return 0, err + } return bq.sqlCount(ctx) } @@ -227,6 +246,9 @@ func (bq *BlobQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (bq *BlobQuery) Exist(ctx context.Context) (bool, error) { + if err := bq.prepareQuery(ctx); err != nil { + return false, err + } return bq.sqlExist(ctx) } @@ -250,7 +272,8 @@ func (bq *BlobQuery) Clone() *BlobQuery { unique: append([]string{}, bq.unique...), predicates: append([]predicate.Blob{}, bq.predicates...), // clone intermediate query. - sql: bq.sql.Clone(), + sql: bq.sql.Clone(), + path: bq.path, } } @@ -294,7 +317,12 @@ func (bq *BlobQuery) WithLinks(opts ...func(*BlobQuery)) *BlobQuery { func (bq *BlobQuery) GroupBy(field string, fields ...string) *BlobGroupBy { group := &BlobGroupBy{config: bq.config} group.fields = append([]string{field}, fields...) - group.sql = bq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := bq.prepareQuery(ctx); err != nil { + return nil, err + } + return bq.sqlQuery(), nil + } return group } @@ -313,10 +341,27 @@ func (bq *BlobQuery) GroupBy(field string, fields ...string) *BlobGroupBy { func (bq *BlobQuery) Select(field string, fields ...string) *BlobSelect { selector := &BlobSelect{config: bq.config} selector.fields = append([]string{field}, fields...) - selector.sql = bq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := bq.prepareQuery(ctx); err != nil { + return nil, err + } + return bq.sqlQuery(), nil + } return selector } +func (bq *BlobQuery) prepareQuery(ctx context.Context) error { + if bq.path != nil { + prev, err := bq.path(ctx) + if err != nil { + return err + } + bq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (bq *BlobQuery) sqlAll(ctx context.Context) ([]*Blob, error) { var ( nodes = []*Blob{} @@ -527,8 +572,9 @@ type BlobGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -539,6 +585,11 @@ func (bgb *BlobGroupBy) Aggregate(fns ...Aggregate) *BlobGroupBy { // Scan applies the group-by query and scan the result into the given value. func (bgb *BlobGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := bgb.path(ctx) + if err != nil { + return err + } + bgb.sql = query return bgb.sqlScan(ctx, v) } @@ -657,12 +708,18 @@ func (bgb *BlobGroupBy) sqlQuery() *sql.Selector { type BlobSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (bs *BlobSelect) Scan(ctx context.Context, v interface{}) error { + query, err := bs.path(ctx) + if err != nil { + return err + } + bs.sql = query return bs.sqlScan(ctx, v) } diff --git a/entc/integration/customid/ent/car_query.go b/entc/integration/customid/ent/car_query.go index 724aa32db..2f8e82dbf 100644 --- a/entc/integration/customid/ent/car_query.go +++ b/entc/integration/customid/ent/car_query.go @@ -31,8 +31,9 @@ type CarQuery struct { // eager-loading edges. withOwner *PetQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (cq *CarQuery) Order(o ...Order) *CarQuery { // QueryOwner chains the current query on the owner edge. func (cq *CarQuery) QueryOwner() *PetQuery { query := &PetQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (cq *CarQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cars. func (cq *CarQuery) All(ctx context.Context) ([]*Car, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (cq *CarQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CarQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (cq *CarQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CarQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (cq *CarQuery) Clone() *CarQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Car{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -269,7 +286,12 @@ func (cq *CarQuery) WithOwner(opts ...func(*PetQuery)) *CarQuery { func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { group := &CarGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { func (cq *CarQuery) Select(field string, fields ...string) *CarSelect { selector := &CarSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CarQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CarQuery) sqlAll(ctx context.Context) ([]*Car, error) { var ( nodes = []*Car{} @@ -438,8 +477,9 @@ type CarGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -450,6 +490,11 @@ func (cgb *CarGroupBy) Aggregate(fns ...Aggregate) *CarGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CarGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -568,12 +613,18 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { type CarSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CarSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/entc/integration/customid/ent/client.go b/entc/integration/customid/ent/client.go index 3b7b7ab55..548592ad1 100644 --- a/entc/integration/customid/ent/client.go +++ b/entc/integration/customid/ent/client.go @@ -209,28 +209,32 @@ func (c *BlobClient) GetX(ctx context.Context, id uuid.UUID) *Blob { // QueryParent queries the parent edge of a Blob. func (c *BlobClient) QueryParent(b *Blob) *BlobQuery { query := &BlobQuery{config: c.config} - id := b.ID - step := sqlgraph.NewStep( - sqlgraph.From(blob.Table, blob.FieldID, id), - sqlgraph.To(blob.Table, blob.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, blob.ParentTable, blob.ParentColumn), - ) - query.sql = sqlgraph.Neighbors(b.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := b.ID + step := sqlgraph.NewStep( + sqlgraph.From(blob.Table, blob.FieldID, id), + sqlgraph.To(blob.Table, blob.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, blob.ParentTable, blob.ParentColumn), + ) + fromV = sqlgraph.Neighbors(b.driver.Dialect(), step) + return fromV, nil + } return query } // QueryLinks queries the links edge of a Blob. func (c *BlobClient) QueryLinks(b *Blob) *BlobQuery { query := &BlobQuery{config: c.config} - id := b.ID - step := sqlgraph.NewStep( - sqlgraph.From(blob.Table, blob.FieldID, id), - sqlgraph.To(blob.Table, blob.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, blob.LinksTable, blob.LinksPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(b.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := b.ID + step := sqlgraph.NewStep( + sqlgraph.From(blob.Table, blob.FieldID, id), + sqlgraph.To(blob.Table, blob.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, blob.LinksTable, blob.LinksPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(b.driver.Dialect(), step) + return fromV, nil + } return query } @@ -320,14 +324,16 @@ func (c *CarClient) GetX(ctx context.Context, id int) *Car { // QueryOwner queries the owner edge of a Car. func (c *CarClient) QueryOwner(ca *Car) *PetQuery { query := &PetQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } @@ -417,14 +423,16 @@ func (c *GroupClient) GetX(ctx context.Context, id int) *Group { // QueryUsers queries the users edge of a Group. func (c *GroupClient) QueryUsers(gr *Group) *UserQuery { query := &UserQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } @@ -514,56 +522,64 @@ func (c *PetClient) GetX(ctx context.Context, id string) *Pet { // QueryOwner queries the owner edge of a Pet. func (c *PetClient) QueryOwner(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } // QueryCars queries the cars edge of a Pet. func (c *PetClient) QueryCars(pe *Pet) *CarQuery { query := &CarQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, pet.CarsTable, pet.CarsColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, pet.CarsTable, pet.CarsColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFriends queries the friends edge of a Pet. func (c *PetClient) QueryFriends(pe *Pet) *PetQuery { query := &PetQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } // QueryBestFriend queries the best_friend edge of a Pet. func (c *PetClient) QueryBestFriend(pe *Pet) *PetQuery { query := &PetQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, pet.BestFriendTable, pet.BestFriendColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, pet.BestFriendTable, pet.BestFriendColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } @@ -653,56 +669,64 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryGroups queries the groups edge of a User. func (c *UserClient) QueryGroups(u *User) *GroupQuery { query := &GroupQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryParent queries the parent edge of a User. func (c *UserClient) QueryParent(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryChildren queries the children edge of a User. func (c *UserClient) QueryChildren(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryPets queries the pets edge of a User. func (c *UserClient) QueryPets(u *User) *PetQuery { query := &PetQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/customid/ent/group_query.go b/entc/integration/customid/ent/group_query.go index 3583fe66f..8c9b2db2d 100644 --- a/entc/integration/customid/ent/group_query.go +++ b/entc/integration/customid/ent/group_query.go @@ -31,8 +31,9 @@ type GroupQuery struct { predicates []predicate.Group // eager-loading edges. withUsers *UserQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (gq *GroupQuery) Order(o ...Order) *GroupQuery { // QueryUsers chains the current query on the users edge. func (gq *GroupQuery) QueryUsers() *UserQuery { query := &UserQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (gq *GroupQuery) Clone() *GroupQuery { unique: append([]string{}, gq.unique...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), + sql: gq.sql.Clone(), + path: gq.path, } } @@ -256,7 +273,12 @@ func (gq *GroupQuery) WithUsers(opts ...func(*UserQuery)) *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.sql = gq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return group } @@ -264,10 +286,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.sql = gq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) { var ( nodes = []*Group{} @@ -442,8 +481,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -454,6 +494,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.sql = query return ggb.sqlScan(ctx, v) } @@ -572,12 +617,18 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { type GroupSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.sql = query return gs.sqlScan(ctx, v) } diff --git a/entc/integration/customid/ent/pet_query.go b/entc/integration/customid/ent/pet_query.go index cecfb3b16..242139204 100644 --- a/entc/integration/customid/ent/pet_query.go +++ b/entc/integration/customid/ent/pet_query.go @@ -36,8 +36,9 @@ type PetQuery struct { withFriends *PetQuery withBestFriend *PetQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -67,48 +68,72 @@ func (pq *PetQuery) Order(o ...Order) *PetQuery { // QueryOwner chains the current query on the owner edge. func (pq *PetQuery) QueryOwner() *UserQuery { query := &UserQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryCars chains the current query on the cars edge. func (pq *PetQuery) QueryCars() *CarQuery { query := &CarQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, pet.CarsTable, pet.CarsColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, pet.CarsTable, pet.CarsColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFriends chains the current query on the friends edge. func (pq *PetQuery) QueryFriends() *PetQuery { query := &PetQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryBestFriend chains the current query on the best_friend edge. func (pq *PetQuery) QueryBestFriend() *PetQuery { query := &PetQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, pet.BestFriendTable, pet.BestFriendColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, pet.BestFriendTable, pet.BestFriendColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -208,6 +233,9 @@ func (pq *PetQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Pets. func (pq *PetQuery) All(ctx context.Context) ([]*Pet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.sqlAll(ctx) } @@ -240,6 +268,9 @@ func (pq *PetQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (pq *PetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.sqlCount(ctx) } @@ -254,6 +285,9 @@ func (pq *PetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.sqlExist(ctx) } @@ -277,7 +311,8 @@ func (pq *PetQuery) Clone() *PetQuery { unique: append([]string{}, pq.unique...), predicates: append([]predicate.Pet{}, pq.predicates...), // clone intermediate query. - sql: pq.sql.Clone(), + sql: pq.sql.Clone(), + path: pq.path, } } @@ -330,7 +365,12 @@ func (pq *PetQuery) WithBestFriend(opts ...func(*PetQuery)) *PetQuery { func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { group := &PetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.sql = pq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return group } @@ -338,10 +378,27 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { func (pq *PetQuery) Select(field string, fields ...string) *PetSelect { selector := &PetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.sql = pq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return selector } +func (pq *PetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) { var ( nodes = []*Pet{} @@ -607,8 +664,9 @@ type PetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -619,6 +677,11 @@ func (pgb *PetGroupBy) Aggregate(fns ...Aggregate) *PetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.sql = query return pgb.sqlScan(ctx, v) } @@ -737,12 +800,18 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { type PetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.sql = query return ps.sqlScan(ctx, v) } diff --git a/entc/integration/customid/ent/user_query.go b/entc/integration/customid/ent/user_query.go index dc5c2d71a..5f59f2cfb 100644 --- a/entc/integration/customid/ent/user_query.go +++ b/entc/integration/customid/ent/user_query.go @@ -36,8 +36,9 @@ type UserQuery struct { withChildren *UserQuery withPets *PetQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -67,48 +68,72 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryGroups chains the current query on the groups edge. func (uq *UserQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryParent chains the current query on the parent edge. func (uq *UserQuery) QueryParent() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryChildren chains the current query on the children edge. func (uq *UserQuery) QueryChildren() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryPets chains the current query on the pets edge. func (uq *UserQuery) QueryPets() *PetQuery { query := &PetQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -208,6 +233,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -240,6 +268,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -254,6 +285,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -277,7 +311,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -330,7 +365,12 @@ func (uq *UserQuery) WithPets(opts ...func(*PetQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -338,10 +378,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -610,8 +667,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -622,6 +680,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -740,12 +803,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index 414a48cb7..3d31ee93e 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -34,8 +34,9 @@ type CardQuery struct { withOwner *UserQuery withSpec *SpecQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -65,24 +66,36 @@ func (cq *CardQuery) Order(o ...Order) *CardQuery { // QueryOwner chains the current query on the owner edge. func (cq *CardQuery) QueryOwner() *UserQuery { query := &UserQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } // QuerySpec chains the current query on the spec edge. func (cq *CardQuery) QuerySpec() *SpecQuery { query := &SpecQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), - sqlgraph.To(spec.Table, spec.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, card.SpecTable, card.SpecPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), + sqlgraph.To(spec.Table, spec.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, card.SpecTable, card.SpecPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -182,6 +195,9 @@ func (cq *CardQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cards. func (cq *CardQuery) All(ctx context.Context) ([]*Card, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -214,6 +230,9 @@ func (cq *CardQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CardQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -228,6 +247,9 @@ func (cq *CardQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CardQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -251,7 +273,8 @@ func (cq *CardQuery) Clone() *CardQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Card{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -295,7 +318,12 @@ func (cq *CardQuery) WithSpec(opts ...func(*SpecQuery)) *CardQuery { func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { group := &CardGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -314,10 +342,27 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { func (cq *CardQuery) Select(field string, fields ...string) *CardSelect { selector := &CardSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CardQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CardQuery) sqlAll(ctx context.Context) ([]*Card, error) { var ( nodes = []*Card{} @@ -528,8 +573,9 @@ type CardGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -540,6 +586,11 @@ func (cgb *CardGroupBy) Aggregate(fns ...Aggregate) *CardGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CardGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -658,12 +709,18 @@ func (cgb *CardGroupBy) sqlQuery() *sql.Selector { type CardSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CardSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/entc/integration/ent/client.go b/entc/integration/ent/client.go index 83599f292..8870fe423 100644 --- a/entc/integration/ent/client.go +++ b/entc/integration/ent/client.go @@ -250,28 +250,32 @@ func (c *CardClient) GetX(ctx context.Context, id int) *Card { // QueryOwner queries the owner edge of a Card. func (c *CardClient) QueryOwner(ca *Card) *UserQuery { query := &UserQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } // QuerySpec queries the spec edge of a Card. func (c *CardClient) QuerySpec(ca *Card) *SpecQuery { query := &SpecQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, id), - sqlgraph.To(spec.Table, spec.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, card.SpecTable, card.SpecPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, id), + sqlgraph.To(spec.Table, spec.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, card.SpecTable, card.SpecPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } @@ -527,28 +531,32 @@ func (c *FileClient) GetX(ctx context.Context, id int) *File { // QueryOwner queries the owner edge of a File. func (c *FileClient) QueryOwner(f *File) *UserQuery { query := &UserQuery{config: c.config} - id := f.ID - step := sqlgraph.NewStep( - sqlgraph.From(file.Table, file.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, file.OwnerTable, file.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(f.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := f.ID + step := sqlgraph.NewStep( + sqlgraph.From(file.Table, file.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, file.OwnerTable, file.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(f.driver.Dialect(), step) + return fromV, nil + } return query } // QueryType queries the type edge of a File. func (c *FileClient) QueryType(f *File) *FileTypeQuery { query := &FileTypeQuery{config: c.config} - id := f.ID - step := sqlgraph.NewStep( - sqlgraph.From(file.Table, file.FieldID, id), - sqlgraph.To(filetype.Table, filetype.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, file.TypeTable, file.TypeColumn), - ) - query.sql = sqlgraph.Neighbors(f.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := f.ID + step := sqlgraph.NewStep( + sqlgraph.From(file.Table, file.FieldID, id), + sqlgraph.To(filetype.Table, filetype.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, file.TypeTable, file.TypeColumn), + ) + fromV = sqlgraph.Neighbors(f.driver.Dialect(), step) + return fromV, nil + } return query } @@ -638,14 +646,16 @@ func (c *FileTypeClient) GetX(ctx context.Context, id int) *FileType { // QueryFiles queries the files edge of a FileType. func (c *FileTypeClient) QueryFiles(ft *FileType) *FileQuery { query := &FileQuery{config: c.config} - id := ft.ID - step := sqlgraph.NewStep( - sqlgraph.From(filetype.Table, filetype.FieldID, id), - sqlgraph.To(file.Table, file.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, filetype.FilesTable, filetype.FilesColumn), - ) - query.sql = sqlgraph.Neighbors(ft.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ft.ID + step := sqlgraph.NewStep( + sqlgraph.From(filetype.Table, filetype.FieldID, id), + sqlgraph.To(file.Table, file.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, filetype.FilesTable, filetype.FilesColumn), + ) + fromV = sqlgraph.Neighbors(ft.driver.Dialect(), step) + return fromV, nil + } return query } @@ -735,56 +745,64 @@ func (c *GroupClient) GetX(ctx context.Context, id int) *Group { // QueryFiles queries the files edge of a Group. func (c *GroupClient) QueryFiles(gr *Group) *FileQuery { query := &FileQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(file.Table, file.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, group.FilesTable, group.FilesColumn), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(file.Table, file.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, group.FilesTable, group.FilesColumn), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } // QueryBlocked queries the blocked edge of a Group. func (c *GroupClient) QueryBlocked(gr *Group) *UserQuery { query := &UserQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, group.BlockedTable, group.BlockedColumn), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, group.BlockedTable, group.BlockedColumn), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } // QueryUsers queries the users edge of a Group. func (c *GroupClient) QueryUsers(gr *Group) *UserQuery { query := &UserQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, group.UsersTable, group.UsersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } // QueryInfo queries the info edge of a Group. func (c *GroupClient) QueryInfo(gr *Group) *GroupInfoQuery { query := &GroupInfoQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(groupinfo.Table, groupinfo.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, group.InfoTable, group.InfoColumn), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(groupinfo.Table, groupinfo.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, group.InfoTable, group.InfoColumn), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } @@ -874,14 +892,16 @@ func (c *GroupInfoClient) GetX(ctx context.Context, id int) *GroupInfo { // QueryGroups queries the groups edge of a GroupInfo. func (c *GroupInfoClient) QueryGroups(gi *GroupInfo) *GroupQuery { query := &GroupQuery{config: c.config} - id := gi.ID - step := sqlgraph.NewStep( - sqlgraph.From(groupinfo.Table, groupinfo.FieldID, id), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.O2M, true, groupinfo.GroupsTable, groupinfo.GroupsColumn), - ) - query.sql = sqlgraph.Neighbors(gi.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gi.ID + step := sqlgraph.NewStep( + sqlgraph.From(groupinfo.Table, groupinfo.FieldID, id), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.O2M, true, groupinfo.GroupsTable, groupinfo.GroupsColumn), + ) + fromV = sqlgraph.Neighbors(gi.driver.Dialect(), step) + return fromV, nil + } return query } @@ -1054,28 +1074,32 @@ func (c *NodeClient) GetX(ctx context.Context, id int) *Node { // QueryPrev queries the prev edge of a Node. func (c *NodeClient) QueryPrev(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} - id := n.ID - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, id), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), - ) - query.sql = sqlgraph.Neighbors(n.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := n.ID + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, id), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), + ) + fromV = sqlgraph.Neighbors(n.driver.Dialect(), step) + return fromV, nil + } return query } // QueryNext queries the next edge of a Node. func (c *NodeClient) QueryNext(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} - id := n.ID - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, id), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), - ) - query.sql = sqlgraph.Neighbors(n.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := n.ID + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, id), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), + ) + fromV = sqlgraph.Neighbors(n.driver.Dialect(), step) + return fromV, nil + } return query } @@ -1165,28 +1189,32 @@ func (c *PetClient) GetX(ctx context.Context, id int) *Pet { // QueryTeam queries the team edge of a Pet. func (c *PetClient) QueryTeam(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, pet.TeamTable, pet.TeamColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, pet.TeamTable, pet.TeamColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } // QueryOwner queries the owner edge of a Pet. func (c *PetClient) QueryOwner(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } @@ -1276,14 +1304,16 @@ func (c *SpecClient) GetX(ctx context.Context, id int) *Spec { // QueryCard queries the card edge of a Spec. func (c *SpecClient) QueryCard(s *Spec) *CardQuery { query := &CardQuery{config: c.config} - id := s.ID - step := sqlgraph.NewStep( - sqlgraph.From(spec.Table, spec.FieldID, id), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, spec.CardTable, spec.CardPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(s.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := s.ID + step := sqlgraph.NewStep( + sqlgraph.From(spec.Table, spec.FieldID, id), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, spec.CardTable, spec.CardPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(s.driver.Dialect(), step) + return fromV, nil + } return query } @@ -1373,154 +1403,176 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryCard queries the card edge of a User. func (c *UserClient) QueryCard(u *User) *CardQuery { query := &CardQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryPets queries the pets edge of a User. func (c *UserClient) QueryPets(u *User) *PetQuery { query := &PetQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFiles queries the files edge of a User. func (c *UserClient) QueryFiles(u *User) *FileQuery { query := &FileQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(file.Table, file.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.FilesTable, user.FilesColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(file.Table, file.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.FilesTable, user.FilesColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryGroups queries the groups edge of a User. func (c *UserClient) QueryGroups(u *User) *GroupQuery { query := &GroupQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFriends queries the friends edge of a User. func (c *UserClient) QueryFriends(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFollowers queries the followers edge of a User. func (c *UserClient) QueryFollowers(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFollowing queries the following edge of a User. func (c *UserClient) QueryFollowing(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryTeam queries the team edge of a User. func (c *UserClient) QueryTeam(u *User) *PetQuery { query := &PetQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.TeamTable, user.TeamColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.TeamTable, user.TeamColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QuerySpouse queries the spouse edge of a User. func (c *UserClient) QuerySpouse(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryChildren queries the children edge of a User. func (c *UserClient) QueryChildren(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, true, user.ChildrenTable, user.ChildrenColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, true, user.ChildrenTable, user.ChildrenColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryParent queries the parent edge of a User. func (c *UserClient) QueryParent(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, user.ParentTable, user.ParentColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, user.ParentTable, user.ParentColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index 1da4399ea..60321b8b7 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -27,8 +27,9 @@ type CommentQuery struct { order []Order unique []string predicates []predicate.Comment - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (cq *CommentQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Comments. func (cq *CommentQuery) All(ctx context.Context) ([]*Comment, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (cq *CommentQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CommentQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (cq *CommentQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CommentQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (cq *CommentQuery) Clone() *CommentQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Comment{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -242,7 +253,12 @@ func (cq *CommentQuery) Clone() *CommentQuery { func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy { group := &CommentGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -261,10 +277,27 @@ func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy func (cq *CommentQuery) Select(field string, fields ...string) *CommentSelect { selector := &CommentSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CommentQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CommentQuery) sqlAll(ctx context.Context) ([]*Comment, error) { var ( nodes = []*Comment{} @@ -371,8 +404,9 @@ type CommentGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -383,6 +417,11 @@ func (cgb *CommentGroupBy) Aggregate(fns ...Aggregate) *CommentGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CommentGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -501,12 +540,18 @@ func (cgb *CommentGroupBy) sqlQuery() *sql.Selector { type CommentSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CommentSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index e00d058e6..56db00607 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -27,8 +27,9 @@ type FieldTypeQuery struct { order []Order unique []string predicates []predicate.FieldType - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (ftq *FieldTypeQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of FieldTypes. func (ftq *FieldTypeQuery) All(ctx context.Context) ([]*FieldType, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } return ftq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (ftq *FieldTypeQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (ftq *FieldTypeQuery) Count(ctx context.Context) (int, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return 0, err + } return ftq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (ftq *FieldTypeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (ftq *FieldTypeQuery) Exist(ctx context.Context) (bool, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return false, err + } return ftq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { unique: append([]string{}, ftq.unique...), predicates: append([]predicate.FieldType{}, ftq.predicates...), // clone intermediate query. - sql: ftq.sql.Clone(), + sql: ftq.sql.Clone(), + path: ftq.path, } } @@ -242,7 +253,12 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGroupBy { group := &FieldTypeGroupBy{config: ftq.config} group.fields = append([]string{field}, fields...) - group.sql = ftq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.sqlQuery(), nil + } return group } @@ -261,10 +277,27 @@ func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGro func (ftq *FieldTypeQuery) Select(field string, fields ...string) *FieldTypeSelect { selector := &FieldTypeSelect{config: ftq.config} selector.fields = append([]string{field}, fields...) - selector.sql = ftq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.sqlQuery(), nil + } return selector } +func (ftq *FieldTypeQuery) prepareQuery(ctx context.Context) error { + if ftq.path != nil { + prev, err := ftq.path(ctx) + if err != nil { + return err + } + ftq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (ftq *FieldTypeQuery) sqlAll(ctx context.Context) ([]*FieldType, error) { var ( nodes = []*FieldType{} @@ -371,8 +404,9 @@ type FieldTypeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -383,6 +417,11 @@ func (ftgb *FieldTypeGroupBy) Aggregate(fns ...Aggregate) *FieldTypeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ftgb *FieldTypeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ftgb.path(ctx) + if err != nil { + return err + } + ftgb.sql = query return ftgb.sqlScan(ctx, v) } @@ -501,12 +540,18 @@ func (ftgb *FieldTypeGroupBy) sqlQuery() *sql.Selector { type FieldTypeSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (fts *FieldTypeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := fts.path(ctx) + if err != nil { + return err + } + fts.sql = query return fts.sqlScan(ctx, v) } diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index d77d3d924..2428981b8 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -33,8 +33,9 @@ type FileQuery struct { withOwner *UserQuery withType *FileTypeQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -64,24 +65,36 @@ func (fq *FileQuery) Order(o ...Order) *FileQuery { // QueryOwner chains the current query on the owner edge. func (fq *FileQuery) QueryOwner() *UserQuery { query := &UserQuery{config: fq.config} - step := sqlgraph.NewStep( - sqlgraph.From(file.Table, file.FieldID, fq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, file.OwnerTable, file.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(fq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(file.Table, file.FieldID, fq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, file.OwnerTable, file.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(fq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryType chains the current query on the type edge. func (fq *FileQuery) QueryType() *FileTypeQuery { query := &FileTypeQuery{config: fq.config} - step := sqlgraph.NewStep( - sqlgraph.From(file.Table, file.FieldID, fq.sqlQuery()), - sqlgraph.To(filetype.Table, filetype.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, file.TypeTable, file.TypeColumn), - ) - query.sql = sqlgraph.SetNeighbors(fq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(file.Table, file.FieldID, fq.sqlQuery()), + sqlgraph.To(filetype.Table, filetype.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, file.TypeTable, file.TypeColumn), + ) + fromU = sqlgraph.SetNeighbors(fq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -181,6 +194,9 @@ func (fq *FileQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Files. func (fq *FileQuery) All(ctx context.Context) ([]*File, error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } return fq.sqlAll(ctx) } @@ -213,6 +229,9 @@ func (fq *FileQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (fq *FileQuery) Count(ctx context.Context) (int, error) { + if err := fq.prepareQuery(ctx); err != nil { + return 0, err + } return fq.sqlCount(ctx) } @@ -227,6 +246,9 @@ func (fq *FileQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (fq *FileQuery) Exist(ctx context.Context) (bool, error) { + if err := fq.prepareQuery(ctx); err != nil { + return false, err + } return fq.sqlExist(ctx) } @@ -250,7 +272,8 @@ func (fq *FileQuery) Clone() *FileQuery { unique: append([]string{}, fq.unique...), predicates: append([]predicate.File{}, fq.predicates...), // clone intermediate query. - sql: fq.sql.Clone(), + sql: fq.sql.Clone(), + path: fq.path, } } @@ -294,7 +317,12 @@ func (fq *FileQuery) WithType(opts ...func(*FileTypeQuery)) *FileQuery { func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { group := &FileGroupBy{config: fq.config} group.fields = append([]string{field}, fields...) - group.sql = fq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + return fq.sqlQuery(), nil + } return group } @@ -313,10 +341,27 @@ func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { func (fq *FileQuery) Select(field string, fields ...string) *FileSelect { selector := &FileSelect{config: fq.config} selector.fields = append([]string{field}, fields...) - selector.sql = fq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + return fq.sqlQuery(), nil + } return selector } +func (fq *FileQuery) prepareQuery(ctx context.Context) error { + if fq.path != nil { + prev, err := fq.path(ctx) + if err != nil { + return err + } + fq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (fq *FileQuery) sqlAll(ctx context.Context) ([]*File, error) { var ( nodes = []*File{} @@ -489,8 +534,9 @@ type FileGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -501,6 +547,11 @@ func (fgb *FileGroupBy) Aggregate(fns ...Aggregate) *FileGroupBy { // Scan applies the group-by query and scan the result into the given value. func (fgb *FileGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := fgb.path(ctx) + if err != nil { + return err + } + fgb.sql = query return fgb.sqlScan(ctx, v) } @@ -619,12 +670,18 @@ func (fgb *FileGroupBy) sqlQuery() *sql.Selector { type FileSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (fs *FileSelect) Scan(ctx context.Context, v interface{}) error { + query, err := fs.path(ctx) + if err != nil { + return err + } + fs.sql = query return fs.sqlScan(ctx, v) } diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index a5b790a5f..c11e7ead1 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -31,8 +31,9 @@ type FileTypeQuery struct { predicates []predicate.FileType // eager-loading edges. withFiles *FileQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (ftq *FileTypeQuery) Order(o ...Order) *FileTypeQuery { // QueryFiles chains the current query on the files edge. func (ftq *FileTypeQuery) QueryFiles() *FileQuery { query := &FileQuery{config: ftq.config} - step := sqlgraph.NewStep( - sqlgraph.From(filetype.Table, filetype.FieldID, ftq.sqlQuery()), - sqlgraph.To(file.Table, file.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, filetype.FilesTable, filetype.FilesColumn), - ) - query.sql = sqlgraph.SetNeighbors(ftq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(filetype.Table, filetype.FieldID, ftq.sqlQuery()), + sqlgraph.To(file.Table, file.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, filetype.FilesTable, filetype.FilesColumn), + ) + fromU = sqlgraph.SetNeighbors(ftq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (ftq *FileTypeQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of FileTypes. func (ftq *FileTypeQuery) All(ctx context.Context) ([]*FileType, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } return ftq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (ftq *FileTypeQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (ftq *FileTypeQuery) Count(ctx context.Context) (int, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return 0, err + } return ftq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (ftq *FileTypeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (ftq *FileTypeQuery) Exist(ctx context.Context) (bool, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return false, err + } return ftq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (ftq *FileTypeQuery) Clone() *FileTypeQuery { unique: append([]string{}, ftq.unique...), predicates: append([]predicate.FileType{}, ftq.predicates...), // clone intermediate query. - sql: ftq.sql.Clone(), + sql: ftq.sql.Clone(), + path: ftq.path, } } @@ -269,7 +286,12 @@ func (ftq *FileTypeQuery) WithFiles(opts ...func(*FileQuery)) *FileTypeQuery { func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroupBy { group := &FileTypeGroupBy{config: ftq.config} group.fields = append([]string{field}, fields...) - group.sql = ftq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroup func (ftq *FileTypeQuery) Select(field string, fields ...string) *FileTypeSelect { selector := &FileTypeSelect{config: ftq.config} selector.fields = append([]string{field}, fields...) - selector.sql = ftq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.sqlQuery(), nil + } return selector } +func (ftq *FileTypeQuery) prepareQuery(ctx context.Context) error { + if ftq.path != nil { + prev, err := ftq.path(ctx) + if err != nil { + return err + } + ftq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (ftq *FileTypeQuery) sqlAll(ctx context.Context) ([]*FileType, error) { var ( nodes = []*FileType{} @@ -431,8 +470,9 @@ type FileTypeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -443,6 +483,11 @@ func (ftgb *FileTypeGroupBy) Aggregate(fns ...Aggregate) *FileTypeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ftgb *FileTypeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ftgb.path(ctx) + if err != nil { + return err + } + ftgb.sql = query return ftgb.sqlScan(ctx, v) } @@ -561,12 +606,18 @@ func (ftgb *FileTypeGroupBy) sqlQuery() *sql.Selector { type FileTypeSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (fts *FileTypeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := fts.path(ctx) + if err != nil { + return err + } + fts.sql = query return fts.sqlScan(ctx, v) } diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index 04aff2642..5672119d1 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -37,8 +37,9 @@ type GroupQuery struct { withUsers *UserQuery withInfo *GroupInfoQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -68,48 +69,72 @@ func (gq *GroupQuery) Order(o ...Order) *GroupQuery { // QueryFiles chains the current query on the files edge. func (gq *GroupQuery) QueryFiles() *FileQuery { query := &FileQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(file.Table, file.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, group.FilesTable, group.FilesColumn), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(file.Table, file.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, group.FilesTable, group.FilesColumn), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryBlocked chains the current query on the blocked edge. func (gq *GroupQuery) QueryBlocked() *UserQuery { query := &UserQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, group.BlockedTable, group.BlockedColumn), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, group.BlockedTable, group.BlockedColumn), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryUsers chains the current query on the users edge. func (gq *GroupQuery) QueryUsers() *UserQuery { query := &UserQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, group.UsersTable, group.UsersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryInfo chains the current query on the info edge. func (gq *GroupQuery) QueryInfo() *GroupInfoQuery { query := &GroupInfoQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(groupinfo.Table, groupinfo.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, group.InfoTable, group.InfoColumn), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(groupinfo.Table, groupinfo.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, group.InfoTable, group.InfoColumn), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -209,6 +234,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.sqlAll(ctx) } @@ -241,6 +269,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.sqlCount(ctx) } @@ -255,6 +286,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.sqlExist(ctx) } @@ -278,7 +312,8 @@ func (gq *GroupQuery) Clone() *GroupQuery { unique: append([]string{}, gq.unique...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), + sql: gq.sql.Clone(), + path: gq.path, } } @@ -344,7 +379,12 @@ func (gq *GroupQuery) WithInfo(opts ...func(*GroupInfoQuery)) *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.sql = gq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return group } @@ -363,10 +403,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.sql = gq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) { var ( nodes = []*Group{} @@ -635,8 +692,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -647,6 +705,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.sql = query return ggb.sqlScan(ctx, v) } @@ -765,12 +828,18 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { type GroupSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.sql = query return gs.sqlScan(ctx, v) } diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index ce44e2dc1..6ac2022d3 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -31,8 +31,9 @@ type GroupInfoQuery struct { predicates []predicate.GroupInfo // eager-loading edges. withGroups *GroupQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (giq *GroupInfoQuery) Order(o ...Order) *GroupInfoQuery { // QueryGroups chains the current query on the groups edge. func (giq *GroupInfoQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: giq.config} - step := sqlgraph.NewStep( - sqlgraph.From(groupinfo.Table, groupinfo.FieldID, giq.sqlQuery()), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.O2M, true, groupinfo.GroupsTable, groupinfo.GroupsColumn), - ) - query.sql = sqlgraph.SetNeighbors(giq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(groupinfo.Table, groupinfo.FieldID, giq.sqlQuery()), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.O2M, true, groupinfo.GroupsTable, groupinfo.GroupsColumn), + ) + fromU = sqlgraph.SetNeighbors(giq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (giq *GroupInfoQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of GroupInfos. func (giq *GroupInfoQuery) All(ctx context.Context) ([]*GroupInfo, error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } return giq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (giq *GroupInfoQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (giq *GroupInfoQuery) Count(ctx context.Context) (int, error) { + if err := giq.prepareQuery(ctx); err != nil { + return 0, err + } return giq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (giq *GroupInfoQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (giq *GroupInfoQuery) Exist(ctx context.Context) (bool, error) { + if err := giq.prepareQuery(ctx); err != nil { + return false, err + } return giq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (giq *GroupInfoQuery) Clone() *GroupInfoQuery { unique: append([]string{}, giq.unique...), predicates: append([]predicate.GroupInfo{}, giq.predicates...), // clone intermediate query. - sql: giq.sql.Clone(), + sql: giq.sql.Clone(), + path: giq.path, } } @@ -269,7 +286,12 @@ func (giq *GroupInfoQuery) WithGroups(opts ...func(*GroupQuery)) *GroupInfoQuery func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGroupBy { group := &GroupInfoGroupBy{config: giq.config} group.fields = append([]string{field}, fields...) - group.sql = giq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } + return giq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGro func (giq *GroupInfoQuery) Select(field string, fields ...string) *GroupInfoSelect { selector := &GroupInfoSelect{config: giq.config} selector.fields = append([]string{field}, fields...) - selector.sql = giq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } + return giq.sqlQuery(), nil + } return selector } +func (giq *GroupInfoQuery) prepareQuery(ctx context.Context) error { + if giq.path != nil { + prev, err := giq.path(ctx) + if err != nil { + return err + } + giq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (giq *GroupInfoQuery) sqlAll(ctx context.Context) ([]*GroupInfo, error) { var ( nodes = []*GroupInfo{} @@ -431,8 +470,9 @@ type GroupInfoGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -443,6 +483,11 @@ func (gigb *GroupInfoGroupBy) Aggregate(fns ...Aggregate) *GroupInfoGroupBy { // Scan applies the group-by query and scan the result into the given value. func (gigb *GroupInfoGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := gigb.path(ctx) + if err != nil { + return err + } + gigb.sql = query return gigb.sqlScan(ctx, v) } @@ -561,12 +606,18 @@ func (gigb *GroupInfoGroupBy) sqlQuery() *sql.Selector { type GroupInfoSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gis *GroupInfoSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gis.path(ctx) + if err != nil { + return err + } + gis.sql = query return gis.sqlScan(ctx, v) } diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index 517e2db68..8d97fe745 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -27,8 +27,9 @@ type ItemQuery struct { order []Order unique []string predicates []predicate.Item - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (iq *ItemQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Items. func (iq *ItemQuery) All(ctx context.Context) ([]*Item, error) { + if err := iq.prepareQuery(ctx); err != nil { + return nil, err + } return iq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (iq *ItemQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (iq *ItemQuery) Count(ctx context.Context) (int, error) { + if err := iq.prepareQuery(ctx); err != nil { + return 0, err + } return iq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (iq *ItemQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (iq *ItemQuery) Exist(ctx context.Context) (bool, error) { + if err := iq.prepareQuery(ctx); err != nil { + return false, err + } return iq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (iq *ItemQuery) Clone() *ItemQuery { unique: append([]string{}, iq.unique...), predicates: append([]predicate.Item{}, iq.predicates...), // clone intermediate query. - sql: iq.sql.Clone(), + sql: iq.sql.Clone(), + path: iq.path, } } @@ -229,7 +240,12 @@ func (iq *ItemQuery) Clone() *ItemQuery { func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { group := &ItemGroupBy{config: iq.config} group.fields = append([]string{field}, fields...) - group.sql = iq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := iq.prepareQuery(ctx); err != nil { + return nil, err + } + return iq.sqlQuery(), nil + } return group } @@ -237,10 +253,27 @@ func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { func (iq *ItemQuery) Select(field string, fields ...string) *ItemSelect { selector := &ItemSelect{config: iq.config} selector.fields = append([]string{field}, fields...) - selector.sql = iq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := iq.prepareQuery(ctx); err != nil { + return nil, err + } + return iq.sqlQuery(), nil + } return selector } +func (iq *ItemQuery) prepareQuery(ctx context.Context) error { + if iq.path != nil { + prev, err := iq.path(ctx) + if err != nil { + return err + } + iq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (iq *ItemQuery) sqlAll(ctx context.Context) ([]*Item, error) { var ( nodes = []*Item{} @@ -347,8 +380,9 @@ type ItemGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -359,6 +393,11 @@ func (igb *ItemGroupBy) Aggregate(fns ...Aggregate) *ItemGroupBy { // Scan applies the group-by query and scan the result into the given value. func (igb *ItemGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := igb.path(ctx) + if err != nil { + return err + } + igb.sql = query return igb.sqlScan(ctx, v) } @@ -477,12 +516,18 @@ func (igb *ItemGroupBy) sqlQuery() *sql.Selector { type ItemSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (is *ItemSelect) Scan(ctx context.Context, v interface{}) error { + query, err := is.path(ctx) + if err != nil { + return err + } + is.sql = query return is.sqlScan(ctx, v) } diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index e62c39fd1..9427aba1d 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -32,8 +32,9 @@ type NodeQuery struct { withPrev *NodeQuery withNext *NodeQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -63,24 +64,36 @@ func (nq *NodeQuery) Order(o ...Order) *NodeQuery { // QueryPrev chains the current query on the prev edge. func (nq *NodeQuery) QueryPrev() *NodeQuery { query := &NodeQuery{config: nq.config} - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), - ) - query.sql = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), + ) + fromU = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryNext chains the current query on the next edge. func (nq *NodeQuery) QueryNext() *NodeQuery { query := &NodeQuery{config: nq.config} - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), - ) - query.sql = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), + ) + fromU = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -180,6 +193,9 @@ func (nq *NodeQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Nodes. func (nq *NodeQuery) All(ctx context.Context) ([]*Node, error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } return nq.sqlAll(ctx) } @@ -212,6 +228,9 @@ func (nq *NodeQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (nq *NodeQuery) Count(ctx context.Context) (int, error) { + if err := nq.prepareQuery(ctx); err != nil { + return 0, err + } return nq.sqlCount(ctx) } @@ -226,6 +245,9 @@ func (nq *NodeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (nq *NodeQuery) Exist(ctx context.Context) (bool, error) { + if err := nq.prepareQuery(ctx); err != nil { + return false, err + } return nq.sqlExist(ctx) } @@ -249,7 +271,8 @@ func (nq *NodeQuery) Clone() *NodeQuery { unique: append([]string{}, nq.unique...), predicates: append([]predicate.Node{}, nq.predicates...), // clone intermediate query. - sql: nq.sql.Clone(), + sql: nq.sql.Clone(), + path: nq.path, } } @@ -293,7 +316,12 @@ func (nq *NodeQuery) WithNext(opts ...func(*NodeQuery)) *NodeQuery { func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { group := &NodeGroupBy{config: nq.config} group.fields = append([]string{field}, fields...) - group.sql = nq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.sqlQuery(), nil + } return group } @@ -312,10 +340,27 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { func (nq *NodeQuery) Select(field string, fields ...string) *NodeSelect { selector := &NodeSelect{config: nq.config} selector.fields = append([]string{field}, fields...) - selector.sql = nq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.sqlQuery(), nil + } return selector } +func (nq *NodeQuery) prepareQuery(ctx context.Context) error { + if nq.path != nil { + prev, err := nq.path(ctx) + if err != nil { + return err + } + nq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (nq *NodeQuery) sqlAll(ctx context.Context) ([]*Node, error) { var ( nodes = []*Node{} @@ -491,8 +536,9 @@ type NodeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -503,6 +549,11 @@ func (ngb *NodeGroupBy) Aggregate(fns ...Aggregate) *NodeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ngb *NodeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ngb.path(ctx) + if err != nil { + return err + } + ngb.sql = query return ngb.sqlScan(ctx, v) } @@ -621,12 +672,18 @@ func (ngb *NodeGroupBy) sqlQuery() *sql.Selector { type NodeSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ns *NodeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ns.path(ctx) + if err != nil { + return err + } + ns.sql = query return ns.sqlScan(ctx, v) } diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index 9b3e1272e..f3d786389 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -32,8 +32,9 @@ type PetQuery struct { withTeam *UserQuery withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -63,24 +64,36 @@ func (pq *PetQuery) Order(o ...Order) *PetQuery { // QueryTeam chains the current query on the team edge. func (pq *PetQuery) QueryTeam() *UserQuery { query := &UserQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, pet.TeamTable, pet.TeamColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, pet.TeamTable, pet.TeamColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryOwner chains the current query on the owner edge. func (pq *PetQuery) QueryOwner() *UserQuery { query := &UserQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -180,6 +193,9 @@ func (pq *PetQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Pets. func (pq *PetQuery) All(ctx context.Context) ([]*Pet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.sqlAll(ctx) } @@ -212,6 +228,9 @@ func (pq *PetQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (pq *PetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.sqlCount(ctx) } @@ -226,6 +245,9 @@ func (pq *PetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.sqlExist(ctx) } @@ -249,7 +271,8 @@ func (pq *PetQuery) Clone() *PetQuery { unique: append([]string{}, pq.unique...), predicates: append([]predicate.Pet{}, pq.predicates...), // clone intermediate query. - sql: pq.sql.Clone(), + sql: pq.sql.Clone(), + path: pq.path, } } @@ -293,7 +316,12 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { group := &PetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.sql = pq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return group } @@ -312,10 +340,27 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { func (pq *PetQuery) Select(field string, fields ...string) *PetSelect { selector := &PetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.sql = pq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return selector } +func (pq *PetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) { var ( nodes = []*Pet{} @@ -488,8 +533,9 @@ type PetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -500,6 +546,11 @@ func (pgb *PetGroupBy) Aggregate(fns ...Aggregate) *PetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.sql = query return pgb.sqlScan(ctx, v) } @@ -618,12 +669,18 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { type PetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.sql = query return ps.sqlScan(ctx, v) } diff --git a/entc/integration/ent/spec_query.go b/entc/integration/ent/spec_query.go index 301054f2c..3cfadfffe 100644 --- a/entc/integration/ent/spec_query.go +++ b/entc/integration/ent/spec_query.go @@ -31,8 +31,9 @@ type SpecQuery struct { predicates []predicate.Spec // eager-loading edges. withCard *CardQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (sq *SpecQuery) Order(o ...Order) *SpecQuery { // QueryCard chains the current query on the card edge. func (sq *SpecQuery) QueryCard() *CardQuery { query := &CardQuery{config: sq.config} - step := sqlgraph.NewStep( - sqlgraph.From(spec.Table, spec.FieldID, sq.sqlQuery()), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, spec.CardTable, spec.CardPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(sq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(spec.Table, spec.FieldID, sq.sqlQuery()), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, spec.CardTable, spec.CardPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(sq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (sq *SpecQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Specs. func (sq *SpecQuery) All(ctx context.Context) ([]*Spec, error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } return sq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (sq *SpecQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (sq *SpecQuery) Count(ctx context.Context) (int, error) { + if err := sq.prepareQuery(ctx); err != nil { + return 0, err + } return sq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (sq *SpecQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (sq *SpecQuery) Exist(ctx context.Context) (bool, error) { + if err := sq.prepareQuery(ctx); err != nil { + return false, err + } return sq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (sq *SpecQuery) Clone() *SpecQuery { unique: append([]string{}, sq.unique...), predicates: append([]predicate.Spec{}, sq.predicates...), // clone intermediate query. - sql: sq.sql.Clone(), + sql: sq.sql.Clone(), + path: sq.path, } } @@ -256,7 +273,12 @@ func (sq *SpecQuery) WithCard(opts ...func(*CardQuery)) *SpecQuery { func (sq *SpecQuery) GroupBy(field string, fields ...string) *SpecGroupBy { group := &SpecGroupBy{config: sq.config} group.fields = append([]string{field}, fields...) - group.sql = sq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + return sq.sqlQuery(), nil + } return group } @@ -264,10 +286,27 @@ func (sq *SpecQuery) GroupBy(field string, fields ...string) *SpecGroupBy { func (sq *SpecQuery) Select(field string, fields ...string) *SpecSelect { selector := &SpecSelect{config: sq.config} selector.fields = append([]string{field}, fields...) - selector.sql = sq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + return sq.sqlQuery(), nil + } return selector } +func (sq *SpecQuery) prepareQuery(ctx context.Context) error { + if sq.path != nil { + prev, err := sq.path(ctx) + if err != nil { + return err + } + sq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (sq *SpecQuery) sqlAll(ctx context.Context) ([]*Spec, error) { var ( nodes = []*Spec{} @@ -442,8 +481,9 @@ type SpecGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -454,6 +494,11 @@ func (sgb *SpecGroupBy) Aggregate(fns ...Aggregate) *SpecGroupBy { // Scan applies the group-by query and scan the result into the given value. func (sgb *SpecGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := sgb.path(ctx) + if err != nil { + return err + } + sgb.sql = query return sgb.sqlScan(ctx, v) } @@ -572,12 +617,18 @@ func (sgb *SpecGroupBy) sqlQuery() *sql.Selector { type SpecSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ss *SpecSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ss.path(ctx) + if err != nil { + return err + } + ss.sql = query return ss.sqlScan(ctx, v) } diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index bde236d4b..9d7dcfb9b 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -45,8 +45,9 @@ type UserQuery struct { withChildren *UserQuery withParent *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -76,132 +77,198 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryCard chains the current query on the card edge. func (uq *UserQuery) QueryCard() *CardQuery { query := &CardQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryPets chains the current query on the pets edge. func (uq *UserQuery) QueryPets() *PetQuery { query := &PetQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFiles chains the current query on the files edge. func (uq *UserQuery) QueryFiles() *FileQuery { query := &FileQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(file.Table, file.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.FilesTable, user.FilesColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(file.Table, file.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.FilesTable, user.FilesColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryGroups chains the current query on the groups edge. func (uq *UserQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFriends chains the current query on the friends edge. func (uq *UserQuery) QueryFriends() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFollowers chains the current query on the followers edge. func (uq *UserQuery) QueryFollowers() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFollowing chains the current query on the following edge. func (uq *UserQuery) QueryFollowing() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryTeam chains the current query on the team edge. func (uq *UserQuery) QueryTeam() *PetQuery { query := &PetQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.TeamTable, user.TeamColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.TeamTable, user.TeamColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QuerySpouse chains the current query on the spouse edge. func (uq *UserQuery) QuerySpouse() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryChildren chains the current query on the children edge. func (uq *UserQuery) QueryChildren() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, true, user.ChildrenTable, user.ChildrenColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, true, user.ChildrenTable, user.ChildrenColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryParent chains the current query on the parent edge. func (uq *UserQuery) QueryParent() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, user.ParentTable, user.ParentColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, user.ParentTable, user.ParentColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -301,6 +368,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -333,6 +403,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -347,6 +420,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -370,7 +446,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -513,7 +590,12 @@ func (uq *UserQuery) WithParent(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -532,10 +614,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -1109,8 +1208,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -1121,6 +1221,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -1239,12 +1344,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/card_query.go b/entc/integration/gremlin/ent/card_query.go index c262d9eed..d3f308d13 100644 --- a/entc/integration/gremlin/ent/card_query.go +++ b/entc/integration/gremlin/ent/card_query.go @@ -32,8 +32,9 @@ type CardQuery struct { // eager-loading edges. withOwner *UserQuery withSpec *SpecQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -63,16 +64,28 @@ func (cq *CardQuery) Order(o ...Order) *CardQuery { // QueryOwner chains the current query on the owner edge. func (cq *CardQuery) QueryOwner() *UserQuery { query := &UserQuery{config: cq.config} - gremlin := cq.gremlinQuery() - query.gremlin = gremlin.InE(user.CardLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := cq.gremlinQuery() + fromU = gremlin.InE(user.CardLabel).OutV() + return fromU, nil + } return query } // QuerySpec chains the current query on the spec edge. func (cq *CardQuery) QuerySpec() *SpecQuery { query := &SpecQuery{config: cq.config} - gremlin := cq.gremlinQuery() - query.gremlin = gremlin.InE(spec.CardLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := cq.gremlinQuery() + fromU = gremlin.InE(spec.CardLabel).OutV() + return fromU, nil + } return query } @@ -172,6 +185,9 @@ func (cq *CardQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Cards. func (cq *CardQuery) All(ctx context.Context) ([]*Card, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.gremlinAll(ctx) } @@ -204,6 +220,9 @@ func (cq *CardQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (cq *CardQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.gremlinCount(ctx) } @@ -218,6 +237,9 @@ func (cq *CardQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CardQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.gremlinExist(ctx) } @@ -242,6 +264,7 @@ func (cq *CardQuery) Clone() *CardQuery { predicates: append([]predicate.Card{}, cq.predicates...), // clone intermediate query. gremlin: cq.gremlin.Clone(), + path: cq.path, } } @@ -285,7 +308,12 @@ func (cq *CardQuery) WithSpec(opts ...func(*SpecQuery)) *CardQuery { func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { group := &CardGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.gremlin = cq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.gremlinQuery(), nil + } return group } @@ -304,10 +332,27 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { func (cq *CardQuery) Select(field string, fields ...string) *CardSelect { selector := &CardSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = cq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.gremlinQuery(), nil + } return selector } +func (cq *CardQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CardQuery) gremlinAll(ctx context.Context) ([]*Card, error) { res := &gremlin.Response{} query, bindings := cq.gremlinQuery().ValueMap(true).Query() @@ -373,8 +418,9 @@ type CardGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -385,6 +431,11 @@ func (cgb *CardGroupBy) Aggregate(fns ...Aggregate) *CardGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CardGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.gremlin = query return cgb.gremlinScan(ctx, v) } @@ -520,12 +571,18 @@ func (cgb *CardGroupBy) gremlinQuery() *dsl.Traversal { type CardSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CardSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.gremlin = query return cs.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/client.go b/entc/integration/gremlin/ent/client.go index 1271951ee..7636c6d5a 100644 --- a/entc/integration/gremlin/ent/client.go +++ b/entc/integration/gremlin/ent/client.go @@ -27,6 +27,7 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/gremlin" + "github.com/facebookincubator/ent/dialect/gremlin/graph/dsl" "github.com/facebookincubator/ent/dialect/gremlin/graph/dsl/g" ) @@ -255,18 +256,22 @@ func (c *CardClient) GetX(ctx context.Context, id string) *Card { // QueryOwner queries the owner edge of a Card. func (c *CardClient) QueryOwner(ca *Card) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(ca.ID).InE(user.CardLabel).OutV() - + fromV = g.V(ca.ID).InE(user.CardLabel).OutV() + return fromV, nil + } return query } // QuerySpec queries the spec edge of a Card. func (c *CardClient) QuerySpec(ca *Card) *SpecQuery { query := &SpecQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(ca.ID).InE(spec.CardLabel).OutV() - + fromV = g.V(ca.ID).InE(spec.CardLabel).OutV() + return fromV, nil + } return query } @@ -522,18 +527,22 @@ func (c *FileClient) GetX(ctx context.Context, id string) *File { // QueryOwner queries the owner edge of a File. func (c *FileClient) QueryOwner(f *File) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(f.ID).InE(user.FilesLabel).OutV() - + fromV = g.V(f.ID).InE(user.FilesLabel).OutV() + return fromV, nil + } return query } // QueryType queries the type edge of a File. func (c *FileClient) QueryType(f *File) *FileTypeQuery { query := &FileTypeQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(f.ID).InE(filetype.FilesLabel).OutV() - + fromV = g.V(f.ID).InE(filetype.FilesLabel).OutV() + return fromV, nil + } return query } @@ -623,9 +632,11 @@ func (c *FileTypeClient) GetX(ctx context.Context, id string) *FileType { // QueryFiles queries the files edge of a FileType. func (c *FileTypeClient) QueryFiles(ft *FileType) *FileQuery { query := &FileQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(ft.ID).OutE(filetype.FilesLabel).InV() - + fromV = g.V(ft.ID).OutE(filetype.FilesLabel).InV() + return fromV, nil + } return query } @@ -715,36 +726,44 @@ func (c *GroupClient) GetX(ctx context.Context, id string) *Group { // QueryFiles queries the files edge of a Group. func (c *GroupClient) QueryFiles(gr *Group) *FileQuery { query := &FileQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(gr.ID).OutE(group.FilesLabel).InV() - + fromV = g.V(gr.ID).OutE(group.FilesLabel).InV() + return fromV, nil + } return query } // QueryBlocked queries the blocked edge of a Group. func (c *GroupClient) QueryBlocked(gr *Group) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(gr.ID).OutE(group.BlockedLabel).InV() - + fromV = g.V(gr.ID).OutE(group.BlockedLabel).InV() + return fromV, nil + } return query } // QueryUsers queries the users edge of a Group. func (c *GroupClient) QueryUsers(gr *Group) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(gr.ID).InE(user.GroupsLabel).OutV() - + fromV = g.V(gr.ID).InE(user.GroupsLabel).OutV() + return fromV, nil + } return query } // QueryInfo queries the info edge of a Group. func (c *GroupClient) QueryInfo(gr *Group) *GroupInfoQuery { query := &GroupInfoQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(gr.ID).OutE(group.InfoLabel).InV() - + fromV = g.V(gr.ID).OutE(group.InfoLabel).InV() + return fromV, nil + } return query } @@ -834,9 +853,11 @@ func (c *GroupInfoClient) GetX(ctx context.Context, id string) *GroupInfo { // QueryGroups queries the groups edge of a GroupInfo. func (c *GroupInfoClient) QueryGroups(gi *GroupInfo) *GroupQuery { query := &GroupQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(gi.ID).InE(group.InfoLabel).OutV() - + fromV = g.V(gi.ID).InE(group.InfoLabel).OutV() + return fromV, nil + } return query } @@ -1009,18 +1030,22 @@ func (c *NodeClient) GetX(ctx context.Context, id string) *Node { // QueryPrev queries the prev edge of a Node. func (c *NodeClient) QueryPrev(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(n.ID).InE(node.NextLabel).OutV() - + fromV = g.V(n.ID).InE(node.NextLabel).OutV() + return fromV, nil + } return query } // QueryNext queries the next edge of a Node. func (c *NodeClient) QueryNext(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(n.ID).OutE(node.NextLabel).InV() - + fromV = g.V(n.ID).OutE(node.NextLabel).InV() + return fromV, nil + } return query } @@ -1110,18 +1135,22 @@ func (c *PetClient) GetX(ctx context.Context, id string) *Pet { // QueryTeam queries the team edge of a Pet. func (c *PetClient) QueryTeam(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(pe.ID).InE(user.TeamLabel).OutV() - + fromV = g.V(pe.ID).InE(user.TeamLabel).OutV() + return fromV, nil + } return query } // QueryOwner queries the owner edge of a Pet. func (c *PetClient) QueryOwner(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(pe.ID).InE(user.PetsLabel).OutV() - + fromV = g.V(pe.ID).InE(user.PetsLabel).OutV() + return fromV, nil + } return query } @@ -1211,9 +1240,11 @@ func (c *SpecClient) GetX(ctx context.Context, id string) *Spec { // QueryCard queries the card edge of a Spec. func (c *SpecClient) QueryCard(s *Spec) *CardQuery { query := &CardQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(s.ID).OutE(spec.CardLabel).InV() - + fromV = g.V(s.ID).OutE(spec.CardLabel).InV() + return fromV, nil + } return query } @@ -1303,99 +1334,121 @@ func (c *UserClient) GetX(ctx context.Context, id string) *User { // QueryCard queries the card edge of a User. func (c *UserClient) QueryCard(u *User) *CardQuery { query := &CardQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).OutE(user.CardLabel).InV() - + fromV = g.V(u.ID).OutE(user.CardLabel).InV() + return fromV, nil + } return query } // QueryPets queries the pets edge of a User. func (c *UserClient) QueryPets(u *User) *PetQuery { query := &PetQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).OutE(user.PetsLabel).InV() - + fromV = g.V(u.ID).OutE(user.PetsLabel).InV() + return fromV, nil + } return query } // QueryFiles queries the files edge of a User. func (c *UserClient) QueryFiles(u *User) *FileQuery { query := &FileQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).OutE(user.FilesLabel).InV() - + fromV = g.V(u.ID).OutE(user.FilesLabel).InV() + return fromV, nil + } return query } // QueryGroups queries the groups edge of a User. func (c *UserClient) QueryGroups(u *User) *GroupQuery { query := &GroupQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).OutE(user.GroupsLabel).InV() - + fromV = g.V(u.ID).OutE(user.GroupsLabel).InV() + return fromV, nil + } return query } // QueryFriends queries the friends edge of a User. func (c *UserClient) QueryFriends(u *User) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).Both(user.FriendsLabel) - + fromV = g.V(u.ID).Both(user.FriendsLabel) + return fromV, nil + } return query } // QueryFollowers queries the followers edge of a User. func (c *UserClient) QueryFollowers(u *User) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).InE(user.FollowingLabel).OutV() - + fromV = g.V(u.ID).InE(user.FollowingLabel).OutV() + return fromV, nil + } return query } // QueryFollowing queries the following edge of a User. func (c *UserClient) QueryFollowing(u *User) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).OutE(user.FollowingLabel).InV() - + fromV = g.V(u.ID).OutE(user.FollowingLabel).InV() + return fromV, nil + } return query } // QueryTeam queries the team edge of a User. func (c *UserClient) QueryTeam(u *User) *PetQuery { query := &PetQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).OutE(user.TeamLabel).InV() - + fromV = g.V(u.ID).OutE(user.TeamLabel).InV() + return fromV, nil + } return query } // QuerySpouse queries the spouse edge of a User. func (c *UserClient) QuerySpouse(u *User) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).Both(user.SpouseLabel) - + fromV = g.V(u.ID).Both(user.SpouseLabel) + return fromV, nil + } return query } // QueryChildren queries the children edge of a User. func (c *UserClient) QueryChildren(u *User) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).InE(user.ParentLabel).OutV() - + fromV = g.V(u.ID).InE(user.ParentLabel).OutV() + return fromV, nil + } return query } // QueryParent queries the parent edge of a User. func (c *UserClient) QueryParent(u *User) *UserQuery { query := &UserQuery{config: c.config} + query.path = func(ctx context.Context) (fromV *dsl.Traversal, _ error) { - query.gremlin = g.V(u.ID).OutE(user.ParentLabel).InV() - + fromV = g.V(u.ID).OutE(user.ParentLabel).InV() + return fromV, nil + } return query } diff --git a/entc/integration/gremlin/ent/comment_query.go b/entc/integration/gremlin/ent/comment_query.go index e2173e486..e56a09afd 100644 --- a/entc/integration/gremlin/ent/comment_query.go +++ b/entc/integration/gremlin/ent/comment_query.go @@ -27,8 +27,9 @@ type CommentQuery struct { order []Order unique []string predicates []predicate.Comment - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (cq *CommentQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Comments. func (cq *CommentQuery) All(ctx context.Context) ([]*Comment, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.gremlinAll(ctx) } @@ -183,6 +187,9 @@ func (cq *CommentQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (cq *CommentQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.gremlinCount(ctx) } @@ -197,6 +204,9 @@ func (cq *CommentQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CommentQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.gremlinExist(ctx) } @@ -221,6 +231,7 @@ func (cq *CommentQuery) Clone() *CommentQuery { predicates: append([]predicate.Comment{}, cq.predicates...), // clone intermediate query. gremlin: cq.gremlin.Clone(), + path: cq.path, } } @@ -242,7 +253,12 @@ func (cq *CommentQuery) Clone() *CommentQuery { func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy { group := &CommentGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.gremlin = cq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.gremlinQuery(), nil + } return group } @@ -261,10 +277,27 @@ func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy func (cq *CommentQuery) Select(field string, fields ...string) *CommentSelect { selector := &CommentSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = cq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.gremlinQuery(), nil + } return selector } +func (cq *CommentQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CommentQuery) gremlinAll(ctx context.Context) ([]*Comment, error) { res := &gremlin.Response{} query, bindings := cq.gremlinQuery().ValueMap(true).Query() @@ -330,8 +363,9 @@ type CommentGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -342,6 +376,11 @@ func (cgb *CommentGroupBy) Aggregate(fns ...Aggregate) *CommentGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CommentGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.gremlin = query return cgb.gremlinScan(ctx, v) } @@ -477,12 +516,18 @@ func (cgb *CommentGroupBy) gremlinQuery() *dsl.Traversal { type CommentSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CommentSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.gremlin = query return cs.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/fieldtype_query.go b/entc/integration/gremlin/ent/fieldtype_query.go index d3e02a53e..14710e055 100644 --- a/entc/integration/gremlin/ent/fieldtype_query.go +++ b/entc/integration/gremlin/ent/fieldtype_query.go @@ -27,8 +27,9 @@ type FieldTypeQuery struct { order []Order unique []string predicates []predicate.FieldType - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (ftq *FieldTypeQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of FieldTypes. func (ftq *FieldTypeQuery) All(ctx context.Context) ([]*FieldType, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } return ftq.gremlinAll(ctx) } @@ -183,6 +187,9 @@ func (ftq *FieldTypeQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (ftq *FieldTypeQuery) Count(ctx context.Context) (int, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return 0, err + } return ftq.gremlinCount(ctx) } @@ -197,6 +204,9 @@ func (ftq *FieldTypeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (ftq *FieldTypeQuery) Exist(ctx context.Context) (bool, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return false, err + } return ftq.gremlinExist(ctx) } @@ -221,6 +231,7 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { predicates: append([]predicate.FieldType{}, ftq.predicates...), // clone intermediate query. gremlin: ftq.gremlin.Clone(), + path: ftq.path, } } @@ -242,7 +253,12 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGroupBy { group := &FieldTypeGroupBy{config: ftq.config} group.fields = append([]string{field}, fields...) - group.gremlin = ftq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.gremlinQuery(), nil + } return group } @@ -261,10 +277,27 @@ func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGro func (ftq *FieldTypeQuery) Select(field string, fields ...string) *FieldTypeSelect { selector := &FieldTypeSelect{config: ftq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = ftq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.gremlinQuery(), nil + } return selector } +func (ftq *FieldTypeQuery) prepareQuery(ctx context.Context) error { + if ftq.path != nil { + prev, err := ftq.path(ctx) + if err != nil { + return err + } + ftq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (ftq *FieldTypeQuery) gremlinAll(ctx context.Context) ([]*FieldType, error) { res := &gremlin.Response{} query, bindings := ftq.gremlinQuery().ValueMap(true).Query() @@ -330,8 +363,9 @@ type FieldTypeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -342,6 +376,11 @@ func (ftgb *FieldTypeGroupBy) Aggregate(fns ...Aggregate) *FieldTypeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ftgb *FieldTypeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ftgb.path(ctx) + if err != nil { + return err + } + ftgb.gremlin = query return ftgb.gremlinScan(ctx, v) } @@ -477,12 +516,18 @@ func (ftgb *FieldTypeGroupBy) gremlinQuery() *dsl.Traversal { type FieldTypeSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (fts *FieldTypeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := fts.path(ctx) + if err != nil { + return err + } + fts.gremlin = query return fts.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/file_query.go b/entc/integration/gremlin/ent/file_query.go index 0843d2f0f..862ce929e 100644 --- a/entc/integration/gremlin/ent/file_query.go +++ b/entc/integration/gremlin/ent/file_query.go @@ -32,8 +32,9 @@ type FileQuery struct { // eager-loading edges. withOwner *UserQuery withType *FileTypeQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -63,16 +64,28 @@ func (fq *FileQuery) Order(o ...Order) *FileQuery { // QueryOwner chains the current query on the owner edge. func (fq *FileQuery) QueryOwner() *UserQuery { query := &UserQuery{config: fq.config} - gremlin := fq.gremlinQuery() - query.gremlin = gremlin.InE(user.FilesLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := fq.gremlinQuery() + fromU = gremlin.InE(user.FilesLabel).OutV() + return fromU, nil + } return query } // QueryType chains the current query on the type edge. func (fq *FileQuery) QueryType() *FileTypeQuery { query := &FileTypeQuery{config: fq.config} - gremlin := fq.gremlinQuery() - query.gremlin = gremlin.InE(filetype.FilesLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := fq.gremlinQuery() + fromU = gremlin.InE(filetype.FilesLabel).OutV() + return fromU, nil + } return query } @@ -172,6 +185,9 @@ func (fq *FileQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Files. func (fq *FileQuery) All(ctx context.Context) ([]*File, error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } return fq.gremlinAll(ctx) } @@ -204,6 +220,9 @@ func (fq *FileQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (fq *FileQuery) Count(ctx context.Context) (int, error) { + if err := fq.prepareQuery(ctx); err != nil { + return 0, err + } return fq.gremlinCount(ctx) } @@ -218,6 +237,9 @@ func (fq *FileQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (fq *FileQuery) Exist(ctx context.Context) (bool, error) { + if err := fq.prepareQuery(ctx); err != nil { + return false, err + } return fq.gremlinExist(ctx) } @@ -242,6 +264,7 @@ func (fq *FileQuery) Clone() *FileQuery { predicates: append([]predicate.File{}, fq.predicates...), // clone intermediate query. gremlin: fq.gremlin.Clone(), + path: fq.path, } } @@ -285,7 +308,12 @@ func (fq *FileQuery) WithType(opts ...func(*FileTypeQuery)) *FileQuery { func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { group := &FileGroupBy{config: fq.config} group.fields = append([]string{field}, fields...) - group.gremlin = fq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + return fq.gremlinQuery(), nil + } return group } @@ -304,10 +332,27 @@ func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { func (fq *FileQuery) Select(field string, fields ...string) *FileSelect { selector := &FileSelect{config: fq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = fq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := fq.prepareQuery(ctx); err != nil { + return nil, err + } + return fq.gremlinQuery(), nil + } return selector } +func (fq *FileQuery) prepareQuery(ctx context.Context) error { + if fq.path != nil { + prev, err := fq.path(ctx) + if err != nil { + return err + } + fq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (fq *FileQuery) gremlinAll(ctx context.Context) ([]*File, error) { res := &gremlin.Response{} query, bindings := fq.gremlinQuery().ValueMap(true).Query() @@ -373,8 +418,9 @@ type FileGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -385,6 +431,11 @@ func (fgb *FileGroupBy) Aggregate(fns ...Aggregate) *FileGroupBy { // Scan applies the group-by query and scan the result into the given value. func (fgb *FileGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := fgb.path(ctx) + if err != nil { + return err + } + fgb.gremlin = query return fgb.gremlinScan(ctx, v) } @@ -520,12 +571,18 @@ func (fgb *FileGroupBy) gremlinQuery() *dsl.Traversal { type FileSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (fs *FileSelect) Scan(ctx context.Context, v interface{}) error { + query, err := fs.path(ctx) + if err != nil { + return err + } + fs.gremlin = query return fs.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/filetype_query.go b/entc/integration/gremlin/ent/filetype_query.go index c72495e6a..c15ddd03e 100644 --- a/entc/integration/gremlin/ent/filetype_query.go +++ b/entc/integration/gremlin/ent/filetype_query.go @@ -29,8 +29,9 @@ type FileTypeQuery struct { predicates []predicate.FileType // eager-loading edges. withFiles *FileQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -60,8 +61,14 @@ func (ftq *FileTypeQuery) Order(o ...Order) *FileTypeQuery { // QueryFiles chains the current query on the files edge. func (ftq *FileTypeQuery) QueryFiles() *FileQuery { query := &FileQuery{config: ftq.config} - gremlin := ftq.gremlinQuery() - query.gremlin = gremlin.OutE(filetype.FilesLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := ftq.gremlinQuery() + fromU = gremlin.OutE(filetype.FilesLabel).InV() + return fromU, nil + } return query } @@ -161,6 +168,9 @@ func (ftq *FileTypeQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of FileTypes. func (ftq *FileTypeQuery) All(ctx context.Context) ([]*FileType, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } return ftq.gremlinAll(ctx) } @@ -193,6 +203,9 @@ func (ftq *FileTypeQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (ftq *FileTypeQuery) Count(ctx context.Context) (int, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return 0, err + } return ftq.gremlinCount(ctx) } @@ -207,6 +220,9 @@ func (ftq *FileTypeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (ftq *FileTypeQuery) Exist(ctx context.Context) (bool, error) { + if err := ftq.prepareQuery(ctx); err != nil { + return false, err + } return ftq.gremlinExist(ctx) } @@ -231,6 +247,7 @@ func (ftq *FileTypeQuery) Clone() *FileTypeQuery { predicates: append([]predicate.FileType{}, ftq.predicates...), // clone intermediate query. gremlin: ftq.gremlin.Clone(), + path: ftq.path, } } @@ -263,7 +280,12 @@ func (ftq *FileTypeQuery) WithFiles(opts ...func(*FileQuery)) *FileTypeQuery { func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroupBy { group := &FileTypeGroupBy{config: ftq.config} group.fields = append([]string{field}, fields...) - group.gremlin = ftq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.gremlinQuery(), nil + } return group } @@ -282,10 +304,27 @@ func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroup func (ftq *FileTypeQuery) Select(field string, fields ...string) *FileTypeSelect { selector := &FileTypeSelect{config: ftq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = ftq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := ftq.prepareQuery(ctx); err != nil { + return nil, err + } + return ftq.gremlinQuery(), nil + } return selector } +func (ftq *FileTypeQuery) prepareQuery(ctx context.Context) error { + if ftq.path != nil { + prev, err := ftq.path(ctx) + if err != nil { + return err + } + ftq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (ftq *FileTypeQuery) gremlinAll(ctx context.Context) ([]*FileType, error) { res := &gremlin.Response{} query, bindings := ftq.gremlinQuery().ValueMap(true).Query() @@ -351,8 +390,9 @@ type FileTypeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -363,6 +403,11 @@ func (ftgb *FileTypeGroupBy) Aggregate(fns ...Aggregate) *FileTypeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ftgb *FileTypeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ftgb.path(ctx) + if err != nil { + return err + } + ftgb.gremlin = query return ftgb.gremlinScan(ctx, v) } @@ -498,12 +543,18 @@ func (ftgb *FileTypeGroupBy) gremlinQuery() *dsl.Traversal { type FileTypeSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (fts *FileTypeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := fts.path(ctx) + if err != nil { + return err + } + fts.gremlin = query return fts.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/group_query.go b/entc/integration/gremlin/ent/group_query.go index 76ff71b4a..fccebbba4 100644 --- a/entc/integration/gremlin/ent/group_query.go +++ b/entc/integration/gremlin/ent/group_query.go @@ -33,8 +33,9 @@ type GroupQuery struct { withBlocked *UserQuery withUsers *UserQuery withInfo *GroupInfoQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -64,32 +65,56 @@ func (gq *GroupQuery) Order(o ...Order) *GroupQuery { // QueryFiles chains the current query on the files edge. func (gq *GroupQuery) QueryFiles() *FileQuery { query := &FileQuery{config: gq.config} - gremlin := gq.gremlinQuery() - query.gremlin = gremlin.OutE(group.FilesLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := gq.gremlinQuery() + fromU = gremlin.OutE(group.FilesLabel).InV() + return fromU, nil + } return query } // QueryBlocked chains the current query on the blocked edge. func (gq *GroupQuery) QueryBlocked() *UserQuery { query := &UserQuery{config: gq.config} - gremlin := gq.gremlinQuery() - query.gremlin = gremlin.OutE(group.BlockedLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := gq.gremlinQuery() + fromU = gremlin.OutE(group.BlockedLabel).InV() + return fromU, nil + } return query } // QueryUsers chains the current query on the users edge. func (gq *GroupQuery) QueryUsers() *UserQuery { query := &UserQuery{config: gq.config} - gremlin := gq.gremlinQuery() - query.gremlin = gremlin.InE(user.GroupsLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := gq.gremlinQuery() + fromU = gremlin.InE(user.GroupsLabel).OutV() + return fromU, nil + } return query } // QueryInfo chains the current query on the info edge. func (gq *GroupQuery) QueryInfo() *GroupInfoQuery { query := &GroupInfoQuery{config: gq.config} - gremlin := gq.gremlinQuery() - query.gremlin = gremlin.OutE(group.InfoLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := gq.gremlinQuery() + fromU = gremlin.OutE(group.InfoLabel).InV() + return fromU, nil + } return query } @@ -189,6 +214,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.gremlinAll(ctx) } @@ -221,6 +249,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.gremlinCount(ctx) } @@ -235,6 +266,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.gremlinExist(ctx) } @@ -259,6 +293,7 @@ func (gq *GroupQuery) Clone() *GroupQuery { predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. gremlin: gq.gremlin.Clone(), + path: gq.path, } } @@ -324,7 +359,12 @@ func (gq *GroupQuery) WithInfo(opts ...func(*GroupInfoQuery)) *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.gremlin = gq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.gremlinQuery(), nil + } return group } @@ -343,10 +383,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = gq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.gremlinQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) gremlinAll(ctx context.Context) ([]*Group, error) { res := &gremlin.Response{} query, bindings := gq.gremlinQuery().ValueMap(true).Query() @@ -412,8 +469,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -424,6 +482,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.gremlin = query return ggb.gremlinScan(ctx, v) } @@ -559,12 +622,18 @@ func (ggb *GroupGroupBy) gremlinQuery() *dsl.Traversal { type GroupSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.gremlin = query return gs.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/groupinfo_query.go b/entc/integration/gremlin/ent/groupinfo_query.go index 719b99b14..d0e08d55a 100644 --- a/entc/integration/gremlin/ent/groupinfo_query.go +++ b/entc/integration/gremlin/ent/groupinfo_query.go @@ -30,8 +30,9 @@ type GroupInfoQuery struct { predicates []predicate.GroupInfo // eager-loading edges. withGroups *GroupQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -61,8 +62,14 @@ func (giq *GroupInfoQuery) Order(o ...Order) *GroupInfoQuery { // QueryGroups chains the current query on the groups edge. func (giq *GroupInfoQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: giq.config} - gremlin := giq.gremlinQuery() - query.gremlin = gremlin.InE(group.InfoLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := giq.gremlinQuery() + fromU = gremlin.InE(group.InfoLabel).OutV() + return fromU, nil + } return query } @@ -162,6 +169,9 @@ func (giq *GroupInfoQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of GroupInfos. func (giq *GroupInfoQuery) All(ctx context.Context) ([]*GroupInfo, error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } return giq.gremlinAll(ctx) } @@ -194,6 +204,9 @@ func (giq *GroupInfoQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (giq *GroupInfoQuery) Count(ctx context.Context) (int, error) { + if err := giq.prepareQuery(ctx); err != nil { + return 0, err + } return giq.gremlinCount(ctx) } @@ -208,6 +221,9 @@ func (giq *GroupInfoQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (giq *GroupInfoQuery) Exist(ctx context.Context) (bool, error) { + if err := giq.prepareQuery(ctx); err != nil { + return false, err + } return giq.gremlinExist(ctx) } @@ -232,6 +248,7 @@ func (giq *GroupInfoQuery) Clone() *GroupInfoQuery { predicates: append([]predicate.GroupInfo{}, giq.predicates...), // clone intermediate query. gremlin: giq.gremlin.Clone(), + path: giq.path, } } @@ -264,7 +281,12 @@ func (giq *GroupInfoQuery) WithGroups(opts ...func(*GroupQuery)) *GroupInfoQuery func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGroupBy { group := &GroupInfoGroupBy{config: giq.config} group.fields = append([]string{field}, fields...) - group.gremlin = giq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } + return giq.gremlinQuery(), nil + } return group } @@ -283,10 +305,27 @@ func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGro func (giq *GroupInfoQuery) Select(field string, fields ...string) *GroupInfoSelect { selector := &GroupInfoSelect{config: giq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = giq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := giq.prepareQuery(ctx); err != nil { + return nil, err + } + return giq.gremlinQuery(), nil + } return selector } +func (giq *GroupInfoQuery) prepareQuery(ctx context.Context) error { + if giq.path != nil { + prev, err := giq.path(ctx) + if err != nil { + return err + } + giq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (giq *GroupInfoQuery) gremlinAll(ctx context.Context) ([]*GroupInfo, error) { res := &gremlin.Response{} query, bindings := giq.gremlinQuery().ValueMap(true).Query() @@ -352,8 +391,9 @@ type GroupInfoGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -364,6 +404,11 @@ func (gigb *GroupInfoGroupBy) Aggregate(fns ...Aggregate) *GroupInfoGroupBy { // Scan applies the group-by query and scan the result into the given value. func (gigb *GroupInfoGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := gigb.path(ctx) + if err != nil { + return err + } + gigb.gremlin = query return gigb.gremlinScan(ctx, v) } @@ -499,12 +544,18 @@ func (gigb *GroupInfoGroupBy) gremlinQuery() *dsl.Traversal { type GroupInfoSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (gis *GroupInfoSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gis.path(ctx) + if err != nil { + return err + } + gis.gremlin = query return gis.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/item_query.go b/entc/integration/gremlin/ent/item_query.go index 718cf126e..399ed4f4a 100644 --- a/entc/integration/gremlin/ent/item_query.go +++ b/entc/integration/gremlin/ent/item_query.go @@ -27,8 +27,9 @@ type ItemQuery struct { order []Order unique []string predicates []predicate.Item - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (iq *ItemQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Items. func (iq *ItemQuery) All(ctx context.Context) ([]*Item, error) { + if err := iq.prepareQuery(ctx); err != nil { + return nil, err + } return iq.gremlinAll(ctx) } @@ -183,6 +187,9 @@ func (iq *ItemQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (iq *ItemQuery) Count(ctx context.Context) (int, error) { + if err := iq.prepareQuery(ctx); err != nil { + return 0, err + } return iq.gremlinCount(ctx) } @@ -197,6 +204,9 @@ func (iq *ItemQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (iq *ItemQuery) Exist(ctx context.Context) (bool, error) { + if err := iq.prepareQuery(ctx); err != nil { + return false, err + } return iq.gremlinExist(ctx) } @@ -221,6 +231,7 @@ func (iq *ItemQuery) Clone() *ItemQuery { predicates: append([]predicate.Item{}, iq.predicates...), // clone intermediate query. gremlin: iq.gremlin.Clone(), + path: iq.path, } } @@ -229,7 +240,12 @@ func (iq *ItemQuery) Clone() *ItemQuery { func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { group := &ItemGroupBy{config: iq.config} group.fields = append([]string{field}, fields...) - group.gremlin = iq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := iq.prepareQuery(ctx); err != nil { + return nil, err + } + return iq.gremlinQuery(), nil + } return group } @@ -237,10 +253,27 @@ func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { func (iq *ItemQuery) Select(field string, fields ...string) *ItemSelect { selector := &ItemSelect{config: iq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = iq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := iq.prepareQuery(ctx); err != nil { + return nil, err + } + return iq.gremlinQuery(), nil + } return selector } +func (iq *ItemQuery) prepareQuery(ctx context.Context) error { + if iq.path != nil { + prev, err := iq.path(ctx) + if err != nil { + return err + } + iq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (iq *ItemQuery) gremlinAll(ctx context.Context) ([]*Item, error) { res := &gremlin.Response{} query, bindings := iq.gremlinQuery().ValueMap(true).Query() @@ -306,8 +339,9 @@ type ItemGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -318,6 +352,11 @@ func (igb *ItemGroupBy) Aggregate(fns ...Aggregate) *ItemGroupBy { // Scan applies the group-by query and scan the result into the given value. func (igb *ItemGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := igb.path(ctx) + if err != nil { + return err + } + igb.gremlin = query return igb.gremlinScan(ctx, v) } @@ -453,12 +492,18 @@ func (igb *ItemGroupBy) gremlinQuery() *dsl.Traversal { type ItemSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (is *ItemSelect) Scan(ctx context.Context, v interface{}) error { + query, err := is.path(ctx) + if err != nil { + return err + } + is.gremlin = query return is.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/node_query.go b/entc/integration/gremlin/ent/node_query.go index 7208daed9..38b0d441d 100644 --- a/entc/integration/gremlin/ent/node_query.go +++ b/entc/integration/gremlin/ent/node_query.go @@ -30,8 +30,9 @@ type NodeQuery struct { // eager-loading edges. withPrev *NodeQuery withNext *NodeQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -61,16 +62,28 @@ func (nq *NodeQuery) Order(o ...Order) *NodeQuery { // QueryPrev chains the current query on the prev edge. func (nq *NodeQuery) QueryPrev() *NodeQuery { query := &NodeQuery{config: nq.config} - gremlin := nq.gremlinQuery() - query.gremlin = gremlin.InE(node.NextLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := nq.gremlinQuery() + fromU = gremlin.InE(node.NextLabel).OutV() + return fromU, nil + } return query } // QueryNext chains the current query on the next edge. func (nq *NodeQuery) QueryNext() *NodeQuery { query := &NodeQuery{config: nq.config} - gremlin := nq.gremlinQuery() - query.gremlin = gremlin.OutE(node.NextLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := nq.gremlinQuery() + fromU = gremlin.OutE(node.NextLabel).InV() + return fromU, nil + } return query } @@ -170,6 +183,9 @@ func (nq *NodeQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Nodes. func (nq *NodeQuery) All(ctx context.Context) ([]*Node, error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } return nq.gremlinAll(ctx) } @@ -202,6 +218,9 @@ func (nq *NodeQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (nq *NodeQuery) Count(ctx context.Context) (int, error) { + if err := nq.prepareQuery(ctx); err != nil { + return 0, err + } return nq.gremlinCount(ctx) } @@ -216,6 +235,9 @@ func (nq *NodeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (nq *NodeQuery) Exist(ctx context.Context) (bool, error) { + if err := nq.prepareQuery(ctx); err != nil { + return false, err + } return nq.gremlinExist(ctx) } @@ -240,6 +262,7 @@ func (nq *NodeQuery) Clone() *NodeQuery { predicates: append([]predicate.Node{}, nq.predicates...), // clone intermediate query. gremlin: nq.gremlin.Clone(), + path: nq.path, } } @@ -283,7 +306,12 @@ func (nq *NodeQuery) WithNext(opts ...func(*NodeQuery)) *NodeQuery { func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { group := &NodeGroupBy{config: nq.config} group.fields = append([]string{field}, fields...) - group.gremlin = nq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.gremlinQuery(), nil + } return group } @@ -302,10 +330,27 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { func (nq *NodeQuery) Select(field string, fields ...string) *NodeSelect { selector := &NodeSelect{config: nq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = nq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.gremlinQuery(), nil + } return selector } +func (nq *NodeQuery) prepareQuery(ctx context.Context) error { + if nq.path != nil { + prev, err := nq.path(ctx) + if err != nil { + return err + } + nq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (nq *NodeQuery) gremlinAll(ctx context.Context) ([]*Node, error) { res := &gremlin.Response{} query, bindings := nq.gremlinQuery().ValueMap(true).Query() @@ -371,8 +416,9 @@ type NodeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -383,6 +429,11 @@ func (ngb *NodeGroupBy) Aggregate(fns ...Aggregate) *NodeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ngb *NodeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ngb.path(ctx) + if err != nil { + return err + } + ngb.gremlin = query return ngb.gremlinScan(ctx, v) } @@ -518,12 +569,18 @@ func (ngb *NodeGroupBy) gremlinQuery() *dsl.Traversal { type NodeSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (ns *NodeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ns.path(ctx) + if err != nil { + return err + } + ns.gremlin = query return ns.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/pet_query.go b/entc/integration/gremlin/ent/pet_query.go index a0aee906a..5743c83b0 100644 --- a/entc/integration/gremlin/ent/pet_query.go +++ b/entc/integration/gremlin/ent/pet_query.go @@ -31,8 +31,9 @@ type PetQuery struct { // eager-loading edges. withTeam *UserQuery withOwner *UserQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -62,16 +63,28 @@ func (pq *PetQuery) Order(o ...Order) *PetQuery { // QueryTeam chains the current query on the team edge. func (pq *PetQuery) QueryTeam() *UserQuery { query := &UserQuery{config: pq.config} - gremlin := pq.gremlinQuery() - query.gremlin = gremlin.InE(user.TeamLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := pq.gremlinQuery() + fromU = gremlin.InE(user.TeamLabel).OutV() + return fromU, nil + } return query } // QueryOwner chains the current query on the owner edge. func (pq *PetQuery) QueryOwner() *UserQuery { query := &UserQuery{config: pq.config} - gremlin := pq.gremlinQuery() - query.gremlin = gremlin.InE(user.PetsLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := pq.gremlinQuery() + fromU = gremlin.InE(user.PetsLabel).OutV() + return fromU, nil + } return query } @@ -171,6 +184,9 @@ func (pq *PetQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Pets. func (pq *PetQuery) All(ctx context.Context) ([]*Pet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.gremlinAll(ctx) } @@ -203,6 +219,9 @@ func (pq *PetQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (pq *PetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.gremlinCount(ctx) } @@ -217,6 +236,9 @@ func (pq *PetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.gremlinExist(ctx) } @@ -241,6 +263,7 @@ func (pq *PetQuery) Clone() *PetQuery { predicates: append([]predicate.Pet{}, pq.predicates...), // clone intermediate query. gremlin: pq.gremlin.Clone(), + path: pq.path, } } @@ -284,7 +307,12 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { group := &PetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.gremlin = pq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.gremlinQuery(), nil + } return group } @@ -303,10 +331,27 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { func (pq *PetQuery) Select(field string, fields ...string) *PetSelect { selector := &PetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = pq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.gremlinQuery(), nil + } return selector } +func (pq *PetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PetQuery) gremlinAll(ctx context.Context) ([]*Pet, error) { res := &gremlin.Response{} query, bindings := pq.gremlinQuery().ValueMap(true).Query() @@ -372,8 +417,9 @@ type PetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -384,6 +430,11 @@ func (pgb *PetGroupBy) Aggregate(fns ...Aggregate) *PetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.gremlin = query return pgb.gremlinScan(ctx, v) } @@ -519,12 +570,18 @@ func (pgb *PetGroupBy) gremlinQuery() *dsl.Traversal { type PetSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.gremlin = query return ps.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/spec_query.go b/entc/integration/gremlin/ent/spec_query.go index cfebe916f..946b9cd9d 100644 --- a/entc/integration/gremlin/ent/spec_query.go +++ b/entc/integration/gremlin/ent/spec_query.go @@ -29,8 +29,9 @@ type SpecQuery struct { predicates []predicate.Spec // eager-loading edges. withCard *CardQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -60,8 +61,14 @@ func (sq *SpecQuery) Order(o ...Order) *SpecQuery { // QueryCard chains the current query on the card edge. func (sq *SpecQuery) QueryCard() *CardQuery { query := &CardQuery{config: sq.config} - gremlin := sq.gremlinQuery() - query.gremlin = gremlin.OutE(spec.CardLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := sq.gremlinQuery() + fromU = gremlin.OutE(spec.CardLabel).InV() + return fromU, nil + } return query } @@ -161,6 +168,9 @@ func (sq *SpecQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Specs. func (sq *SpecQuery) All(ctx context.Context) ([]*Spec, error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } return sq.gremlinAll(ctx) } @@ -193,6 +203,9 @@ func (sq *SpecQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (sq *SpecQuery) Count(ctx context.Context) (int, error) { + if err := sq.prepareQuery(ctx); err != nil { + return 0, err + } return sq.gremlinCount(ctx) } @@ -207,6 +220,9 @@ func (sq *SpecQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (sq *SpecQuery) Exist(ctx context.Context) (bool, error) { + if err := sq.prepareQuery(ctx); err != nil { + return false, err + } return sq.gremlinExist(ctx) } @@ -231,6 +247,7 @@ func (sq *SpecQuery) Clone() *SpecQuery { predicates: append([]predicate.Spec{}, sq.predicates...), // clone intermediate query. gremlin: sq.gremlin.Clone(), + path: sq.path, } } @@ -250,7 +267,12 @@ func (sq *SpecQuery) WithCard(opts ...func(*CardQuery)) *SpecQuery { func (sq *SpecQuery) GroupBy(field string, fields ...string) *SpecGroupBy { group := &SpecGroupBy{config: sq.config} group.fields = append([]string{field}, fields...) - group.gremlin = sq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + return sq.gremlinQuery(), nil + } return group } @@ -258,10 +280,27 @@ func (sq *SpecQuery) GroupBy(field string, fields ...string) *SpecGroupBy { func (sq *SpecQuery) Select(field string, fields ...string) *SpecSelect { selector := &SpecSelect{config: sq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = sq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + return sq.gremlinQuery(), nil + } return selector } +func (sq *SpecQuery) prepareQuery(ctx context.Context) error { + if sq.path != nil { + prev, err := sq.path(ctx) + if err != nil { + return err + } + sq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (sq *SpecQuery) gremlinAll(ctx context.Context) ([]*Spec, error) { res := &gremlin.Response{} query, bindings := sq.gremlinQuery().ValueMap(true).Query() @@ -327,8 +366,9 @@ type SpecGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -339,6 +379,11 @@ func (sgb *SpecGroupBy) Aggregate(fns ...Aggregate) *SpecGroupBy { // Scan applies the group-by query and scan the result into the given value. func (sgb *SpecGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := sgb.path(ctx) + if err != nil { + return err + } + sgb.gremlin = query return sgb.gremlinScan(ctx, v) } @@ -474,12 +519,18 @@ func (sgb *SpecGroupBy) gremlinQuery() *dsl.Traversal { type SpecSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (ss *SpecSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ss.path(ctx) + if err != nil { + return err + } + ss.gremlin = query return ss.gremlinScan(ctx, v) } diff --git a/entc/integration/gremlin/ent/user_query.go b/entc/integration/gremlin/ent/user_query.go index c222da29a..bd8a3d4eb 100644 --- a/entc/integration/gremlin/ent/user_query.go +++ b/entc/integration/gremlin/ent/user_query.go @@ -39,8 +39,9 @@ type UserQuery struct { withSpouse *UserQuery withChildren *UserQuery withParent *UserQuery - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Where adds a new predicate for the builder. @@ -70,88 +71,154 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryCard chains the current query on the card edge. func (uq *UserQuery) QueryCard() *CardQuery { query := &CardQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.OutE(user.CardLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.OutE(user.CardLabel).InV() + return fromU, nil + } return query } // QueryPets chains the current query on the pets edge. func (uq *UserQuery) QueryPets() *PetQuery { query := &PetQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.OutE(user.PetsLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.OutE(user.PetsLabel).InV() + return fromU, nil + } return query } // QueryFiles chains the current query on the files edge. func (uq *UserQuery) QueryFiles() *FileQuery { query := &FileQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.OutE(user.FilesLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.OutE(user.FilesLabel).InV() + return fromU, nil + } return query } // QueryGroups chains the current query on the groups edge. func (uq *UserQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.OutE(user.GroupsLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.OutE(user.GroupsLabel).InV() + return fromU, nil + } return query } // QueryFriends chains the current query on the friends edge. func (uq *UserQuery) QueryFriends() *UserQuery { query := &UserQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.Both(user.FriendsLabel) + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.Both(user.FriendsLabel) + return fromU, nil + } return query } // QueryFollowers chains the current query on the followers edge. func (uq *UserQuery) QueryFollowers() *UserQuery { query := &UserQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.InE(user.FollowingLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.InE(user.FollowingLabel).OutV() + return fromU, nil + } return query } // QueryFollowing chains the current query on the following edge. func (uq *UserQuery) QueryFollowing() *UserQuery { query := &UserQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.OutE(user.FollowingLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.OutE(user.FollowingLabel).InV() + return fromU, nil + } return query } // QueryTeam chains the current query on the team edge. func (uq *UserQuery) QueryTeam() *PetQuery { query := &PetQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.OutE(user.TeamLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.OutE(user.TeamLabel).InV() + return fromU, nil + } return query } // QuerySpouse chains the current query on the spouse edge. func (uq *UserQuery) QuerySpouse() *UserQuery { query := &UserQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.Both(user.SpouseLabel) + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.Both(user.SpouseLabel) + return fromU, nil + } return query } // QueryChildren chains the current query on the children edge. func (uq *UserQuery) QueryChildren() *UserQuery { query := &UserQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.InE(user.ParentLabel).OutV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.InE(user.ParentLabel).OutV() + return fromU, nil + } return query } // QueryParent chains the current query on the parent edge. func (uq *UserQuery) QueryParent() *UserQuery { query := &UserQuery{config: uq.config} - gremlin := uq.gremlinQuery() - query.gremlin = gremlin.OutE(user.ParentLabel).InV() + query.path = func(ctx context.Context) (fromU *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + gremlin := uq.gremlinQuery() + fromU = gremlin.OutE(user.ParentLabel).InV() + return fromU, nil + } return query } @@ -251,6 +318,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) string { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.gremlinAll(ctx) } @@ -283,6 +353,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []string { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.gremlinCount(ctx) } @@ -297,6 +370,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.gremlinExist(ctx) } @@ -321,6 +397,7 @@ func (uq *UserQuery) Clone() *UserQuery { predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. gremlin: uq.gremlin.Clone(), + path: uq.path, } } @@ -463,7 +540,12 @@ func (uq *UserQuery) WithParent(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.gremlin = uq.gremlinQuery() + group.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.gremlinQuery(), nil + } return group } @@ -482,10 +564,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.gremlin = uq.gremlinQuery() + selector.path = func(ctx context.Context) (prev *dsl.Traversal, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.gremlinQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.gremlin = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) gremlinAll(ctx context.Context) ([]*User, error) { res := &gremlin.Response{} query, bindings := uq.gremlinQuery().ValueMap(true).Query() @@ -551,8 +650,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -563,6 +663,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.gremlin = query return ugb.gremlinScan(ctx, v) } @@ -698,12 +803,18 @@ func (ugb *UserGroupBy) gremlinQuery() *dsl.Traversal { type UserSelect struct { config fields []string - // intermediate queries. + // intermediate query (i.e. traversal path). gremlin *dsl.Traversal + path func(context.Context) (*dsl.Traversal, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.gremlin = query return us.gremlinScan(ctx, v) } diff --git a/entc/integration/hooks/ent/card_query.go b/entc/integration/hooks/ent/card_query.go index 21c8ca32a..b0d46d6b2 100644 --- a/entc/integration/hooks/ent/card_query.go +++ b/entc/integration/hooks/ent/card_query.go @@ -31,8 +31,9 @@ type CardQuery struct { // eager-loading edges. withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (cq *CardQuery) Order(o ...Order) *CardQuery { // QueryOwner chains the current query on the owner edge. func (cq *CardQuery) QueryOwner() *UserQuery { query := &UserQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, card.OwnerTable, card.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, card.OwnerTable, card.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (cq *CardQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cards. func (cq *CardQuery) All(ctx context.Context) ([]*Card, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (cq *CardQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CardQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (cq *CardQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CardQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (cq *CardQuery) Clone() *CardQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Card{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -269,7 +286,12 @@ func (cq *CardQuery) WithOwner(opts ...func(*UserQuery)) *CardQuery { func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { group := &CardGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { func (cq *CardQuery) Select(field string, fields ...string) *CardSelect { selector := &CardSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CardQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CardQuery) sqlAll(ctx context.Context) ([]*Card, error) { var ( nodes = []*Card{} @@ -438,8 +477,9 @@ type CardGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -450,6 +490,11 @@ func (cgb *CardGroupBy) Aggregate(fns ...Aggregate) *CardGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CardGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -568,12 +613,18 @@ func (cgb *CardGroupBy) sqlQuery() *sql.Selector { type CardSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CardSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/entc/integration/hooks/ent/client.go b/entc/integration/hooks/ent/client.go index 135da8042..e3d654a31 100644 --- a/entc/integration/hooks/ent/client.go +++ b/entc/integration/hooks/ent/client.go @@ -190,14 +190,16 @@ func (c *CardClient) GetX(ctx context.Context, id int) *Card { // QueryOwner queries the owner edge of a Card. func (c *CardClient) QueryOwner(ca *Card) *UserQuery { query := &UserQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, card.OwnerTable, card.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, card.OwnerTable, card.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } @@ -288,42 +290,48 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryCards queries the cards edge of a User. func (c *UserClient) QueryCards(u *User) *CardQuery { query := &CardQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.CardsTable, user.CardsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.CardsTable, user.CardsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFriends queries the friends edge of a User. func (c *UserClient) QueryFriends(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryBestFriend queries the best_friend edge of a User. func (c *UserClient) QueryBestFriend(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.BestFriendTable, user.BestFriendColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.BestFriendTable, user.BestFriendColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/hooks/ent/user_query.go b/entc/integration/hooks/ent/user_query.go index db1fae4f9..52564bb24 100644 --- a/entc/integration/hooks/ent/user_query.go +++ b/entc/integration/hooks/ent/user_query.go @@ -34,8 +34,9 @@ type UserQuery struct { withFriends *UserQuery withBestFriend *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -65,36 +66,54 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryCards chains the current query on the cards edge. func (uq *UserQuery) QueryCards() *CardQuery { query := &CardQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.CardsTable, user.CardsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.CardsTable, user.CardsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFriends chains the current query on the friends edge. func (uq *UserQuery) QueryFriends() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryBestFriend chains the current query on the best_friend edge. func (uq *UserQuery) QueryBestFriend() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.BestFriendTable, user.BestFriendColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.BestFriendTable, user.BestFriendColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -194,6 +213,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -226,6 +248,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -240,6 +265,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -263,7 +291,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -318,7 +347,12 @@ func (uq *UserQuery) WithBestFriend(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -337,10 +371,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -580,8 +631,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -592,6 +644,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -710,12 +767,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/idtype/ent/client.go b/entc/integration/idtype/ent/client.go index b6fc7c69e..e5f859ce3 100644 --- a/entc/integration/idtype/ent/client.go +++ b/entc/integration/idtype/ent/client.go @@ -184,42 +184,48 @@ func (c *UserClient) GetX(ctx context.Context, id uint64) *User { // QuerySpouse queries the spouse edge of a User. func (c *UserClient) QuerySpouse(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFollowers queries the followers edge of a User. func (c *UserClient) QueryFollowers(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFollowing queries the following edge of a User. func (c *UserClient) QueryFollowing(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/idtype/ent/user_query.go b/entc/integration/idtype/ent/user_query.go index a9fa58123..a79757878 100644 --- a/entc/integration/idtype/ent/user_query.go +++ b/entc/integration/idtype/ent/user_query.go @@ -33,8 +33,9 @@ type UserQuery struct { withFollowers *UserQuery withFollowing *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -64,36 +65,54 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QuerySpouse chains the current query on the spouse edge. func (uq *UserQuery) QuerySpouse() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFollowers chains the current query on the followers edge. func (uq *UserQuery) QueryFollowers() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFollowing chains the current query on the following edge. func (uq *UserQuery) QueryFollowing() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -193,6 +212,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) uint64 { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -225,6 +247,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []uint64 { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -239,6 +264,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -262,7 +290,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -317,7 +346,12 @@ func (uq *UserQuery) WithFollowing(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -336,10 +370,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -614,8 +665,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -626,6 +678,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -744,12 +801,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/json/ent/user_query.go b/entc/integration/json/ent/user_query.go index bd1a6e928..7f5b0bf62 100644 --- a/entc/integration/json/ent/user_query.go +++ b/entc/integration/json/ent/user_query.go @@ -27,8 +27,9 @@ type UserQuery struct { order []Order unique []string predicates []predicate.User - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -242,7 +253,12 @@ func (uq *UserQuery) Clone() *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -261,10 +277,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -371,8 +404,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -383,6 +417,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -501,12 +540,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/migrate/entv1/car_query.go b/entc/integration/migrate/entv1/car_query.go index 277e528b5..24ea02dca 100644 --- a/entc/integration/migrate/entv1/car_query.go +++ b/entc/integration/migrate/entv1/car_query.go @@ -31,8 +31,9 @@ type CarQuery struct { // eager-loading edges. withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (cq *CarQuery) Order(o ...Order) *CarQuery { // QueryOwner chains the current query on the owner edge. func (cq *CarQuery) QueryOwner() *UserQuery { query := &UserQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (cq *CarQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cars. func (cq *CarQuery) All(ctx context.Context) ([]*Car, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (cq *CarQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CarQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (cq *CarQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CarQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (cq *CarQuery) Clone() *CarQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Car{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -256,7 +273,12 @@ func (cq *CarQuery) WithOwner(opts ...func(*UserQuery)) *CarQuery { func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { group := &CarGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -264,10 +286,27 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { func (cq *CarQuery) Select(field string, fields ...string) *CarSelect { selector := &CarSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CarQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CarQuery) sqlAll(ctx context.Context) ([]*Car, error) { var ( nodes = []*Car{} @@ -414,8 +453,9 @@ type CarGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -426,6 +466,11 @@ func (cgb *CarGroupBy) Aggregate(fns ...Aggregate) *CarGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CarGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -544,12 +589,18 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { type CarSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CarSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/entc/integration/migrate/entv1/client.go b/entc/integration/migrate/entv1/client.go index 032bff346..1e16f66b1 100644 --- a/entc/integration/migrate/entv1/client.go +++ b/entc/integration/migrate/entv1/client.go @@ -190,14 +190,16 @@ func (c *CarClient) GetX(ctx context.Context, id int) *Car { // QueryOwner queries the owner edge of a Car. func (c *CarClient) QueryOwner(ca *Car) *UserQuery { query := &UserQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } @@ -287,56 +289,64 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryParent queries the parent edge of a User. func (c *UserClient) QueryParent(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryChildren queries the children edge of a User. func (c *UserClient) QueryChildren(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QuerySpouse queries the spouse edge of a User. func (c *UserClient) QuerySpouse(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryCar queries the car edge of a User. func (c *UserClient) QueryCar(u *User) *CarQuery { query := &CarQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.CarTable, user.CarColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.CarTable, user.CarColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/migrate/entv1/user_query.go b/entc/integration/migrate/entv1/user_query.go index 058764ee7..81730be4a 100644 --- a/entc/integration/migrate/entv1/user_query.go +++ b/entc/integration/migrate/entv1/user_query.go @@ -35,8 +35,9 @@ type UserQuery struct { withSpouse *UserQuery withCar *CarQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -66,48 +67,72 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryParent chains the current query on the parent edge. func (uq *UserQuery) QueryParent() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, user.ParentTable, user.ParentColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryChildren chains the current query on the children edge. func (uq *UserQuery) QueryChildren() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.ChildrenTable, user.ChildrenColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QuerySpouse chains the current query on the spouse edge. func (uq *UserQuery) QuerySpouse() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryCar chains the current query on the car edge. func (uq *UserQuery) QueryCar() *CarQuery { query := &CarQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.CarTable, user.CarColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.CarTable, user.CarColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -207,6 +232,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -239,6 +267,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -253,6 +284,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -276,7 +310,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -342,7 +377,12 @@ func (uq *UserQuery) WithCar(opts ...func(*CarQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -361,10 +401,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -595,8 +652,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -607,6 +665,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -725,12 +788,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/migrate/entv2/car_query.go b/entc/integration/migrate/entv2/car_query.go index 5453a98cc..1b19e65f3 100644 --- a/entc/integration/migrate/entv2/car_query.go +++ b/entc/integration/migrate/entv2/car_query.go @@ -31,8 +31,9 @@ type CarQuery struct { // eager-loading edges. withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (cq *CarQuery) Order(o ...Order) *CarQuery { // QueryOwner chains the current query on the owner edge. func (cq *CarQuery) QueryOwner() *UserQuery { query := &UserQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (cq *CarQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cars. func (cq *CarQuery) All(ctx context.Context) ([]*Car, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (cq *CarQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CarQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (cq *CarQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CarQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (cq *CarQuery) Clone() *CarQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Car{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -256,7 +273,12 @@ func (cq *CarQuery) WithOwner(opts ...func(*UserQuery)) *CarQuery { func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { group := &CarGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -264,10 +286,27 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { func (cq *CarQuery) Select(field string, fields ...string) *CarSelect { selector := &CarSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CarQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CarQuery) sqlAll(ctx context.Context) ([]*Car, error) { var ( nodes = []*Car{} @@ -414,8 +453,9 @@ type CarGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -426,6 +466,11 @@ func (cgb *CarGroupBy) Aggregate(fns ...Aggregate) *CarGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CarGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -544,12 +589,18 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { type CarSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CarSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/entc/integration/migrate/entv2/client.go b/entc/integration/migrate/entv2/client.go index 65c4b18db..ed50bc449 100644 --- a/entc/integration/migrate/entv2/client.go +++ b/entc/integration/migrate/entv2/client.go @@ -202,14 +202,16 @@ func (c *CarClient) GetX(ctx context.Context, id int) *Car { // QueryOwner queries the owner edge of a Car. func (c *CarClient) QueryOwner(ca *Car) *UserQuery { query := &UserQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } @@ -465,28 +467,32 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryCar queries the car edge of a User. func (c *UserClient) QueryCar(u *User) *CarQuery { query := &CarQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.CarTable, user.CarColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.CarTable, user.CarColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryPets queries the pets edge of a User. func (c *UserClient) QueryPets(u *User) *PetQuery { query := &PetQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, user.PetsTable, user.PetsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/migrate/entv2/group_query.go b/entc/integration/migrate/entv2/group_query.go index 4f0a0e291..55edb5317 100644 --- a/entc/integration/migrate/entv2/group_query.go +++ b/entc/integration/migrate/entv2/group_query.go @@ -27,8 +27,9 @@ type GroupQuery struct { order []Order unique []string predicates []predicate.Group - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (gq *GroupQuery) Clone() *GroupQuery { unique: append([]string{}, gq.unique...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), + sql: gq.sql.Clone(), + path: gq.path, } } @@ -229,7 +240,12 @@ func (gq *GroupQuery) Clone() *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.sql = gq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return group } @@ -237,10 +253,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.sql = gq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) { var ( nodes = []*Group{} @@ -347,8 +380,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -359,6 +393,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.sql = query return ggb.sqlScan(ctx, v) } @@ -477,12 +516,18 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { type GroupSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.sql = query return gs.sqlScan(ctx, v) } diff --git a/entc/integration/migrate/entv2/pet_query.go b/entc/integration/migrate/entv2/pet_query.go index 6283d0b22..8d4b6a415 100644 --- a/entc/integration/migrate/entv2/pet_query.go +++ b/entc/integration/migrate/entv2/pet_query.go @@ -27,8 +27,9 @@ type PetQuery struct { order []Order unique []string predicates []predicate.Pet - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (pq *PetQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Pets. func (pq *PetQuery) All(ctx context.Context) ([]*Pet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (pq *PetQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (pq *PetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (pq *PetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (pq *PetQuery) Clone() *PetQuery { unique: append([]string{}, pq.unique...), predicates: append([]predicate.Pet{}, pq.predicates...), // clone intermediate query. - sql: pq.sql.Clone(), + sql: pq.sql.Clone(), + path: pq.path, } } @@ -229,7 +240,12 @@ func (pq *PetQuery) Clone() *PetQuery { func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { group := &PetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.sql = pq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return group } @@ -237,10 +253,27 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { func (pq *PetQuery) Select(field string, fields ...string) *PetSelect { selector := &PetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.sql = pq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return selector } +func (pq *PetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) { var ( nodes = []*Pet{} @@ -347,8 +380,9 @@ type PetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -359,6 +393,11 @@ func (pgb *PetGroupBy) Aggregate(fns ...Aggregate) *PetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.sql = query return pgb.sqlScan(ctx, v) } @@ -477,12 +516,18 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { type PetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.sql = query return ps.sqlScan(ctx, v) } diff --git a/entc/integration/migrate/entv2/user_query.go b/entc/integration/migrate/entv2/user_query.go index 22f2580f1..66eea79f1 100644 --- a/entc/integration/migrate/entv2/user_query.go +++ b/entc/integration/migrate/entv2/user_query.go @@ -34,8 +34,9 @@ type UserQuery struct { withCar *CarQuery withPets *PetQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -65,24 +66,36 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryCar chains the current query on the car edge. func (uq *UserQuery) QueryCar() *CarQuery { query := &CarQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.CarTable, user.CarColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.CarTable, user.CarColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryPets chains the current query on the pets edge. func (uq *UserQuery) QueryPets() *PetQuery { query := &PetQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, user.PetsTable, user.PetsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -182,6 +195,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -214,6 +230,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -228,6 +247,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -251,7 +273,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -295,7 +318,12 @@ func (uq *UserQuery) WithPets(opts ...func(*PetQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -314,10 +342,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -493,8 +538,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -505,6 +551,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -623,12 +674,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/entc/integration/privacy/ent/client.go b/entc/integration/privacy/ent/client.go index ac01cab1f..e96b6b603 100644 --- a/entc/integration/privacy/ent/client.go +++ b/entc/integration/privacy/ent/client.go @@ -184,14 +184,16 @@ func (c *PlanetClient) GetX(ctx context.Context, id int) *Planet { // QueryNeighbors queries the neighbors edge of a Planet. func (c *PlanetClient) QueryNeighbors(pl *Planet) *PlanetQuery { query := &PlanetQuery{config: c.config} - id := pl.ID - step := sqlgraph.NewStep( - sqlgraph.From(planet.Table, planet.FieldID, id), - sqlgraph.To(planet.Table, planet.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, planet.NeighborsTable, planet.NeighborsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(pl.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pl.ID + step := sqlgraph.NewStep( + sqlgraph.From(planet.Table, planet.FieldID, id), + sqlgraph.To(planet.Table, planet.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, planet.NeighborsTable, planet.NeighborsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(pl.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/privacy/ent/planet_query.go b/entc/integration/privacy/ent/planet_query.go index 176ab224b..26d00f4ff 100644 --- a/entc/integration/privacy/ent/planet_query.go +++ b/entc/integration/privacy/ent/planet_query.go @@ -30,8 +30,9 @@ type PlanetQuery struct { predicates []predicate.Planet // eager-loading edges. withNeighbors *PlanetQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -61,12 +62,18 @@ func (pq *PlanetQuery) Order(o ...Order) *PlanetQuery { // QueryNeighbors chains the current query on the neighbors edge. func (pq *PlanetQuery) QueryNeighbors() *PlanetQuery { query := &PlanetQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(planet.Table, planet.FieldID, pq.sqlQuery()), - sqlgraph.To(planet.Table, planet.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, planet.NeighborsTable, planet.NeighborsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(planet.Table, planet.FieldID, pq.sqlQuery()), + sqlgraph.To(planet.Table, planet.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, planet.NeighborsTable, planet.NeighborsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -166,6 +173,9 @@ func (pq *PlanetQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Planets. func (pq *PlanetQuery) All(ctx context.Context) ([]*Planet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.sqlAll(ctx) } @@ -198,6 +208,9 @@ func (pq *PlanetQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (pq *PlanetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.sqlCount(ctx) } @@ -212,6 +225,9 @@ func (pq *PlanetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PlanetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.sqlExist(ctx) } @@ -235,7 +251,8 @@ func (pq *PlanetQuery) Clone() *PlanetQuery { unique: append([]string{}, pq.unique...), predicates: append([]predicate.Planet{}, pq.predicates...), // clone intermediate query. - sql: pq.sql.Clone(), + sql: pq.sql.Clone(), + path: pq.path, } } @@ -268,7 +285,12 @@ func (pq *PlanetQuery) WithNeighbors(opts ...func(*PlanetQuery)) *PlanetQuery { func (pq *PlanetQuery) GroupBy(field string, fields ...string) *PlanetGroupBy { group := &PlanetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.sql = pq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return group } @@ -287,10 +309,27 @@ func (pq *PlanetQuery) GroupBy(field string, fields ...string) *PlanetGroupBy { func (pq *PlanetQuery) Select(field string, fields ...string) *PlanetSelect { selector := &PlanetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.sql = pq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return selector } +func (pq *PlanetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PlanetQuery) sqlAll(ctx context.Context) ([]*Planet, error) { var ( nodes = []*Planet{} @@ -465,8 +504,9 @@ type PlanetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -477,6 +517,11 @@ func (pgb *PlanetGroupBy) Aggregate(fns ...Aggregate) *PlanetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PlanetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.sql = query return pgb.sqlScan(ctx, v) } @@ -595,12 +640,18 @@ func (pgb *PlanetGroupBy) sqlQuery() *sql.Selector { type PlanetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PlanetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.sql = query return ps.sqlScan(ctx, v) } diff --git a/entc/integration/template/ent/client.go b/entc/integration/template/ent/client.go index 34a79fb53..79af65968 100644 --- a/entc/integration/template/ent/client.go +++ b/entc/integration/template/ent/client.go @@ -282,14 +282,16 @@ func (c *PetClient) GetX(ctx context.Context, id int) *Pet { // QueryOwner queries the owner edge of a Pet. func (c *PetClient) QueryOwner(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } @@ -379,28 +381,32 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryPets queries the pets edge of a User. func (c *UserClient) QueryPets(u *User) *PetQuery { query := &PetQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFriends queries the friends edge of a User. func (c *UserClient) QueryFriends(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/entc/integration/template/ent/group_query.go b/entc/integration/template/ent/group_query.go index 7f1ce2d5b..ae98d7417 100644 --- a/entc/integration/template/ent/group_query.go +++ b/entc/integration/template/ent/group_query.go @@ -27,8 +27,9 @@ type GroupQuery struct { order []Order unique []string predicates []predicate.Group - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (gq *GroupQuery) Clone() *GroupQuery { unique: append([]string{}, gq.unique...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), + sql: gq.sql.Clone(), + path: gq.path, } } @@ -242,7 +253,12 @@ func (gq *GroupQuery) Clone() *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.sql = gq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return group } @@ -261,10 +277,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.sql = gq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) { var ( nodes = []*Group{} @@ -371,8 +404,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -383,6 +417,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.sql = query return ggb.sqlScan(ctx, v) } @@ -501,12 +540,18 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { type GroupSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.sql = query return gs.sqlScan(ctx, v) } diff --git a/entc/integration/template/ent/pet_query.go b/entc/integration/template/ent/pet_query.go index 5a24789cc..9e050f333 100644 --- a/entc/integration/template/ent/pet_query.go +++ b/entc/integration/template/ent/pet_query.go @@ -31,8 +31,9 @@ type PetQuery struct { // eager-loading edges. withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (pq *PetQuery) Order(o ...Order) *PetQuery { // QueryOwner chains the current query on the owner edge. func (pq *PetQuery) QueryOwner() *UserQuery { query := &UserQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (pq *PetQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Pets. func (pq *PetQuery) All(ctx context.Context) ([]*Pet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (pq *PetQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (pq *PetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (pq *PetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (pq *PetQuery) Clone() *PetQuery { unique: append([]string{}, pq.unique...), predicates: append([]predicate.Pet{}, pq.predicates...), // clone intermediate query. - sql: pq.sql.Clone(), + sql: pq.sql.Clone(), + path: pq.path, } } @@ -269,7 +286,12 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { group := &PetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.sql = pq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { func (pq *PetQuery) Select(field string, fields ...string) *PetSelect { selector := &PetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.sql = pq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return selector } +func (pq *PetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) { var ( nodes = []*Pet{} @@ -438,8 +477,9 @@ type PetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -450,6 +490,11 @@ func (pgb *PetGroupBy) Aggregate(fns ...Aggregate) *PetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.sql = query return pgb.sqlScan(ctx, v) } @@ -568,12 +613,18 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { type PetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.sql = query return ps.sqlScan(ctx, v) } diff --git a/entc/integration/template/ent/user_query.go b/entc/integration/template/ent/user_query.go index 0a6898505..c60579f7d 100644 --- a/entc/integration/template/ent/user_query.go +++ b/entc/integration/template/ent/user_query.go @@ -32,8 +32,9 @@ type UserQuery struct { // eager-loading edges. withPets *PetQuery withFriends *UserQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -63,24 +64,36 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryPets chains the current query on the pets edge. func (uq *UserQuery) QueryPets() *PetQuery { query := &PetQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFriends chains the current query on the friends edge. func (uq *UserQuery) QueryFriends() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -180,6 +193,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -212,6 +228,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -226,6 +245,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -249,7 +271,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -293,7 +316,12 @@ func (uq *UserQuery) WithFriends(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -312,10 +340,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -519,8 +564,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -531,6 +577,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -649,12 +700,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/edgeindex/ent/city_query.go b/examples/edgeindex/ent/city_query.go index 82ece19cb..c90aa068e 100644 --- a/examples/edgeindex/ent/city_query.go +++ b/examples/edgeindex/ent/city_query.go @@ -31,8 +31,9 @@ type CityQuery struct { predicates []predicate.City // eager-loading edges. withStreets *StreetQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (cq *CityQuery) Order(o ...Order) *CityQuery { // QueryStreets chains the current query on the streets edge. func (cq *CityQuery) QueryStreets() *StreetQuery { query := &StreetQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(city.Table, city.FieldID, cq.sqlQuery()), - sqlgraph.To(street.Table, street.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, city.StreetsTable, city.StreetsColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(city.Table, city.FieldID, cq.sqlQuery()), + sqlgraph.To(street.Table, street.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, city.StreetsTable, city.StreetsColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (cq *CityQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cities. func (cq *CityQuery) All(ctx context.Context) ([]*City, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (cq *CityQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CityQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (cq *CityQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CityQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (cq *CityQuery) Clone() *CityQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.City{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -269,7 +286,12 @@ func (cq *CityQuery) WithStreets(opts ...func(*StreetQuery)) *CityQuery { func (cq *CityQuery) GroupBy(field string, fields ...string) *CityGroupBy { group := &CityGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (cq *CityQuery) GroupBy(field string, fields ...string) *CityGroupBy { func (cq *CityQuery) Select(field string, fields ...string) *CitySelect { selector := &CitySelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CityQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CityQuery) sqlAll(ctx context.Context) ([]*City, error) { var ( nodes = []*City{} @@ -431,8 +470,9 @@ type CityGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -443,6 +483,11 @@ func (cgb *CityGroupBy) Aggregate(fns ...Aggregate) *CityGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CityGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -561,12 +606,18 @@ func (cgb *CityGroupBy) sqlQuery() *sql.Selector { type CitySelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CitySelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/examples/edgeindex/ent/client.go b/examples/edgeindex/ent/client.go index 0fa87b15d..4affa6778 100644 --- a/examples/edgeindex/ent/client.go +++ b/examples/edgeindex/ent/client.go @@ -190,14 +190,16 @@ func (c *CityClient) GetX(ctx context.Context, id int) *City { // QueryStreets queries the streets edge of a City. func (c *CityClient) QueryStreets(ci *City) *StreetQuery { query := &StreetQuery{config: c.config} - id := ci.ID - step := sqlgraph.NewStep( - sqlgraph.From(city.Table, city.FieldID, id), - sqlgraph.To(street.Table, street.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, city.StreetsTable, city.StreetsColumn), - ) - query.sql = sqlgraph.Neighbors(ci.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ci.ID + step := sqlgraph.NewStep( + sqlgraph.From(city.Table, city.FieldID, id), + sqlgraph.To(street.Table, street.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, city.StreetsTable, city.StreetsColumn), + ) + fromV = sqlgraph.Neighbors(ci.driver.Dialect(), step) + return fromV, nil + } return query } @@ -287,14 +289,16 @@ func (c *StreetClient) GetX(ctx context.Context, id int) *Street { // QueryCity queries the city edge of a Street. func (c *StreetClient) QueryCity(s *Street) *CityQuery { query := &CityQuery{config: c.config} - id := s.ID - step := sqlgraph.NewStep( - sqlgraph.From(street.Table, street.FieldID, id), - sqlgraph.To(city.Table, city.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, street.CityTable, street.CityColumn), - ) - query.sql = sqlgraph.Neighbors(s.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := s.ID + step := sqlgraph.NewStep( + sqlgraph.From(street.Table, street.FieldID, id), + sqlgraph.To(city.Table, city.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, street.CityTable, street.CityColumn), + ) + fromV = sqlgraph.Neighbors(s.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/edgeindex/ent/street_query.go b/examples/edgeindex/ent/street_query.go index f4c9efdcb..f9ad968e9 100644 --- a/examples/edgeindex/ent/street_query.go +++ b/examples/edgeindex/ent/street_query.go @@ -31,8 +31,9 @@ type StreetQuery struct { // eager-loading edges. withCity *CityQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (sq *StreetQuery) Order(o ...Order) *StreetQuery { // QueryCity chains the current query on the city edge. func (sq *StreetQuery) QueryCity() *CityQuery { query := &CityQuery{config: sq.config} - step := sqlgraph.NewStep( - sqlgraph.From(street.Table, street.FieldID, sq.sqlQuery()), - sqlgraph.To(city.Table, city.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, street.CityTable, street.CityColumn), - ) - query.sql = sqlgraph.SetNeighbors(sq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(street.Table, street.FieldID, sq.sqlQuery()), + sqlgraph.To(city.Table, city.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, street.CityTable, street.CityColumn), + ) + fromU = sqlgraph.SetNeighbors(sq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (sq *StreetQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Streets. func (sq *StreetQuery) All(ctx context.Context) ([]*Street, error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } return sq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (sq *StreetQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (sq *StreetQuery) Count(ctx context.Context) (int, error) { + if err := sq.prepareQuery(ctx); err != nil { + return 0, err + } return sq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (sq *StreetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (sq *StreetQuery) Exist(ctx context.Context) (bool, error) { + if err := sq.prepareQuery(ctx); err != nil { + return false, err + } return sq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (sq *StreetQuery) Clone() *StreetQuery { unique: append([]string{}, sq.unique...), predicates: append([]predicate.Street{}, sq.predicates...), // clone intermediate query. - sql: sq.sql.Clone(), + sql: sq.sql.Clone(), + path: sq.path, } } @@ -269,7 +286,12 @@ func (sq *StreetQuery) WithCity(opts ...func(*CityQuery)) *StreetQuery { func (sq *StreetQuery) GroupBy(field string, fields ...string) *StreetGroupBy { group := &StreetGroupBy{config: sq.config} group.fields = append([]string{field}, fields...) - group.sql = sq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + return sq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (sq *StreetQuery) GroupBy(field string, fields ...string) *StreetGroupBy { func (sq *StreetQuery) Select(field string, fields ...string) *StreetSelect { selector := &StreetSelect{config: sq.config} selector.fields = append([]string{field}, fields...) - selector.sql = sq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := sq.prepareQuery(ctx); err != nil { + return nil, err + } + return sq.sqlQuery(), nil + } return selector } +func (sq *StreetQuery) prepareQuery(ctx context.Context) error { + if sq.path != nil { + prev, err := sq.path(ctx) + if err != nil { + return err + } + sq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (sq *StreetQuery) sqlAll(ctx context.Context) ([]*Street, error) { var ( nodes = []*Street{} @@ -438,8 +477,9 @@ type StreetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -450,6 +490,11 @@ func (sgb *StreetGroupBy) Aggregate(fns ...Aggregate) *StreetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (sgb *StreetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := sgb.path(ctx) + if err != nil { + return err + } + sgb.sql = query return sgb.sqlScan(ctx, v) } @@ -568,12 +613,18 @@ func (sgb *StreetGroupBy) sqlQuery() *sql.Selector { type StreetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ss *StreetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ss.path(ctx) + if err != nil { + return err + } + ss.sql = query return ss.sqlScan(ctx, v) } diff --git a/examples/entcpkg/ent/user_query.go b/examples/entcpkg/ent/user_query.go index 9d952e311..c2f470964 100644 --- a/examples/entcpkg/ent/user_query.go +++ b/examples/entcpkg/ent/user_query.go @@ -27,8 +27,9 @@ type UserQuery struct { order []Order unique []string predicates []predicate.User - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -151,6 +152,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -183,6 +187,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -197,6 +204,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -220,7 +230,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -229,7 +240,12 @@ func (uq *UserQuery) Clone() *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -237,10 +253,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -347,8 +380,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -359,6 +393,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -477,12 +516,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/m2m2types/ent/client.go b/examples/m2m2types/ent/client.go index 4924f6b63..177f12a8e 100644 --- a/examples/m2m2types/ent/client.go +++ b/examples/m2m2types/ent/client.go @@ -190,14 +190,16 @@ func (c *GroupClient) GetX(ctx context.Context, id int) *Group { // QueryUsers queries the users edge of a Group. func (c *GroupClient) QueryUsers(gr *Group) *UserQuery { query := &UserQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } @@ -287,14 +289,16 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryGroups queries the groups edge of a User. func (c *UserClient) QueryGroups(u *User) *GroupQuery { query := &GroupQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/m2m2types/ent/group_query.go b/examples/m2m2types/ent/group_query.go index 8aab3c34d..2fcdf3e69 100644 --- a/examples/m2m2types/ent/group_query.go +++ b/examples/m2m2types/ent/group_query.go @@ -31,8 +31,9 @@ type GroupQuery struct { predicates []predicate.Group // eager-loading edges. withUsers *UserQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (gq *GroupQuery) Order(o ...Order) *GroupQuery { // QueryUsers chains the current query on the users edge. func (gq *GroupQuery) QueryUsers() *UserQuery { query := &UserQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (gq *GroupQuery) Clone() *GroupQuery { unique: append([]string{}, gq.unique...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), + sql: gq.sql.Clone(), + path: gq.path, } } @@ -269,7 +286,12 @@ func (gq *GroupQuery) WithUsers(opts ...func(*UserQuery)) *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.sql = gq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.sql = gq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) { var ( nodes = []*Group{} @@ -466,8 +505,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -478,6 +518,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.sql = query return ggb.sqlScan(ctx, v) } @@ -596,12 +641,18 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { type GroupSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.sql = query return gs.sqlScan(ctx, v) } diff --git a/examples/m2m2types/ent/user_query.go b/examples/m2m2types/ent/user_query.go index 08e812e4d..05d8b728e 100644 --- a/examples/m2m2types/ent/user_query.go +++ b/examples/m2m2types/ent/user_query.go @@ -31,8 +31,9 @@ type UserQuery struct { predicates []predicate.User // eager-loading edges. withGroups *GroupQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryGroups chains the current query on the groups edge. func (uq *UserQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -269,7 +286,12 @@ func (uq *UserQuery) WithGroups(opts ...func(*GroupQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -466,8 +505,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -478,6 +518,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -596,12 +641,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/m2mbidi/ent/client.go b/examples/m2mbidi/ent/client.go index 780c13ff3..6fbe15940 100644 --- a/examples/m2mbidi/ent/client.go +++ b/examples/m2mbidi/ent/client.go @@ -184,14 +184,16 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryFriends queries the friends edge of a User. func (c *UserClient) QueryFriends(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/m2mbidi/ent/user_query.go b/examples/m2mbidi/ent/user_query.go index f5f413bdc..c23ba7221 100644 --- a/examples/m2mbidi/ent/user_query.go +++ b/examples/m2mbidi/ent/user_query.go @@ -30,8 +30,9 @@ type UserQuery struct { predicates []predicate.User // eager-loading edges. withFriends *UserQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -61,12 +62,18 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryFriends chains the current query on the friends edge. func (uq *UserQuery) QueryFriends() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -166,6 +173,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -198,6 +208,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -212,6 +225,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -235,7 +251,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -268,7 +285,12 @@ func (uq *UserQuery) WithFriends(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -287,10 +309,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -465,8 +504,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -477,6 +517,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -595,12 +640,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/m2mrecur/ent/client.go b/examples/m2mrecur/ent/client.go index e1402da1f..aedc5e309 100644 --- a/examples/m2mrecur/ent/client.go +++ b/examples/m2mrecur/ent/client.go @@ -184,28 +184,32 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryFollowers queries the followers edge of a User. func (c *UserClient) QueryFollowers(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFollowing queries the following edge of a User. func (c *UserClient) QueryFollowing(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/m2mrecur/ent/user_query.go b/examples/m2mrecur/ent/user_query.go index f4ae33a7b..4d8e5b91a 100644 --- a/examples/m2mrecur/ent/user_query.go +++ b/examples/m2mrecur/ent/user_query.go @@ -31,8 +31,9 @@ type UserQuery struct { // eager-loading edges. withFollowers *UserQuery withFollowing *UserQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,24 +63,36 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryFollowers chains the current query on the followers edge. func (uq *UserQuery) QueryFollowers() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFollowing chains the current query on the following edge. func (uq *UserQuery) QueryFollowing() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -179,6 +192,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -211,6 +227,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -225,6 +244,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -248,7 +270,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -292,7 +315,12 @@ func (uq *UserQuery) WithFollowing(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -311,10 +339,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -553,8 +598,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -565,6 +611,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -683,12 +734,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/o2m2types/ent/client.go b/examples/o2m2types/ent/client.go index 20fda3259..15e2d1ed1 100644 --- a/examples/o2m2types/ent/client.go +++ b/examples/o2m2types/ent/client.go @@ -190,14 +190,16 @@ func (c *PetClient) GetX(ctx context.Context, id int) *Pet { // QueryOwner queries the owner edge of a Pet. func (c *PetClient) QueryOwner(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } @@ -287,14 +289,16 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryPets queries the pets edge of a User. func (c *UserClient) QueryPets(u *User) *PetQuery { query := &PetQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/o2m2types/ent/pet_query.go b/examples/o2m2types/ent/pet_query.go index 25317a0fb..8ec6f48b1 100644 --- a/examples/o2m2types/ent/pet_query.go +++ b/examples/o2m2types/ent/pet_query.go @@ -31,8 +31,9 @@ type PetQuery struct { // eager-loading edges. withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (pq *PetQuery) Order(o ...Order) *PetQuery { // QueryOwner chains the current query on the owner edge. func (pq *PetQuery) QueryOwner() *UserQuery { query := &UserQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (pq *PetQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Pets. func (pq *PetQuery) All(ctx context.Context) ([]*Pet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (pq *PetQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (pq *PetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (pq *PetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (pq *PetQuery) Clone() *PetQuery { unique: append([]string{}, pq.unique...), predicates: append([]predicate.Pet{}, pq.predicates...), // clone intermediate query. - sql: pq.sql.Clone(), + sql: pq.sql.Clone(), + path: pq.path, } } @@ -269,7 +286,12 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { group := &PetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.sql = pq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { func (pq *PetQuery) Select(field string, fields ...string) *PetSelect { selector := &PetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.sql = pq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return selector } +func (pq *PetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) { var ( nodes = []*Pet{} @@ -438,8 +477,9 @@ type PetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -450,6 +490,11 @@ func (pgb *PetGroupBy) Aggregate(fns ...Aggregate) *PetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.sql = query return pgb.sqlScan(ctx, v) } @@ -568,12 +613,18 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { type PetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.sql = query return ps.sqlScan(ctx, v) } diff --git a/examples/o2m2types/ent/user_query.go b/examples/o2m2types/ent/user_query.go index 98808f1f9..494d4e240 100644 --- a/examples/o2m2types/ent/user_query.go +++ b/examples/o2m2types/ent/user_query.go @@ -31,8 +31,9 @@ type UserQuery struct { predicates []predicate.User // eager-loading edges. withPets *PetQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryPets chains the current query on the pets edge. func (uq *UserQuery) QueryPets() *PetQuery { query := &PetQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -269,7 +286,12 @@ func (uq *UserQuery) WithPets(opts ...func(*PetQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -431,8 +470,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -443,6 +483,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -561,12 +606,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/o2mrecur/ent/client.go b/examples/o2mrecur/ent/client.go index de7b375b0..5ab1c15c6 100644 --- a/examples/o2mrecur/ent/client.go +++ b/examples/o2mrecur/ent/client.go @@ -184,28 +184,32 @@ func (c *NodeClient) GetX(ctx context.Context, id int) *Node { // QueryParent queries the parent edge of a Node. func (c *NodeClient) QueryParent(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} - id := n.ID - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, id), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, node.ParentTable, node.ParentColumn), - ) - query.sql = sqlgraph.Neighbors(n.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := n.ID + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, id), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, node.ParentTable, node.ParentColumn), + ) + fromV = sqlgraph.Neighbors(n.driver.Dialect(), step) + return fromV, nil + } return query } // QueryChildren queries the children edge of a Node. func (c *NodeClient) QueryChildren(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} - id := n.ID - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, id), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, node.ChildrenTable, node.ChildrenColumn), - ) - query.sql = sqlgraph.Neighbors(n.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := n.ID + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, id), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, node.ChildrenTable, node.ChildrenColumn), + ) + fromV = sqlgraph.Neighbors(n.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/o2mrecur/ent/node_query.go b/examples/o2mrecur/ent/node_query.go index 3ece891f9..00ace4711 100644 --- a/examples/o2mrecur/ent/node_query.go +++ b/examples/o2mrecur/ent/node_query.go @@ -32,8 +32,9 @@ type NodeQuery struct { withParent *NodeQuery withChildren *NodeQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -63,24 +64,36 @@ func (nq *NodeQuery) Order(o ...Order) *NodeQuery { // QueryParent chains the current query on the parent edge. func (nq *NodeQuery) QueryParent() *NodeQuery { query := &NodeQuery{config: nq.config} - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, node.ParentTable, node.ParentColumn), - ) - query.sql = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, node.ParentTable, node.ParentColumn), + ) + fromU = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryChildren chains the current query on the children edge. func (nq *NodeQuery) QueryChildren() *NodeQuery { query := &NodeQuery{config: nq.config} - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, node.ChildrenTable, node.ChildrenColumn), - ) - query.sql = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, node.ChildrenTable, node.ChildrenColumn), + ) + fromU = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -180,6 +193,9 @@ func (nq *NodeQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Nodes. func (nq *NodeQuery) All(ctx context.Context) ([]*Node, error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } return nq.sqlAll(ctx) } @@ -212,6 +228,9 @@ func (nq *NodeQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (nq *NodeQuery) Count(ctx context.Context) (int, error) { + if err := nq.prepareQuery(ctx); err != nil { + return 0, err + } return nq.sqlCount(ctx) } @@ -226,6 +245,9 @@ func (nq *NodeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (nq *NodeQuery) Exist(ctx context.Context) (bool, error) { + if err := nq.prepareQuery(ctx); err != nil { + return false, err + } return nq.sqlExist(ctx) } @@ -249,7 +271,8 @@ func (nq *NodeQuery) Clone() *NodeQuery { unique: append([]string{}, nq.unique...), predicates: append([]predicate.Node{}, nq.predicates...), // clone intermediate query. - sql: nq.sql.Clone(), + sql: nq.sql.Clone(), + path: nq.path, } } @@ -293,7 +316,12 @@ func (nq *NodeQuery) WithChildren(opts ...func(*NodeQuery)) *NodeQuery { func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { group := &NodeGroupBy{config: nq.config} group.fields = append([]string{field}, fields...) - group.sql = nq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.sqlQuery(), nil + } return group } @@ -312,10 +340,27 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { func (nq *NodeQuery) Select(field string, fields ...string) *NodeSelect { selector := &NodeSelect{config: nq.config} selector.fields = append([]string{field}, fields...) - selector.sql = nq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.sqlQuery(), nil + } return selector } +func (nq *NodeQuery) prepareQuery(ctx context.Context) error { + if nq.path != nil { + prev, err := nq.path(ctx) + if err != nil { + return err + } + nq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (nq *NodeQuery) sqlAll(ctx context.Context) ([]*Node, error) { var ( nodes = []*Node{} @@ -491,8 +536,9 @@ type NodeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -503,6 +549,11 @@ func (ngb *NodeGroupBy) Aggregate(fns ...Aggregate) *NodeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ngb *NodeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ngb.path(ctx) + if err != nil { + return err + } + ngb.sql = query return ngb.sqlScan(ctx, v) } @@ -621,12 +672,18 @@ func (ngb *NodeGroupBy) sqlQuery() *sql.Selector { type NodeSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ns *NodeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ns.path(ctx) + if err != nil { + return err + } + ns.sql = query return ns.sqlScan(ctx, v) } diff --git a/examples/o2o2types/ent/card_query.go b/examples/o2o2types/ent/card_query.go index cc576d6b2..93c28259d 100644 --- a/examples/o2o2types/ent/card_query.go +++ b/examples/o2o2types/ent/card_query.go @@ -31,8 +31,9 @@ type CardQuery struct { // eager-loading edges. withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (cq *CardQuery) Order(o ...Order) *CardQuery { // QueryOwner chains the current query on the owner edge. func (cq *CardQuery) QueryOwner() *UserQuery { query := &UserQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (cq *CardQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cards. func (cq *CardQuery) All(ctx context.Context) ([]*Card, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (cq *CardQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CardQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (cq *CardQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CardQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (cq *CardQuery) Clone() *CardQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Card{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -269,7 +286,12 @@ func (cq *CardQuery) WithOwner(opts ...func(*UserQuery)) *CardQuery { func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { group := &CardGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { func (cq *CardQuery) Select(field string, fields ...string) *CardSelect { selector := &CardSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CardQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CardQuery) sqlAll(ctx context.Context) ([]*Card, error) { var ( nodes = []*Card{} @@ -438,8 +477,9 @@ type CardGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -450,6 +490,11 @@ func (cgb *CardGroupBy) Aggregate(fns ...Aggregate) *CardGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CardGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -568,12 +613,18 @@ func (cgb *CardGroupBy) sqlQuery() *sql.Selector { type CardSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CardSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/examples/o2o2types/ent/client.go b/examples/o2o2types/ent/client.go index 5b6402ae6..5e2e291e7 100644 --- a/examples/o2o2types/ent/client.go +++ b/examples/o2o2types/ent/client.go @@ -190,14 +190,16 @@ func (c *CardClient) GetX(ctx context.Context, id int) *Card { // QueryOwner queries the owner edge of a Card. func (c *CardClient) QueryOwner(ca *Card) *UserQuery { query := &UserQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(card.Table, card.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } @@ -287,14 +289,16 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryCard queries the card edge of a User. func (c *UserClient) QueryCard(u *User) *CardQuery { query := &CardQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/o2o2types/ent/user_query.go b/examples/o2o2types/ent/user_query.go index 7a61267eb..33ed15e96 100644 --- a/examples/o2o2types/ent/user_query.go +++ b/examples/o2o2types/ent/user_query.go @@ -31,8 +31,9 @@ type UserQuery struct { predicates []predicate.User // eager-loading edges. withCard *CardQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryCard chains the current query on the card edge. func (uq *UserQuery) QueryCard() *CardQuery { query := &CardQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(card.Table, card.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(card.Table, card.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -269,7 +286,12 @@ func (uq *UserQuery) WithCard(opts ...func(*CardQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -431,8 +470,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -443,6 +483,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -561,12 +606,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/o2obidi/ent/client.go b/examples/o2obidi/ent/client.go index b5c149eb6..d211d6d13 100644 --- a/examples/o2obidi/ent/client.go +++ b/examples/o2obidi/ent/client.go @@ -184,14 +184,16 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QuerySpouse queries the spouse edge of a User. func (c *UserClient) QuerySpouse(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/o2obidi/ent/user_query.go b/examples/o2obidi/ent/user_query.go index 9d8ccdfa6..3a90b98ae 100644 --- a/examples/o2obidi/ent/user_query.go +++ b/examples/o2obidi/ent/user_query.go @@ -30,8 +30,9 @@ type UserQuery struct { // eager-loading edges. withSpouse *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -61,12 +62,18 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QuerySpouse chains the current query on the spouse edge. func (uq *UserQuery) QuerySpouse() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -166,6 +173,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -198,6 +208,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -212,6 +225,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -235,7 +251,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -268,7 +285,12 @@ func (uq *UserQuery) WithSpouse(opts ...func(*UserQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -287,10 +309,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -437,8 +476,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -449,6 +489,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -567,12 +612,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/o2orecur/ent/client.go b/examples/o2orecur/ent/client.go index df2b4c880..3656c7895 100644 --- a/examples/o2orecur/ent/client.go +++ b/examples/o2orecur/ent/client.go @@ -184,28 +184,32 @@ func (c *NodeClient) GetX(ctx context.Context, id int) *Node { // QueryPrev queries the prev edge of a Node. func (c *NodeClient) QueryPrev(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} - id := n.ID - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, id), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), - ) - query.sql = sqlgraph.Neighbors(n.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := n.ID + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, id), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), + ) + fromV = sqlgraph.Neighbors(n.driver.Dialect(), step) + return fromV, nil + } return query } // QueryNext queries the next edge of a Node. func (c *NodeClient) QueryNext(n *Node) *NodeQuery { query := &NodeQuery{config: c.config} - id := n.ID - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, id), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), - ) - query.sql = sqlgraph.Neighbors(n.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := n.ID + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, id), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), + ) + fromV = sqlgraph.Neighbors(n.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/o2orecur/ent/node_query.go b/examples/o2orecur/ent/node_query.go index cff6eba0b..4da4805ab 100644 --- a/examples/o2orecur/ent/node_query.go +++ b/examples/o2orecur/ent/node_query.go @@ -32,8 +32,9 @@ type NodeQuery struct { withPrev *NodeQuery withNext *NodeQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -63,24 +64,36 @@ func (nq *NodeQuery) Order(o ...Order) *NodeQuery { // QueryPrev chains the current query on the prev edge. func (nq *NodeQuery) QueryPrev() *NodeQuery { query := &NodeQuery{config: nq.config} - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), - ) - query.sql = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), + ) + fromU = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryNext chains the current query on the next edge. func (nq *NodeQuery) QueryNext() *NodeQuery { query := &NodeQuery{config: nq.config} - step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), - sqlgraph.To(node.Table, node.FieldID), - sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), - ) - query.sql = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.To(node.Table, node.FieldID), + sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), + ) + fromU = sqlgraph.SetNeighbors(nq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -180,6 +193,9 @@ func (nq *NodeQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Nodes. func (nq *NodeQuery) All(ctx context.Context) ([]*Node, error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } return nq.sqlAll(ctx) } @@ -212,6 +228,9 @@ func (nq *NodeQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (nq *NodeQuery) Count(ctx context.Context) (int, error) { + if err := nq.prepareQuery(ctx); err != nil { + return 0, err + } return nq.sqlCount(ctx) } @@ -226,6 +245,9 @@ func (nq *NodeQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (nq *NodeQuery) Exist(ctx context.Context) (bool, error) { + if err := nq.prepareQuery(ctx); err != nil { + return false, err + } return nq.sqlExist(ctx) } @@ -249,7 +271,8 @@ func (nq *NodeQuery) Clone() *NodeQuery { unique: append([]string{}, nq.unique...), predicates: append([]predicate.Node{}, nq.predicates...), // clone intermediate query. - sql: nq.sql.Clone(), + sql: nq.sql.Clone(), + path: nq.path, } } @@ -293,7 +316,12 @@ func (nq *NodeQuery) WithNext(opts ...func(*NodeQuery)) *NodeQuery { func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { group := &NodeGroupBy{config: nq.config} group.fields = append([]string{field}, fields...) - group.sql = nq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.sqlQuery(), nil + } return group } @@ -312,10 +340,27 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { func (nq *NodeQuery) Select(field string, fields ...string) *NodeSelect { selector := &NodeSelect{config: nq.config} selector.fields = append([]string{field}, fields...) - selector.sql = nq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := nq.prepareQuery(ctx); err != nil { + return nil, err + } + return nq.sqlQuery(), nil + } return selector } +func (nq *NodeQuery) prepareQuery(ctx context.Context) error { + if nq.path != nil { + prev, err := nq.path(ctx) + if err != nil { + return err + } + nq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (nq *NodeQuery) sqlAll(ctx context.Context) ([]*Node, error) { var ( nodes = []*Node{} @@ -491,8 +536,9 @@ type NodeGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -503,6 +549,11 @@ func (ngb *NodeGroupBy) Aggregate(fns ...Aggregate) *NodeGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ngb *NodeGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ngb.path(ctx) + if err != nil { + return err + } + ngb.sql = query return ngb.sqlScan(ctx, v) } @@ -621,12 +672,18 @@ func (ngb *NodeGroupBy) sqlQuery() *sql.Selector { type NodeSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ns *NodeSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ns.path(ctx) + if err != nil { + return err + } + ns.sql = query return ns.sqlScan(ctx, v) } diff --git a/examples/start/ent/car_query.go b/examples/start/ent/car_query.go index c3847de96..f2e27b251 100644 --- a/examples/start/ent/car_query.go +++ b/examples/start/ent/car_query.go @@ -31,8 +31,9 @@ type CarQuery struct { // eager-loading edges. withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (cq *CarQuery) Order(o ...Order) *CarQuery { // QueryOwner chains the current query on the owner edge. func (cq *CarQuery) QueryOwner() *UserQuery { query := &UserQuery{config: cq.config} - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, cq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(cq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (cq *CarQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Cars. func (cq *CarQuery) All(ctx context.Context) ([]*Car, error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } return cq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (cq *CarQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (cq *CarQuery) Count(ctx context.Context) (int, error) { + if err := cq.prepareQuery(ctx); err != nil { + return 0, err + } return cq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (cq *CarQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (cq *CarQuery) Exist(ctx context.Context) (bool, error) { + if err := cq.prepareQuery(ctx); err != nil { + return false, err + } return cq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (cq *CarQuery) Clone() *CarQuery { unique: append([]string{}, cq.unique...), predicates: append([]predicate.Car{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), + sql: cq.sql.Clone(), + path: cq.path, } } @@ -269,7 +286,12 @@ func (cq *CarQuery) WithOwner(opts ...func(*UserQuery)) *CarQuery { func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { group := &CarGroupBy{config: cq.config} group.fields = append([]string{field}, fields...) - group.sql = cq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { func (cq *CarQuery) Select(field string, fields ...string) *CarSelect { selector := &CarSelect{config: cq.config} selector.fields = append([]string{field}, fields...) - selector.sql = cq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := cq.prepareQuery(ctx); err != nil { + return nil, err + } + return cq.sqlQuery(), nil + } return selector } +func (cq *CarQuery) prepareQuery(ctx context.Context) error { + if cq.path != nil { + prev, err := cq.path(ctx) + if err != nil { + return err + } + cq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (cq *CarQuery) sqlAll(ctx context.Context) ([]*Car, error) { var ( nodes = []*Car{} @@ -438,8 +477,9 @@ type CarGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -450,6 +490,11 @@ func (cgb *CarGroupBy) Aggregate(fns ...Aggregate) *CarGroupBy { // Scan applies the group-by query and scan the result into the given value. func (cgb *CarGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := cgb.path(ctx) + if err != nil { + return err + } + cgb.sql = query return cgb.sqlScan(ctx, v) } @@ -568,12 +613,18 @@ func (cgb *CarGroupBy) sqlQuery() *sql.Selector { type CarSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (cs *CarSelect) Scan(ctx context.Context, v interface{}) error { + query, err := cs.path(ctx) + if err != nil { + return err + } + cs.sql = query return cs.sqlScan(ctx, v) } diff --git a/examples/start/ent/client.go b/examples/start/ent/client.go index 5dffb8bd7..47d262746 100644 --- a/examples/start/ent/client.go +++ b/examples/start/ent/client.go @@ -196,14 +196,16 @@ func (c *CarClient) GetX(ctx context.Context, id int) *Car { // QueryOwner queries the owner edge of a Car. func (c *CarClient) QueryOwner(ca *Car) *UserQuery { query := &UserQuery{config: c.config} - id := ca.ID - step := sqlgraph.NewStep( - sqlgraph.From(car.Table, car.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(ca.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := ca.ID + step := sqlgraph.NewStep( + sqlgraph.From(car.Table, car.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, car.OwnerTable, car.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(ca.driver.Dialect(), step) + return fromV, nil + } return query } @@ -293,14 +295,16 @@ func (c *GroupClient) GetX(ctx context.Context, id int) *Group { // QueryUsers queries the users edge of a Group. func (c *GroupClient) QueryUsers(gr *Group) *UserQuery { query := &UserQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } @@ -390,28 +394,32 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryCars queries the cars edge of a User. func (c *UserClient) QueryCars(u *User) *CarQuery { query := &CarQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.CarsTable, user.CarsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.CarsTable, user.CarsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryGroups queries the groups edge of a User. func (c *UserClient) QueryGroups(u *User) *GroupQuery { query := &GroupQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/start/ent/group_query.go b/examples/start/ent/group_query.go index 413dde241..c89857dd8 100644 --- a/examples/start/ent/group_query.go +++ b/examples/start/ent/group_query.go @@ -31,8 +31,9 @@ type GroupQuery struct { predicates []predicate.Group // eager-loading edges. withUsers *UserQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -62,12 +63,18 @@ func (gq *GroupQuery) Order(o ...Order) *GroupQuery { // QueryUsers chains the current query on the users edge. func (gq *GroupQuery) QueryUsers() *UserQuery { query := &UserQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -167,6 +174,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.sqlAll(ctx) } @@ -199,6 +209,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.sqlCount(ctx) } @@ -213,6 +226,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.sqlExist(ctx) } @@ -236,7 +252,8 @@ func (gq *GroupQuery) Clone() *GroupQuery { unique: append([]string{}, gq.unique...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), + sql: gq.sql.Clone(), + path: gq.path, } } @@ -269,7 +286,12 @@ func (gq *GroupQuery) WithUsers(opts ...func(*UserQuery)) *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.sql = gq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return group } @@ -288,10 +310,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.sql = gq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) { var ( nodes = []*Group{} @@ -466,8 +505,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -478,6 +518,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.sql = query return ggb.sqlScan(ctx, v) } @@ -596,12 +641,18 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { type GroupSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.sql = query return gs.sqlScan(ctx, v) } diff --git a/examples/start/ent/user_query.go b/examples/start/ent/user_query.go index f44d4a52d..1133eed26 100644 --- a/examples/start/ent/user_query.go +++ b/examples/start/ent/user_query.go @@ -33,8 +33,9 @@ type UserQuery struct { // eager-loading edges. withCars *CarQuery withGroups *GroupQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -64,24 +65,36 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryCars chains the current query on the cars edge. func (uq *UserQuery) QueryCars() *CarQuery { query := &CarQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(car.Table, car.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.CarsTable, user.CarsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(car.Table, car.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.CarsTable, user.CarsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryGroups chains the current query on the groups edge. func (uq *UserQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -181,6 +194,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -213,6 +229,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -227,6 +246,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -250,7 +272,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -294,7 +317,12 @@ func (uq *UserQuery) WithGroups(opts ...func(*GroupQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -313,10 +341,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -520,8 +565,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -532,6 +578,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -650,12 +701,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) } diff --git a/examples/traversal/ent/client.go b/examples/traversal/ent/client.go index 01321374d..a7609e6d6 100644 --- a/examples/traversal/ent/client.go +++ b/examples/traversal/ent/client.go @@ -196,28 +196,32 @@ func (c *GroupClient) GetX(ctx context.Context, id int) *Group { // QueryUsers queries the users edge of a Group. func (c *GroupClient) QueryUsers(gr *Group) *UserQuery { query := &UserQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } // QueryAdmin queries the admin edge of a Group. func (c *GroupClient) QueryAdmin(gr *Group) *UserQuery { query := &UserQuery{config: c.config} - id := gr.ID - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, group.AdminTable, group.AdminColumn), - ) - query.sql = sqlgraph.Neighbors(gr.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := gr.ID + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, group.AdminTable, group.AdminColumn), + ) + fromV = sqlgraph.Neighbors(gr.driver.Dialect(), step) + return fromV, nil + } return query } @@ -307,28 +311,32 @@ func (c *PetClient) GetX(ctx context.Context, id int) *Pet { // QueryFriends queries the friends edge of a Pet. func (c *PetClient) QueryFriends(pe *Pet) *PetQuery { query := &PetQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } // QueryOwner queries the owner edge of a Pet. func (c *PetClient) QueryOwner(pe *Pet) *UserQuery { query := &UserQuery{config: c.config} - id := pe.ID - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.Neighbors(pe.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := pe.ID + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromV = sqlgraph.Neighbors(pe.driver.Dialect(), step) + return fromV, nil + } return query } @@ -418,56 +426,64 @@ func (c *UserClient) GetX(ctx context.Context, id int) *User { // QueryPets queries the pets edge of a User. func (c *UserClient) QueryPets(u *User) *PetQuery { query := &PetQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryFriends queries the friends edge of a User. func (c *UserClient) QueryFriends(u *User) *UserQuery { query := &UserQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryGroups queries the groups edge of a User. func (c *UserClient) QueryGroups(u *User) *GroupQuery { query := &GroupQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } // QueryManage queries the manage edge of a User. func (c *UserClient) QueryManage(u *User) *GroupQuery { query := &GroupQuery{config: c.config} - id := u.ID - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, id), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.O2M, true, user.ManageTable, user.ManageColumn), - ) - query.sql = sqlgraph.Neighbors(u.driver.Dialect(), step) - + query.path = func(ctx context.Context) (fromV *sql.Selector, _ error) { + id := u.ID + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, id), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.O2M, true, user.ManageTable, user.ManageColumn), + ) + fromV = sqlgraph.Neighbors(u.driver.Dialect(), step) + return fromV, nil + } return query } diff --git a/examples/traversal/ent/group_query.go b/examples/traversal/ent/group_query.go index 9f0d58ca5..542291ae5 100644 --- a/examples/traversal/ent/group_query.go +++ b/examples/traversal/ent/group_query.go @@ -33,8 +33,9 @@ type GroupQuery struct { withUsers *UserQuery withAdmin *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -64,24 +65,36 @@ func (gq *GroupQuery) Order(o ...Order) *GroupQuery { // QueryUsers chains the current query on the users edge. func (gq *GroupQuery) QueryUsers() *UserQuery { query := &UserQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, group.UsersTable, group.UsersPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryAdmin chains the current query on the admin edge. func (gq *GroupQuery) QueryAdmin() *UserQuery { query := &UserQuery{config: gq.config} - step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, false, group.AdminTable, group.AdminColumn), - ) - query.sql = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, false, group.AdminTable, group.AdminColumn), + ) + fromU = sqlgraph.SetNeighbors(gq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -181,6 +194,9 @@ func (gq *GroupQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Groups. func (gq *GroupQuery) All(ctx context.Context) ([]*Group, error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } return gq.sqlAll(ctx) } @@ -213,6 +229,9 @@ func (gq *GroupQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (gq *GroupQuery) Count(ctx context.Context) (int, error) { + if err := gq.prepareQuery(ctx); err != nil { + return 0, err + } return gq.sqlCount(ctx) } @@ -227,6 +246,9 @@ func (gq *GroupQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (gq *GroupQuery) Exist(ctx context.Context) (bool, error) { + if err := gq.prepareQuery(ctx); err != nil { + return false, err + } return gq.sqlExist(ctx) } @@ -250,7 +272,8 @@ func (gq *GroupQuery) Clone() *GroupQuery { unique: append([]string{}, gq.unique...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), + sql: gq.sql.Clone(), + path: gq.path, } } @@ -294,7 +317,12 @@ func (gq *GroupQuery) WithAdmin(opts ...func(*UserQuery)) *GroupQuery { func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { group := &GroupGroupBy{config: gq.config} group.fields = append([]string{field}, fields...) - group.sql = gq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return group } @@ -313,10 +341,27 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { func (gq *GroupQuery) Select(field string, fields ...string) *GroupSelect { selector := &GroupSelect{config: gq.config} selector.fields = append([]string{field}, fields...) - selector.sql = gq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := gq.prepareQuery(ctx); err != nil { + return nil, err + } + return gq.sqlQuery(), nil + } return selector } +func (gq *GroupQuery) prepareQuery(ctx context.Context) error { + if gq.path != nil { + prev, err := gq.path(ctx) + if err != nil { + return err + } + gq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) { var ( nodes = []*Group{} @@ -527,8 +572,9 @@ type GroupGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -539,6 +585,11 @@ func (ggb *GroupGroupBy) Aggregate(fns ...Aggregate) *GroupGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ggb *GroupGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ggb.path(ctx) + if err != nil { + return err + } + ggb.sql = query return ggb.sqlScan(ctx, v) } @@ -657,12 +708,18 @@ func (ggb *GroupGroupBy) sqlQuery() *sql.Selector { type GroupSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (gs *GroupSelect) Scan(ctx context.Context, v interface{}) error { + query, err := gs.path(ctx) + if err != nil { + return err + } + gs.sql = query return gs.sqlScan(ctx, v) } diff --git a/examples/traversal/ent/pet_query.go b/examples/traversal/ent/pet_query.go index a73d33107..ede4b0aec 100644 --- a/examples/traversal/ent/pet_query.go +++ b/examples/traversal/ent/pet_query.go @@ -33,8 +33,9 @@ type PetQuery struct { withFriends *PetQuery withOwner *UserQuery withFKs bool - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -64,24 +65,36 @@ func (pq *PetQuery) Order(o ...Order) *PetQuery { // QueryFriends chains the current query on the friends edge. func (pq *PetQuery) QueryFriends() *PetQuery { query := &PetQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, pet.FriendsTable, pet.FriendsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryOwner chains the current query on the owner edge. func (pq *PetQuery) QueryOwner() *UserQuery { query := &UserQuery{config: pq.config} - step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), - ) - query.sql = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), + ) + fromU = sqlgraph.SetNeighbors(pq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -181,6 +194,9 @@ func (pq *PetQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Pets. func (pq *PetQuery) All(ctx context.Context) ([]*Pet, error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } return pq.sqlAll(ctx) } @@ -213,6 +229,9 @@ func (pq *PetQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (pq *PetQuery) Count(ctx context.Context) (int, error) { + if err := pq.prepareQuery(ctx); err != nil { + return 0, err + } return pq.sqlCount(ctx) } @@ -227,6 +246,9 @@ func (pq *PetQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (pq *PetQuery) Exist(ctx context.Context) (bool, error) { + if err := pq.prepareQuery(ctx); err != nil { + return false, err + } return pq.sqlExist(ctx) } @@ -250,7 +272,8 @@ func (pq *PetQuery) Clone() *PetQuery { unique: append([]string{}, pq.unique...), predicates: append([]predicate.Pet{}, pq.predicates...), // clone intermediate query. - sql: pq.sql.Clone(), + sql: pq.sql.Clone(), + path: pq.path, } } @@ -294,7 +317,12 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { group := &PetGroupBy{config: pq.config} group.fields = append([]string{field}, fields...) - group.sql = pq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return group } @@ -313,10 +341,27 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { func (pq *PetQuery) Select(field string, fields ...string) *PetSelect { selector := &PetSelect{config: pq.config} selector.fields = append([]string{field}, fields...) - selector.sql = pq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := pq.prepareQuery(ctx); err != nil { + return nil, err + } + return pq.sqlQuery(), nil + } return selector } +func (pq *PetQuery) prepareQuery(ctx context.Context) error { + if pq.path != nil { + prev, err := pq.path(ctx) + if err != nil { + return err + } + pq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) { var ( nodes = []*Pet{} @@ -527,8 +572,9 @@ type PetGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -539,6 +585,11 @@ func (pgb *PetGroupBy) Aggregate(fns ...Aggregate) *PetGroupBy { // Scan applies the group-by query and scan the result into the given value. func (pgb *PetGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := pgb.path(ctx) + if err != nil { + return err + } + pgb.sql = query return pgb.sqlScan(ctx, v) } @@ -657,12 +708,18 @@ func (pgb *PetGroupBy) sqlQuery() *sql.Selector { type PetSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (ps *PetSelect) Scan(ctx context.Context, v interface{}) error { + query, err := ps.path(ctx) + if err != nil { + return err + } + ps.sql = query return ps.sqlScan(ctx, v) } diff --git a/examples/traversal/ent/user_query.go b/examples/traversal/ent/user_query.go index 1c3f4702f..400938a62 100644 --- a/examples/traversal/ent/user_query.go +++ b/examples/traversal/ent/user_query.go @@ -35,8 +35,9 @@ type UserQuery struct { withFriends *UserQuery withGroups *GroupQuery withManage *GroupQuery - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Where adds a new predicate for the builder. @@ -66,48 +67,72 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery { // QueryPets chains the current query on the pets edge. func (uq *UserQuery) QueryPets() *PetQuery { query := &PetQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(pet.Table, pet.FieldID), - sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(pet.Table, pet.FieldID), + sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryFriends chains the current query on the friends edge. func (uq *UserQuery) QueryFriends() *UserQuery { query := &UserQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(user.Table, user.FieldID), - sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(user.Table, user.FieldID), + sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryGroups chains the current query on the groups edge. func (uq *UserQuery) QueryGroups() *GroupQuery { query := &GroupQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.M2M, true, user.GroupsTable, user.GroupsPrimaryKey...), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } // QueryManage chains the current query on the manage edge. func (uq *UserQuery) QueryManage() *GroupQuery { query := &GroupQuery{config: uq.config} - step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), - sqlgraph.To(group.Table, group.FieldID), - sqlgraph.Edge(sqlgraph.O2M, true, user.ManageTable, user.ManageColumn), - ) - query.sql = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + query.path = func(ctx context.Context) (fromU *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + step := sqlgraph.NewStep( + sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.To(group.Table, group.FieldID), + sqlgraph.Edge(sqlgraph.O2M, true, user.ManageTable, user.ManageColumn), + ) + fromU = sqlgraph.SetNeighbors(uq.driver.Dialect(), step) + return fromU, nil + } return query } @@ -207,6 +232,9 @@ func (uq *UserQuery) OnlyXID(ctx context.Context) int { // All executes the query and returns a list of Users. func (uq *UserQuery) All(ctx context.Context) ([]*User, error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } return uq.sqlAll(ctx) } @@ -239,6 +267,9 @@ func (uq *UserQuery) IDsX(ctx context.Context) []int { // Count returns the count of the given query. func (uq *UserQuery) Count(ctx context.Context) (int, error) { + if err := uq.prepareQuery(ctx); err != nil { + return 0, err + } return uq.sqlCount(ctx) } @@ -253,6 +284,9 @@ func (uq *UserQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (uq *UserQuery) Exist(ctx context.Context) (bool, error) { + if err := uq.prepareQuery(ctx); err != nil { + return false, err + } return uq.sqlExist(ctx) } @@ -276,7 +310,8 @@ func (uq *UserQuery) Clone() *UserQuery { unique: append([]string{}, uq.unique...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), + sql: uq.sql.Clone(), + path: uq.path, } } @@ -342,7 +377,12 @@ func (uq *UserQuery) WithManage(opts ...func(*GroupQuery)) *UserQuery { func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { group := &UserGroupBy{config: uq.config} group.fields = append([]string{field}, fields...) - group.sql = uq.sqlQuery() + group.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return group } @@ -361,10 +401,27 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { func (uq *UserQuery) Select(field string, fields ...string) *UserSelect { selector := &UserSelect{config: uq.config} selector.fields = append([]string{field}, fields...) - selector.sql = uq.sqlQuery() + selector.path = func(ctx context.Context) (prev *sql.Selector, err error) { + if err := uq.prepareQuery(ctx); err != nil { + return nil, err + } + return uq.sqlQuery(), nil + } return selector } +func (uq *UserQuery) prepareQuery(ctx context.Context) error { + if uq.path != nil { + prev, err := uq.path(ctx) + if err != nil { + return err + } + uq.sql = prev + } + // Privacy and query checks go here. + return nil +} + func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) { var ( nodes = []*User{} @@ -661,8 +718,9 @@ type UserGroupBy struct { config fields []string fns []Aggregate - // intermediate query. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Aggregate adds the given aggregation functions to the group-by query. @@ -673,6 +731,11 @@ func (ugb *UserGroupBy) Aggregate(fns ...Aggregate) *UserGroupBy { // Scan applies the group-by query and scan the result into the given value. func (ugb *UserGroupBy) Scan(ctx context.Context, v interface{}) error { + query, err := ugb.path(ctx) + if err != nil { + return err + } + ugb.sql = query return ugb.sqlScan(ctx, v) } @@ -791,12 +854,18 @@ func (ugb *UserGroupBy) sqlQuery() *sql.Selector { type UserSelect struct { config fields []string - // intermediate queries. - sql *sql.Selector + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) } // Scan applies the selector query and scan the result into the given value. func (us *UserSelect) Scan(ctx context.Context, v interface{}) error { + query, err := us.path(ctx) + if err != nil { + return err + } + us.sql = query return us.sqlScan(ctx, v) }