diff --git a/ent.go b/ent.go
index fd1f0b630..54bc66dda 100644
--- a/ent.go
+++ b/ent.go
@@ -156,10 +156,10 @@ type (
 	//
 	//
 	Policy interface {
-		EvalWrite(context.Context, Mutation) error
-		// Note that the read policy is under development
+		EvalMutation(context.Context, Mutation) error
+		// Note that the query policy is under development
 		// and is currently disabled.
-		// EvalRead(context.Context, Value) error
+		// EvalQuery(context.Context, Query) error
 	}
 
 	// Schema is the default implementation for the schema Interface.
@@ -198,6 +198,8 @@ func (Schema) Policy() Policy { return nil }
 type (
 	// Value represents a value returned by ent.
 	Value interface{}
+	// Value represents an ent query builder.
+	Query interface{}
 	// Mutation represents an operation that mutate the graph.
 	// For example, adding a new node, updating many, or dropping
 	// data. The implementation is generated by entc (ent codegen).
diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go
index 491d27c41..b3c81eb22 100644
--- a/entc/gen/internal/bindata.go
+++ b/entc/gen/internal/bindata.go
@@ -124,7 +124,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _templateBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\x5f\x6f\xdc\xb0\x0d\x7f\x3e\x7f\x0a\xc2\xb8\x75\x76\x7a\xb1\xd3\xbc\xad\x40\x1e\xd2\xac\xd9\x02\xb4\xe9\x80\x74\xeb\x43\x51\x0c\x8a\x4d\xfb\x84\xc8\x92\x23\xc9\x49\x0e\x86\xbf\xfb\x40\xc9\xff\xee\x72\x4d\xd2\xa6\xeb\x43\x71\x26\x25\xf2\x47\xf2\x47\x9a\x4e\xdb\xa6\x07\xc1\x99\xaa\x37\x9a\x97\x6b\x0b\xc7\x47\xef\xfe\x76\x58\x6b\x34\x28\x2d\x9c\xb3\x0c\xaf\x95\xba\x81\x0b\x99\x25\x70\x2a\x04\xb8\x43\x06\x48\xaf\xef\x30\x4f\x82\xaf\x6b\x6e\xc0\xa8\x46\x67\x08\x99\xca\x11\xb8\x01\xc1\x33\x94\x06\x73\x68\x64\x8e\x1a\xec\x1a\xe1\xb4\x66\xd9\x1a\xe1\x38\x39\x1a\xb4\x50\xa8\x46\xe6\x01\x97\x4e\xff\xe9\xe2\xec\xe3\xe5\xd5\x47\x28\xb8\x40\xe8\x65\x5a\x29\x0b\x39\xd7\x98\x59\xa5\x37\xa0\x0a\xb0\x33\x67\x56\x23\x26\xc1\x41\xda\x75\x41\xd0\xb6\x90\x63\xc1\x25\x42\x78\xcd\x0c\x86\xd0\x0b\x97\xf5\x4d\x09\xef\x4f\x80\x84\xb0\x4c\xce\x94\x2c\x78\x99\xfc\x8b\x65\x37\xac\x44\x3a\xd4\xb6\x60\xb1\xaa\x05\xb3\x08\xe1\x1a\x59\x8e\x3a\x84\xe5\x70\x7d\x52\xf1\xaa\x56\xda\x0e\xaa\x34\x05\xca\x0e\x13\x9c\x19\x34\x60\x15\xb0\x3b\xc5\x73\xf0\xa7\x20\x53\xb2\x10\x3c\xb3\x14\x47\x63\x50\xff\xd5\xb8\xcc\x24\x81\xdd\xd4\x08\x51\xb0\xf8\x52\xc3\xf0\xef\x84\x2c\x25\x5f\xea\x60\xf1\x4f\xca\xf3\x5c\x48\x82\x60\xf1\x1f\x26\x1a\x9c\x8b\x9d\x20\x58\x7c\x6e\x2c\xb3\x4a\x4f\xf2\x5e\xd0\x6b\xb8\x92\xdb\x1a\xae\x64\xaf\xc2\xf3\x46\x66\x73\x95\x13\x04\xb1\x8b\xeb\x8b\xa6\x8a\xb1\xba\x16\x1c\x0d\x30\x09\x8a\x04\x5c\x96\xa0\x24\x20\xb7\x6b\xd4\x50\x6a\x56\xaf\xc1\x6a\x76\x87\xda\x30\x01\x4a\x83\xb9\x15\x60\x50\xb8\x4a\xf5\x71\x7a\x4b\x45\x23\xb3\x88\x2a\x91\x5c\x59\xa5\x59\x89\xc9\x87\x86\x0b\xd2\x74\x5d\xec\x92\xac\x99\x2c\x11\x96\xc5\x0a\x96\xce\x17\xd5\xcb\xff\xe8\xba\x60\x41\x57\x0b\x38\x81\x9a\x99\x8c\x09\xfa\x4d\xd2\x34\x05\xaf\xe8\xba\x11\x2b\x31\xa6\xe4\x77\x28\xa1\xe0\x28\x72\x43\xd9\x6f\x5b\x68\xea\x1a\x75\x7f\xd4\x99\x4d\x82\x05\x81\x1a\x0d\x44\xfd\xf1\x24\x49\x8c\xa5\x48\xe3\x1e\x7a\x1b\x2c\x16\x6d\x7b\x08\xf7\xdc\xae\x01\x1f\x2c\xca\x1c\x22\x2e\x73\x7c\x80\x65\x72\xa9\x72\x34\x70\x14\x43\x48\xc9\x0b\xc9\x54\xe8\xae\x85\x43\x18\x87\x04\x74\xe1\x02\xb0\x55\x2d\x28\xac\x5a\x73\x69\x0b\x08\x73\xce\x28\x55\xe9\x5f\x4c\xaa\xfa\x3b\x43\x7a\xc0\xdf\xd2\x68\x1b\xed\xf0\x3f\x8c\x24\xf4\x66\x12\x7f\xa2\x6d\x81\xf0\x38\x27\x8e\xc6\xf4\x34\xb0\xfe\x09\x7f\xa5\x56\x4d\x9d\x1a\x5e\x4a\x66\x1b\x8d\x3b\x9e\xd3\x14\x4e\xcb\x52\x63\x49\xfe\x66\x24\x60\xbd\x90\x58\x65\x2c\xd6\x44\x06\x97\x6f\xb2\x76\x78\xbd\x99\xc8\x90\x4e\x2c\xf8\x19\x78\xc7\xb3\x53\x43\x83\x82\x41\x6d\xb0\xc9\xd5\x96\x03\xaa\x8e\xff\xa1\x34\x68\x94\xac\x22\xfa\x31\xa9\x1c\xf9\xfc\xff\xc3\x19\xe3\xab\x93\x35\xc6\xaa\x0a\x24\xab\xd0\x24\x70\xae\x34\xe0\x03\xab\x6a\x81\xef\x83\x34\x0d\xd2\x74\xf1\x0f\x02\xfa\x61\xe3\x6b\xfd\x6e\xe5\x29\x72\x1c\x27\xa4\x1b\x23\x8e\x86\x89\xd1\x75\xc9\xa9\x99\x3f\x5d\x35\x55\x7f\x35\x5e\x41\x68\x9a\xea\xbf\xfe\x29\x8c\x57\xf0\x82\x5b\xc7\x5b\xb7\x8e\xc3\xd8\x3b\xbe\xca\x98\x8c\x32\xfb\xb0\x82\x37\x77\x31\x01\x75\xbc\x3c\x35\x51\x21\xa7\x32\xac\x5c\x65\x07\x66\x4e\xd5\x69\x03\x47\x4e\x9f\xd7\x27\x4a\xcd\xcc\x2e\xbb\x9e\xe1\x56\x37\xef\x4a\xca\xe8\x0a\x96\x94\xe4\x73\xc2\x4e\xac\x62\x23\x86\xb1\x41\xa5\x63\x5b\xdf\xa2\x74\x67\x54\x3d\x4b\xc5\x4c\x49\x63\x77\x21\xb6\x2d\xf0\x02\xd6\xcc\x7c\xdd\x06\x38\x50\xff\x99\x96\xbc\x64\x15\x31\xdb\x01\x19\xfb\x53\xce\x3a\xf2\xe9\xa6\xea\x11\x0c\x1d\x35\x4e\x1b\xb9\x3b\x6e\xda\x16\x6e\x1b\x65\x71\x8c\x79\x3f\x8f\x95\x4b\x36\x2f\xe6\x79\xec\xba\x9d\x79\x45\xaf\xb7\xd1\x29\xb2\x6c\xed\x9b\x6b\x6b\x5a\x11\x80\x68\x8f\x29\x6f\xc0\x73\x64\xb4\xb1\x43\x96\x5f\x19\x65\x12\xc2\x6f\x83\xf9\x70\xee\xea\x65\x33\xcd\x17\xb6\xf0\xc6\xfe\xd8\x60\x4b\x53\xb8\x54\xf6\x9c\x96\x86\x8f\x5a\xbb\xd1\x40\xa6\x0c\xdc\xaf\x51\x82\xd5\x1b\x9a\x12\x56\x41\x81\x36\x5b\x03\x03\x53\x63\xc6\x0b\x9e\xd1\x7b\x8e\xdb\x0d\x30\x99\x03\xb7\x70\xcf\x0c\x48\x65\xfd\xf6\x31\x6c\x1a\x39\xb3\x8c\x76\x84\xfe\xd5\xb5\xed\xc7\x58\xdd\x64\x96\x72\x28\xd8\x35\x8a\x3e\xcf\x81\x87\xe4\x8f\x70\x9a\x35\x15\x4a\xeb\x79\x81\x5e\x28\x2d\xea\x82\x65\x98\xf8\xc6\x8e\x10\x0e\xb6\x2c\xc7\xfe\x76\x14\xf7\x26\xc9\x45\x9f\x9f\x70\x1a\x23\xef\x21\x84\xb7\x80\x89\x77\xfe\x16\xc2\x09\x7e\xd8\x83\xb8\x30\x83\xdd\x31\x29\x0c\xae\x95\x12\xc8\x24\x70\x99\xf3\x8c\x59\xb2\x7f\xbf\x46\x37\x3d\x67\x18\xe9\xe4\x94\x0e\x27\xec\xe1\x4e\x46\x23\xd4\xda\xab\x62\x67\x95\x70\xf2\x82\x24\x70\x72\x02\x92\x3b\xc1\x80\xbc\x60\xc2\x20\x95\x6e\x71\xc7\x34\xec\x86\x3c\x06\xf8\xe0\xec\x19\x9a\x98\xa8\xf5\x0a\xde\x60\xdc\x07\xf3\x99\x99\x9b\x31\x9c\x8a\x99\x1b\xaa\x97\xde\x03\x70\x7e\x70\x0e\xd1\x47\xe6\x31\x6e\x07\x11\xcf\x81\x4a\x2e\x1c\xcc\xfe\x11\xb5\x0e\x46\x96\x5d\x71\x59\x36\x82\xe9\x97\x11\xad\x3f\x3c\x27\x5a\xa5\x34\x52\x9a\xa9\xf9\xd1\x71\xee\x19\xbe\x6d\x7b\xfc\xc3\x94\xdb\x32\xfe\x1a\xd6\x0d\xa1\x6e\x11\x6f\xb0\xfe\xdb\xdc\x9b\x12\xb8\x4b\xbf\xc1\xf4\xab\x19\xb8\x95\x81\x17\x90\xf0\x52\xd9\x4f\x8a\xe5\xf8\xf4\xa8\x29\xd1\xba\x10\x72\xaa\x35\x9b\x66\x8b\x70\x57\x81\xf6\xa2\x35\xc2\x6d\x83\x7a\x33\x55\x7a\x6e\x77\xaa\x33\xe6\x25\xbe\xb6\xcc\x33\xcb\xbf\x56\x64\xe7\x9c\x6a\xec\x7e\x6c\x47\xb1\x55\x6a\xef\xe1\xb7\x0b\xdd\xe7\xe5\x51\x99\xbd\xd9\x57\x17\x79\x16\xff\x0b\x4a\x7c\x46\x8b\x87\x66\x5c\xda\x27\x6b\x9c\x69\x64\x16\xd3\xa6\xce\xe9\x55\x45\xdd\xac\xb4\x6f\x6f\xd7\xee\x7e\x41\xce\xc9\xe0\x5c\xe7\xbe\x55\x91\x6b\xc8\x46\x2f\x06\x0a\xc6\x05\xe6\x5b\xfb\xe9\x0a\xee\xb8\x12\x7e\x5f\x50\x85\xcf\xbf\xd2\x64\xcd\xbf\xd3\x1b\xc9\x6f\x1b\x94\x68\x4c\x4f\xa0\x5d\xd4\x13\x83\x2a\x53\x0e\x04\x5a\xdc\x6b\x56\xfb\x54\xfe\x16\x99\x76\x9c\xbc\x94\x4c\x53\xac\x7d\xa8\x03\xbf\x2a\x33\x90\xfa\xdf\xd2\x41\xdb\x07\xc4\x24\xdf\x34\x73\x1f\x6b\xfb\xe8\xfd\x08\x92\xb7\x14\xcd\xc6\xfd\x30\xc8\x13\x52\x8c\xac\xfd\x59\x99\x7f\x85\xbb\x3b\x81\x35\x1a\x47\xf6\xee\x98\x7f\x1d\x87\x77\x8c\x3d\x47\xe2\xb6\x4d\x0f\x00\x1f\x6a\x36\xbc\x18\x81\x28\xe2\xf8\x08\xa5\x50\xd7\x4c\xc0\x1a\x45\x8d\xda\x24\xe0\xfe\x4e\x32\xee\x6d\x7b\xd7\x36\xef\x64\x67\x65\x7b\x6a\x13\xdf\xb3\xc4\x2d\xfb\x3b\x8f\xbe\x46\xf7\x2f\x8a\x0e\xe4\xff\xc1\x25\x77\x1f\x2a\x8f\x36\xdc\xe4\xe2\xef\xc9\x57\xea\x22\xff\xa9\x7b\x83\x1b\x33\xf2\x81\x4a\x4e\x82\x94\xe7\x06\x0a\xad\x2a\x4f\x02\x6a\xc8\x8a\xd5\x7d\xbd\xe9\x40\x54\x91\xe0\x7b\xef\xa6\xeb\x7e\xf8\x16\x6c\xbb\x18\xbe\xff\x18\xa5\x54\x67\x43\x20\x2a\x76\x83\xd1\x4c\xb1\x82\xa3\x15\x08\x94\x51\x15\xc7\xc1\x82\x3e\x71\x3d\x58\xff\xc1\x55\x39\x7e\x18\x38\xa1\xef\x0c\x94\x79\x64\x56\xc0\xf3\x78\xbe\xa8\x98\x60\x1e\xee\xff\x02\x00\x00\xff\xff\xcb\x05\xd3\x14\xbe\x13\x00\x00")
+var _templateBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\xdf\x6f\xdc\xbe\x0d\x7f\x3e\xff\x15\x84\x71\xfb\xce\x4e\x2f\x76\x9a\xb7\x15\xc8\x43\x9a\x35\x5b\x80\x36\xdd\x90\x6e\x7d\x28\x8a\x41\xb1\x69\x9f\x10\x59\x72\x24\x39\xc9\xc1\xf0\xff\x3e\x50\xf2\xaf\xbb\x5c\x93\xb4\xe9\xb7\x0f\xc5\x99\x94\xc8\x0f\xc9\x0f\x69\x3a\x6d\x9b\x1e\x04\x67\xaa\xde\x68\x5e\xae\x2d\x1c\x1f\xbd\xfd\xdb\x61\xad\xd1\xa0\xb4\x70\xce\x32\xbc\x56\xea\x06\x2e\x64\x96\xc0\xa9\x10\xe0\x0e\x19\x20\xbd\xbe\xc3\x3c\x09\xbe\xac\xb9\x01\xa3\x1a\x9d\x21\x64\x2a\x47\xe0\x06\x04\xcf\x50\x1a\xcc\xa1\x91\x39\x6a\xb0\x6b\x84\xd3\x9a\x65\x6b\x84\xe3\xe4\x68\xd0\x42\xa1\x1a\x99\x07\x5c\x3a\xfd\xc7\x8b\xb3\x0f\x97\x57\x1f\xa0\xe0\x02\xa1\x97\x69\xa5\x2c\xe4\x5c\x63\x66\x95\xde\x80\x2a\xc0\xce\x9c\x59\x8d\x98\x04\x07\x69\xd7\x05\x41\xdb\x42\x8e\x05\x97\x08\xe1\x35\x33\x18\x42\x2f\x5c\xd6\x37\x25\xbc\x3b\x01\x12\xc2\x32\x39\x53\xb2\xe0\x65\xf2\x2f\x96\xdd\xb0\x12\xe9\x50\xdb\x82\xc5\xaa\x16\xcc\x22\x84\x6b\x64\x39\xea\x10\x96\xc3\xf5\x49\xc5\xab\x5a\x69\x3b\xa8\xd2\x14\x28\x3b\x4c\x70\x66\xd0\x80\x55\xc0\xee\x14\xcf\xc1\x9f\x82\x4c\xc9\x42\xf0\xcc\x52\x1c\x8d\x41\xfd\x57\xe3\x32\x93\x04\x76\x53\x23\x44\xc1\xe2\x73\x0d\xc3\xbf\x13\xb2\x94\x7c\xae\x83\xc5\x3f\x29\xcf\x73\x21\x09\x82\xc5\x7f\x99\x68\x70\x2e\x76\x82\x60\xf1\xef\x06\xf5\x66\x2e\x77\x82\x60\xf1\xa9\xb1\xcc\x2a\x3d\xc9\x7b\x41\xaf\xe1\x4a\x6e\x6b\xb8\x92\xbd\x0a\xcf\x1b\x99\xcd\x55\x4e\x10\xc4\x2e\xde\xcf\x9a\x2a\xc9\xea\x5a\x70\x34\xc0\x24\x28\x12\x70\x59\x82\x92\x80\xdc\xae\x51\x43\xa9\x59\xbd\x06\xab\xd9\x1d\x6a\xc3\x04\x28\x0d\xe6\x56\x80\x41\xe1\x2a\xd8\xc7\xef\x2d\x15\x8d\xcc\x22\xaa\x50\x72\x65\x95\x66\x25\x26\xef\x1b\x2e\x48\xd3\x75\xb1\x4b\xbe\x66\xb2\x44\x58\x16\x2b\x58\x3a\x5f\x54\x47\xff\xa3\xeb\x82\x05\x5d\x2d\xe0\x04\x6a\x66\x32\x26\xe8\x37\x49\xd3\x14\xbc\xa2\xeb\x46\xac\xc4\xa4\x92\xdf\xa1\x84\x82\xa3\xc8\x0d\x55\xa5\x6d\xa1\xa9\x6b\xd4\xfd\x51\x67\x36\x09\x16\x04\x6a\x34\x10\xf5\xc7\x93\x24\x31\x96\x22\x8d\x7b\xe8\x6d\xb0\x58\xb4\xed\x21\xdc\x73\xbb\x06\x7c\xb0\x28\x73\x88\xb8\xcc\xf1\x01\x96\xc9\xa5\xca\xd1\xc0\x51\x0c\x21\x25\x2f\x24\x53\xa1\xbb\x16\x0e\x61\x1c\x12\xd0\x85\x0b\xc0\x56\xb5\xa0\xb0\x6a\xcd\xa5\x2d\x20\xcc\x39\xa3\x54\xa5\x7f\x31\xa9\xea\xef\x0c\xe9\x01\x7f\x4b\xa3\x6d\xb4\xc3\xff\x30\x92\xd3\x9b\x49\xfc\x89\xb6\x05\xc2\xe3\x9c\x38\x7a\xd3\xd3\xd0\x0d\x4f\xf8\x2b\xb5\x6a\xea\xd4\xf0\x52\x32\xdb\x68\xdc\xf1\x9c\xa6\x70\x5a\x96\x1a\x4b\xf2\x37\x23\x01\xeb\x85\xc4\x2a\x63\xb1\x26\x32\xb8\x7c\x93\xb5\xc3\xeb\xcd\x44\x86\x74\x62\xc1\x8f\xc0\x3b\x9e\x9d\x1a\x1a\x20\x0c\x6a\x83\x4d\xae\xb6\x1c\x50\x75\xfc\x0f\xa5\x41\xa3\x64\x15\xd1\x8f\x49\xe5\xc8\xe7\xff\x1f\xce\x18\x5f\x9d\xac\x31\x56\x55\x20\x59\x85\x26\x81\x73\xa5\x01\x1f\x58\x55\x0b\x7c\x17\xa4\x69\x90\xa6\x8b\x7f\x10\xd0\xf7\x1b\x5f\xeb\xb7\x2b\x4f\x91\xe3\x38\x21\xdd\x18\x71\x34\x4c\x92\xae\x4b\x4e\xcd\xfc\xe9\xaa\xa9\xfa\xab\xf1\x0a\x42\xd3\x54\xff\xf3\x4f\x61\xbc\x82\x17\xdc\x3a\xde\xba\x75\x1c\xc6\xde\xf1\x55\xc6\x64\x94\xd9\x87\x15\xfc\x71\x17\x13\x50\xc7\xcb\x53\x13\x15\x72\x2a\xc3\xca\x55\x76\x60\xe6\x54\x9d\x36\x70\xe4\xf4\x79\x7d\xa2\xd4\xcc\xec\xb2\xeb\x19\x6e\x75\xf3\xae\xa4\x8c\xae\x60\x49\x49\x3e\x27\xec\xc4\x2a\x36\x62\x18\x1b\x54\x3a\xb6\xf5\x2d\x4a\x77\x46\xd5\xb3\x54\xcc\x94\x34\x76\x17\x62\xdb\x02\x2f\x60\xcd\xcc\x97\x6d\x80\x03\xf5\x9f\x69\xc9\x4b\x56\x11\xb3\x1d\x90\xb1\x3f\xe5\xac\x23\x9f\x6e\xaa\x1e\xc1\xd0\x51\xe3\xb4\x91\xbb\xe3\xa6\x6d\xe1\xb6\x51\x16\xc7\x98\xf7\xf3\x58\xb9\x64\xf3\x62\x9e\xc7\xae\xdb\x99\x57\xf4\xda\x1b\x9d\x22\xcb\xd6\xbe\xb9\xb6\xa6\x15\x01\x88\xf6\x98\xf2\x06\x3c\x47\x46\x1b\x3b\x64\xf9\x99\x51\x26\x21\xfc\x3a\x98\x0f\xe7\xae\x5e\x36\xd3\x7c\x61\x0b\x6f\xec\xb7\x0d\xb6\x34\x85\x4b\x65\xcf\x69\x99\xf8\xa0\xb5\x1b\x0d\x64\xca\xc0\xfd\x1a\x25\x58\xbd\xa1\x29\x61\x15\x14\x68\xb3\x35\x30\x30\x35\x66\xbc\xe0\x19\xbd\xe7\xb8\xdd\x00\x93\x39\x70\x0b\xf7\xcc\x80\x54\xd6\x6f\x25\xc3\x06\x92\x33\xcb\x68\x77\xe8\x5f\x5d\xdb\x7e\x8c\xd5\x4d\x66\x29\x87\x82\x5d\xa3\xe8\xf3\x1c\x78\x48\xfe\x08\xa7\x59\x53\xa1\xb4\x9e\x17\xe8\x85\xd2\xa2\x2e\x58\x86\x89\x6f\xec\x08\xe1\x60\xcb\x72\xec\x6f\x47\x71\x6f\x92\x5c\xf4\xf9\x09\xa7\x31\xf2\x0e\x42\x78\x03\x98\x78\xe7\x6f\x20\x9c\xe0\x87\x3d\x88\x0b\x33\xd8\x1d\x93\xc2\xe0\x5a\x29\x81\x4c\x02\x97\x39\xcf\x98\x25\xfb\xf7\x6b\x74\xd3\x73\x86\x91\x4e\x4e\xe9\x70\xc2\x1e\xee\x64\x34\x42\xad\xbd\x2a\x76\x56\x09\x27\x2f\x48\x02\x27\x27\x20\xb9\x13\x0c\xc8\x0b\x26\x0c\x52\xe9\x16\x77\x4c\xc3\x6e\xc8\x63\x80\x0f\xce\x9e\xa1\x89\x89\x5a\xaf\xe0\x0f\x8c\xfb\x60\x3e\x31\x73\x33\x86\x53\x31\x73\x43\xf5\xd2\x7b\x00\xce\x0f\xce\x21\xfa\xc8\x3c\xc6\xed\x20\xe2\x39\x50\xc9\x85\x83\xd9\x3f\xa2\xd6\xc1\xc8\xb2\x2b\x2e\xcb\x46\x30\xfd\x32\xa2\xf5\x87\xe7\x44\xab\x94\x46\x4a\x33\x35\x3f\x3a\xce\x3d\xc3\xb7\x6d\x8f\xbf\x99\x72\x5b\xc6\x5f\xc3\xba\x21\xd4\x2d\xe2\x0d\xd6\x7f\x99\x7b\x53\x02\x77\xe9\x37\x98\x7e\x35\x03\xb7\x32\xf0\x02\x12\x5e\x2a\xfb\x51\xb1\x1c\x9f\x1e\x35\x25\x5a\x17\x42\x4e\xb5\x66\xd3\x6c\x11\xee\x2a\xd0\x5e\xb4\x46\xb8\xa5\x85\x7d\xaa\xf4\xdc\xee\x54\x67\xcc\x4b\x7c\x6d\x99\x67\x96\x7f\xae\xc8\xce\x39\xd5\xd8\xfd\xd8\x8e\x62\xab\xd4\xde\xc3\x2f\x17\xba\xcf\xcb\xa3\x32\x7b\xb3\xaf\x2e\xf2\x2c\xfe\x17\x94\xf8\x8c\x16\x0f\xcd\xb8\xb4\x4f\xd6\x38\xd3\xc8\x2c\xa6\x4d\x9d\xd3\xab\x8a\xba\x59\x69\xdf\xde\xae\xdd\xfd\x82\x9c\x93\xc1\xb9\xce\x7d\xc3\x22\xd7\x90\x8d\x5e\x0c\x14\x8c\x0b\xcc\xb7\xf6\xd3\x15\xdc\x71\x25\xfc\xbe\xa0\x0a\x9f\x7f\xa5\xc9\x9a\x7f\xa7\x37\x92\xdf\x36\x28\xd1\x98\x9e\x40\xbb\xa8\x27\x06\x55\xa6\x1c\x08\xb4\xb8\xd7\xac\xf6\xa9\xfc\x25\x32\xed\x38\x79\x29\x99\xa6\x58\xfb\x50\x07\x7e\x55\x66\x20\xf5\x7f\xa4\x83\xb6\x0f\x88\x49\xbe\x6a\xe6\x3e\xd6\xf6\xd1\xfb\x11\x24\x6f\x29\x9a\x8d\xfb\x61\x90\x27\xa4\x18\x59\xfb\xa3\x32\xff\x0c\x77\x77\x02\x6b\x34\x8e\xec\xdd\x31\xff\x3a\x0e\xef\x18\x7b\x8e\xc4\x6d\x9b\x1e\x00\x3e\xd4\x6c\x78\x31\x02\x51\xc4\xf1\x11\x4a\xa1\xae\x99\x80\x35\x8a\x1a\xb5\x49\xc0\xfd\xfd\x64\xdc\xdb\xf6\xae\x6d\xde\xc9\xce\xca\xf6\xd4\x26\xbe\x67\x89\x5b\xf6\x77\x1e\x7d\x8d\xee\x5f\x14\x1d\xc8\x3f\xc1\x25\x77\x1f\x2a\x8f\x36\xdc\xe4\xe2\xef\xc9\x17\xea\x22\xff\xa9\x7b\x83\x1b\x33\xf2\x81\x4a\x4e\x82\x94\xe7\x06\x0a\xad\x2a\x4f\x02\x6a\xc8\x8a\xd5\x7d\xbd\xe9\x40\x54\x91\xe0\x5b\xef\xa6\xeb\xbe\xfb\x16\x6c\xbb\x18\xbe\x7d\x1f\xa5\x54\x67\x43\x20\x2a\x76\x83\xd1\x4c\xb1\x82\xa3\x15\x08\x94\x51\x15\xc7\xc1\x82\x3e\x71\x3d\x58\xff\xc1\x55\x39\x7e\x18\x38\xa1\xef\x0c\x94\x79\x64\x56\xc0\xf3\x78\xbe\xa8\x98\x60\x1e\xee\xff\x03\x00\x00\xff\xff\xf5\x58\xa4\x2b\xd6\x13\x00\x00")
 
 func templateBaseTmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -139,7 +139,7 @@ func templateBaseTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/base.tmpl", size: 5054, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
+	info := bindataFileInfo{name: "template/base.tmpl", size: 5078, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/entc/gen/template/base.tmpl b/entc/gen/template/base.tmpl
index 280ad2f6d..30483d8f3 100644
--- a/entc/gen/template/base.tmpl
+++ b/entc/gen/template/base.tmpl
@@ -16,6 +16,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/config/ent/ent.go b/entc/integration/config/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/entc/integration/config/ent/ent.go
+++ b/entc/integration/config/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/customid/ent/ent.go b/entc/integration/customid/ent/ent.go
index dd408a585..25b1a88b2 100644
--- a/entc/integration/customid/ent/ent.go
+++ b/entc/integration/customid/ent/ent.go
@@ -24,6 +24,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/ent/ent.go b/entc/integration/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/entc/integration/ent/ent.go
+++ b/entc/integration/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/gremlin/ent/ent.go b/entc/integration/gremlin/ent/ent.go
index f6be08637..ebe1836c5 100644
--- a/entc/integration/gremlin/ent/ent.go
+++ b/entc/integration/gremlin/ent/ent.go
@@ -24,6 +24,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/hooks/ent/ent.go b/entc/integration/hooks/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/entc/integration/hooks/ent/ent.go
+++ b/entc/integration/hooks/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/idtype/ent/ent.go b/entc/integration/idtype/ent/ent.go
index 2c95e167b..504229256 100644
--- a/entc/integration/idtype/ent/ent.go
+++ b/entc/integration/idtype/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/json/ent/ent.go b/entc/integration/json/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/entc/integration/json/ent/ent.go
+++ b/entc/integration/json/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/migrate/entv1/ent.go b/entc/integration/migrate/entv1/ent.go
index 843c8b7b2..a7763fa36 100644
--- a/entc/integration/migrate/entv1/ent.go
+++ b/entc/integration/migrate/entv1/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/migrate/entv2/ent.go b/entc/integration/migrate/entv2/ent.go
index 125d6886a..0de600894 100644
--- a/entc/integration/migrate/entv2/ent.go
+++ b/entc/integration/migrate/entv2/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/privacy/ent/ent.go b/entc/integration/privacy/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/entc/integration/privacy/ent/ent.go
+++ b/entc/integration/privacy/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/entc/integration/template/ent/ent.go b/entc/integration/template/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/entc/integration/template/ent/ent.go
+++ b/entc/integration/template/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/edgeindex/ent/ent.go b/examples/edgeindex/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/edgeindex/ent/ent.go
+++ b/examples/edgeindex/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/entcpkg/ent/ent.go b/examples/entcpkg/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/entcpkg/ent/ent.go
+++ b/examples/entcpkg/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/m2m2types/ent/ent.go b/examples/m2m2types/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/m2m2types/ent/ent.go
+++ b/examples/m2m2types/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/m2mbidi/ent/ent.go b/examples/m2mbidi/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/m2mbidi/ent/ent.go
+++ b/examples/m2mbidi/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/m2mrecur/ent/ent.go b/examples/m2mrecur/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/m2mrecur/ent/ent.go
+++ b/examples/m2mrecur/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/o2m2types/ent/ent.go b/examples/o2m2types/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/o2m2types/ent/ent.go
+++ b/examples/o2m2types/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/o2mrecur/ent/ent.go b/examples/o2mrecur/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/o2mrecur/ent/ent.go
+++ b/examples/o2mrecur/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/o2o2types/ent/ent.go b/examples/o2o2types/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/o2o2types/ent/ent.go
+++ b/examples/o2o2types/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/o2obidi/ent/ent.go b/examples/o2obidi/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/o2obidi/ent/ent.go
+++ b/examples/o2obidi/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/o2orecur/ent/ent.go b/examples/o2orecur/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/o2orecur/ent/ent.go
+++ b/examples/o2orecur/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/start/ent/ent.go b/examples/start/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/start/ent/ent.go
+++ b/examples/start/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc
diff --git a/examples/traversal/ent/ent.go b/examples/traversal/ent/ent.go
index 468ee7ba7..7c2204a88 100644
--- a/examples/traversal/ent/ent.go
+++ b/examples/traversal/ent/ent.go
@@ -23,6 +23,7 @@ type (
 	Op         = ent.Op
 	Hook       = ent.Hook
 	Value      = ent.Value
+	Query      = ent.Query
 	Mutator    = ent.Mutator
 	Mutation   = ent.Mutation
 	MutateFunc = ent.MutateFunc