diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go
index a433bfebc..41327d53c 100644
--- a/entc/gen/internal/bindata.go
+++ b/entc/gen/internal/bindata.go
@@ -1046,7 +1046,7 @@ func templatePredicateTmpl() (*asset, error) {
 	return a, nil
 }
 
-var _templatePrivacyTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\x51\x6f\xdb\x38\x0c\x7e\x8e\x7f\x05\x67\xa4\x43\xbc\xcb\xdc\xdd\xde\x6e\xc3\x1e\x86\xad\x03\x06\xdc\x75\xbb\xdb\xde\x86\x61\x50\x6d\x3a\x11\x6a\x4b\xae\x24\x37\x0d\x0c\xff\xf7\x03\x65\xc9\x91\x9d\x26\x6b\xd7\xee\x29\xb0\x44\x91\x14\xf9\x7d\x24\x95\xb6\x3d\x7d\x16\xbd\x93\xf5\x56\xf1\xd5\xda\xc0\xcb\x17\x7f\xfe\xf5\xbc\x56\xa8\x51\x18\xf8\xc0\x32\xbc\x90\xf2\x12\x3e\x8a\x2c\x85\xb7\x65\x09\x56\x48\x03\xed\xab\x6b\xcc\xd3\xe8\xeb\x9a\x6b\xd0\xb2\x51\x19\x42\x26\x73\x04\xae\xa1\xe4\x19\x0a\x8d\x39\x34\x22\x47\x05\x66\x8d\xf0\xb6\x66\xd9\x1a\xe1\x65\xfa\xc2\xef\x42\x21\x1b\x91\x47\x5c\xd8\xfd\xbf\x3f\xbe\x3b\x3b\xff\x72\x06\x05\x2f\x11\xdc\x9a\x92\xd2\x40\xce\x15\x66\x46\xaa\x2d\xc8\x02\x4c\x60\xcc\x28\xc4\x34\x7a\x76\xda\x75\x51\xd4\xb6\x90\x63\xc1\x05\x42\x5c\x2b\x7e\xcd\xb2\x6d\x0c\xfd\xfa\x73\xd8\x70\xb3\x06\xbc\x31\x28\x72\x98\x43\xfc\x99\x65\x97\x6c\x85\x71\x20\xf9\xbc\xeb\xa2\x59\xdb\x82\xc1\xaa\x2e\x99\x41\x88\xd7\xc8\x72\x54\x31\xa4\xa4\xa5\x6d\x81\xce\x92\x3e\x5e\xd5\x52\x19\x88\xdb\x16\xe6\xe9\x3b\x29\x0a\xbe\x4a\x9d\x42\xe8\xba\xd8\x3a\x32\xaf\x2f\x57\xf0\xea\x0d\x5c\x30\x8d\xb7\x49\x45\xd1\x35\x53\xb0\x88\x66\xa7\xa7\x14\x51\xb9\x81\x8a\x6d\xe1\x02\x41\xa1\x69\x94\xc0\x1c\x2e\xb6\xa0\x9a\x12\x35\x18\x09\x5c\xe4\x3c\x23\x9f\xcc\x9a\x19\x1b\x95\x5a\x96\x3c\xdb\xda\xe3\x78\xcd\xca\x86\x19\x2e\x05\xe8\xb5\x6c\xca\x1c\x0c\xaa\x8a\x0b\x92\xb7\xd7\x66\x02\x98\x35\x91\x63\xc6\x35\x97\x22\x8d\x66\xbd\xcd\x37\x80\x4a\x49\xa5\xd3\x73\xdc\x2c\x62\x14\xe6\xd4\x85\xe3\x95\x3b\x41\x1e\xc4\x49\x64\xed\xbc\x47\xb1\xfd\xbd\x5e\xe6\x64\x21\x70\xd2\x5a\x3c\xe2\xa3\x95\x0f\x5d\xfc\x72\xc9\xeb\xc7\x74\x31\x93\xc2\x70\xd1\x20\x1d\x25\x61\x81\x37\xc6\x2a\x4b\xa3\x99\xb5\x75\xc4\x39\x4d\xfb\xce\xb9\xa4\x07\xa1\x62\x62\x85\x30\xf7\x37\x24\x7c\x94\x5c\x1b\x88\x6d\x36\x62\x88\xe9\xc2\x31\xc4\xa4\xda\x42\x97\xbc\x22\x30\x0d\x27\xba\xae\x70\x17\xd3\x14\xb0\x42\xaa\x8a\x19\x83\x39\x6c\x14\xab\x6b\xcc\xa7\xd2\x61\x34\x8b\x46\x64\x7b\xda\x16\xbd\x0a\xd0\x46\x71\xb1\x5a\x02\x83\x34\x4d\xb9\x30\xa8\x0a\x96\x61\xdb\x25\xfd\x05\xa1\x8d\x66\xb3\xde\x30\x14\x95\x49\xcf\x68\xd1\x1f\xfe\x23\x7e\x05\x27\x9b\x78\x09\xe4\x82\xc8\x17\x6c\x39\x35\x93\xa4\x69\x9a\x44\xb3\xce\x46\xc1\xd3\xc8\x6c\x6b\x74\x0c\xf8\xb7\x41\xb5\xfd\x6c\x33\x01\x99\xac\x2e\xb8\x40\x0d\x55\x53\x1a\x5e\x97\x08\x57\xb4\xeb\x72\xc8\x85\x91\xc0\x40\x73\xb1\x2a\x7d\xf2\xd2\x68\x16\x2a\xf8\xf6\xdd\x7e\xfd\xd7\x94\x18\xed\xb4\xd3\xa7\x2b\x0f\xda\xe6\x72\xb8\xa4\x8d\x51\xce\xc5\x0a\x36\x6b\x34\x6b\x54\xc0\xec\xb1\xde\x2c\xd7\x3d\x15\x30\x07\x26\x72\x90\x35\xe1\x83\x95\xe5\x16\x2a\x99\xf3\x62\x0b\xdc\x78\xfb\xd6\xc4\x4e\x2d\x85\xec\xec\x9a\x95\x76\x6f\x41\x50\xc2\x1b\x43\x95\x80\x7e\xfb\x10\x51\x91\xe8\xba\xd4\x4a\xb8\x48\x53\x94\x92\x28\x3a\x3d\x85\xe1\xac\x07\x26\x6a\x60\xce\x2b\xb6\x62\x5c\x68\x33\x7c\xfb\x40\xd8\x1c\x2f\xfa\xaf\x30\xaa\x09\x04\x9e\x98\x1b\xd8\xf3\xe6\xea\x90\x3f\x74\x8d\x42\x2a\xf8\xb1\xb4\x19\x20\xcc\xf6\x30\x76\x46\xe8\x96\xbc\x20\x59\xbb\x45\xdc\x18\x99\x5a\xc2\x55\xf2\xda\x6e\x3f\x79\x03\x82\x97\xf0\xf4\x29\x3c\x71\xa4\xf9\xa8\x17\xa8\xd4\xd2\xd2\x36\xb1\x9a\x3c\xc6\x50\xa9\x68\x36\xeb\x28\x18\x7e\x49\xf0\x32\xea\x6c\x60\x86\x60\x7f\xa0\xdb\x5a\x18\x71\x4b\x07\x96\xb3\xda\x50\xab\x91\xae\x7c\x51\x9e\x1b\x8d\x20\x0b\x3a\x27\x55\xce\x05\x53\x5b\xa0\x28\x51\x1a\x35\x30\x1d\xa2\x2b\xed\x31\x39\xd6\x4f\xc2\x77\xcf\x9e\x4f\xdc\xc0\xd2\xc2\x07\xc1\x27\xa7\x18\xeb\x7f\x58\x66\x3c\x25\xbd\x91\x68\xcc\xab\x7f\x1a\x63\xeb\xd9\x41\x6a\x55\x4e\xe0\x38\xbb\x26\x6a\xbe\x7d\xf7\x0b\x3b\x8e\x85\x2b\xf7\xa3\xd9\xe0\xc2\xdd\x98\x36\x32\xb4\x4f\x36\xbf\x7d\x34\x63\x5e\xe8\x56\xca\xf9\xcd\x11\xeb\x06\x27\x77\xc4\x1b\x96\x6e\xe5\xde\x38\x64\x09\x8c\x7d\xbb\x2d\xcf\xd5\x11\x0f\x7f\x91\x84\xa1\xc1\x25\x54\x8f\xcd\xc3\x30\x15\x8f\x42\xc5\x31\x1a\x1d\x1b\xf7\xac\xfc\x94\x90\xd3\xf4\xee\x65\x76\xc2\xcd\x2a\xe0\xe6\xd4\xda\x63\x64\x6e\x4c\xd2\x2a\x71\xe1\x73\x6c\x5a\x29\xd9\xd4\xbe\x0c\x11\xf0\xc7\xc0\xe2\x43\x20\x9c\xbc\x36\xaa\xc9\x0c\xe9\xed\x9b\x43\x50\xe5\x77\xec\x98\xe0\xcf\x59\xdc\x75\x94\x42\xaa\x0d\x53\xb9\x0e\x67\x1e\x23\x8f\x35\x93\xc7\xe8\x23\x0e\x9f\x4e\xbf\xdd\xdd\x6f\x16\x91\x43\x72\x08\x4c\x3b\x1f\xf5\xc8\x24\x1d\x16\xc0\x21\x26\x09\xa6\xdd\x7e\x9e\x0f\xdc\xf2\x38\x73\x1f\x8f\xb1\xe3\xeb\x7a\x81\x5b\x99\xf9\xb0\x4b\xdb\xf8\x8d\x0b\xe3\xb4\xf8\xda\x79\xf7\x30\xd4\xf6\xda\xdf\xe1\x32\xbb\x1b\xae\x46\xb5\xd8\xb9\xf2\xb6\xdc\xb0\xad\xb6\xae\xdb\xa3\xc3\xb0\xda\x17\x2e\xeb\x46\x30\xc0\x4e\xdf\x25\x36\x13\x13\x1d\x8b\xe4\x16\x97\x02\x5a\xf1\x1b\xcc\xdf\x3b\x0d\xb4\xd7\xda\x93\xdd\xc8\x21\x1a\xac\x7f\xee\xcf\xf4\x01\x12\x78\xe3\x15\xdc\xdb\x19\x3a\xd8\x0d\x6d\x79\x6f\x7f\xa0\xb3\x2d\xcd\x3d\x74\xba\x68\x28\x47\x7b\xf2\x23\x02\xde\x71\x28\x81\x16\xbc\x7b\x29\x59\xe9\x7e\xa6\xfe\x57\x9a\xe8\xbe\x91\xc8\xbd\x19\xbd\xe0\xa7\x1a\xd5\x2e\x66\x93\x44\x50\xe4\x69\x36\xd0\x35\x66\xbc\xe0\x18\x60\x53\xfa\x73\x2e\x21\x07\x75\x2e\x64\x1d\x3a\xf8\xa9\x4e\xe0\x40\x9a\xa6\x55\x7e\x61\x7b\xca\x8f\xfb\x53\x9c\x68\x5b\xa5\x9f\xea\x45\x42\xb4\x95\x93\xee\x49\x9e\x16\x93\x67\xe1\x70\x1b\x38\xd1\x44\x53\x21\x8d\x1f\x7b\xe2\xa5\xd3\x95\xf4\x3d\xd7\xab\xa1\xb6\x1c\xcd\x3a\xdb\x37\x82\x67\xa4\x7d\x3f\xce\xd3\x73\x99\xa3\x06\xf7\xe7\xc5\x5c\xb0\xca\x8e\x07\xb5\xe2\xc2\xc0\x5c\xa4\xe7\xb4\x10\x8f\x46\xce\x78\x90\xb6\x98\xf4\xd2\x05\xc4\xcf\x4e\x74\x7a\xa2\xe3\xfe\xc6\x73\xd1\xa3\xc8\x6a\x70\x8f\xd1\xaf\x6b\x84\xc1\x4c\xd7\xdd\xb1\xe3\x0f\xed\xde\xea\x18\xb5\x7c\x16\xcc\xdf\x69\x34\xb3\xfa\x42\x03\x87\x9b\xbd\x15\xed\xba\xa1\xc9\xcf\x46\x0d\x6e\x3a\x18\xfb\xf7\xef\xa2\x08\xd5\x3f\xac\x9d\x51\xf2\xaf\x96\x20\x2f\x29\x84\x57\xe9\x22\xf4\xea\x35\x2d\x87\x58\xd8\x8d\xe8\xa3\xdc\xde\x06\x91\x46\xe0\x4d\x8d\x19\x3d\xeb\xfb\xe0\x58\xa5\x27\x5f\x97\xd0\xaf\x87\xd7\x8f\x7b\x95\x5d\x14\xa4\x7f\x2f\xfb\x53\xb8\x4f\x00\x70\x38\xff\xfe\xe0\x6f\x86\xc0\xa8\x0d\x3d\x0e\x0a\x86\x19\x20\x63\x65\x39\x9a\xf4\x0e\xe3\xe0\x61\xdd\xde\x96\x02\x8f\x86\xea\x6e\x68\xa8\xee\x87\x86\x21\x4e\xc7\x01\x51\xed\xfd\xd5\xb2\xfb\xf3\xf2\xff\x00\x00\x00\xff\xff\xb2\x39\xd2\x77\xe8\x15\x00\x00")
+var _templatePrivacyTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x58\x41\x6f\xdb\xb8\x12\x3e\x4b\xbf\x62\x20\x38\x80\xd5\xe7\x2a\x7d\xbd\xbd\x14\x39\x14\x6d\x0a\x14\x78\x9b\x76\xb7\xbd\x15\x45\xc1\x48\x23\x9b\x88\x44\x2a\x24\x15\xc7\x70\xf5\xdf\x17\x43\x91\x32\x25\xc7\x6e\xb2\x49\x81\x3d\x05\x26\x87\x33\x1f\x67\xbe\x6f\x86\xca\x76\x7b\xfa\x22\x7e\x27\x9b\x8d\xe2\xcb\x95\x81\xd7\xaf\xfe\xfb\xbf\x97\x8d\x42\x8d\xc2\xc0\x07\x96\xe3\x95\x94\xd7\xf0\x51\xe4\x19\xbc\xad\x2a\xb0\x46\x1a\x68\x5f\xdd\x62\x91\xc5\x5f\x57\x5c\x83\x96\xad\xca\x11\x72\x59\x20\x70\x0d\x15\xcf\x51\x68\x2c\xa0\x15\x05\x2a\x30\x2b\x84\xb7\x0d\xcb\x57\x08\xaf\xb3\x57\x7e\x17\x4a\xd9\x8a\x22\xe6\xc2\xee\xff\xff\xe3\xbb\x8b\xcb\x2f\x17\x50\xf2\x0a\xc1\xad\x29\x29\x0d\x14\x5c\x61\x6e\xa4\xda\x80\x2c\xc1\x04\xc1\x8c\x42\xcc\xe2\x17\xa7\x5d\x17\xc7\xdb\x2d\x14\x58\x72\x81\x90\x34\x8a\xdf\xb2\x7c\x93\x40\xbf\xfe\x12\xd6\xdc\xac\x00\xef\x0c\x8a\x02\x66\x90\x7c\x66\xf9\x35\x5b\x62\x12\x58\xbe\xec\xba\x38\xda\x6e\xc1\x60\xdd\x54\xcc\x20\x24\x2b\x64\x05\xaa\x04\x32\xf2\xb2\xdd\x02\x9d\x25\x7f\xbc\x6e\xa4\x32\x90\x6c\xb7\x30\xcb\xde\x49\x51\xf2\x65\xe6\x1c\x42\xd7\x25\x16\xc8\xac\xb9\x5e\xc2\xd9\x39\x5c\x31\x8d\xf7\x59\xc5\xf1\x2d\x53\x30\x8f\xa3\xd3\x53\xca\xa8\x5c\x43\xcd\x36\x70\x85\xa0\xd0\xb4\x4a\x60\x01\x57\x1b\x50\x6d\x85\x1a\x8c\x04\x2e\x0a\x9e\x13\x26\xb3\x62\xc6\x66\xa5\x91\x15\xcf\x37\xf6\x38\xde\xb2\xaa\x65\x86\x4b\x01\x7a\x25\xdb\xaa\x00\x83\xaa\xe6\x82\xec\xed\xb5\x99\x00\x66\x43\x14\x98\x73\xcd\xa5\xc8\xe2\xa8\x8f\x79\x0e\xa8\x94\x54\x3a\xbb\xc4\xf5\x3c\x41\x61\x4e\x5d\x3a\xce\xdc\x09\x42\x90\xa4\xb1\x8d\xf3\x1e\xc5\xe6\xf7\xa2\x2c\x28\x42\x00\xd2\x46\x3c\x82\xd1\xda\x87\x10\xbf\x5c\xf3\xe6\x39\x21\xe6\x52\x18\x2e\x5a\xa4\xa3\x64\x2c\xf0\xce\x58\x67\x59\x1c\xd9\x58\x47\xc0\x69\xda\x77\xe0\xd2\x9e\x84\x8a\x89\x25\xc2\xcc\xdf\x90\xf8\x51\x71\x6d\x20\xb1\xd5\x48\x20\xa1\x0b\x27\x90\x90\x6b\x4b\x5d\x42\x45\x64\x1a\x4e\x74\x5d\xe9\x2e\xa6\x29\x61\xa5\x54\x35\x33\x06\x0b\x58\x2b\xd6\x34\x58\x4c\xad\xc3\x6c\x96\xad\xc8\xf7\xbc\xcd\x7b\x17\xa0\x8d\xe2\x62\xb9\x00\x06\x59\x96\x71\x61\x50\x95\x2c\xc7\x6d\x97\xf6\x17\x84\x6d\x1c\x45\x7d\x60\x28\x6b\x93\x5d\xd0\xa2\x3f\xfc\x9f\xe4\x0c\x4e\xd6\xc9\x02\x08\x82\x28\xe6\x6c\x31\x0d\x93\x66\x59\x96\xc6\x51\x67\xb3\xe0\x65\x64\x36\x0d\x3a\x05\xfc\xd9\xa2\xda\x7c\xb6\x95\x80\x5c\xd6\x57\x5c\xa0\x86\xba\xad\x0c\x6f\x2a\x84\x1b\xda\x75\x35\xe4\xc2\x48\x60\xa0\xb9\x58\x56\xbe\x78\x59\x1c\x85\x0e\xbe\x7d\xb7\xbf\xfe\x6a\x2b\x8c\x77\xde\xe9\xa7\x6b\x0f\xda\xd6\x72\xb8\xa4\xcd\x51\xc1\xc5\x12\xd6\x2b\x34\x2b\x54\xc0\xec\xb1\x3e\x2c\xd7\xbd\x14\xb0\x00\x26\x0a\x90\x0d\xf1\x83\x55\xd5\x06\x6a\x59\xf0\x72\x03\xdc\xf8\xf8\x36\xc4\xce\x2d\xa5\xec\xe2\x96\x55\x76\x6f\x4e\x54\xc2\x3b\x43\x9d\x80\xfe\xf6\x29\xa2\x26\xd1\x75\x99\xb5\x70\x99\xa6\x2c\xa5\x71\x7c\x7a\x0a\xc3\x59\x4f\x4c\xd4\xc0\x1c\x2a\xb6\x64\x5c\x68\x33\xfc\xf6\x89\xb0\x35\x9e\xf7\xbf\xc2\xac\xa6\x10\x20\x31\x77\xb0\x87\xe6\xe6\x10\x1e\xba\x46\x29\x15\xfc\x58\xd8\x0a\x10\x67\x7b\x1a\xbb\x20\x74\x4b\xbd\xe6\x26\x5f\x91\xbd\xdd\x26\x7d\x8c\xc2\x2d\xe0\x26\x7d\x63\x2d\x73\x6a\x87\x64\x77\x7e\x0e\x82\x57\xf0\xf3\xa7\x17\xd0\x47\x3d\x47\xa5\x16\x56\xc2\xe9\x59\x60\x1a\x6e\x5a\x9d\xd8\x5d\x4f\x46\xc1\xab\x38\x8a\x0a\x2c\x59\x5b\x99\x70\x03\x95\x8a\xa3\xa8\xa3\x74\x86\xb6\x9d\x4d\xed\x50\xae\x0f\x94\x2f\x4b\x44\x6e\x05\xc5\x0a\xd6\x18\x1a\x56\xd2\x35\x40\x62\x4a\xab\x11\x64\x49\xe7\xa4\x2a\xb8\x60\x6a\x03\x94\x67\x22\x82\x06\xa6\x43\x7e\x66\x3d\xab\xc7\xfe\xc9\xf8\xe1\xf5\xf7\xa5\x1f\x74\x5e\xfa\x14\xfa\xf2\x96\x63\xff\x4f\xab\xad\x17\xb5\x0f\x12\x8f\x95\xf9\x47\x6b\x6c\x47\x3c\x28\xce\xda\x19\x1c\xd7\xe7\xc4\xcd\xb7\xef\x7e\x61\xa7\xd2\x70\xe5\x71\x42\x1d\x20\x3c\x4c\xab\xa3\x40\xfb\x72\xf5\xdb\x47\x2b\xe6\x8d\xee\x15\xad\xdf\x1c\xe9\x76\x00\xb9\x93\xee\xb0\x74\xaf\x7a\xc7\x29\x4b\x61\x8c\xed\xbe\x3a\xd7\x47\x10\x3e\x41\xc6\x61\xd0\x05\xd4\xff\x2e\x25\x87\xc5\x7c\x16\x31\x8f\xf9\xec\xf4\xbc\x17\xe5\x97\x92\x9e\x12\x64\x8f\x1b\x13\x75\xd7\x81\xba\xa7\xd1\x9e\xa3\xf6\x63\x99\xd7\xa9\x4b\x9f\xd3\xe3\x52\xc9\xb6\xf1\x8d\x8c\xa4\x33\xa6\x26\x1f\x12\xe1\xec\xb5\x51\x6d\x6e\xc8\x6f\x3f\xa0\x82\x49\xb3\xd3\xd7\x84\xc1\x2e\xe2\x6e\xaa\x95\x52\xad\x99\x2a\x74\xf8\xee\x32\xf2\xd8\x40\x7b\x8e\x59\xe6\x12\xe1\xfc\xdb\xdd\xfd\x61\x15\x60\x1d\x6e\x73\x00\xee\x71\x11\x3f\x9f\x78\xc7\xb8\xbd\xc1\xbd\x02\x0d\x87\xdc\xb8\xd9\x4d\x1b\xaa\x7d\x05\x1f\x2e\xfe\xde\x48\x3b\xdc\x3a\x77\x4f\xae\x51\x7f\x75\x50\xde\x56\x6b\xb6\xd1\x56\xf3\xf6\xe8\xf0\x84\xed\x9b\x91\x85\x11\x3c\x6b\xa7\x5f\x2b\x36\xa5\x13\x1f\xf3\xf4\x1e\x48\x01\xd1\xf9\x1d\x16\xef\x9d\x07\xda\xdb\xda\x93\xdd\x08\x10\x3d\xb7\x7f\x8d\x67\xfa\x59\x12\xa0\xf1\x0e\x1e\x0d\x86\x0e\x76\xc3\xa8\xdd\xdb\x1f\x04\x66\x3b\x6c\xcf\x81\x2e\x1e\x1a\xc4\x9e\xfd\x48\x12\x0f\x7c\x68\xc0\x16\x3c\xbc\x8c\xa2\x74\xbf\x72\xff\x4f\x06\xe3\x7e\x90\xd8\x7d\x49\x7a\xc3\x4f\x0d\xaa\x5d\xce\x26\x85\xa0\xcc\xd3\xbc\xd7\x0d\xe6\xbc\xe4\x18\x70\x53\xfa\x73\xae\x20\x07\x7d\xce\x65\x13\x02\xfc\xd4\xa4\x70\xa0\x4c\xd3\xbe\x3b\xb7\x5d\xfe\xc7\xe3\xb5\x1a\xf1\x12\xea\xec\x53\x33\x4f\x69\xde\xc9\x26\xb5\x8b\x3e\x0c\x21\x2d\x27\x1f\x8b\xc3\x6d\xe0\x44\x93\x4c\x85\x34\xfe\x29\x93\x2c\x9c\xaf\xb4\x9f\x82\xde\x0d\x8d\xd7\x38\xea\xac\xda\x83\x8f\x4b\xfb\x55\x39\xcb\x2e\x65\x81\x1a\xdc\xbf\x34\x66\x82\xd5\x76\xe4\x37\x8a\x0b\x03\x33\x91\x5d\xd2\x42\x32\x7a\x46\x26\x83\xb5\xe5\xa4\xb7\x2e\x21\x79\x71\xa2\xb3\x13\x9d\xf4\x37\x9e\x89\x9e\x45\xd6\x83\xfb\x44\xfd\xba\x42\x18\xc2\x74\xdd\x03\x67\xf0\x30\x80\xad\x8f\xd1\x10\x66\xc1\x9b\x3a\x8b\x23\xeb\x2f\x0c\x70\x78\xfc\x5a\xd3\xae\x1b\xc6\x6e\x34\x1a\x39\xd3\xc7\xae\xff\x2a\x9e\x97\xa1\xfb\xa7\x0d\x18\x2a\xfe\xcd\x02\xe4\x35\xa5\xf0\x26\x9b\x87\xa8\xde\xd0\x72\xc8\x85\xdd\xb3\x7b\x54\xdb\xfb\x28\xd2\x0a\xbc\x6b\x30\xa7\x8f\xfd\x3e\x39\xd6\xe9\xc9\xd7\x05\xf4\xeb\xe1\xf5\x93\xde\x65\x17\x07\xe5\xdf\xab\xfe\x94\xee\x13\x02\x1c\xae\xbf\x3f\xf8\x9b\x29\x30\x1a\x43\xcf\xc3\x82\x61\x98\xe7\xac\xaa\x46\x6f\xaf\xc3\x3c\x78\xda\xd8\xb6\xad\xc0\xb3\xa1\x7e\x18\x1b\xea\xc7\xb1\x61\xc8\xd3\x71\x42\xd4\x7b\xff\x80\xd9\xfd\x4b\xf3\xef\x00\x00\x00\xff\xff\x6d\x2f\x50\x5f\xfe\x15\x00\x00")
 
 func templatePrivacyTmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -1061,7 +1061,7 @@ func templatePrivacyTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/privacy.tmpl", size: 5608, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
