From a761561c9c2d01e800a781abec42245e8be67c49 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki <7413593+a8m@users.noreply.github.com> Date: Tue, 29 Dec 2020 09:19:53 +0200 Subject: [PATCH] entc/gen: support field selections with eager-loading (#1100) --- entc/gen/internal/bindata.go | 4 ++-- entc/gen/template/dialect/sql/query.tmpl | 8 +++++++- entc/integration/config/ent/user_query.go | 8 +++++++- entc/integration/customid/ent/blob_query.go | 8 +++++++- entc/integration/customid/ent/car_query.go | 8 +++++++- entc/integration/customid/ent/group_query.go | 8 +++++++- entc/integration/customid/ent/mixinid_query.go | 8 +++++++- entc/integration/customid/ent/pet_query.go | 8 +++++++- entc/integration/customid/ent/user_query.go | 8 +++++++- entc/integration/ent/card_query.go | 8 +++++++- entc/integration/ent/comment_query.go | 8 +++++++- entc/integration/ent/fieldtype_query.go | 8 +++++++- entc/integration/ent/file_query.go | 8 +++++++- entc/integration/ent/filetype_query.go | 8 +++++++- entc/integration/ent/goods_query.go | 8 +++++++- entc/integration/ent/group_query.go | 8 +++++++- entc/integration/ent/groupinfo_query.go | 8 +++++++- entc/integration/ent/item_query.go | 8 +++++++- entc/integration/ent/node_query.go | 8 +++++++- entc/integration/ent/pet_query.go | 8 +++++++- entc/integration/ent/spec_query.go | 8 +++++++- entc/integration/ent/task_query.go | 8 +++++++- entc/integration/ent/user_query.go | 8 +++++++- entc/integration/hooks/ent/card_query.go | 8 +++++++- entc/integration/hooks/ent/user_query.go | 8 +++++++- entc/integration/idtype/ent/user_query.go | 8 +++++++- entc/integration/integration_test.go | 12 +++++++++++- entc/integration/json/ent/user_query.go | 8 +++++++- entc/integration/migrate/entv1/car_query.go | 8 +++++++- entc/integration/migrate/entv1/conversion_query.go | 8 +++++++- entc/integration/migrate/entv1/customtype_query.go | 8 +++++++- entc/integration/migrate/entv1/user_query.go | 8 +++++++- entc/integration/migrate/entv2/car_query.go | 8 +++++++- entc/integration/migrate/entv2/conversion_query.go | 8 +++++++- entc/integration/migrate/entv2/customtype_query.go | 8 +++++++- entc/integration/migrate/entv2/group_query.go | 8 +++++++- entc/integration/migrate/entv2/media_query.go | 8 +++++++- entc/integration/migrate/entv2/pet_query.go | 8 +++++++- entc/integration/migrate/entv2/user_query.go | 8 +++++++- entc/integration/privacy/ent/task_query.go | 8 +++++++- entc/integration/privacy/ent/team_query.go | 8 +++++++- entc/integration/privacy/ent/user_query.go | 8 +++++++- entc/integration/template/ent/group_query.go | 8 +++++++- entc/integration/template/ent/pet_query.go | 8 +++++++- entc/integration/template/ent/user_query.go | 8 +++++++- examples/edgeindex/ent/city_query.go | 8 +++++++- examples/edgeindex/ent/street_query.go | 8 +++++++- examples/entcpkg/ent/user_query.go | 8 +++++++- examples/m2m2types/ent/group_query.go | 8 +++++++- examples/m2m2types/ent/user_query.go | 8 +++++++- examples/m2mbidi/ent/user_query.go | 8 +++++++- examples/m2mrecur/ent/user_query.go | 8 +++++++- examples/o2m2types/ent/pet_query.go | 8 +++++++- examples/o2m2types/ent/user_query.go | 8 +++++++- examples/o2mrecur/ent/node_query.go | 8 +++++++- examples/o2o2types/ent/card_query.go | 8 +++++++- examples/o2o2types/ent/user_query.go | 8 +++++++- examples/o2obidi/ent/user_query.go | 8 +++++++- examples/o2orecur/ent/node_query.go | 8 +++++++- examples/privacyadmin/ent/user_query.go | 8 +++++++- examples/privacytenant/ent/group_query.go | 8 +++++++- examples/privacytenant/ent/tenant_query.go | 8 +++++++- examples/privacytenant/ent/user_query.go | 8 +++++++- examples/start/ent/car_query.go | 8 +++++++- examples/start/ent/group_query.go | 8 +++++++- examples/start/ent/user_query.go | 8 +++++++- examples/traversal/ent/group_query.go | 8 +++++++- examples/traversal/ent/pet_query.go | 8 +++++++- examples/traversal/ent/user_query.go | 8 +++++++- 69 files changed, 482 insertions(+), 70 deletions(-) diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go index 350f1dd94..0460cb710 100644 --- a/entc/gen/internal/bindata.go +++ b/entc/gen/internal/bindata.go @@ -830,7 +830,7 @@ func templateDialectSqlPredicateTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\xef\x6f\xdb\x46\xb2\x9f\xa9\xbf\x62\x4a\xb8\x81\x64\x28\xb4\x93\xf7\xf0\x80\xa7\xc0\x07\xf8\x62\x07\x10\xd2\xa6\xb9\x3a\x6d\x3f\x08\x42\xcb\x90\x43\x79\x21\x6a\x49\x93\x2b\xc7\x81\xc2\xff\xfd\x30\xb3\x3f\xb4\x14\x29\x59\x4e\x7b\xed\xe1\x70\x1f\x12\x8b\xbb\x33\x3b\xb3\xf3\x6b\x67\x66\x77\xb3\x39\x3b\x1d\xbc\x2e\xca\xcf\x95\x58\xdc\x2a\x78\x79\xfe\xe2\xff\x9f\x97\x15\xd6\x28\x15\xbc\x89\x13\xfc\x58\x14\x4b\x98\xca\x24\x82\xcb\x3c\x07\x06\xaa\x81\xe6\xab\x7b\x4c\xa3\xc1\x87\x5b\x51\x43\x5d\xac\xab\x04\x21\x29\x52\x04\x51\x43\x2e\x12\x94\x35\xa6\xb0\x96\x29\x56\xa0\x6e\x11\x2e\xcb\x38\xb9\x45\x78\x19\x9d\xdb\x59\xc8\x8a\xb5\x4c\x07\x42\xf2\xfc\x77\xd3\xd7\xd7\xef\x6e\xae\x21\x13\x39\x82\x19\xab\x8a\x42\x41\x2a\x2a\x4c\x54\x51\x7d\x86\x22\x03\xe5\x11\x53\x15\x62\x34\x38\x3d\x6b\x9a\xc1\x80\xf6\x00\x97\x69\x2a\x94\x28\x64\x9c\x43\x26\x30\x4f\x6b\xc8\x0a\x4d\xfc\xe3\x5a\xe4\x29\x56\x11\x30\xf4\x66\x03\x29\x66\x42\x22\x84\xa9\x88\x73\x4c\xd4\x59\x7d\x97\x9f\xdd\xad\xb1\xfa\x7c\xa6\x31\x43\x68\x9a\x41\xb0\xd9\x3c\x87\x4f\x42\xdd\xc2\x49\xf4\xa6\xa8\x50\x2c\xe4\x5b\xfc\x5c\xf3\x54\x40\xe3\x6f\xde\xd6\xf0\xb1\x28\x72\x0d\x89\x32\x05\x5e\xdd\xfd\x3c\x48\x29\xd4\xc0\x70\x52\x2e\x17\x30\xb9\x80\x93\xe8\x26\x29\x4a\x8c\xde\xc7\xc9\x32\x5e\xa0\x9d\x35\xac\x13\x44\x19\xd7\x49\x9c\x3b\xc0\xbf\x9b\x19\x03\x58\x61\x82\xe2\x5e\x43\xba\xdf\x0e\x9d\xb8\xc9\xd6\x32\x81\x61\x0b\xb6\x69\xe0\xd4\xa7\xd2\x34\x23\xa8\xef\xf2\xcb\x3c\x1f\x26\xea\x01\x92\x42\x2a\x7c\x50\xd1\x6b\xfd\x77\x04\xc3\xd9\x9c\xe1\xa3\x77\xf1\x8a\x58\x1c\x03\x56\x55\x51\x8d\x60\x33\x08\xee\xe3\x0a\x86\x83\x20\x90\x45\x8a\x35\x5c\xc0\x0e\xe8\x86\xa4\x76\x48\xa2\x4e\xa4\x17\xb0\xc3\x63\x64\x66\xcc\x02\x46\xba\x41\xf0\x6b\x5d\x62\xd2\x03\xce\xf2\xbd\x29\x31\x19\x8e\xda\x34\xaf\xd3\x05\x5a\x6a\x79\x11\xa7\x98\x7e\xf8\x5c\x6a\x66\x37\x1b\xc8\x51\x42\x04\x4d\x33\x27\x9d\x6e\x08\x86\x71\xab\x58\x2e\x10\x4e\x90\x04\x1b\x19\x64\x9a\x69\xd3\xa4\x6f\x8c\xae\xe3\x05\x56\xdf\x15\x71\xfa\x86\xcc\x88\xc4\xfb\xcd\x05\x48\x91\x8f\xdd\x6a\x8e\xf9\xa0\xd9\xd9\xce\xe8\xb0\xc1\xb5\x26\xdf\xfa\x3b\x09\x44\x46\x22\x30\x7c\x8a\xb1\xc7\xeb\x66\x03\x22\x83\x85\x82\x13\x01\xe7\xc4\xce\x97\x2f\x04\xaa\x49\x3e\x6d\x0b\x0e\x0d\xb4\x68\x3c\x75\xa9\x6a\x8d\x3c\xe6\xf8\xdc\xee\x52\x64\x60\x01\x35\x1e\x2b\x2d\x7a\x57\xa4\x18\xbd\x2e\xf2\xf5\x4a\xd2\x0a\x71\x59\xa2\x4c\x87\xdd\xb9\x31\x2b\xd7\x73\x0a\x5f\x30\x51\x14\x8d\x8c\x24\x7d\xa2\x7a\x95\x9b\x24\x96\x3f\xc7\xf9\x9a\xd5\x4b\xa6\x3f\x4c\x0c\xb9\xd9\xbc\x56\x95\x90\x0b\x36\x67\x21\x15\x56\x59\x9c\xe0\xa6\x65\xcc\x6c\xc5\x24\xc5\x67\x2d\x1b\x4e\x0a\x99\x89\xc5\xa4\x63\x71\x7a\xbc\xf1\xac\xdf\xec\x88\x3f\xc7\x40\x7f\x88\xd5\x0a\xd5\xba\x92\xfc\x19\xd5\x8e\x41\xcb\xd9\x68\x10\x38\xf6\x2f\xeb\x5a\x2c\xe4\x3e\xd6\xc7\x70\xaf\xb7\xd6\xda\xc0\x48\x6f\x80\xf9\x17\x19\xd9\xb3\xa6\x3f\x82\x8b\x0b\x38\xd7\xf2\x37\x1c\x64\x2b\x15\x5d\x13\x70\x36\x0c\x6d\x10\x6a\x9a\x09\x18\xb2\x49\x9c\xe7\x98\xb2\xe6\x8a\xb5\xe2\x4f\x21\x17\xb0\x95\x69\x48\xbb\x69\x3c\x39\x31\xa1\xd9\x96\xe4\xf3\x17\xf3\xfd\xbe\xc7\xfb\xe7\x81\xa8\xed\x86\xde\xd7\xae\xb3\xfb\xa2\x8b\x99\xcb\xb6\xf0\xac\x48\xb4\x10\x45\x46\xb2\x20\xc6\xea\xbb\x7c\x51\xc5\xe5\x6d\xf4\x0f\x8a\x0a\x64\x5b\x35\xc5\xb6\x71\x47\x87\x69\x45\xbf\xc6\xc0\xf2\x1f\xbd\x62\x7c\x6d\xfa\x2c\x39\x4b\x5f\xe4\x6c\x27\x96\x4a\x9f\x90\x3d\x56\x49\xf7\x22\x1f\x58\x13\xf5\x63\x49\x4b\x24\x4e\x50\xf8\xa0\x68\xcb\x27\x10\xfe\x88\x49\xe8\x71\x18\x12\x74\x48\xb8\x36\x1c\x80\xc2\x55\x99\xc7\xaa\xf7\x1c\x43\x72\x63\x12\xa7\x90\x8b\xd0\xc6\x2d\x5f\xa0\xfe\xef\x2e\xc3\x4f\x3a\x2e\x5e\x17\x6b\xa9\xf6\x1c\x18\x42\x2a\xdf\xaf\x74\xc8\x9e\x3c\x12\xb3\x0d\x3f\x4e\x75\x4c\xe0\x68\xd5\x3d\x8d\xf9\xeb\x07\x51\xef\x63\x9e\x0e\x02\x9f\x7b\x39\xb6\x56\xb5\xcb\x81\x2f\x85\x91\x33\xbf\xae\xf9\x64\x71\x5e\xe3\x78\xaf\xfb\x25\xb7\x98\x2c\x01\x89\x25\x94\x09\x4e\xe0\xdb\xfb\x90\x69\x6a\xab\xb6\x7a\x82\xbf\xc1\xf9\x53\xf5\xe4\x09\x18\x4e\xdb\x4e\x41\xa3\x2d\xe5\x3c\xeb\xce\xd3\x1e\x48\x03\x13\x6f\x92\xbe\xed\x5c\xf0\x21\xfe\x98\xe3\xa4\x13\xae\x79\x98\x8f\x3f\x13\xd1\xbb\x20\x36\xd4\x13\xd0\xf4\xca\x27\xc0\x47\x90\xa3\x10\x50\x5c\x98\xe8\xdc\x8e\x0f\xab\x68\x7a\x15\xd1\x18\x69\xac\x56\x36\x25\x61\x50\xbd\x66\x97\x96\x45\x63\x8c\x58\x2a\x8b\xc0\xff\xf3\x7f\x6f\xaa\x62\xd5\x0d\xf0\xf5\x1d\x9f\xe1\x3f\x49\x71\xb7\xc6\x09\x9f\x78\x63\x1b\x02\x4c\xb2\xd9\x63\x15\x7a\xe6\x15\x07\x09\xfd\x7b\x44\xaa\x63\x83\xe8\x3d\x07\x35\x90\x5d\xb8\xec\x5d\xb4\xac\x30\x15\x49\xac\xd0\x2c\x5c\x76\x16\x7d\x6f\x21\xec\xf1\x51\x63\xce\x39\x34\x2b\x3e\xba\x31\x5f\xfa\xa0\x0b\x28\x49\x16\x9c\x35\x72\x70\x2a\xed\x41\x5d\xd6\x33\x31\x77\xa8\xf6\xa0\xa5\x7f\x26\xf2\x89\x95\x50\x7d\x0c\xf2\xc4\x2b\x33\xef\xb9\x80\x66\xee\x3b\x1e\xbe\x80\x53\x9e\xb7\x8b\x15\x59\x56\x63\xef\x6a\x7a\xe6\x95\x85\xe8\xac\xf7\x83\x1e\xbf\x80\x53\x0d\x71\x58\x78\x45\x95\x62\xb5\x4f\x6e\x3f\xd0\xe4\x1f\x28\xb3\x6e\xf2\xf2\x73\x9c\x8b\x54\xab\x7b\x47\xa0\xc6\xb5\x99\x91\xa7\x05\x30\x76\x51\xe3\xd4\x8e\x4f\xe2\xc7\x2b\x1d\x68\xea\x4a\x9f\x11\xbb\x6b\x9a\xe0\xe9\xa6\x47\xa3\x41\xa0\x5e\x10\x92\xad\x9a\xd8\x85\x87\xbd\x8e\x3d\x1a\x04\x4e\x4e\x1e\x86\xe6\x62\xa8\x5e\x58\xd3\xee\x60\x9b\x71\xca\xe0\xf8\x1f\x79\xdd\x50\xbd\xd0\xa1\xb3\xc7\xf9\x7c\xbd\x3b\x8a\xbd\x61\xd8\x03\xb0\x7c\xb8\xef\x23\xb9\x61\x85\x90\x8a\x7f\x1d\x43\xb9\xd5\xf2\x7e\x47\x64\xb6\x4a\xdf\x57\x8e\x5a\x80\x8d\x71\x07\xf7\x31\x9b\xf9\x7a\x77\x39\x3b\x33\x2e\x29\x6a\x58\xc5\x32\x8d\xb9\xa8\x26\x2e\x0d\x6c\x92\xc7\xeb\x1a\x23\xf8\x05\xa1\x56\x71\xa5\x34\x0e\x67\x25\x29\x66\xf1\x3a\x57\x3a\xc5\x1a\x43\x2c\x53\x28\xee\xb1\xaa\x04\xd5\xfb\x0a\x3e\x62\x5e\x7c\xa2\x4a\x43\x22\xa6\x98\x46\xbe\x0e\xb4\x7f\x0e\x8d\x77\x8e\xb4\xff\x0f\x57\xb1\xba\x8d\xbe\x8f\x1f\xa6\x52\xfd\xcf\xcb\xd1\x57\x87\x14\x47\x45\xaf\xaa\x63\x4a\xeb\xac\xb4\x10\x03\xae\x92\xb7\x85\xf9\xd9\xa9\x3e\x11\xcf\xca\x58\xef\x4f\x48\xac\xb9\x59\xc0\xc3\xb0\x40\x89\x55\xac\x44\x21\x59\x44\x0c\x55\x64\x10\xc3\x42\xdc\xa3\x04\x4c\x17\x78\x4c\x3b\x81\xf0\xb6\xcd\x84\x13\xc9\x89\x1f\x17\x51\xc4\x01\x91\xe3\x04\xfa\x93\x11\xb9\xc7\x40\x56\x15\x2b\x43\x41\xe3\xa2\xdf\x25\xa0\x64\xb0\xb5\x0c\x31\x44\xcb\x90\x06\x40\x15\xcc\xff\xa2\xa2\x33\x80\x66\x99\x7d\x55\xb4\xd6\x13\x29\x4a\xe5\xaf\x39\xe5\x81\xe7\x0e\xc0\xef\x28\x58\x98\x1f\xb7\x4a\x69\xbb\x7e\x8f\x27\x9a\xc0\xd4\x4a\xc6\xad\xbe\xae\xab\x6a\x78\x5c\x8e\x5d\x2b\x2c\x5b\x79\xfc\x3b\xfc\x74\xa3\xb0\x1c\x92\xfa\x5d\xa2\x40\xe1\x83\x58\x90\xdd\xdc\x03\x3a\xe3\x7a\x60\x27\x0b\x70\xbc\x8d\xc6\xfe\xca\x1f\x8a\xa1\xae\x8b\x39\xd1\xe8\x5f\xbc\x3b\xe9\x8d\xb6\xc9\xb4\x17\x27\x2d\x0e\xdd\x97\x46\xfa\x11\x73\x46\x64\x9e\xf4\xd0\xb4\x9e\xca\x7b\xac\xea\xed\x58\x67\x3b\xa8\xf9\xd9\x4d\x6b\x48\x8f\x22\xa3\xe9\xef\x5f\x7e\xaf\x55\x6b\x7a\x17\x3d\x2b\xbc\x7f\xeb\xa1\x47\x51\xe4\x8a\xf9\xbc\xc6\xc7\x70\x75\x7c\xf2\xf0\xfd\x4e\x80\xc6\xa5\xad\x73\x8f\xc3\x9a\x5e\xd3\x80\xa7\xd6\x1b\x54\xef\x50\x2c\x6e\x3f\x16\x55\xfd\xe8\x19\x35\x06\x32\x8b\xd1\x1e\x97\x26\xd7\x79\xdc\xa5\x63\xed\xc5\x9e\xbb\x39\xef\xe6\x22\xf3\x98\x66\x61\x55\xac\xfe\x23\xbd\x9b\xc1\x44\xda\xe7\xd8\xd3\xab\x3f\xd1\x27\x45\xfa\x5f\x6f\xfc\x4b\xbc\xf1\x77\xba\xe2\x01\x9f\x69\x37\x26\x0e\xda\xff\x61\x4b\x65\x00\x91\x19\x87\xea\xb1\xd4\x3d\xfd\xcc\x57\x06\xc3\x3b\x77\xda\x8a\xd1\xe2\xca\x96\x5c\x40\xac\xe2\x25\x0e\x67\x73\xb3\xeb\x9f\x75\xfe\x73\x3e\xf6\xfa\x3e\x9c\xc8\x8b\x74\x0b\xbd\x8a\xcb\x99\x5f\x9e\x42\xd3\xec\x76\xcd\x77\xb0\x4d\xaa\x68\x7b\x69\x3a\x5b\xd4\x9d\x44\x5d\x57\x88\xb4\x9e\x71\x50\x9a\x5e\xcd\x41\x37\xdb\x78\x9c\x98\x74\xbd\xc6\x6c\x69\x3a\x8d\xd1\xf4\x8a\x97\xf5\xfb\x6c\x5a\x18\x37\xaa\x5a\x27\xca\x75\x76\x5d\x93\xde\x78\x87\xdf\xaa\xd7\xcd\x5c\xdb\xd4\x0f\x02\x0a\x41\xb4\xcb\xd9\xbc\xed\x4e\x66\x87\x0e\x86\x18\x6a\x89\xa1\x03\x3a\xdf\xb9\x19\x60\x5e\xf9\xbf\x9e\x06\x04\x71\xdf\x6a\x42\x04\x01\x0d\x4d\x76\x40\xb6\xb3\x81\xf1\xce\x49\x9f\xbb\x6a\x88\x3d\xad\x8a\x03\x9e\x7b\xa0\x7b\xd1\xe3\xad\x1a\xc5\xfc\x71\xc5\xf8\xc4\xd4\x95\xbd\x05\x65\x10\xd4\xd1\x2f\xb7\x58\x71\x00\x8a\xa6\xb6\xb7\x79\x04\xb1\x99\xee\xf1\xef\xec\xf4\x05\xb9\x63\xce\x3f\xcf\x9d\x67\xce\xc7\x90\x2d\xb9\xca\x19\xf9\x1c\xd2\xa2\xc5\x9a\x0f\x8b\x90\xa8\xbf\x5b\xe7\xf9\x54\xaa\xff\xfb\xdf\xd0\xdd\x20\xb0\x2d\xff\x54\x63\x75\xc5\x7e\x6d\x6f\x0f\x08\xeb\x42\x4f\x12\x92\xd1\xef\x36\x12\xd8\xd5\x85\x3c\xb8\xf8\xd6\x42\xba\x24\x84\x24\x0a\x5b\x88\xbd\x74\xb6\xbd\x69\x23\xe8\x11\xcc\x5e\xfa\xdd\x71\x23\x67\x93\x63\xee\xcc\x3d\xb3\xdb\x21\xeb\x1f\xeb\xae\xbf\x90\xfc\xd5\xf8\xb2\xd2\xfd\x71\x43\xa1\x58\xab\x31\x08\x09\x7b\x5a\xf0\xe4\x10\x0c\x52\x2c\x69\xfb\xc5\x5a\x45\xc3\xd3\x2d\x1d\xad\x03\x8a\x60\xdf\x14\x4b\xf8\xf2\x05\x90\xc5\xb9\x8d\x4a\x41\x7f\xbb\x7e\x2d\xf1\xa1\xc4\x44\x61\x0a\x22\xd5\x15\x19\xe7\x33\xe4\x7c\xcf\x8b\xb5\x0a\xcd\xc2\xe6\xa2\x0a\x85\xb4\x1c\x08\x69\x18\xe0\x9d\x75\xe9\x93\xac\x7f\x1f\x79\x21\x77\xa8\x17\x6b\xc5\x4a\x31\xf1\x79\xa7\xc5\x7d\x59\x2d\x42\x08\x69\xdf\x21\x84\x1c\x95\x42\xb6\x26\x08\xad\x9a\x43\xa7\x95\xe3\xdb\xdd\x67\xab\x97\x2b\x7d\x43\x10\xda\x4b\x30\xcf\x4e\x02\x21\x1f\xe7\x48\x48\x8f\x21\x67\x7c\x2d\xb6\xb4\x75\xfc\x61\x5c\x51\xa8\x76\x7a\x4a\xeb\x99\x15\xdc\xbc\xa5\xa5\xe3\xf4\xc2\xe7\x88\x48\xc9\x34\x39\x22\x9b\x36\xb2\x5d\x72\xc7\x3e\x4c\x5c\x77\xc7\x88\x19\x20\xcb\xf6\xc1\x79\xa5\x99\x19\x9b\xb7\xc1\xb7\xe3\xdb\xab\xae\xc0\x2f\xe7\x3c\x17\xb2\xb7\x82\xbd\xd7\x33\x7c\x56\x7d\xd5\xf5\x4c\xbb\x78\xf4\x04\xf3\x9b\x3e\xed\xf5\xd1\x14\xea\x00\x6a\x0e\x9e\x90\x04\xf3\x9b\xed\xaf\x1b\xd6\x18\xdc\xc4\xe2\xfe\x74\x72\x7a\x35\x95\x56\x4a\x2e\x98\x4a\x9b\x30\xb9\x2b\x02\xbd\x90\xb9\x4a\x1f\x79\xbb\xde\xcb\x35\x97\xbc\x86\x0d\x9b\x12\x78\xf9\x80\xa5\x60\x30\xcd\x6d\x8d\x36\x19\xad\x05\x4a\xa0\xe7\x83\xae\xbd\xec\x13\x8d\x67\x33\x3b\x92\xd1\x36\xa4\xf1\x30\xd5\x62\x92\x2e\xaf\xd0\xa6\xb3\xd3\x04\xf5\xf3\x15\xcd\xdc\x4c\xcc\x0f\x67\x1f\xfe\x25\xe9\x61\xe0\x31\x48\x8f\xb4\xbb\xcb\xa2\x13\x4e\x9f\x20\x3f\x7c\x92\x6f\xde\xda\x3b\xe7\xd4\x4f\xdd\x7a\x73\x90\xbe\x1c\x8e\x7e\xf6\xe5\x71\xc7\x25\x30\x07\xa4\x21\x32\xc8\x96\xdb\x4b\x52\x31\x6f\x6f\xf1\xed\x36\x33\xcd\x96\x6d\xeb\x08\x5a\x9e\xc9\x5e\x79\x9a\x2d\x47\x5b\x19\x53\xa8\x38\xcd\x96\xf3\xb6\x30\xed\xe8\xd8\x51\xdc\x11\xde\xb1\x56\xfe\x6f\x64\xe1\x76\x5f\xbf\xc3\xc6\x33\xfd\x74\xe0\xf9\x12\x3f\x5b\x7b\xdf\x55\x41\xf8\x2f\xb7\x79\xb9\xc7\x8c\xbf\xa6\xea\xd8\x67\xb1\x7b\x2b\x8f\xc7\x2c\xb5\xbf\x9e\xe0\x4d\xf9\x35\x85\x2d\x47\xcc\x84\x2d\x49\xe8\xd3\x3d\x74\x31\x6e\xe9\xea\xa9\x63\xe5\x73\xa0\x22\xe9\x79\x40\x63\x0c\xb9\xfb\x16\xc5\x37\x70\xd7\xa8\x8f\xba\x2b\x0f\x0f\x25\xe5\x4f\xc8\xc9\x3b\x25\x77\x3b\xd7\x6e\xfe\x2a\x1f\x32\x81\x67\x4f\xc4\xf1\xc2\x53\x3b\xf3\xdb\xe7\x4d\x47\xb9\x90\xa8\x79\x29\x62\x8e\x8f\x91\x5e\x4f\xf2\x13\x1e\x3f\x66\xfd\x39\xae\xbd\xc3\xdc\x69\xb6\xec\xe7\xf0\xb0\xad\xba\xfa\x45\xdf\x0b\x43\xd3\xc8\x6d\xdd\xe5\xc5\xe3\x47\x0e\xb6\x56\x2a\xb8\xfb\x4e\xa3\xf9\xaa\xce\x8a\x9f\x6d\xba\x46\x4a\x5c\xb5\x5e\x1a\x5e\x56\x8b\xed\x1c\xdf\x3c\xfb\xb3\x5b\x13\xd1\xbd\xcd\x75\x9e\x2b\x0a\x29\x1e\x88\x57\x8b\x0d\xac\xcf\xdf\xc6\xf5\xfb\x0a\x33\xf1\xe0\xa1\x50\xe1\x17\x9a\xbe\x13\xc9\x40\xdf\xe0\x5b\x6c\x4d\x88\x99\x73\xdd\x49\xaf\xc9\xa5\x65\x2c\x0b\xe5\xf0\x44\x9e\x53\x8d\x0e\x4d\x73\xda\x7a\xcb\x16\x7b\xfb\x79\xe2\x63\xcc\xb3\xb2\xc2\x32\xae\x90\xdf\x5f\x78\x12\xdb\xff\x36\xf3\xc8\x2b\x12\xe3\xa0\xd9\xfe\x4b\x40\xf3\x7a\xc0\xbc\xd9\xfa\xe6\xc0\xed\xdf\x30\x1b\xb5\xde\x70\x3d\xe3\x39\x6e\x68\xb3\x47\x6c\x28\xa4\x4d\x20\xe3\x10\x31\xd9\xfb\xc6\x44\xc8\x7b\xc2\xd3\x6f\x0d\xe0\xdb\x3b\x76\x05\xfd\x24\x75\x0c\xd9\xc8\x5d\x49\x6f\x65\xf7\xcf\x00\x00\x00\xff\xff\x14\xa0\x1e\xdc\x22\x2c\x00\x00") +var _templateDialectSqlQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1a\x5d\x6f\xdb\x46\xf2\x59\xfa\x15\x53\xc1\x0d\x24\x43\xa1\x9d\xdc\xe1\x80\x53\xe0\x03\x7c\xb1\x03\x08\x69\xd3\x5c\x9d\xb6\x0f\x86\xd0\x32\xe4\x50\x5e\x88\x5a\xd2\xe4\xca\x71\xa0\xf0\xbf\x1f\x66\xf6\x83\xcb\x0f\xc9\xb2\xd3\x6b\x0f\x87\x7b\x48\x2c\xee\xce\xec\xcc\xce\xd7\xce\xcc\xee\x76\x7b\x72\x3c\x7c\x9d\xe5\x9f\x0b\xb1\xbc\x51\xf0\xf2\xf4\xc5\xdf\x9f\xe7\x05\x96\x28\x15\xbc\x09\x23\xfc\x98\x65\x2b\x98\xcb\x28\x80\xf3\x34\x05\x06\x2a\x81\xe6\x8b\x3b\x8c\x83\xe1\x87\x1b\x51\x42\x99\x6d\x8a\x08\x21\xca\x62\x04\x51\x42\x2a\x22\x94\x25\xc6\xb0\x91\x31\x16\xa0\x6e\x10\xce\xf3\x30\xba\x41\x78\x19\x9c\xda\x59\x48\xb2\x8d\x8c\x87\x42\xf2\xfc\x77\xf3\xd7\x97\xef\xae\x2e\x21\x11\x29\x82\x19\x2b\xb2\x4c\x41\x2c\x0a\x8c\x54\x56\x7c\x86\x2c\x01\xe5\x11\x53\x05\x62\x30\x3c\x3e\xa9\xaa\xe1\x90\xf6\x00\xe7\x71\x2c\x94\xc8\x64\x98\x42\x22\x30\x8d\x4b\x48\x32\x4d\xfc\xe3\x46\xa4\x31\x16\x01\x30\xf4\x76\x0b\x31\x26\x42\x22\x8c\x62\x11\xa6\x18\xa9\x93\xf2\x36\x3d\xb9\xdd\x60\xf1\xf9\x44\x63\x8e\xa0\xaa\x86\x83\xed\xf6\x39\x7c\x12\xea\x06\x8e\x82\x37\x59\x81\x62\x29\xdf\xe2\xe7\x92\xa7\x06\x34\xfe\xe6\x6d\x09\x1f\xb3\x2c\xd5\x90\x28\x63\xe0\xd5\xdd\xcf\xbd\x94\x46\x1a\x18\x8e\xf2\xd5\x12\x66\x67\x70\x14\x5c\x45\x59\x8e\xc1\xfb\x30\x5a\x85\x4b\xb4\xb3\x86\x75\x82\xc8\xc3\x32\x0a\x53\x07\xf8\x4f\x33\x63\x00\x0b\x8c\x50\xdc\x69\x48\xf7\xdb\xa1\x13\x37\xc9\x46\x46\x30\x6e\xc0\x56\x15\x1c\xfb\x54\xaa\x6a\x02\xe5\x6d\x7a\x9e\xa6\xe3\x48\xdd\x43\x94\x49\x85\xf7\x2a\x78\xad\xff\x4e\x60\x7c\xbd\x60\xf8\xe0\x5d\xb8\x26\x16\xa7\x80\x45\x91\x15\x13\xd8\x0e\x07\x77\x61\x01\xe3\xe1\x60\x20\xb3\x18\x4b\x38\x83\x16\xe8\x96\xa4\xb6\x4f\xa2\x4e\xa4\x67\xd0\xe2\x31\x30\x33\x66\x01\x23\xdd\xc1\xe0\xd7\x32\xc7\xa8\x07\x9c\xe5\x7b\x95\x63\x34\x9e\x34\x69\x5e\xc6\x4b\xb4\xd4\xd2\x2c\x8c\x31\xfe\xf0\x39\xd7\xcc\x6e\xb7\x90\xa2\x84\x00\xaa\x6a\x41\x3a\xdd\x12\x0c\xe3\x16\xa1\x5c\x22\x1c\x21\x09\x36\x30\xc8\x34\xd3\xa4\x49\xdf\x18\x5c\x86\x4b\x2c\xbe\xcb\xc2\xf8\x0d\x99\x11\x89\xf7\x9b\x33\x90\x22\x9d\xba\xd5\x1c\xf3\x83\xaa\xb5\x9d\xc9\x7e\x83\x6b\x4c\xbe\xf5\x77\x32\x10\x09\x89\xc0\xf0\x29\xa6\x1e\xaf\xdb\x2d\x88\x04\x96\x0a\x8e\x04\x9c\x12\x3b\x5f\xbe\x10\xa8\x26\xf9\xb8\x2d\x38\x34\xd0\xa2\xf1\xd4\xa5\x8a\x0d\xf2\x98\xe3\xb3\xde\xa5\x48\xc0\x02\x6a\x3c\x56\x5a\xf0\x2e\x8b\x31\x78\x9d\xa5\x9b\xb5\xa4\x15\xc2\x3c\x47\x19\x8f\xbb\x73\x53\x56\xae\xe7\x14\xbe\x60\x82\x20\x98\x18\x49\xfa\x44\xf5\x2a\x57\x51\x28\x7f\x0e\xd3\x0d\xab\x97\x4c\x7f\x1c\x19\x72\xd7\x8b\x52\x15\x42\x2e\xd9\x9c\x85\x54\x58\x24\x61\x84\xdb\x86\x31\xb3\x15\x93\x14\x9f\x35\x6c\x38\xca\x64\x22\x96\xb3\x8e\xc5\xe9\xf1\xca\xb3\x7e\xb3\x23\xfe\x9c\x02\xfd\x21\x56\x0b\x54\x9b\x42\xf2\x67\x50\x3a\x06\x2d\x67\x93\xe1\xc0\xb1\x7f\x5e\x96\x62\x29\x77\xb1\x3e\x85\x3b\xbd\xb5\xc6\x06\x26\x7a\x03\xcc\xbf\x48\xc8\x9e\x35\xfd\x09\x9c\x9d\xc1\xa9\x96\xbf\xe1\x20\x59\xab\xe0\x92\x80\x93\xf1\xc8\x06\xa1\xaa\x9a\x81\x21\x1b\x85\x69\x8a\x31\x6b\x2e\xdb\x28\xfe\x14\x72\x09\xb5\x4c\x47\xb4\x9b\xca\x93\x13\x13\xba\xae\x49\x3e\x7f\xb1\xd8\xed\x7b\xbc\x7f\x1e\x08\x9a\x6e\xe8\x7d\xb5\x9d\xdd\x17\x5d\xc8\x5c\x36\x85\x67\x45\xa2\x85\x28\x12\x92\x05\x31\x56\xde\xa6\xcb\x22\xcc\x6f\x82\x7f\x51\x54\x20\xdb\x2a\x29\xb6\x4d\x3b\x3a\x8c\x0b\xfa\x35\x05\x96\xff\xe4\x15\xe3\x6b\xd3\x67\xc9\x59\xfa\x22\x65\x3b\xb1\x54\xfa\x84\xec\xb1\x4a\xba\x17\xe9\xd0\x9a\xa8\x1f\x4b\x1a\x22\x71\x82\xc2\x7b\x45\x5b\x3e\x82\xd1\x8f\x18\x8d\x3c\x0e\x47\x04\x3d\x22\x5c\x1b\x0e\x40\xe1\x3a\x4f\x43\xd5\x7b\x8e\x21\xb9\x31\x89\x53\xc8\xe5\xc8\xc6\x2d\x5f\xa0\xfe\xef\x2e\xc3\x8f\x3a\x2e\x5e\x67\x1b\xa9\x76\x1c\x18\x42\x2a\xdf\xaf\x74\xc8\x9e\x3d\x10\xb3\x0d\x3f\x4e\x75\x4c\xe0\x60\xd5\x3d\x8e\xf9\xcb\x7b\x51\xee\x62\x9e\x0e\x02\x9f\x7b\x39\xb5\x56\xd5\xe6\xc0\x97\xc2\xc4\x99\x5f\xd7\x7c\x92\x30\x2d\x71\xba\xd3\xfd\xa2\x1b\x8c\x56\x80\xc4\x12\xca\x08\x67\xf0\xed\xdd\x88\x69\x6a\xab\xb6\x7a\x82\x7f\xc0\xe9\x63\xf5\xe4\x09\x18\x8e\x9b\x4e\x41\xa3\x0d\xe5\x3c\xeb\xce\xd3\x1e\x48\x03\x33\x6f\x92\xbe\xed\xdc\xe0\x43\xf8\x31\xc5\x59\x27\x5c\xf3\x30\x1f\x7f\x26\xa2\x77\x41\x6c\xa8\x27\xa0\xf9\x85\x4f\x80\x8f\x20\x47\x61\x40\x71\x61\xa6\x73\x3b\x3e\xac\x82\xf9\x45\x40\x63\xa4\xb1\x52\xd9\x94\x84\x41\xf5\x9a\x5d\x5a\x16\x8d\x31\x42\xa9\x2c\x02\xff\xcf\xff\xbd\x29\xb2\x75\x37\xc0\x97\xb7\x7c\x86\xff\x24\xc5\xed\x06\x67\x7c\xe2\x4d\x6d\x08\x30\xc9\x66\x8f\x55\xe8\x99\x57\x1c\x24\xf4\xef\x09\xa9\x8e\x0d\xa2\xf7\x1c\x5c\x87\x2b\x1c\xd7\x41\xfe\x74\xea\xa3\x4e\x76\x61\x3d\xe2\xf4\xec\xd9\x3f\x2d\x4b\x89\xb2\xe0\xcc\x91\x03\x94\xd9\xd1\xd6\x1c\xe0\xfa\xf3\x5a\x2c\xc8\xa0\x0f\x58\xf1\x89\x27\xbd\x23\x63\x0f\x75\xfa\xa7\x45\x9c\xf7\x8a\x37\x2f\x30\x16\x51\xa8\xd0\x88\x38\xef\x88\xf7\xbd\x85\xb0\x07\x69\x89\x29\x57\x13\xec\x02\xc1\x95\xf9\xd2\x47\x7e\x5b\x0a\xb9\x4d\x59\x72\x62\xca\xa1\x76\xb9\x4b\xc5\x5a\xa8\x3e\x06\x79\xe2\x95\x99\xf7\x82\x81\x66\xee\x3b\x1e\x3e\x83\x63\x9e\xb7\x8b\x65\x49\x52\x62\xef\x6a\x7a\xe6\x95\x85\xe8\xac\xf7\x83\x1e\x3f\x83\x63\x0d\xb1\x5f\x78\x59\x11\x63\xb1\x4b\x6e\x3f\xd0\xe4\xef\x28\xb3\xae\x21\xfe\x1c\xa6\x22\xd6\xaa\x6f\x09\xd4\x04\x39\x66\xe4\x71\xa1\x9c\x83\x95\x09\x6f\x8e\x4f\xe2\xc7\x2b\xa2\x68\xea\x42\x9f\x96\xed\x35\xcd\x31\xe2\xa6\xc9\xe1\xd4\x0b\x42\xb2\xf5\x23\x07\xb3\x71\x6f\x88\x9b\x0c\x07\x4e\x4e\x1e\x86\xe6\x62\xac\x5e\x58\x33\xef\x60\x9b\x71\xca\x65\xf9\x1f\xc5\x9f\xb1\x7a\xa1\x0f\x91\x9e\x30\xe4\xeb\xdd\x51\xec\x3d\x90\x3c\x00\xcb\x87\xfb\x3e\x90\x1b\x56\x08\xa9\xf8\xd7\x29\xe4\xb5\x96\x77\x3b\x22\xb3\x95\xfb\xbe\x72\xd0\x02\x6c\x8c\x2d\xdc\x87\x6c\xe6\xe9\xee\x72\x72\x62\x5c\x52\x94\xb0\x0e\x65\x1c\x72\x7b\x81\xb8\x34\xb0\x51\x1a\x6e\x4a\x0c\xe0\x17\x84\x52\x85\x85\xd2\x38\x9c\x9f\xc5\x98\x84\x9b\x54\xe9\x64\x73\x0a\xa1\x8c\x21\xbb\xc3\xa2\x10\x31\x82\x50\xf0\x11\xd3\xec\x13\xd5\x5c\x12\x31\xc6\x38\xf0\x75\xa0\xfd\x73\x6c\xbc\x73\xa2\xfd\x7f\xbc\x0e\xd5\x4d\xf0\x7d\x78\x3f\x97\xea\x2f\x2f\x27\x4f\x0e\x29\x8e\x8a\x5e\x55\xc7\x94\x46\xd6\x60\x21\x86\xdc\x2f\xa8\x5b\x14\x27\xc7\x3a\x37\x38\xc9\x43\xbd\x3f\x21\xb1\xe4\xb6\x09\x0f\xc3\x12\x25\x16\xa1\x12\x99\x64\x11\x31\x54\x96\x40\x08\x4b\x71\x87\x12\x30\x5e\xe2\x21\x8d\x15\xc2\xab\xdb\x2a\x47\x92\x53\x60\x3e\x2c\x88\x03\x22\xc7\xa5\xc4\x27\x23\x72\x8f\x81\xa4\xc8\xd6\x86\x82\xc6\x45\xbf\x5f\x42\x69\x71\x63\x19\x62\x88\x96\x21\x0d\x80\xca\x98\xff\x65\x41\x67\x00\xcd\x32\xfb\x2a\x6b\xac\x27\x62\x94\xca\x5f\x73\xce\x03\xcf\x1d\x80\xdf\x5b\xb1\x30\x3f\xd6\x4a\x69\xba\x7e\x8f\x27\x9a\xc0\xd4\x28\x4b\xac\xbe\x2e\x8b\x62\x7c\x58\xb5\x51\x2a\xcc\x1b\x15\xcd\x3b\xfc\x74\xa5\x30\x1f\x93\xfa\x5d\xca\x44\xe1\x83\x58\x90\xdd\x2c\x0c\x3a\xe3\x7a\xa0\x95\x0f\x39\xde\x26\x53\x7f\xe5\x0f\xd9\x58\x77\x08\x38\xe5\xea\x5f\xbc\x3b\xe9\x8d\xb6\xd2\x8e\xc6\xe2\xa4\xc5\xb1\xfb\xd2\x48\x3f\x62\xca\x88\xcc\x93\x1e\x9a\x97\x73\x79\x87\x45\x59\x8f\x75\xb6\x83\x9a\x9f\x76\x82\x47\x7a\x14\x09\x4d\x7f\xff\xf2\x7b\xad\x5a\xd3\xc5\xe9\x59\xe1\xfd\x5b\x0f\x3d\x08\x02\xd7\xd6\x48\x4b\x7c\x08\x57\xc7\x27\x0f\xdf\xef\x89\x68\x5c\xda\x3a\x77\x7b\xac\xe9\x55\x15\x78\x6a\xbd\x42\xf5\x0e\xc5\xf2\xe6\x63\x56\x94\x0f\x9e\x51\x53\x20\xb3\x98\xec\x70\x69\x72\x9d\x87\x5d\x3a\xd4\x5e\xec\xb9\x9b\xf3\x6e\x2e\xb7\x0f\x69\x9b\x16\xd9\xfa\x7f\xd2\xbb\x19\x4c\xc4\x7d\x8e\x3d\xbf\xf8\x03\x7d\x52\xc4\xff\xf7\xc6\x3f\xc5\x1b\xbf\xd2\x15\xf7\xf8\x4c\xb3\x45\xb3\xd7\xfe\xf7\x5b\x2a\x03\x88\xc4\x38\x54\x8f\xa5\xee\xe8\xec\xbe\x32\x18\xde\xb9\xd3\x54\x8c\x16\x57\xb2\xe2\x02\xc2\xd4\xa6\x66\xd7\x3f\xeb\xfc\xc7\x54\xa8\xba\x03\xc6\x89\xbc\x88\x6b\xe8\x75\x98\x5f\xfb\x85\x3a\x54\x55\xfb\xfe\xa0\x85\x6d\x52\x45\xdb\x55\xd4\xd9\xa2\xee\xa9\xea\xba\x42\xc4\xe5\x35\x07\xa5\xf9\xc5\x02\x74\xdb\x91\xc7\x89\x49\x57\x5d\x26\x2b\xd3\x73\x0d\xe6\x17\xbc\xac\xdf\x71\xd4\xc2\xb8\x52\xc5\x26\x52\xae\xc7\xed\xae\x2b\x8c\x77\xf8\x97\x16\xba\xad\x6d\xaf\x37\x06\x03\x0a\x41\xb4\xcb\xeb\x45\xd3\x9d\xcc\x0e\x1d\x8c\x2b\xe8\xad\x18\x3a\xa0\x8b\xd6\x1d\x09\xf3\xca\xff\xf5\xb4\x62\x88\xfb\x46\x3b\x66\x30\xa0\xa1\x59\x0b\xa4\x9e\x1d\x18\xef\x9c\xf5\xb9\xab\x86\xd8\xd1\xb4\xd9\xe3\xb9\x7b\xfa\x38\x3d\xde\xaa\x51\xcc\x1f\x57\x8c\xcf\x4c\x5d\xd9\x5b\x50\x0e\x06\x65\xf0\xcb\x0d\x16\x1c\x80\x82\xb9\xed\xf2\x1e\x40\xec\x5a\xdf\x76\xb4\x76\xfa\x82\xdc\x31\xe5\x9f\xa7\xce\x33\x17\x53\x48\x56\x5c\xe5\x4c\x7c\x0e\x69\xd1\x6c\xc3\x87\xc5\x88\xa8\xbf\xdb\xa4\xe9\x5c\xaa\xbf\xfd\x75\xe4\xee\x52\xd8\x96\x7f\x2a\xb1\xb8\x60\xbf\xb6\xf7\x28\x84\x75\xa6\x27\x09\xc9\xe8\xb7\x8e\x04\x76\x75\x21\xf7\x2e\x5e\x5b\x48\x97\x84\x90\x44\xa1\x86\xd8\x49\xa7\xee\xd2\x1b\x41\x4f\xe0\xfa\xa5\x7f\x4f\x60\xe4\x6c\x72\xcc\xd6\xdc\x33\xbb\x1d\xb2\xfe\xa9\xbe\xff\x10\x92\xbf\x2a\x5f\x56\xfa\xa6\xc0\x50\xc8\x36\x6a\x0a\x42\xc2\x8e\xcb\x08\x72\x08\x06\xc9\x56\xb4\xfd\x6c\xa3\x82\xf1\x71\x4d\x47\xeb\x80\x22\xd8\x37\xd9\x0a\xbe\x7c\x01\x64\x71\xd6\x51\x69\xd0\x7f\x71\xb1\x91\x78\x9f\x63\xa4\x30\x06\x11\xeb\x8a\x8c\xf3\x19\x72\xbe\xe7\xd9\x46\x8d\xcc\xc2\xe6\xca\x0e\x85\xb4\x1c\x08\x69\x18\xe0\x9d\x75\xe9\x93\xac\xbf\x8e\xbc\x90\x2d\xea\xd9\x46\xb1\x52\x4c\x7c\x6e\x35\xfb\xcf\x8b\xe5\x08\x46\xb4\xef\x11\x8c\x38\x2a\x8d\xd8\x9a\x60\x64\xd5\x3c\x72\x5a\x39\xbc\xf1\x7f\xb2\x7e\xb9\xd6\x77\x25\x23\x7b\x1d\xe8\xd9\xc9\x40\xc8\x87\x39\x12\xd2\x63\xc8\x19\x5f\x83\x2d\x6d\x1d\xbf\x1b\x57\x14\xaa\x9d\x9e\xe2\xf2\xda\x0a\x6e\xd1\xd0\xd2\x61\x7a\xe1\x73\x44\xc4\x64\x9a\x1c\x91\x4d\x43\xdd\x2e\xd9\xb2\x0f\x13\xd7\xdd\x31\x62\x06\xc8\xb2\x7d\x70\x5e\xe9\xda\x8c\x2d\x9a\xe0\xf5\x78\x7d\xe9\x37\xf0\xcb\x39\xcf\x85\xec\xfd\x68\xef\x45\x15\x9f\x55\x4f\xba\xa8\x6a\x16\x8f\x9e\x60\x7e\xd3\xa7\xbd\x3e\x9a\x46\x3a\x80\x9a\x83\x67\x44\x82\xf9\xcd\xde\x34\x18\xd6\x18\xdc\xc4\xe2\xfe\x74\x72\x7e\x31\x97\x56\x4a\x2e\x98\x4a\x9b\x30\xb9\xcb\x12\xbd\x90\x79\x54\x30\xf1\x76\xbd\x93\x6b\x2e\x79\x0d\x1b\x36\x25\xf0\xf2\x01\x4b\xc1\x60\x9a\x7b\x2b\x6d\x32\x5a\x0b\x94\x40\x2f\x86\x5d\x7b\xd9\x25\x1a\xcf\x66\x5a\x92\xd1\x36\xa4\xf1\x30\xd6\x62\x92\x2e\xaf\xd0\xa6\xd3\x6a\x82\xfa\xf9\x8a\x66\xee\x5a\x2c\xf6\x67\x1f\xfe\x75\xf1\x7e\xe0\x29\x48\x8f\xb4\xbb\xd5\xa3\x13\x4e\x9f\x20\x3f\x7c\x92\x6f\xde\xda\xdb\xf7\xd8\x4f\xdd\x7a\x73\x90\xbe\x1c\x8e\x7e\xf6\xe5\x71\x87\x25\x30\x7b\xa4\x21\x12\x48\x56\xf5\x75\xb1\x58\x34\xb7\xf8\xb6\xce\x4c\x93\x55\xd3\x3a\x06\x0d\xcf\x64\xaf\x3c\x4e\x56\x93\x5a\xc6\x14\x2a\x8e\x93\xd5\xa2\x29\x4c\x3b\x3a\x75\x14\x5b\xc2\x3b\xd4\xca\xff\x8b\x2c\xdc\xee\xeb\x2b\x6c\x3c\xd1\x8f\x28\x9e\xaf\xf0\xb3\xb5\xf7\xb6\x0a\x46\xff\x71\x9b\x97\x3b\xcc\xf8\x29\x55\xc7\x2e\x8b\xdd\x59\x79\x3c\x64\xa9\xfd\xf5\x04\x6f\xca\xaf\x29\x6c\x39\x62\x26\x6c\x49\x42\x9f\xee\xc9\x8f\x71\x4b\x57\x4f\x1d\x2a\x9f\x3d\x15\x49\xcf\x53\x22\x63\xc8\xdd\x57\x39\xbe\x81\xbb\x46\x7d\xd0\x5d\x79\xbc\x2f\x29\x7f\x44\x4e\xde\x29\xb9\x9b\xb9\x76\xf5\x67\xf9\x90\x09\x3c\x3b\x22\x8e\x17\x9e\x9a\x99\xdf\x2e\x6f\x3a\xc8\x85\x44\xc9\x4b\x11\x73\x7c\x8c\xf4\x7a\x92\x9f\xf0\xf8\x31\xeb\x8f\x71\xed\x16\x73\xc7\xc9\xaa\x9f\xc3\xfd\xb6\xea\xea\x17\x7d\x43\x0e\x55\x25\xeb\xba\xcb\x8b\xc7\x0f\x1c\x6c\x8d\x54\xb0\xfd\x62\xa5\x7a\x52\x67\xc5\xcf\x36\x5d\x23\x25\x2c\x1a\x6f\x2e\xcf\x8b\x65\x3d\xc7\xd7\xd0\xfe\x6c\x6d\x22\xba\xb7\xb9\x49\x53\x45\x21\xc5\x03\xf1\x6a\xb1\xa1\xf5\xf9\x9b\xb0\x7c\x5f\x60\x22\xee\x3d\x14\x2a\xfc\x46\xa6\xef\x44\x32\xd0\x6f\x19\x2c\xb6\x26\xc4\xcc\xb9\xee\xa4\xd7\xe4\xd2\x32\x96\x99\x72\x78\x22\x4d\xa9\x46\x87\xaa\x3a\x6e\xbc\xea\x0b\xbd\xfd\x3c\xf2\x59\xea\x49\x5e\x60\x1e\x16\xc8\x2f\x51\x3c\x89\xed\x7e\xa5\x7a\xe0\x15\x89\x71\xd0\x64\xf7\x25\xa0\xf7\xea\x80\xac\x7e\xcf\xed\xdf\x38\x99\x34\x5e\xb3\x3d\xe3\x39\x6e\x68\xb3\x47\x6c\x29\xa4\xcd\x20\xe1\x10\x31\xdb\xf9\xda\x46\xc8\x3b\xc2\xd3\x0f\x0f\xe0\xdb\x5b\x76\x05\xfd\x38\x77\x0a\xc9\xc4\x5d\x49\xd7\xb2\xfb\x77\x00\x00\x00\xff\xff\xff\x41\x07\x89\x2c\x2d\x00\x00") func templateDialectSqlQueryTmplBytes() ([]byte, error) { return bindataRead( @@ -845,7 +845,7 @@ func templateDialectSqlQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 11298, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 11564, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/template/dialect/sql/query.tmpl b/entc/gen/template/dialect/sql/query.tmpl index 4748bea12..85aa77949 100644 --- a/entc/gen/template/dialect/sql/query.tmpl +++ b/entc/gen/template/dialect/sql/query.tmpl @@ -97,7 +97,13 @@ func ({{ $receiver }} *{{ $builder }}) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := {{ $receiver }}.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, {{ $.Package }}.{{ $.ID.Constant }}) + for i := range fields { + if fields[i] != {{ $.Package }}.{{ $.ID.Constant }} { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := {{ $receiver }}.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/config/ent/user_query.go b/entc/integration/config/ent/user_query.go index bedbbc22f..48bd608bd 100644 --- a/entc/integration/config/ent/user_query.go +++ b/entc/integration/config/ent/user_query.go @@ -350,7 +350,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/customid/ent/blob_query.go b/entc/integration/customid/ent/blob_query.go index 03f03cb85..1f07c21ed 100644 --- a/entc/integration/customid/ent/blob_query.go +++ b/entc/integration/customid/ent/blob_query.go @@ -526,7 +526,13 @@ func (bq *BlobQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := bq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, blob.FieldID) + for i := range fields { + if fields[i] != blob.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := bq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/customid/ent/car_query.go b/entc/integration/customid/ent/car_query.go index b8cca2aa6..31063eb73 100644 --- a/entc/integration/customid/ent/car_query.go +++ b/entc/integration/customid/ent/car_query.go @@ -425,7 +425,13 @@ func (cq *CarQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, car.FieldID) + for i := range fields { + if fields[i] != car.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/customid/ent/group_query.go b/entc/integration/customid/ent/group_query.go index 52232bbe3..e4217aec1 100644 --- a/entc/integration/customid/ent/group_query.go +++ b/entc/integration/customid/ent/group_query.go @@ -433,7 +433,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/customid/ent/mixinid_query.go b/entc/integration/customid/ent/mixinid_query.go index 28fd5eccb..2df5b39fc 100644 --- a/entc/integration/customid/ent/mixinid_query.go +++ b/entc/integration/customid/ent/mixinid_query.go @@ -351,7 +351,13 @@ func (miq *MixinIDQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := miq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, mixinid.FieldID) + for i := range fields { + if fields[i] != mixinid.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := miq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/customid/ent/pet_query.go b/entc/integration/customid/ent/pet_query.go index fc74e1a90..13df08a8b 100644 --- a/entc/integration/customid/ent/pet_query.go +++ b/entc/integration/customid/ent/pet_query.go @@ -629,7 +629,13 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := pq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, pet.FieldID) + for i := range fields { + if fields[i] != pet.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := pq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/customid/ent/user_query.go b/entc/integration/customid/ent/user_query.go index ed9057ba7..a9b671b43 100644 --- a/entc/integration/customid/ent/user_query.go +++ b/entc/integration/customid/ent/user_query.go @@ -633,7 +633,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index 5e8403dea..6236334c3 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -527,7 +527,13 @@ func (cq *CardQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, card.FieldID) + for i := range fields { + if fields[i] != card.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index 3970c8312..5ab2f595a 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -350,7 +350,13 @@ func (cq *CommentQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, comment.FieldID) + for i := range fields { + if fields[i] != comment.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index 0e2840129..5ebc04f1d 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -355,7 +355,13 @@ func (ftq *FieldTypeQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := ftq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, fieldtype.FieldID) + for i := range fields { + if fields[i] != fieldtype.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := ftq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index fcb7abaac..91d23c88d 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -554,7 +554,13 @@ func (fq *FileQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := fq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, file.FieldID) + for i := range fields { + if fields[i] != file.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := fq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index cfcdb6f46..6e1f83332 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -422,7 +422,13 @@ func (ftq *FileTypeQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := ftq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, filetype.FieldID) + for i := range fields { + if fields[i] != filetype.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := ftq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/goods_query.go b/entc/integration/ent/goods_query.go index 46c7a71c5..43877f418 100644 --- a/entc/integration/ent/goods_query.go +++ b/entc/integration/ent/goods_query.go @@ -326,7 +326,13 @@ func (gq *GoodsQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, goods.FieldID) + for i := range fields { + if fields[i] != goods.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index dd5cc6f4d..d919359e7 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -658,7 +658,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index 652c13376..33e1de48a 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -422,7 +422,13 @@ func (giq *GroupInfoQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := giq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, groupinfo.FieldID) + for i := range fields { + if fields[i] != groupinfo.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := giq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index 93b8d9808..e62318ba0 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -326,7 +326,13 @@ func (iq *ItemQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := iq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, item.FieldID) + for i := range fields { + if fields[i] != item.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := iq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index edb159088..804a4560d 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -489,7 +489,13 @@ func (nq *NodeQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := nq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, node.FieldID) + for i := range fields { + if fields[i] != node.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := nq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index e66a73333..149748a8d 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -486,7 +486,13 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := pq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, pet.FieldID) + for i := range fields { + if fields[i] != pet.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := pq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/spec_query.go b/entc/integration/ent/spec_query.go index 2e200a1c9..aa486fc4a 100644 --- a/entc/integration/ent/spec_query.go +++ b/entc/integration/ent/spec_query.go @@ -433,7 +433,13 @@ func (sq *SpecQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := sq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, spec.FieldID) + for i := range fields { + if fields[i] != spec.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := sq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/task_query.go b/entc/integration/ent/task_query.go index 616b41c23..ace075f5d 100644 --- a/entc/integration/ent/task_query.go +++ b/entc/integration/ent/task_query.go @@ -350,7 +350,13 @@ func (tq *TaskQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := tq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, task.FieldID) + for i := range fields { + if fields[i] != task.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := tq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 67700edde..04c1350a4 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -1213,7 +1213,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/hooks/ent/card_query.go b/entc/integration/hooks/ent/card_query.go index e0b061b5a..95c5d6d59 100644 --- a/entc/integration/hooks/ent/card_query.go +++ b/entc/integration/hooks/ent/card_query.go @@ -425,7 +425,13 @@ func (cq *CardQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, card.FieldID) + for i := range fields { + if fields[i] != card.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/hooks/ent/user_query.go b/entc/integration/hooks/ent/user_query.go index b08a0fffa..61c53c443 100644 --- a/entc/integration/hooks/ent/user_query.go +++ b/entc/integration/hooks/ent/user_query.go @@ -591,7 +591,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/idtype/ent/user_query.go b/entc/integration/idtype/ent/user_query.go index be6028557..5b32fafc2 100644 --- a/entc/integration/idtype/ent/user_query.go +++ b/entc/integration/idtype/ent/user_query.go @@ -625,7 +625,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go index 43ef46058..e626e8a70 100644 --- a/entc/integration/integration_test.go +++ b/entc/integration/integration_test.go @@ -295,7 +295,7 @@ func Select(t *testing.T, client *ent.Client) { Select(user.FieldName). StringX(ctx) require.Equal("foo", name) - client.User.Create().SetName("bar").SetAge(30).SaveX(ctx) + client.User.Create().SetName("bar").SetAge(30).AddFriends(u).SaveX(ctx) t.Log("select one field with ordering") names := client.User. Query(). @@ -333,10 +333,20 @@ func Select(t *testing.T, client *ent.Client) { users := client.User. Query(). Select(user.FieldAge). + Where(user.Name("foo")). + WithFriends(func(q *ent.UserQuery) { + q.Select(user.FieldName) + }). AllX(ctx) for i := range users { require.Empty(users[i].Name) + require.NotZero(users[i].ID) require.NotZero(users[i].Age) + for _, f := range users[i].Edges.Friends { + require.NotEmpty(f.Name) + require.NotZero(f.ID) + require.Zero(f.Age) + } } } diff --git a/entc/integration/json/ent/user_query.go b/entc/integration/json/ent/user_query.go index 1e2a5142f..daab41ebe 100644 --- a/entc/integration/json/ent/user_query.go +++ b/entc/integration/json/ent/user_query.go @@ -350,7 +350,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv1/car_query.go b/entc/integration/migrate/entv1/car_query.go index 69ee7177e..cf654ab65 100644 --- a/entc/integration/migrate/entv1/car_query.go +++ b/entc/integration/migrate/entv1/car_query.go @@ -401,7 +401,13 @@ func (cq *CarQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, car.FieldID) + for i := range fields { + if fields[i] != car.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv1/conversion_query.go b/entc/integration/migrate/entv1/conversion_query.go index 86bd894b3..ac4c007c1 100644 --- a/entc/integration/migrate/entv1/conversion_query.go +++ b/entc/integration/migrate/entv1/conversion_query.go @@ -350,7 +350,13 @@ func (cq *ConversionQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, conversion.FieldID) + for i := range fields { + if fields[i] != conversion.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv1/customtype_query.go b/entc/integration/migrate/entv1/customtype_query.go index e36dec241..2a4c9bcc0 100644 --- a/entc/integration/migrate/entv1/customtype_query.go +++ b/entc/integration/migrate/entv1/customtype_query.go @@ -350,7 +350,13 @@ func (ctq *CustomTypeQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := ctq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, customtype.FieldID) + for i := range fields { + if fields[i] != customtype.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := ctq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv1/user_query.go b/entc/integration/migrate/entv1/user_query.go index f39d30346..c9c52928b 100644 --- a/entc/integration/migrate/entv1/user_query.go +++ b/entc/integration/migrate/entv1/user_query.go @@ -616,7 +616,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv2/car_query.go b/entc/integration/migrate/entv2/car_query.go index a373f2022..469d8a549 100644 --- a/entc/integration/migrate/entv2/car_query.go +++ b/entc/integration/migrate/entv2/car_query.go @@ -401,7 +401,13 @@ func (cq *CarQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, car.FieldID) + for i := range fields { + if fields[i] != car.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv2/conversion_query.go b/entc/integration/migrate/entv2/conversion_query.go index 8da7cc614..64a11274d 100644 --- a/entc/integration/migrate/entv2/conversion_query.go +++ b/entc/integration/migrate/entv2/conversion_query.go @@ -350,7 +350,13 @@ func (cq *ConversionQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, conversion.FieldID) + for i := range fields { + if fields[i] != conversion.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv2/customtype_query.go b/entc/integration/migrate/entv2/customtype_query.go index 67a6f2dc7..7a6872b09 100644 --- a/entc/integration/migrate/entv2/customtype_query.go +++ b/entc/integration/migrate/entv2/customtype_query.go @@ -350,7 +350,13 @@ func (ctq *CustomTypeQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := ctq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, customtype.FieldID) + for i := range fields { + if fields[i] != customtype.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := ctq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv2/group_query.go b/entc/integration/migrate/entv2/group_query.go index 6115a4f9b..52932af61 100644 --- a/entc/integration/migrate/entv2/group_query.go +++ b/entc/integration/migrate/entv2/group_query.go @@ -326,7 +326,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv2/media_query.go b/entc/integration/migrate/entv2/media_query.go index 2f02dd2e7..f9da8309f 100644 --- a/entc/integration/migrate/entv2/media_query.go +++ b/entc/integration/migrate/entv2/media_query.go @@ -350,7 +350,13 @@ func (mq *MediaQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := mq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, media.FieldID) + for i := range fields { + if fields[i] != media.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := mq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv2/pet_query.go b/entc/integration/migrate/entv2/pet_query.go index 8a6542981..07ac0ea6a 100644 --- a/entc/integration/migrate/entv2/pet_query.go +++ b/entc/integration/migrate/entv2/pet_query.go @@ -401,7 +401,13 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := pq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, pet.FieldID) + for i := range fields { + if fields[i] != pet.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := pq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/migrate/entv2/user_query.go b/entc/integration/migrate/entv2/user_query.go index 705f236b0..359db9a98 100644 --- a/entc/integration/migrate/entv2/user_query.go +++ b/entc/integration/migrate/entv2/user_query.go @@ -587,7 +587,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/privacy/ent/task_query.go b/entc/integration/privacy/ent/task_query.go index 0c1d89a52..f41306e2b 100644 --- a/entc/integration/privacy/ent/task_query.go +++ b/entc/integration/privacy/ent/task_query.go @@ -533,7 +533,13 @@ func (tq *TaskQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := tq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, task.FieldID) + for i := range fields { + if fields[i] != task.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := tq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/privacy/ent/team_query.go b/entc/integration/privacy/ent/team_query.go index ca1b82bc7..d15da61a2 100644 --- a/entc/integration/privacy/ent/team_query.go +++ b/entc/integration/privacy/ent/team_query.go @@ -564,7 +564,13 @@ func (tq *TeamQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := tq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, team.FieldID) + for i := range fields { + if fields[i] != team.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := tq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/privacy/ent/user_query.go b/entc/integration/privacy/ent/user_query.go index 9c41370ea..776fbf3f2 100644 --- a/entc/integration/privacy/ent/user_query.go +++ b/entc/integration/privacy/ent/user_query.go @@ -529,7 +529,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/template/ent/group_query.go b/entc/integration/template/ent/group_query.go index 63bfdb6c8..eca434b31 100644 --- a/entc/integration/template/ent/group_query.go +++ b/entc/integration/template/ent/group_query.go @@ -350,7 +350,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/template/ent/pet_query.go b/entc/integration/template/ent/pet_query.go index 980666c45..db441de36 100644 --- a/entc/integration/template/ent/pet_query.go +++ b/entc/integration/template/ent/pet_query.go @@ -425,7 +425,13 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := pq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, pet.FieldID) + for i := range fields { + if fields[i] != pet.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := pq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/entc/integration/template/ent/user_query.go b/entc/integration/template/ent/user_query.go index e4e87fadb..f74510967 100644 --- a/entc/integration/template/ent/user_query.go +++ b/entc/integration/template/ent/user_query.go @@ -522,7 +522,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/edgeindex/ent/city_query.go b/examples/edgeindex/ent/city_query.go index 633a1c023..1f7ba66e8 100644 --- a/examples/edgeindex/ent/city_query.go +++ b/examples/edgeindex/ent/city_query.go @@ -422,7 +422,13 @@ func (cq *CityQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, city.FieldID) + for i := range fields { + if fields[i] != city.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/edgeindex/ent/street_query.go b/examples/edgeindex/ent/street_query.go index 9bc3e9be8..b31768c3c 100644 --- a/examples/edgeindex/ent/street_query.go +++ b/examples/edgeindex/ent/street_query.go @@ -425,7 +425,13 @@ func (sq *StreetQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := sq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, street.FieldID) + for i := range fields { + if fields[i] != street.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := sq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/entcpkg/ent/user_query.go b/examples/entcpkg/ent/user_query.go index 1d4520cd8..0554c83e3 100644 --- a/examples/entcpkg/ent/user_query.go +++ b/examples/entcpkg/ent/user_query.go @@ -326,7 +326,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/m2m2types/ent/group_query.go b/examples/m2m2types/ent/group_query.go index c32b4d03a..ab74f769a 100644 --- a/examples/m2m2types/ent/group_query.go +++ b/examples/m2m2types/ent/group_query.go @@ -457,7 +457,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/m2m2types/ent/user_query.go b/examples/m2m2types/ent/user_query.go index 145bda714..963facc30 100644 --- a/examples/m2m2types/ent/user_query.go +++ b/examples/m2m2types/ent/user_query.go @@ -457,7 +457,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/m2mbidi/ent/user_query.go b/examples/m2mbidi/ent/user_query.go index 9dce34e13..8d1098418 100644 --- a/examples/m2mbidi/ent/user_query.go +++ b/examples/m2mbidi/ent/user_query.go @@ -456,7 +456,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/m2mrecur/ent/user_query.go b/examples/m2mrecur/ent/user_query.go index a1b2a7443..4dea45d1c 100644 --- a/examples/m2mrecur/ent/user_query.go +++ b/examples/m2mrecur/ent/user_query.go @@ -556,7 +556,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/o2m2types/ent/pet_query.go b/examples/o2m2types/ent/pet_query.go index 4e8867d3c..d73914d46 100644 --- a/examples/o2m2types/ent/pet_query.go +++ b/examples/o2m2types/ent/pet_query.go @@ -425,7 +425,13 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := pq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, pet.FieldID) + for i := range fields { + if fields[i] != pet.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := pq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/o2m2types/ent/user_query.go b/examples/o2m2types/ent/user_query.go index 1c1e4d39b..ffc8d57a6 100644 --- a/examples/o2m2types/ent/user_query.go +++ b/examples/o2m2types/ent/user_query.go @@ -422,7 +422,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/o2mrecur/ent/node_query.go b/examples/o2mrecur/ent/node_query.go index d989ab681..b5b13e52d 100644 --- a/examples/o2mrecur/ent/node_query.go +++ b/examples/o2mrecur/ent/node_query.go @@ -490,7 +490,13 @@ func (nq *NodeQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := nq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, node.FieldID) + for i := range fields { + if fields[i] != node.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := nq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/o2o2types/ent/card_query.go b/examples/o2o2types/ent/card_query.go index 37deaa914..aa67c1634 100644 --- a/examples/o2o2types/ent/card_query.go +++ b/examples/o2o2types/ent/card_query.go @@ -425,7 +425,13 @@ func (cq *CardQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, card.FieldID) + for i := range fields { + if fields[i] != card.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/o2o2types/ent/user_query.go b/examples/o2o2types/ent/user_query.go index efde02bf6..d6d227a1b 100644 --- a/examples/o2o2types/ent/user_query.go +++ b/examples/o2o2types/ent/user_query.go @@ -421,7 +421,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/o2obidi/ent/user_query.go b/examples/o2obidi/ent/user_query.go index 11151d051..951400a47 100644 --- a/examples/o2obidi/ent/user_query.go +++ b/examples/o2obidi/ent/user_query.go @@ -424,7 +424,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/o2orecur/ent/node_query.go b/examples/o2orecur/ent/node_query.go index 9626b1a92..407c724bc 100644 --- a/examples/o2orecur/ent/node_query.go +++ b/examples/o2orecur/ent/node_query.go @@ -489,7 +489,13 @@ func (nq *NodeQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := nq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, node.FieldID) + for i := range fields { + if fields[i] != node.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := nq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/privacyadmin/ent/user_query.go b/examples/privacyadmin/ent/user_query.go index cf07064a5..3adc6b3a9 100644 --- a/examples/privacyadmin/ent/user_query.go +++ b/examples/privacyadmin/ent/user_query.go @@ -356,7 +356,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/privacytenant/ent/group_query.go b/examples/privacytenant/ent/group_query.go index 20e3b0eb0..c054b025a 100644 --- a/examples/privacytenant/ent/group_query.go +++ b/examples/privacytenant/ent/group_query.go @@ -533,7 +533,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/privacytenant/ent/tenant_query.go b/examples/privacytenant/ent/tenant_query.go index 30ffe0d19..53a5a41e0 100644 --- a/examples/privacytenant/ent/tenant_query.go +++ b/examples/privacytenant/ent/tenant_query.go @@ -356,7 +356,13 @@ func (tq *TenantQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := tq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, tenant.FieldID) + for i := range fields { + if fields[i] != tenant.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := tq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/privacytenant/ent/user_query.go b/examples/privacytenant/ent/user_query.go index c35a1fbc8..68f854a65 100644 --- a/examples/privacytenant/ent/user_query.go +++ b/examples/privacytenant/ent/user_query.go @@ -533,7 +533,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/start/ent/car_query.go b/examples/start/ent/car_query.go index 0373fc3f9..e22b1d1ca 100644 --- a/examples/start/ent/car_query.go +++ b/examples/start/ent/car_query.go @@ -425,7 +425,13 @@ func (cq *CarQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := cq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, car.FieldID) + for i := range fields { + if fields[i] != car.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := cq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/start/ent/group_query.go b/examples/start/ent/group_query.go index 092ac1f91..7c7337dbd 100644 --- a/examples/start/ent/group_query.go +++ b/examples/start/ent/group_query.go @@ -457,7 +457,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/start/ent/user_query.go b/examples/start/ent/user_query.go index 2e3924884..36b613f0c 100644 --- a/examples/start/ent/user_query.go +++ b/examples/start/ent/user_query.go @@ -523,7 +523,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/traversal/ent/group_query.go b/examples/traversal/ent/group_query.go index 9d5be772b..ce79ac57a 100644 --- a/examples/traversal/ent/group_query.go +++ b/examples/traversal/ent/group_query.go @@ -526,7 +526,13 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := gq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, group.FieldID) + for i := range fields { + if fields[i] != group.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := gq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/traversal/ent/pet_query.go b/examples/traversal/ent/pet_query.go index f0838508f..86319c9ae 100644 --- a/examples/traversal/ent/pet_query.go +++ b/examples/traversal/ent/pet_query.go @@ -526,7 +526,13 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := pq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, pet.FieldID) + for i := range fields { + if fields[i] != pet.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := pq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { diff --git a/examples/traversal/ent/user_query.go b/examples/traversal/ent/user_query.go index 9bf425126..5df66ccb8 100644 --- a/examples/traversal/ent/user_query.go +++ b/examples/traversal/ent/user_query.go @@ -688,7 +688,13 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { Unique: true, } if fields := uq.fields; len(fields) > 0 { - _spec.Node.Columns = fields + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, user.FieldID) + for i := range fields { + if fields[i] != user.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } } if ps := uq.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) {