+	info := bindataFileInfo{name: "template/privacy.tmpl", size: 5630, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/entc/gen/template/privacy.tmpl b/entc/gen/template/privacy.tmpl
index c1210c594..cb7d0c061 100644
--- a/entc/gen/template/privacy.tmpl
+++ b/entc/gen/template/privacy.tmpl
@@ -49,7 +49,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q {{ $pkg }}.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -79,7 +83,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m {{ $pkg }}.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -103,20 +111,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q {{ $pkg }}.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m {{ $pkg }}.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/config/ent/privacy/privacy.go b/entc/integration/config/ent/privacy/privacy.go
index b32ac41d6..4080760a7 100644
--- a/entc/integration/config/ent/privacy/privacy.go
+++ b/entc/integration/config/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/customid/ent/privacy/privacy.go b/entc/integration/customid/ent/privacy/privacy.go
index 412629374..de10bff8d 100644
--- a/entc/integration/customid/ent/privacy/privacy.go
+++ b/entc/integration/customid/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/ent/privacy/privacy.go b/entc/integration/ent/privacy/privacy.go
index 6c30b4580..e3d721965 100644
--- a/entc/integration/ent/privacy/privacy.go
+++ b/entc/integration/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/gremlin/ent/privacy/privacy.go b/entc/integration/gremlin/ent/privacy/privacy.go
index 399072f2e..88c659404 100644
--- a/entc/integration/gremlin/ent/privacy/privacy.go
+++ b/entc/integration/gremlin/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/hooks/ent/privacy/privacy.go b/entc/integration/hooks/ent/privacy/privacy.go
index efa76b3c5..091a28a80 100644
--- a/entc/integration/hooks/ent/privacy/privacy.go
+++ b/entc/integration/hooks/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/idtype/ent/privacy/privacy.go b/entc/integration/idtype/ent/privacy/privacy.go
index 706c477c9..4dc3780bf 100644
--- a/entc/integration/idtype/ent/privacy/privacy.go
+++ b/entc/integration/idtype/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/json/ent/privacy/privacy.go b/entc/integration/json/ent/privacy/privacy.go
index fcd377aeb..6485dcd82 100644
--- a/entc/integration/json/ent/privacy/privacy.go
+++ b/entc/integration/json/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/migrate/entv1/privacy/privacy.go b/entc/integration/migrate/entv1/privacy/privacy.go
index c95893a4d..75cc5f1e6 100644
--- a/entc/integration/migrate/entv1/privacy/privacy.go
+++ b/entc/integration/migrate/entv1/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q entv1.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m entv1.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q entv1.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m entv1.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/migrate/entv2/privacy/privacy.go b/entc/integration/migrate/entv2/privacy/privacy.go
index 35c3301ee..dad8eaac2 100644
--- a/entc/integration/migrate/entv2/privacy/privacy.go
+++ b/entc/integration/migrate/entv2/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q entv2.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m entv2.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q entv2.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m entv2.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/privacy/ent/privacy/privacy.go b/entc/integration/privacy/ent/privacy/privacy.go
index 10555c5ca..a4e18dfc4 100644
--- a/entc/integration/privacy/ent/privacy/privacy.go
+++ b/entc/integration/privacy/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/entc/integration/template/ent/privacy/privacy.go b/entc/integration/template/ent/privacy/privacy.go
index fd2ad12da..d3c4554f4 100644
--- a/entc/integration/template/ent/privacy/privacy.go
+++ b/entc/integration/template/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/edgeindex/ent/privacy/privacy.go b/examples/edgeindex/ent/privacy/privacy.go
index c7bda4800..126e9accc 100644
--- a/examples/edgeindex/ent/privacy/privacy.go
+++ b/examples/edgeindex/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/entcpkg/ent/privacy/privacy.go b/examples/entcpkg/ent/privacy/privacy.go
index 39e7fef8c..aa5296005 100644
--- a/examples/entcpkg/ent/privacy/privacy.go
+++ b/examples/entcpkg/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/m2m2types/ent/privacy/privacy.go b/examples/m2m2types/ent/privacy/privacy.go
index 0d6e1871e..57ac12574 100644
--- a/examples/m2m2types/ent/privacy/privacy.go
+++ b/examples/m2m2types/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/m2mbidi/ent/privacy/privacy.go b/examples/m2mbidi/ent/privacy/privacy.go
index cfdfd71f1..654453c52 100644
--- a/examples/m2mbidi/ent/privacy/privacy.go
+++ b/examples/m2mbidi/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/m2mrecur/ent/privacy/privacy.go b/examples/m2mrecur/ent/privacy/privacy.go
index 0552de574..9a748e444 100644
--- a/examples/m2mrecur/ent/privacy/privacy.go
+++ b/examples/m2mrecur/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/o2m2types/ent/privacy/privacy.go b/examples/o2m2types/ent/privacy/privacy.go
index 52dd04c0a..28982c646 100644
--- a/examples/o2m2types/ent/privacy/privacy.go
+++ b/examples/o2m2types/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/o2mrecur/ent/privacy/privacy.go b/examples/o2mrecur/ent/privacy/privacy.go
index b3a3df55f..06ef385d7 100644
--- a/examples/o2mrecur/ent/privacy/privacy.go
+++ b/examples/o2mrecur/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/o2o2types/ent/privacy/privacy.go b/examples/o2o2types/ent/privacy/privacy.go
index 468f9abdd..063a4773c 100644
--- a/examples/o2o2types/ent/privacy/privacy.go
+++ b/examples/o2o2types/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/o2obidi/ent/privacy/privacy.go b/examples/o2obidi/ent/privacy/privacy.go
index bc5c4e95c..54bff12ac 100644
--- a/examples/o2obidi/ent/privacy/privacy.go
+++ b/examples/o2obidi/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/o2orecur/ent/privacy/privacy.go b/examples/o2orecur/ent/privacy/privacy.go
index 5b3851456..db8be12cb 100644
--- a/examples/o2orecur/ent/privacy/privacy.go
+++ b/examples/o2orecur/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/start/ent/privacy/privacy.go b/examples/start/ent/privacy/privacy.go
index 6022b249e..433b8431b 100644
--- a/examples/start/ent/privacy/privacy.go
+++ b/examples/start/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.
diff --git a/examples/traversal/ent/privacy/privacy.go b/examples/traversal/ent/privacy/privacy.go
index 55b41f7d9..fd7769d59 100644
--- a/examples/traversal/ent/privacy/privacy.go
+++ b/examples/traversal/ent/privacy/privacy.go
@@ -57,7 +57,11 @@ type (
 // EvalQuery evaluates a query against a query policy.
 func (policy QueryPolicy) EvalQuery(ctx context.Context, q ent.Query) error {
 	for _, rule := range policy {
-		if err := rule.EvalQuery(ctx, q); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalQuery(ctx, q); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -87,7 +91,11 @@ type (
 // EvalMutation evaluates a mutation against a mutation policy.
 func (policy MutationPolicy) EvalMutation(ctx context.Context, m ent.Mutation) error {
 	for _, rule := range policy {
-		if err := rule.EvalMutation(ctx, m); err != nil && !errors.Is(err, Skip) {
+		switch err := rule.EvalMutation(ctx, m); {
+		case err == nil || errors.Is(err, Skip):
+		case errors.Is(err, Allow):
+			return nil
+		default:
 			return err
 		}
 	}
@@ -111,20 +119,12 @@ type Policy struct {
 
 // EvalQuery forwards evaluation to query policy.
 func (policy Policy) EvalQuery(ctx context.Context, q ent.Query) error {
-	err := policy.Query.EvalQuery(ctx, q)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Query.EvalQuery(ctx, q)
 }
 
 // EvalMutation forwards evaluation to mutation policy.
 func (policy Policy) EvalMutation(ctx context.Context, m ent.Mutation) error {
-	err := policy.Mutation.EvalMutation(ctx, m)
-	if errors.Is(err, Allow) {
-		err = nil
-	}
-	return err
+	return policy.Mutation.EvalMutation(ctx, m)
 }
 
 // QueryMutationRule is the interface that groups query and mutation rules.