From 53e0526dd49e791dc7fc5a0688367112246c08b0 Mon Sep 17 00:00:00 2001 From: aca Date: Sat, 18 Jan 2020 16:55:18 +0900 Subject: [PATCH 1/3] add json tag to edges --- entc/gen/template/ent.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entc/gen/template/ent.tmpl b/entc/gen/template/ent.tmpl index cd6d57d6c..bcda390e9 100644 --- a/entc/gen/template/ent.tmpl +++ b/entc/gen/template/ent.tmpl @@ -28,7 +28,7 @@ type {{ $.Name }} struct { // {{ $e.StructField }} holds the value of the {{ $e.Name }} edge. {{ $e.StructField }} {{ if not $e.Unique }}[]{{ end }}*{{ $e.Type.Name }} {{ with $e.StructTag }}`{{ . }}`{{ end }} {{- end }} - } + } `json:"edges,omitempty"` {{- end -}} {{- /* Additional fields to add by the storage driver. */}} {{- $tmpl := printf "dialect/%s/model/fields" $.Storage }} From 8f5f8e87029be8541a6e612196a28b848d583bc1 Mon Sep 17 00:00:00 2001 From: aca Date: Sat, 18 Jan 2020 16:56:31 +0900 Subject: [PATCH 2/3] go generate --- entc/gen/internal/bindata.go | 4 ++-- entc/integration/customid/ent/group.go | 2 +- entc/integration/customid/ent/user.go | 2 +- entc/integration/ent/card.go | 2 +- entc/integration/ent/file.go | 2 +- entc/integration/ent/filetype.go | 2 +- entc/integration/ent/group.go | 2 +- entc/integration/ent/groupinfo.go | 2 +- entc/integration/ent/node.go | 2 +- entc/integration/ent/pet.go | 2 +- entc/integration/ent/spec.go | 2 +- entc/integration/ent/user.go | 2 +- entc/integration/gremlin/ent/card.go | 2 +- entc/integration/gremlin/ent/file.go | 2 +- entc/integration/gremlin/ent/filetype.go | 2 +- entc/integration/gremlin/ent/group.go | 2 +- entc/integration/gremlin/ent/groupinfo.go | 2 +- entc/integration/gremlin/ent/node.go | 2 +- entc/integration/gremlin/ent/pet.go | 2 +- entc/integration/gremlin/ent/spec.go | 2 +- entc/integration/gremlin/ent/user.go | 2 +- entc/integration/idtype/ent/user.go | 2 +- entc/integration/migrate/entv1/car.go | 2 +- entc/integration/migrate/entv1/user.go | 2 +- entc/integration/migrate/entv2/car.go | 2 +- entc/integration/migrate/entv2/user.go | 2 +- entc/integration/template/ent/pet.go | 2 +- entc/integration/template/ent/user.go | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go index 77a0ebbd1..3f71a04e4 100644 --- a/entc/gen/internal/bindata.go +++ b/entc/gen/internal/bindata.go @@ -821,7 +821,7 @@ func templateDialectSqlUpdateTmpl() (*asset, error) { return a, nil } -var _templateEntTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x6f\xe3\xb8\x11\x7f\x96\x3e\xc5\x9c\xe0\xed\xd9\x86\x43\x6d\xef\xad\xdb\xa6\x40\x2e\xd9\x05\x0c\x14\xdb\x3f\xc9\xa2\x0f\x8b\xc5\x2e\x2d\x8e\x2c\x36\x12\xa9\x23\x29\x27\x86\xe0\xef\x5e\x0c\x29\xc9\x92\xed\xe4\xd2\x3e\x45\xe6\xcc\xfc\x66\x38\x33\x9c\x3f\x69\xdb\x74\x19\xdf\xea\x7a\x6f\xe4\xb6\x70\xf0\xcb\xfb\x3f\xfe\xe9\xaa\x36\x68\x51\x39\xf8\xc4\x33\xdc\x68\xfd\x08\x6b\x95\x31\xb8\x29\x4b\xf0\x4c\x16\x88\x6e\x76\x28\x58\xfc\x50\x48\x0b\x56\x37\x26\x43\xc8\xb4\x40\x90\x16\x4a\x99\xa1\xb2\x28\xa0\x51\x02\x0d\xb8\x02\xe1\xa6\xe6\x59\x81\xf0\x0b\x7b\xdf\x53\x21\xd7\x8d\x12\xb1\x54\x9e\xfe\xb7\xf5\xed\xc7\xcf\xf7\x1f\x21\x97\x25\x42\x77\x66\xb4\x76\x20\xa4\xc1\xcc\x69\xb3\x07\x9d\x83\x1b\x29\x73\x06\x91\xc5\xcb\xf4\x70\x88\xe3\xb6\x05\x81\xb9\x54\x08\x49\xa5\x05\x96\x09\x74\xa7\xb3\xfa\x71\x0b\x1f\xae\x61\xc3\x2d\xc2\x8c\xdd\x6a\x95\xcb\x2d\xfb\x07\xcf\x1e\xf9\x16\x89\xa9\x6d\xc1\x61\x55\x97\xdc\x21\x24\x05\x72\x81\x26\x81\x59\x2f\x7e\x24\xc9\xaa\xd6\xc6\xf5\xa4\x34\x05\x02\x67\x9f\x79\x45\x28\x74\x67\x32\xd8\xeb\x06\x54\x4e\xba\x3d\xe4\x3a\xdc\x7c\xc2\x68\xb3\x02\x2b\xce\x62\xb7\xaf\x4f\x29\xce\x34\x99\x83\x36\x8e\x32\x6f\x24\x4c\xd4\x7b\xe4\x54\x57\xd2\x39\xbe\xb5\x9d\x19\x51\x9a\xc2\xfa\x2e\xf8\x05\x49\x2d\x8b\xa3\xf5\x5d\x80\x5d\xdf\xb1\x07\xd2\x71\x38\xc0\x8f\xff\x58\xad\x3e\x24\x52\xac\x48\x1e\xab\xda\xed\x93\x1f\x71\xd4\xb6\x57\x60\xb8\xda\x22\xcc\xbe\xaf\x60\x96\x93\x9b\x66\xec\x93\xc4\x52\x58\x8f\x1e\x75\xb7\xcc\xd9\xbd\xb7\xcd\x93\x08\xb0\xd0\xc4\x42\x3a\x77\xbc\x6c\xb0\x37\x20\x09\xcc\xdd\x85\x12\xc8\x89\x9f\xc5\x00\x00\xd1\x45\x9c\xb6\x05\x99\x7b\x11\x59\x96\x7c\x53\x92\xd8\xb2\x6d\x01\x15\x91\x83\x48\x7f\x89\xc0\xab\xb4\xf3\x38\xa8\xac\x74\x72\x47\x94\x1f\x63\xe8\x07\xbe\xed\x8e\xb0\xb4\x18\x40\x5e\x77\xe2\xa0\x2e\x38\x64\xfc\xfd\x24\x5d\x01\x33\xf6\x51\x6c\xf1\xe8\x90\xf0\xeb\xe8\x01\x83\x25\x77\x52\x2b\x9b\xa2\xa7\x50\xd4\xb5\x2b\xd0\x80\xd2\x02\x6d\x9f\xca\x5b\xc3\xeb\x82\x05\x88\x87\xde\x71\x16\xb8\x41\xd8\xa0\x54\x5b\xa8\x75\xdd\x90\x95\x02\x36\xfb\xb3\xb4\xf9\x67\x83\x66\x0f\x4f\x05\x2a\x40\xbe\x45\x73\x55\x6a\x2e\x48\x8a\x5e\x03\x52\xd8\xa3\x60\xd7\x31\x89\xa2\x71\x7c\x31\xc4\x76\x74\x93\x21\xb8\xf8\xc6\xe0\x06\xde\x3e\x59\xe9\xae\xcc\xc3\x5c\xc4\x18\x05\x0b\xd9\x17\x25\x7f\x6b\x48\xea\xeb\xb7\xc1\xd9\xcb\x20\x46\xc1\x1d\x30\xdb\xb6\xf3\x38\x9e\x05\x93\xf5\x41\xed\xa2\x13\x4d\x62\x15\x8d\x62\x77\xd5\x07\x2f\x5d\xc2\x8d\x10\x92\x42\xc3\xcb\x90\x8a\x16\x9c\x06\x2e\x06\x0f\x5b\xa7\x0d\x55\x01\x61\xe4\x0e\x0d\x03\x5f\x4a\xbc\xf0\xcc\x55\x75\x49\x3e\xab\x8d\x54\x2e\x87\x44\x48\x5e\x62\xe6\xd2\x77\x36\x0d\x49\x14\x00\x13\x98\xb1\xfb\x0e\xa5\x97\x95\x39\x14\xdc\x3e\xf4\x49\x17\xa0\xbc\x99\x44\x7d\x76\x53\x02\xbb\x98\x79\x6f\x30\xbe\xb1\x63\x93\xcf\x92\x3c\xc8\xa4\x7c\x40\xe9\x4a\x46\x57\x15\xbd\xee\x8b\xd7\x13\x48\x45\x3c\xd5\x0a\x4f\x2e\xd7\xb6\x67\xc6\x0f\x65\x72\x66\x30\x43\x72\x62\xc8\xb3\x7f\xf5\xbf\x3a\xf2\xa8\xca\x9c\x65\xa2\x7f\xbd\x8d\xca\x06\x6f\x43\xe2\xb3\x3d\x39\x4f\xab\x78\x28\x48\xc4\x7f\x38\xc0\x6f\x0d\x1a\x89\xf6\x85\xfc\x1c\x67\x6e\x4f\x60\x71\xe4\x85\xe7\x13\xa3\x0f\x07\x58\x8e\xb9\x16\x63\x2d\xf3\x05\x9c\x66\x6b\xff\x20\xe9\x99\x19\x74\x8d\x51\x30\xff\xc3\x18\xe0\xb6\x94\xa8\x5c\x0b\x27\x5a\x58\xa8\xec\x87\x05\x1b\xe3\x9f\x30\x2d\xe2\xc8\x3b\xbb\xcb\x07\x6a\x35\x5f\x6a\x41\x4e\x0f\xaa\x2c\x70\xd8\x34\xb2\xa4\xc6\x4a\xc5\xa6\x21\x22\xd5\x02\xdf\x1b\xa7\x97\x4d\x53\xf8\xac\x1d\x82\x2b\xb8\x5b\xc1\x5e\x37\xa0\x10\x05\x65\x52\xc6\xcb\x72\xca\xfc\x45\x3d\x19\x5e\xcf\x17\xb0\xc1\x5c\x1b\xf4\x1c\x03\x6c\x85\xae\xd0\x62\x45\xc9\x7d\xa6\x86\xb4\x3c\x71\xdb\x99\x87\x02\x72\xa3\x2b\xe0\xe0\x0c\x57\x96\x67\x94\x7e\x2b\xe0\x4a\xf8\x60\x8c\x0e\xbd\x50\xa6\x2b\x2a\xc7\x28\x40\x1b\x30\xba\x2c\xa9\x00\xf2\xec\x91\xc5\x6f\x8a\x53\xf0\x4c\x1f\xa2\xfe\x3c\x9c\xfe\x5d\x21\x45\xe8\xff\x0b\xd0\x00\x71\x1e\x9e\x2e\x26\xde\x5d\xd0\xf8\x3f\xb6\x6f\xc0\xd4\xf7\xc9\xd9\xbf\xe7\x10\xe0\xb9\x43\x03\x32\x30\x66\xa5\xb6\x28\x56\x04\x6b\x75\x90\xa7\xf0\x28\x7c\x76\x43\x8e\x3f\xc9\xb2\x84\x0d\x02\x3e\x63\xd6\x90\xbf\x5c\x61\x74\xb3\x2d\xbc\xe6\x50\xc1\xe0\xa9\x90\x59\x01\x99\x41\x1e\x18\x26\xee\x7e\xab\x47\xfb\x34\x98\x9c\x93\x23\xdd\xf3\x0a\xf4\x23\xbd\xd3\xcb\x5e\x63\x5d\x1d\x9d\x2f\xdd\xf3\x9d\xff\x5c\xc4\x91\xcc\xe1\x27\xfd\xe8\x5f\x4a\xcd\x95\xcc\xe6\x49\x3f\x94\x1d\x0e\x1f\xce\x66\x28\xea\x18\x13\x3f\xf1\x7e\x9a\x4a\xfc\xb3\x88\x5e\xd5\x0c\xd7\xe0\x9e\x99\x30\xbb\x21\xe8\x27\xec\x5d\xe8\xee\x9d\xf1\xbd\xb3\xaa\x4b\xac\x50\xb9\x10\xbd\xbc\x72\x2c\x50\xd0\xbc\xd1\x57\x81\x7d\xbe\xa0\xb6\x4b\x88\x6d\x1c\xed\xb8\x19\x5e\x67\x38\xb5\xec\xd7\xf0\x3b\x8e\x3a\x02\xfb\xb7\x91\x0e\x3b\xe1\x64\x0c\x39\xa7\x6b\x5e\xe2\xf2\xc6\x85\x6a\x3d\x4f\xa4\xb8\x7e\xb7\x4b\x56\x67\x61\x58\xdf\x2d\x16\x93\xb1\x4e\x5e\x1e\xeb\xba\x2e\x75\x32\x47\x51\x57\xbd\x68\xe0\x0a\x26\x73\xdd\xf5\x5f\x6c\x2f\xf5\x57\x32\x37\x34\xaf\x30\x6d\xf5\x9d\x79\x66\xf3\x71\xf7\x7c\x67\xd9\x3b\xea\x95\x83\xb1\x67\xa3\x60\x2f\x78\x36\x0e\xfa\x19\x43\xe6\xb0\xeb\xf3\xce\xe6\x70\x38\xfc\x19\x76\xf0\xd3\x35\x28\x59\x86\x51\xe7\x8d\x96\x7b\x73\x27\x9a\xd6\xf6\x41\x56\x83\x9e\xcb\x30\x3b\xf6\x49\x9b\x8a\xbb\xb9\x93\x15\xb2\x9b\xcf\xf7\xeb\xdb\xc5\x08\xc8\x5f\xbd\x47\xeb\x52\xeb\x55\xbc\xe5\xee\x54\xfa\x55\xf6\x49\xe8\x7d\xdc\x97\xbb\x89\xfe\x61\x26\x8a\x8e\x93\xd1\x08\xf5\x7f\xf1\xcc\x8b\x8e\xb9\x04\x32\x44\xe3\x45\xff\xfc\x9e\x7b\x5e\x45\x3d\x81\x78\x4d\xe6\xdc\x45\x47\x94\x11\xcc\xe5\xe1\xf1\x74\xf6\xea\xbf\x27\x8a\x7e\xdd\x3b\x9c\xff\xbc\xf8\x79\x31\x94\x96\x9e\xdc\xd7\x80\x30\x59\x05\xf7\xd1\xf2\x35\xbe\x6c\x9a\x82\x14\x43\xfb\xa6\x62\x43\x73\x8e\xc1\x6e\xcb\xf6\xfb\x43\x3f\xad\xac\xef\xfa\xbd\xe9\x4d\x25\x48\x8a\xf9\xc2\xa3\xb5\x71\x24\xc5\x0a\xbe\xd3\x3b\xb1\xce\x64\x5a\xed\xd8\x8d\xd3\xf2\x14\x80\xaa\xc4\x70\x09\x29\xe2\x43\x3c\xba\xb4\x9f\xe5\x2c\xed\xe7\xfe\xf9\x96\x8d\xe1\xe5\xb4\xd1\x1f\x19\x42\xc5\xe6\x50\x73\x63\xfd\x63\x0d\xc7\x3a\x3f\x99\x41\x86\x4d\x77\x10\xfb\xfa\x6d\x72\x09\xaf\xd5\x4f\xfe\xf8\xec\xc8\x90\x19\x24\xf7\xc4\x9b\x1c\x65\x42\xe5\x7f\x65\x2a\xef\xc6\xd6\x8a\xab\xfd\xf9\x50\x7e\x79\xea\x1e\xcd\x58\x97\x5d\x3d\x36\x7a\x01\xa1\xd5\xcc\xb3\x7c\xdb\x7d\x2e\xc8\xe7\x34\x81\x7d\x97\x64\x54\xa8\xb9\x67\x18\x71\x74\xda\xb4\xbe\x7e\x97\xdf\xba\xc6\x05\xd7\x90\xe5\x5b\xea\x6c\x13\x73\xda\x96\x16\x80\xe3\x4c\xef\x77\x4a\x1a\x93\x28\x9f\xc2\x8a\x77\x45\x1b\x6c\x37\xff\x9f\xfe\xf3\x63\xb4\xe1\xfa\xfd\xb6\xdb\x63\x1f\xf8\x96\x26\x58\xdb\xed\x52\xa3\x1e\xe1\xc8\x7e\x16\x98\x69\x6f\xa3\x63\x78\xdf\xb9\xe0\xb8\x8c\x3b\xea\xd9\xc9\x55\x32\x1c\xfe\x18\x93\x5f\x32\xde\x8f\x33\x19\x57\x34\xbc\xe8\x1d\x1a\x23\x05\x0a\x5a\x8b\xb5\xf1\xff\x1b\x0a\x5b\x0d\xbf\xb4\xee\xf8\xa1\x8a\x67\x05\x50\x0e\xb1\xcb\x77\xbd\xb0\xe8\x90\x39\xa8\xc4\xe1\x10\xff\x37\x00\x00\xff\xff\x1c\xfa\x46\xfc\xdb\x12\x00\x00") +var _templateEntTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x6f\xe3\xb8\x11\x7f\x96\x3e\xc5\x9c\xe0\xed\xd9\x86\x43\x6d\xef\xad\xdb\xa6\x40\x2e\xd9\x05\x0c\x14\xdb\x3f\xc9\xa2\x0f\x8b\xc5\x2e\x2d\x8e\x2c\x36\x12\xa9\x23\x29\x27\x86\xe0\xef\x5e\x0c\x29\xc9\x92\xed\xe4\xd2\x3e\x45\xe6\xcc\xfc\x66\x38\x33\x9c\x3f\x69\xdb\x74\x19\xdf\xea\x7a\x6f\xe4\xb6\x70\xf0\xcb\xfb\x3f\xfe\xe9\xaa\x36\x68\x51\x39\xf8\xc4\x33\xdc\x68\xfd\x08\x6b\x95\x31\xb8\x29\x4b\xf0\x4c\x16\x88\x6e\x76\x28\x58\xfc\x50\x48\x0b\x56\x37\x26\x43\xc8\xb4\x40\x90\x16\x4a\x99\xa1\xb2\x28\xa0\x51\x02\x0d\xb8\x02\xe1\xa6\xe6\x59\x81\xf0\x0b\x7b\xdf\x53\x21\xd7\x8d\x12\xb1\x54\x9e\xfe\xb7\xf5\xed\xc7\xcf\xf7\x1f\x21\x97\x25\x42\x77\x66\xb4\x76\x20\xa4\xc1\xcc\x69\xb3\x07\x9d\x83\x1b\x29\x73\x06\x91\xc5\xcb\xf4\x70\x88\xe3\xb6\x05\x81\xb9\x54\x08\x49\xa5\x05\x96\x09\x74\xa7\xb3\xfa\x71\x0b\x1f\xae\x61\xc3\x2d\xc2\x8c\xdd\x6a\x95\xcb\x2d\xfb\x07\xcf\x1e\xf9\x16\x89\xa9\x6d\xc1\x61\x55\x97\xdc\x21\x24\x05\x72\x81\x26\x81\x59\x2f\x7e\x24\xc9\xaa\xd6\xc6\xf5\xa4\x34\x05\x02\x67\x9f\x79\x45\x28\x74\x67\x32\xd8\xeb\x06\x54\x4e\xba\x3d\xe4\x3a\xdc\x7c\xc2\x68\xb3\x02\x2b\xce\x62\xb7\xaf\x4f\x29\xce\x34\x99\x83\x36\x8e\x32\x6f\x24\x4c\xd4\x7b\xe4\x54\x57\xd2\x39\xbe\xb5\x9d\x19\x51\x9a\xc2\xfa\x2e\xf8\x05\x49\x2d\x8b\xa3\xf5\x5d\x80\x5d\xdf\xb1\x07\xd2\x71\x38\xc0\x8f\xff\x58\xad\x3e\x24\x52\xac\x48\x1e\xab\xda\xed\x93\x1f\x71\xd4\xb6\x57\x60\xb8\xda\x22\xcc\xbe\xaf\x60\x96\x93\x9b\x66\xec\x93\xc4\x52\x58\x8f\x1e\x75\xb7\xcc\xd9\xbd\xb7\xcd\x93\x08\xb0\xd0\xc4\x42\x3a\x77\xbc\x6c\xb0\x37\x20\x09\xcc\xdd\x85\x12\xc8\x89\x9f\xc5\x00\x00\xd1\x45\x9c\xb6\x05\x99\x7b\x11\x59\x96\x7c\x53\x92\xd8\xb2\x6d\x01\x15\x91\x83\x48\x7f\x89\xc0\xab\xb4\xf3\x38\xa8\xac\x74\x72\x47\x94\x1f\x63\xe8\x07\xbe\xed\x8e\xb0\xb4\x18\x40\x5e\x77\xe2\xa0\x2e\x38\x64\xfc\xfd\x24\x5d\x01\x33\xf6\x51\x6c\xf1\xe8\x90\xf0\xeb\xe8\x01\x83\x25\x77\x52\x2b\x9b\xa2\xa7\x50\xd4\xb5\x2b\xd0\x80\xd2\x02\x6d\x9f\xca\x5b\xc3\xeb\x82\x05\x88\x87\xde\x71\x16\xb8\x41\xd8\xa0\x54\x5b\xa8\x75\xdd\x90\x95\x02\x36\xfb\xb3\xb4\xf9\x67\x83\x66\x0f\x4f\x05\x2a\x40\xbe\x45\x73\x55\x6a\x2e\x48\x8a\x5e\x03\x52\xd8\xa3\x60\xd7\x31\x89\xa2\x71\x7c\x31\xc4\x76\x74\x93\x21\xb8\xf8\xc6\xe0\x06\xde\x3e\x59\xe9\xae\xcc\xc3\x5c\xc4\x18\x05\x0b\xd9\x17\x25\x7f\x6b\x48\xea\xeb\xb7\xc1\xd9\xcb\x20\x46\xc1\x1d\x30\xdb\xb6\xf3\x38\x9e\x05\x93\xf5\x41\xed\xa2\x13\x4d\x62\x15\x0d\x29\xee\x43\x70\x9e\xe5\xc4\x78\xd5\x47\x35\x5d\xc2\x8d\x10\x92\x62\xc6\xcb\x90\xa3\x16\x9c\x06\x2e\x06\xd7\x5b\xa7\x0d\x95\x07\x61\xe4\x0e\x0d\x03\x5f\x63\xbc\xf0\xcc\x55\x75\x49\xce\xac\x8d\x54\x2e\x87\x44\x48\x5e\x62\xe6\xd2\x77\x36\x0d\xd9\x15\x00\x13\x98\xb1\xfb\x0e\xa5\x97\x95\x39\x14\xdc\x3e\xf4\xd9\x18\xa0\xbc\xfd\x44\x7d\x76\x53\x02\xbb\x98\x92\x6f\x30\xbe\xb1\x63\x93\xcf\xb2\x3f\xc8\xa4\x7c\x40\xe9\x6a\x49\x57\x2e\xbd\xee\x8b\xd7\x13\x48\xd5\x3d\xd5\x0a\x4f\x2e\xd7\xb6\x67\xc6\x0f\xf5\x73\x66\x30\x43\x72\x62\x48\xc0\x7f\xf5\xbf\x3a\xf2\xa8\xfc\x9c\xa5\xa8\x7f\xd6\x8d\xca\x06\x6f\x43\xe2\x9f\x41\x72\x9e\x6f\xf1\x50\xa9\x88\xff\x70\x80\xdf\x1a\x34\x12\xed\x0b\x89\x3b\x4e\xe9\x9e\xc0\xe2\xc8\x0b\xcf\x27\x46\x1f\x0e\xb0\x1c\x73\x2d\xc6\x5a\xe6\x0b\x38\x4d\xe3\xfe\xa5\xd2\xfb\x33\xe8\x1a\xa3\x60\xfe\x87\x31\xc0\x6d\x29\x51\xb9\x16\x4e\xb4\xb0\x50\xf2\x0f\x0b\x36\xc6\x3f\x61\x5a\xc4\x91\x77\x76\x97\x0f\xd4\x83\xbe\xd4\x82\x9c\x1e\x54\x59\xe0\xb0\x69\x64\x49\x1d\x97\xaa\x50\x43\x44\x2a\x12\xbe\x69\x4e\x2f\x9b\xa6\xf0\x59\x3b\x04\x57\x70\xb7\x82\xbd\x6e\x40\x21\x0a\xca\xa4\x8c\x97\xe5\x94\xf9\x8b\x7a\x32\xbc\x9e\x2f\x60\x83\xb9\x36\xe8\x39\x06\xd8\x0a\x5d\xa1\xc5\x8a\x92\xfb\x4c\x0d\x69\x79\xe2\xb6\x33\x0f\x05\xe4\x46\x57\xc0\xc1\x19\xae\x2c\xcf\x28\xfd\x56\xc0\x95\xf0\xc1\x18\x1d\x7a\xa1\x4c\x57\x54\xa7\x51\x80\x36\x60\x74\x59\x52\x65\xe4\xd9\x23\x8b\xdf\x14\xa7\xe0\x99\x3e\x44\xfd\x79\x38\xfd\xbb\x42\x8a\xd0\xff\x17\xa0\x01\xe2\x3c\x3c\x5d\x4c\xbc\xbb\xa0\xf1\x7f\x6c\xdf\x99\x69\x20\x20\x67\xff\x9e\x43\x80\xe7\x0e\x0d\xc8\xc0\x98\x95\xda\xa2\x58\x11\xac\xd5\x41\x9e\xc2\xa3\xf0\xd9\x0d\x39\xfe\x24\xcb\x12\x36\x08\xf8\x8c\x59\x43\xfe\x72\x85\xd1\xcd\xb6\xf0\x9a\x43\x05\x83\xa7\x42\x66\x05\x64\x06\x79\x60\x98\xb8\xfb\xad\x1e\xed\xd3\x60\x72\x4e\x8e\x74\xcf\x2b\xd0\x8f\xf4\x4e\x2f\x7b\x8d\x75\x75\x74\xbe\x74\xcf\x77\xfe\x73\x11\x47\x32\x87\x9f\xf4\xa3\x7f\x29\x35\x57\x32\x9b\x27\xfd\xb4\x76\x38\x7c\x38\x1b\xae\xa8\x95\x4c\xfc\xc4\xfb\x31\x2b\xf1\xcf\x22\x7a\x55\x33\x5c\x83\x7b\x66\xc2\xec\x86\xa0\x9f\xb0\x77\xa1\xbb\x77\xc6\x37\xd5\xaa\x2e\xb1\x42\xe5\x42\xf4\xf2\xca\xb1\x40\x41\xf3\x46\x5f\x05\xf6\xf9\x82\xfa\x31\x21\xb6\x71\xb4\xe3\x66\x78\x9d\xe1\xd4\xb2\x5f\xc3\xef\x38\xea\x08\xec\xdf\x46\x3a\xec\x84\x93\x31\xe4\x9c\xae\x79\x89\xcb\x1b\x17\xaa\xf5\x3c\x91\xe2\xfa\xdd\x2e\x59\x9d\x85\x61\x7d\xb7\x58\x4c\xe6\x3d\x79\x79\xde\xeb\xba\xd4\xc9\x80\x45\xed\xf6\xa2\x81\x2b\x98\x0c\x7c\xd7\x7f\xb1\xbd\xd4\x5f\xc9\xdc\xd0\xbc\xc2\x18\xd6\xb7\xec\x99\xcd\xc7\xdd\xf3\x9d\x65\xef\xa8\x57\x0e\xc6\x9e\xcd\x88\xbd\xe0\xd9\x9c\xe8\x87\x0f\x99\xc3\xae\xcf\x3b\x9b\xc3\xe1\xf0\x67\xd8\xc1\x4f\xd7\xa0\x64\x19\x66\xa0\x37\x5a\xee\xcd\x9d\x68\x5a\xdb\x07\x59\x0d\x7a\x2e\xc3\xec\xd8\x27\x6d\x2a\xee\xe6\x4e\x56\xc8\x6e\x3e\xdf\xaf\x6f\x17\x23\x20\x7f\xf5\x1e\xad\x4b\xad\x57\xf1\x96\xbb\x53\xe9\x57\xd9\x27\xa1\xf7\x71\x5f\xee\x26\xfa\x87\x61\x29\x3a\x8e\x4c\x23\xd4\xff\xc5\x33\x2f\x3a\xe6\x12\xc8\x10\x8d\x17\xfd\xf3\x7b\xee\x79\x15\xf5\x04\xe2\x35\x99\x73\x17\x1d\x51\x46\x30\x97\xa7\xca\xd3\xd9\xab\xff\x9e\x28\xfa\x75\xef\x70\xfe\xf3\xe2\xe7\xc5\x50\x5a\x7a\x72\x5f\x03\xc2\x64\x15\xdc\x47\x5b\xd9\xf8\xb2\x69\x0a\x52\x0c\xed\x9b\x8a\x0d\xcd\x39\x06\xbb\xf5\xdb\x2f\x16\xfd\xb4\xb2\xbe\xeb\x17\xaa\x37\x95\x20\x29\xe6\x0b\x8f\xd6\xc6\x91\x14\x2b\xf8\x4e\xef\xc4\x3a\x93\x69\xb5\x63\x37\x4e\xcb\x53\x00\xaa\x12\xc3\x25\xa4\x88\x0f\xf1\xe8\xd2\x7e\x96\xb3\xb4\xb8\xfb\xe7\x5b\x36\x86\x97\xd3\x46\x7f\x64\x08\x15\x9b\x43\xcd\x8d\xf5\x8f\x35\x1c\xeb\xfc\x64\x06\x19\x56\xe0\x41\xec\xeb\xb7\xc9\x25\xbc\x56\xbf\x12\xe0\xb3\x23\x43\x66\x90\xdc\x13\x6f\x72\x94\x09\x95\xff\x95\xa9\xbc\x1b\x5b\x2b\xae\xf6\xe7\x43\xf9\xe5\xa9\x7b\x34\x63\x5d\x76\xf5\xd8\xe8\x05\x84\x56\x33\xcf\xf2\x6d\xf7\xb9\x20\x9f\xd3\x04\xf6\x5d\x92\x51\xa1\xe6\x9e\x61\xc4\xd1\x69\xd3\xfa\xfa\x5d\x7e\xeb\x1a\x17\x5c\x43\x96\x6f\xa9\xb3\x4d\xcc\x69\x5b\x5a\x00\x8e\x33\xbd\x5f\x36\x69\x4c\xa2\x7c\x0a\xbb\xdf\x15\xad\xb6\xdd\xfc\x7f\xfa\x5f\x91\xd1\xea\xeb\x17\xdf\x6e\xc1\x7d\xe0\x5b\x9a\x60\x6d\xb7\x64\x8d\x7a\x84\x23\xfb\x59\x60\xa6\x85\x8e\x8e\xe1\x7d\xe7\x82\xe3\x96\xee\xa8\x67\x27\x57\xc9\x70\xf8\x63\x4c\x7e\xc9\x78\x3f\xce\x64\x5c\xd1\xf0\xa2\x77\x68\x8c\x14\x28\x68\x5f\xd6\xc6\xff\xd3\x28\x6c\x35\xfc\xd2\xba\xe3\x87\x2a\x9e\x15\x40\x39\xc4\x2e\xdf\xf5\xc2\xa2\x43\xe6\xa0\x12\x87\x43\xfc\xdf\x00\x00\x00\xff\xff\xdc\xa1\x3a\x59\xf4\x12\x00\x00") func templateEntTmplBytes() ([]byte, error) { return bindataRead( @@ -836,7 +836,7 @@ func templateEntTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/ent.tmpl", size: 4827, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/ent.tmpl", size: 4852, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/integration/customid/ent/group.go b/entc/integration/customid/ent/group.go index 25fd013e8..861b45815 100644 --- a/entc/integration/customid/ent/group.go +++ b/entc/integration/customid/ent/group.go @@ -24,7 +24,7 @@ type Group struct { Edges struct { // Users holds the value of the users edge. Users []*User - } + } `json:"edges,omitempty"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/customid/ent/user.go b/entc/integration/customid/ent/user.go index 27209bd64..7817dc309 100644 --- a/entc/integration/customid/ent/user.go +++ b/entc/integration/customid/ent/user.go @@ -28,7 +28,7 @@ type User struct { Parent *User // Children holds the value of the children edge. Children []*User - } + } `json:"edges,omitempty"` parent_id *int } diff --git a/entc/integration/ent/card.go b/entc/integration/ent/card.go index 717a4ac58..6ebde6d07 100644 --- a/entc/integration/ent/card.go +++ b/entc/integration/ent/card.go @@ -36,7 +36,7 @@ type Card struct { Owner *User // Spec holds the value of the spec edge. Spec []*Spec - } + } `json:"edges,omitempty"` owner_id *string // StaticField defined by templates. diff --git a/entc/integration/ent/file.go b/entc/integration/ent/file.go index 52cb4155a..ad50047b0 100644 --- a/entc/integration/ent/file.go +++ b/entc/integration/ent/file.go @@ -35,7 +35,7 @@ type File struct { Owner *User // Type holds the value of the type edge. Type *FileType - } + } `json:"edges,omitempty"` type_id *string group_file_id *string owner_id *string diff --git a/entc/integration/ent/filetype.go b/entc/integration/ent/filetype.go index 1ff6188ae..d93b13b60 100644 --- a/entc/integration/ent/filetype.go +++ b/entc/integration/ent/filetype.go @@ -27,7 +27,7 @@ type FileType struct { Edges struct { // Files holds the value of the files edge. Files []*File - } + } `json:"edges,omitempty"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/ent/group.go b/entc/integration/ent/group.go index 8ae6e25a9..71449f195 100644 --- a/entc/integration/ent/group.go +++ b/entc/integration/ent/group.go @@ -42,7 +42,7 @@ type Group struct { Users []*User // Info holds the value of the info edge. Info *GroupInfo - } + } `json:"edges,omitempty"` info_id *string } diff --git a/entc/integration/ent/groupinfo.go b/entc/integration/ent/groupinfo.go index 36f6a1f54..f8356a372 100644 --- a/entc/integration/ent/groupinfo.go +++ b/entc/integration/ent/groupinfo.go @@ -29,7 +29,7 @@ type GroupInfo struct { Edges struct { // Groups holds the value of the groups edge. Groups []*Group - } + } `json:"edges,omitempty"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/ent/node.go b/entc/integration/ent/node.go index 7fc336c6e..e764d842e 100644 --- a/entc/integration/ent/node.go +++ b/entc/integration/ent/node.go @@ -29,7 +29,7 @@ type Node struct { Prev *Node // Next holds the value of the next edge. Next *Node - } + } `json:"edges,omitempty"` prev_id *string } diff --git a/entc/integration/ent/pet.go b/entc/integration/ent/pet.go index b115a6d73..47e6a12ce 100644 --- a/entc/integration/ent/pet.go +++ b/entc/integration/ent/pet.go @@ -29,7 +29,7 @@ type Pet struct { Team *User // Owner holds the value of the owner edge. Owner *User - } + } `json:"edges,omitempty"` owner_id *string team_id *string } diff --git a/entc/integration/ent/spec.go b/entc/integration/ent/spec.go index f049733ea..62bc6ae11 100644 --- a/entc/integration/ent/spec.go +++ b/entc/integration/ent/spec.go @@ -25,7 +25,7 @@ type Spec struct { Edges struct { // Card holds the value of the card edge. Card []*Card - } + } `json:"edges,omitempty"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/ent/user.go b/entc/integration/ent/user.go index 885e2cb97..bb1821fbe 100644 --- a/entc/integration/ent/user.go +++ b/entc/integration/ent/user.go @@ -61,7 +61,7 @@ type User struct { Children []*User // Parent holds the value of the parent edge. Parent *User - } + } `json:"edges,omitempty"` group_blocked_id *string user_spouse_id *string parent_id *string diff --git a/entc/integration/gremlin/ent/card.go b/entc/integration/gremlin/ent/card.go index 872acf35c..149e12a54 100644 --- a/entc/integration/gremlin/ent/card.go +++ b/entc/integration/gremlin/ent/card.go @@ -35,7 +35,7 @@ type Card struct { Owner *User // Spec holds the value of the spec edge. Spec []*Spec - } + } `json:"edges,omitempty"` // StaticField defined by templates. StaticField string `json:"boring,omitempty"` diff --git a/entc/integration/gremlin/ent/file.go b/entc/integration/gremlin/ent/file.go index ce17f89d8..e055df6f1 100644 --- a/entc/integration/gremlin/ent/file.go +++ b/entc/integration/gremlin/ent/file.go @@ -34,7 +34,7 @@ type File struct { Owner *User // Type holds the value of the type edge. Type *FileType - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into File. diff --git a/entc/integration/gremlin/ent/filetype.go b/entc/integration/gremlin/ent/filetype.go index b3ae42f45..ada551940 100644 --- a/entc/integration/gremlin/ent/filetype.go +++ b/entc/integration/gremlin/ent/filetype.go @@ -26,7 +26,7 @@ type FileType struct { Edges struct { // Files holds the value of the files edge. Files []*File - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into FileType. diff --git a/entc/integration/gremlin/ent/group.go b/entc/integration/gremlin/ent/group.go index d4f162751..fd3674336 100644 --- a/entc/integration/gremlin/ent/group.go +++ b/entc/integration/gremlin/ent/group.go @@ -41,7 +41,7 @@ type Group struct { Users []*User // Info holds the value of the info edge. Info *GroupInfo - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into Group. diff --git a/entc/integration/gremlin/ent/groupinfo.go b/entc/integration/gremlin/ent/groupinfo.go index a6523218f..b915d24f0 100644 --- a/entc/integration/gremlin/ent/groupinfo.go +++ b/entc/integration/gremlin/ent/groupinfo.go @@ -28,7 +28,7 @@ type GroupInfo struct { Edges struct { // Groups holds the value of the groups edge. Groups []*Group - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into GroupInfo. diff --git a/entc/integration/gremlin/ent/node.go b/entc/integration/gremlin/ent/node.go index 0d52dbecb..a431a2854 100644 --- a/entc/integration/gremlin/ent/node.go +++ b/entc/integration/gremlin/ent/node.go @@ -28,7 +28,7 @@ type Node struct { Prev *Node // Next holds the value of the next edge. Next *Node - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into Node. diff --git a/entc/integration/gremlin/ent/pet.go b/entc/integration/gremlin/ent/pet.go index 6f540057a..3c4a95d32 100644 --- a/entc/integration/gremlin/ent/pet.go +++ b/entc/integration/gremlin/ent/pet.go @@ -28,7 +28,7 @@ type Pet struct { Team *User // Owner holds the value of the owner edge. Owner *User - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into Pet. diff --git a/entc/integration/gremlin/ent/spec.go b/entc/integration/gremlin/ent/spec.go index 1568d3448..9f6033467 100644 --- a/entc/integration/gremlin/ent/spec.go +++ b/entc/integration/gremlin/ent/spec.go @@ -24,7 +24,7 @@ type Spec struct { Edges struct { // Card holds the value of the card edge. Card []*Card - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into Spec. diff --git a/entc/integration/gremlin/ent/user.go b/entc/integration/gremlin/ent/user.go index 6962e255d..0e86c33eb 100644 --- a/entc/integration/gremlin/ent/user.go +++ b/entc/integration/gremlin/ent/user.go @@ -61,7 +61,7 @@ type User struct { Children []*User // Parent holds the value of the parent edge. Parent *User - } + } `json:"edges,omitempty"` } // FromResponse scans the gremlin response data into User. diff --git a/entc/integration/idtype/ent/user.go b/entc/integration/idtype/ent/user.go index 2116c004e..e4d3c03af 100644 --- a/entc/integration/idtype/ent/user.go +++ b/entc/integration/idtype/ent/user.go @@ -30,7 +30,7 @@ type User struct { Followers []*User // Following holds the value of the following edge. Following []*User - } + } `json:"edges,omitempty"` user_spouse_id *uint64 } diff --git a/entc/integration/migrate/entv1/car.go b/entc/integration/migrate/entv1/car.go index 33cf6688b..c28759502 100644 --- a/entc/integration/migrate/entv1/car.go +++ b/entc/integration/migrate/entv1/car.go @@ -24,7 +24,7 @@ type Car struct { Edges struct { // Owner holds the value of the owner edge. Owner *User - } + } `json:"edges,omitempty"` owner_id *int } diff --git a/entc/integration/migrate/entv1/user.go b/entc/integration/migrate/entv1/user.go index 276b23ee9..eaa459179 100644 --- a/entc/integration/migrate/entv1/user.go +++ b/entc/integration/migrate/entv1/user.go @@ -44,7 +44,7 @@ type User struct { Spouse *User // Car holds the value of the car edge. Car *Car - } + } `json:"edges,omitempty"` parent_id *int user_spouse_id *int } diff --git a/entc/integration/migrate/entv2/car.go b/entc/integration/migrate/entv2/car.go index 64a4a7126..a61b9b781 100644 --- a/entc/integration/migrate/entv2/car.go +++ b/entc/integration/migrate/entv2/car.go @@ -24,7 +24,7 @@ type Car struct { Edges struct { // Owner holds the value of the owner edge. Owner *User - } + } `json:"edges,omitempty"` owner_id *int } diff --git a/entc/integration/migrate/entv2/user.go b/entc/integration/migrate/entv2/user.go index 0ac7201b5..2ad69922e 100644 --- a/entc/integration/migrate/entv2/user.go +++ b/entc/integration/migrate/entv2/user.go @@ -42,7 +42,7 @@ type User struct { Edges struct { // Car holds the value of the car edge. Car []*Car - } + } `json:"edges,omitempty"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/template/ent/pet.go b/entc/integration/template/ent/pet.go index 962812491..23f385785 100644 --- a/entc/integration/template/ent/pet.go +++ b/entc/integration/template/ent/pet.go @@ -29,7 +29,7 @@ type Pet struct { Edges struct { // Owner holds the value of the owner edge. Owner *User - } + } `json:"edges,omitempty"` owner_id *int } diff --git a/entc/integration/template/ent/user.go b/entc/integration/template/ent/user.go index 73d02d971..52c82a7a2 100644 --- a/entc/integration/template/ent/user.go +++ b/entc/integration/template/ent/user.go @@ -28,7 +28,7 @@ type User struct { Pets []*Pet // Friends holds the value of the friends edge. Friends []*User - } + } `json:"edges,omitempty"` } // scanValues returns the types for scanning values from sql.Rows. From 891fc4c5ef599c93d84357690ec78d5edcec4868 Mon Sep 17 00:00:00 2001 From: aca Date: Sun, 19 Jan 2020 00:26:04 +0900 Subject: [PATCH 3/3] remove meaningless omitempty --- entc/gen/internal/bindata.go | 4 ++-- entc/gen/template/ent.tmpl | 2 +- entc/integration/customid/ent/group.go | 2 +- entc/integration/customid/ent/user.go | 2 +- entc/integration/ent/card.go | 2 +- entc/integration/ent/file.go | 2 +- entc/integration/ent/filetype.go | 2 +- entc/integration/ent/group.go | 2 +- entc/integration/ent/groupinfo.go | 2 +- entc/integration/ent/node.go | 2 +- entc/integration/ent/pet.go | 2 +- entc/integration/ent/spec.go | 2 +- entc/integration/ent/user.go | 2 +- entc/integration/gremlin/ent/card.go | 2 +- entc/integration/gremlin/ent/file.go | 2 +- entc/integration/gremlin/ent/filetype.go | 2 +- entc/integration/gremlin/ent/group.go | 2 +- entc/integration/gremlin/ent/groupinfo.go | 2 +- entc/integration/gremlin/ent/node.go | 2 +- entc/integration/gremlin/ent/pet.go | 2 +- entc/integration/gremlin/ent/spec.go | 2 +- entc/integration/gremlin/ent/user.go | 2 +- entc/integration/idtype/ent/user.go | 2 +- entc/integration/migrate/entv1/car.go | 2 +- entc/integration/migrate/entv1/user.go | 2 +- entc/integration/migrate/entv2/car.go | 2 +- entc/integration/migrate/entv2/user.go | 2 +- entc/integration/template/ent/pet.go | 2 +- entc/integration/template/ent/user.go | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go index 3f71a04e4..3e1299ae8 100644 --- a/entc/gen/internal/bindata.go +++ b/entc/gen/internal/bindata.go @@ -821,7 +821,7 @@ func templateDialectSqlUpdateTmpl() (*asset, error) { return a, nil } -var _templateEntTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x6f\xe3\xb8\x11\x7f\x96\x3e\xc5\x9c\xe0\xed\xd9\x86\x43\x6d\xef\xad\xdb\xa6\x40\x2e\xd9\x05\x0c\x14\xdb\x3f\xc9\xa2\x0f\x8b\xc5\x2e\x2d\x8e\x2c\x36\x12\xa9\x23\x29\x27\x86\xe0\xef\x5e\x0c\x29\xc9\x92\xed\xe4\xd2\x3e\x45\xe6\xcc\xfc\x66\x38\x33\x9c\x3f\x69\xdb\x74\x19\xdf\xea\x7a\x6f\xe4\xb6\x70\xf0\xcb\xfb\x3f\xfe\xe9\xaa\x36\x68\x51\x39\xf8\xc4\x33\xdc\x68\xfd\x08\x6b\x95\x31\xb8\x29\x4b\xf0\x4c\x16\x88\x6e\x76\x28\x58\xfc\x50\x48\x0b\x56\x37\x26\x43\xc8\xb4\x40\x90\x16\x4a\x99\xa1\xb2\x28\xa0\x51\x02\x0d\xb8\x02\xe1\xa6\xe6\x59\x81\xf0\x0b\x7b\xdf\x53\x21\xd7\x8d\x12\xb1\x54\x9e\xfe\xb7\xf5\xed\xc7\xcf\xf7\x1f\x21\x97\x25\x42\x77\x66\xb4\x76\x20\xa4\xc1\xcc\x69\xb3\x07\x9d\x83\x1b\x29\x73\x06\x91\xc5\xcb\xf4\x70\x88\xe3\xb6\x05\x81\xb9\x54\x08\x49\xa5\x05\x96\x09\x74\xa7\xb3\xfa\x71\x0b\x1f\xae\x61\xc3\x2d\xc2\x8c\xdd\x6a\x95\xcb\x2d\xfb\x07\xcf\x1e\xf9\x16\x89\xa9\x6d\xc1\x61\x55\x97\xdc\x21\x24\x05\x72\x81\x26\x81\x59\x2f\x7e\x24\xc9\xaa\xd6\xc6\xf5\xa4\x34\x05\x02\x67\x9f\x79\x45\x28\x74\x67\x32\xd8\xeb\x06\x54\x4e\xba\x3d\xe4\x3a\xdc\x7c\xc2\x68\xb3\x02\x2b\xce\x62\xb7\xaf\x4f\x29\xce\x34\x99\x83\x36\x8e\x32\x6f\x24\x4c\xd4\x7b\xe4\x54\x57\xd2\x39\xbe\xb5\x9d\x19\x51\x9a\xc2\xfa\x2e\xf8\x05\x49\x2d\x8b\xa3\xf5\x5d\x80\x5d\xdf\xb1\x07\xd2\x71\x38\xc0\x8f\xff\x58\xad\x3e\x24\x52\xac\x48\x1e\xab\xda\xed\x93\x1f\x71\xd4\xb6\x57\x60\xb8\xda\x22\xcc\xbe\xaf\x60\x96\x93\x9b\x66\xec\x93\xc4\x52\x58\x8f\x1e\x75\xb7\xcc\xd9\xbd\xb7\xcd\x93\x08\xb0\xd0\xc4\x42\x3a\x77\xbc\x6c\xb0\x37\x20\x09\xcc\xdd\x85\x12\xc8\x89\x9f\xc5\x00\x00\xd1\x45\x9c\xb6\x05\x99\x7b\x11\x59\x96\x7c\x53\x92\xd8\xb2\x6d\x01\x15\x91\x83\x48\x7f\x89\xc0\xab\xb4\xf3\x38\xa8\xac\x74\x72\x47\x94\x1f\x63\xe8\x07\xbe\xed\x8e\xb0\xb4\x18\x40\x5e\x77\xe2\xa0\x2e\x38\x64\xfc\xfd\x24\x5d\x01\x33\xf6\x51\x6c\xf1\xe8\x90\xf0\xeb\xe8\x01\x83\x25\x77\x52\x2b\x9b\xa2\xa7\x50\xd4\xb5\x2b\xd0\x80\xd2\x02\x6d\x9f\xca\x5b\xc3\xeb\x82\x05\x88\x87\xde\x71\x16\xb8\x41\xd8\xa0\x54\x5b\xa8\x75\xdd\x90\x95\x02\x36\xfb\xb3\xb4\xf9\x67\x83\x66\x0f\x4f\x05\x2a\x40\xbe\x45\x73\x55\x6a\x2e\x48\x8a\x5e\x03\x52\xd8\xa3\x60\xd7\x31\x89\xa2\x71\x7c\x31\xc4\x76\x74\x93\x21\xb8\xf8\xc6\xe0\x06\xde\x3e\x59\xe9\xae\xcc\xc3\x5c\xc4\x18\x05\x0b\xd9\x17\x25\x7f\x6b\x48\xea\xeb\xb7\xc1\xd9\xcb\x20\x46\xc1\x1d\x30\xdb\xb6\xf3\x38\x9e\x05\x93\xf5\x41\xed\xa2\x13\x4d\x62\x15\x0d\x29\xee\x43\x70\x9e\xe5\xc4\x78\xd5\x47\x35\x5d\xc2\x8d\x10\x92\x62\xc6\xcb\x90\xa3\x16\x9c\x06\x2e\x06\xd7\x5b\xa7\x0d\x95\x07\x61\xe4\x0e\x0d\x03\x5f\x63\xbc\xf0\xcc\x55\x75\x49\xce\xac\x8d\x54\x2e\x87\x44\x48\x5e\x62\xe6\xd2\x77\x36\x0d\xd9\x15\x00\x13\x98\xb1\xfb\x0e\xa5\x97\x95\x39\x14\xdc\x3e\xf4\xd9\x18\xa0\xbc\xfd\x44\x7d\x76\x53\x02\xbb\x98\x92\x6f\x30\xbe\xb1\x63\x93\xcf\xb2\x3f\xc8\xa4\x7c\x40\xe9\x6a\x49\x57\x2e\xbd\xee\x8b\xd7\x13\x48\xd5\x3d\xd5\x0a\x4f\x2e\xd7\xb6\x67\xc6\x0f\xf5\x73\x66\x30\x43\x72\x62\x48\xc0\x7f\xf5\xbf\x3a\xf2\xa8\xfc\x9c\xa5\xa8\x7f\xd6\x8d\xca\x06\x6f\x43\xe2\x9f\x41\x72\x9e\x6f\xf1\x50\xa9\x88\xff\x70\x80\xdf\x1a\x34\x12\xed\x0b\x89\x3b\x4e\xe9\x9e\xc0\xe2\xc8\x0b\xcf\x27\x46\x1f\x0e\xb0\x1c\x73\x2d\xc6\x5a\xe6\x0b\x38\x4d\xe3\xfe\xa5\xd2\xfb\x33\xe8\x1a\xa3\x60\xfe\x87\x31\xc0\x6d\x29\x51\xb9\x16\x4e\xb4\xb0\x50\xf2\x0f\x0b\x36\xc6\x3f\x61\x5a\xc4\x91\x77\x76\x97\x0f\xd4\x83\xbe\xd4\x82\x9c\x1e\x54\x59\xe0\xb0\x69\x64\x49\x1d\x97\xaa\x50\x43\x44\x2a\x12\xbe\x69\x4e\x2f\x9b\xa6\xf0\x59\x3b\x04\x57\x70\xb7\x82\xbd\x6e\x40\x21\x0a\xca\xa4\x8c\x97\xe5\x94\xf9\x8b\x7a\x32\xbc\x9e\x2f\x60\x83\xb9\x36\xe8\x39\x06\xd8\x0a\x5d\xa1\xc5\x8a\x92\xfb\x4c\x0d\x69\x79\xe2\xb6\x33\x0f\x05\xe4\x46\x57\xc0\xc1\x19\xae\x2c\xcf\x28\xfd\x56\xc0\x95\xf0\xc1\x18\x1d\x7a\xa1\x4c\x57\x54\xa7\x51\x80\x36\x60\x74\x59\x52\x65\xe4\xd9\x23\x8b\xdf\x14\xa7\xe0\x99\x3e\x44\xfd\x79\x38\xfd\xbb\x42\x8a\xd0\xff\x17\xa0\x01\xe2\x3c\x3c\x5d\x4c\xbc\xbb\xa0\xf1\x7f\x6c\xdf\x99\x69\x20\x20\x67\xff\x9e\x43\x80\xe7\x0e\x0d\xc8\xc0\x98\x95\xda\xa2\x58\x11\xac\xd5\x41\x9e\xc2\xa3\xf0\xd9\x0d\x39\xfe\x24\xcb\x12\x36\x08\xf8\x8c\x59\x43\xfe\x72\x85\xd1\xcd\xb6\xf0\x9a\x43\x05\x83\xa7\x42\x66\x05\x64\x06\x79\x60\x98\xb8\xfb\xad\x1e\xed\xd3\x60\x72\x4e\x8e\x74\xcf\x2b\xd0\x8f\xf4\x4e\x2f\x7b\x8d\x75\x75\x74\xbe\x74\xcf\x77\xfe\x73\x11\x47\x32\x87\x9f\xf4\xa3\x7f\x29\x35\x57\x32\x9b\x27\xfd\xb4\x76\x38\x7c\x38\x1b\xae\xa8\x95\x4c\xfc\xc4\xfb\x31\x2b\xf1\xcf\x22\x7a\x55\x33\x5c\x83\x7b\x66\xc2\xec\x86\xa0\x9f\xb0\x77\xa1\xbb\x77\xc6\x37\xd5\xaa\x2e\xb1\x42\xe5\x42\xf4\xf2\xca\xb1\x40\x41\xf3\x46\x5f\x05\xf6\xf9\x82\xfa\x31\x21\xb6\x71\xb4\xe3\x66\x78\x9d\xe1\xd4\xb2\x5f\xc3\xef\x38\xea\x08\xec\xdf\x46\x3a\xec\x84\x93\x31\xe4\x9c\xae\x79\x89\xcb\x1b\x17\xaa\xf5\x3c\x91\xe2\xfa\xdd\x2e\x59\x9d\x85\x61\x7d\xb7\x58\x4c\xe6\x3d\x79\x79\xde\xeb\xba\xd4\xc9\x80\x45\xed\xf6\xa2\x81\x2b\x98\x0c\x7c\xd7\x7f\xb1\xbd\xd4\x5f\xc9\xdc\xd0\xbc\xc2\x18\xd6\xb7\xec\x99\xcd\xc7\xdd\xf3\x9d\x65\xef\xa8\x57\x0e\xc6\x9e\xcd\x88\xbd\xe0\xd9\x9c\xe8\x87\x0f\x99\xc3\xae\xcf\x3b\x9b\xc3\xe1\xf0\x67\xd8\xc1\x4f\xd7\xa0\x64\x19\x66\xa0\x37\x5a\xee\xcd\x9d\x68\x5a\xdb\x07\x59\x0d\x7a\x2e\xc3\xec\xd8\x27\x6d\x2a\xee\xe6\x4e\x56\xc8\x6e\x3e\xdf\xaf\x6f\x17\x23\x20\x7f\xf5\x1e\xad\x4b\xad\x57\xf1\x96\xbb\x53\xe9\x57\xd9\x27\xa1\xf7\x71\x5f\xee\x26\xfa\x87\x61\x29\x3a\x8e\x4c\x23\xd4\xff\xc5\x33\x2f\x3a\xe6\x12\xc8\x10\x8d\x17\xfd\xf3\x7b\xee\x79\x15\xf5\x04\xe2\x35\x99\x73\x17\x1d\x51\x46\x30\x97\xa7\xca\xd3\xd9\xab\xff\x9e\x28\xfa\x75\xef\x70\xfe\xf3\xe2\xe7\xc5\x50\x5a\x7a\x72\x5f\x03\xc2\x64\x15\xdc\x47\x5b\xd9\xf8\xb2\x69\x0a\x52\x0c\xed\x9b\x8a\x0d\xcd\x39\x06\xbb\xf5\xdb\x2f\x16\xfd\xb4\xb2\xbe\xeb\x17\xaa\x37\x95\x20\x29\xe6\x0b\x8f\xd6\xc6\x91\x14\x2b\xf8\x4e\xef\xc4\x3a\x93\x69\xb5\x63\x37\x4e\xcb\x53\x00\xaa\x12\xc3\x25\xa4\x88\x0f\xf1\xe8\xd2\x7e\x96\xb3\xb4\xb8\xfb\xe7\x5b\x36\x86\x97\xd3\x46\x7f\x64\x08\x15\x9b\x43\xcd\x8d\xf5\x8f\x35\x1c\xeb\xfc\x64\x06\x19\x56\xe0\x41\xec\xeb\xb7\xc9\x25\xbc\x56\xbf\x12\xe0\xb3\x23\x43\x66\x90\xdc\x13\x6f\x72\x94\x09\x95\xff\x95\xa9\xbc\x1b\x5b\x2b\xae\xf6\xe7\x43\xf9\xe5\xa9\x7b\x34\x63\x5d\x76\xf5\xd8\xe8\x05\x84\x56\x33\xcf\xf2\x6d\xf7\xb9\x20\x9f\xd3\x04\xf6\x5d\x92\x51\xa1\xe6\x9e\x61\xc4\xd1\x69\xd3\xfa\xfa\x5d\x7e\xeb\x1a\x17\x5c\x43\x96\x6f\xa9\xb3\x4d\xcc\x69\x5b\x5a\x00\x8e\x33\xbd\x5f\x36\x69\x4c\xa2\x7c\x0a\xbb\xdf\x15\xad\xb6\xdd\xfc\x7f\xfa\x5f\x91\xd1\xea\xeb\x17\xdf\x6e\xc1\x7d\xe0\x5b\x9a\x60\x6d\xb7\x64\x8d\x7a\x84\x23\xfb\x59\x60\xa6\x85\x8e\x8e\xe1\x7d\xe7\x82\xe3\x96\xee\xa8\x67\x27\x57\xc9\x70\xf8\x63\x4c\x7e\xc9\x78\x3f\xce\x64\x5c\xd1\xf0\xa2\x77\x68\x8c\x14\x28\x68\x5f\xd6\xc6\xff\xd3\x28\x6c\x35\xfc\xd2\xba\xe3\x87\x2a\x9e\x15\x40\x39\xc4\x2e\xdf\xf5\xc2\xa2\x43\xe6\xa0\x12\x87\x43\xfc\xdf\x00\x00\x00\xff\xff\xdc\xa1\x3a\x59\xf4\x12\x00\x00") +var _templateEntTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x6f\xe3\xb8\x11\x7f\x96\x3e\xc5\x9c\xe0\xed\xd9\x86\x43\x6d\xef\xad\xdb\xa6\x40\x2e\xd9\x05\x0c\x14\xdb\x3f\xc9\xa2\x0f\x8b\xc5\x2e\x2d\x8e\x2c\x36\x12\xa9\x23\x29\x27\x86\xe0\xef\x5e\x0c\x29\xc9\x92\xed\xe4\xd2\x3e\x45\xe6\xcc\xfc\x66\x38\x33\x9c\x3f\x69\xdb\x74\x19\xdf\xea\x7a\x6f\xe4\xb6\x70\xf0\xcb\xfb\x3f\xfe\xe9\xaa\x36\x68\x51\x39\xf8\xc4\x33\xdc\x68\xfd\x08\x6b\x95\x31\xb8\x29\x4b\xf0\x4c\x16\x88\x6e\x76\x28\x58\xfc\x50\x48\x0b\x56\x37\x26\x43\xc8\xb4\x40\x90\x16\x4a\x99\xa1\xb2\x28\xa0\x51\x02\x0d\xb8\x02\xe1\xa6\xe6\x59\x81\xf0\x0b\x7b\xdf\x53\x21\xd7\x8d\x12\xb1\x54\x9e\xfe\xb7\xf5\xed\xc7\xcf\xf7\x1f\x21\x97\x25\x42\x77\x66\xb4\x76\x20\xa4\xc1\xcc\x69\xb3\x07\x9d\x83\x1b\x29\x73\x06\x91\xc5\xcb\xf4\x70\x88\xe3\xb6\x05\x81\xb9\x54\x08\x49\xa5\x05\x96\x09\x74\xa7\xb3\xfa\x71\x0b\x1f\xae\x61\xc3\x2d\xc2\x8c\xdd\x6a\x95\xcb\x2d\xfb\x07\xcf\x1e\xf9\x16\x89\xa9\x6d\xc1\x61\x55\x97\xdc\x21\x24\x05\x72\x81\x26\x81\x59\x2f\x7e\x24\xc9\xaa\xd6\xc6\xf5\xa4\x34\x05\x02\x67\x9f\x79\x45\x28\x74\x67\x32\xd8\xeb\x06\x54\x4e\xba\x3d\xe4\x3a\xdc\x7c\xc2\x68\xb3\x02\x2b\xce\x62\xb7\xaf\x4f\x29\xce\x34\x99\x83\x36\x8e\x32\x6f\x24\x4c\xd4\x7b\xe4\x54\x57\xd2\x39\xbe\xb5\x9d\x19\x51\x9a\xc2\xfa\x2e\xf8\x05\x49\x2d\x8b\xa3\xf5\x5d\x80\x5d\xdf\xb1\x07\xd2\x71\x38\xc0\x8f\xff\x58\xad\x3e\x24\x52\xac\x48\x1e\xab\xda\xed\x93\x1f\x71\xd4\xb6\x57\x60\xb8\xda\x22\xcc\xbe\xaf\x60\x96\x93\x9b\x66\xec\x93\xc4\x52\x58\x8f\x1e\x75\xb7\xcc\xd9\xbd\xb7\xcd\x93\x08\xb0\xd0\xc4\x42\x3a\x77\xbc\x6c\xb0\x37\x20\x09\xcc\xdd\x85\x12\xc8\x89\x9f\xc5\x00\x00\xd1\x45\x9c\xb6\x05\x99\x7b\x11\x59\x96\x7c\x53\x92\xd8\xb2\x6d\x01\x15\x91\x83\x48\x7f\x89\xc0\xab\xb4\xf3\x38\xa8\xac\x74\x72\x47\x94\x1f\x63\xe8\x07\xbe\xed\x8e\xb0\xb4\x18\x40\x5e\x77\xe2\xa0\x2e\x38\x64\xfc\xfd\x24\x5d\x01\x33\xf6\x51\x6c\xf1\xe8\x90\xf0\xeb\xe8\x01\x83\x25\x77\x52\x2b\x9b\xa2\xa7\x50\xd4\xb5\x2b\xd0\x80\xd2\x02\x6d\x9f\xca\x5b\xc3\xeb\x82\x05\x88\x87\xde\x71\x16\xb8\x41\xd8\xa0\x54\x5b\xa8\x75\xdd\x90\x95\x02\x36\xfb\xb3\xb4\xf9\x67\x83\x66\x0f\x4f\x05\x2a\x40\xbe\x45\x73\x55\x6a\x2e\x48\x8a\x5e\x03\x52\xd8\xa3\x60\xd7\x31\x89\xa2\x71\x7c\x31\xc4\x76\x74\x93\x21\xb8\xf8\xc6\xe0\x06\xde\x3e\x59\xe9\xae\xcc\xc3\x5c\xc4\x18\x05\x0b\xd9\x17\x25\x7f\x6b\x48\xea\xeb\xb7\xc1\xd9\xcb\x20\x46\xc1\x1d\x30\xdb\xb6\xf3\x38\x9e\x05\x93\xf5\x41\xed\xa2\x13\x4d\x62\x15\x0d\x29\xee\x43\xd0\xe7\x36\x91\xaf\xfa\x58\xa6\x4b\xb8\x11\x42\x52\xa4\x78\x19\x32\xd3\x82\xd3\xc0\xc5\xe0\x70\xeb\xb4\xa1\xa2\x20\x8c\xdc\xa1\x61\xe0\x2b\x8b\x17\x9e\xb9\xaa\x2e\xc9\x85\xb5\x91\xca\xe5\x90\x08\xc9\x4b\xcc\x5c\xfa\xce\xa6\x21\xa7\x02\x60\x02\x33\x76\xdf\xa1\xf4\xb2\x32\x87\x82\xdb\x87\x3e\x07\x03\x94\xb7\x9a\xa8\xcf\x6e\x4a\x60\x17\x13\xf1\x0d\xc6\x37\x76\x6c\xf2\x59\xce\x07\x99\x94\x0f\x28\x5d\x05\xe9\x8a\xa4\xd7\x7d\xf1\x7a\x02\xa9\xa6\xa7\x5a\xe1\xc9\xe5\xda\xf6\xcc\xf8\xa1\x6a\xce\x0c\x66\x48\x4e\x0c\x69\xf7\xaf\xfe\x57\x47\x1e\x15\x9d\xb3\xc4\xf4\x8f\xb9\x51\xd9\xe0\x6d\x48\x7c\xf2\x27\xe7\x59\x16\x0f\xf5\x89\xf8\x0f\x07\xf8\xad\x41\x23\xd1\xbe\x90\xae\xe3\x44\xee\x09\x2c\x8e\xbc\xf0\x7c\x62\xf4\xe1\x00\xcb\x31\xd7\x62\xac\x65\xbe\x80\xd3\xe4\xed\xdf\x27\xbd\x3a\x83\xae\x31\x0a\xe6\x7f\x18\x03\xdc\x96\x12\x95\x6b\xe1\x44\x0b\x0b\x85\xfe\xb0\x60\x63\xfc\x13\xa6\x45\x1c\x79\x67\x77\xf9\x40\x9d\xe7\x4b\x2d\xc8\xe9\x41\x95\x05\x0e\x9b\x46\x96\xd4\x67\xa9\xf6\x34\x44\xa4\xd2\xe0\x5b\xe5\xf4\xb2\x69\x0a\x9f\xb5\x43\x70\x05\x77\x2b\xd8\xeb\x06\x14\xa2\xa0\x4c\xca\x78\x59\x4e\x99\xbf\xa8\x27\xc3\xeb\xf9\x02\x36\x98\x6b\x83\x9e\x63\x80\xad\xd0\x15\x5a\xac\x28\xb9\xcf\xd4\x90\x96\x27\x6e\x3b\xf3\x50\x40\x6e\x74\x05\x1c\x9c\xe1\xca\xf2\x8c\xd2\x6f\x05\x5c\x09\x1f\x8c\xd1\xa1\x17\xca\x74\x45\xd5\x19\x05\x68\x03\x46\x97\x25\xd5\x43\x9e\x3d\xb2\xf8\x4d\x71\x0a\x9e\xe9\x43\xd4\x9f\x87\xd3\xbf\x2b\xa4\x08\xfd\x7f\x01\x1a\x20\xce\xc3\xd3\xc5\xc4\xbb\x0b\x1a\xff\xc7\xf6\xfd\x98\xc6\x00\x72\xf6\xef\x39\x04\x78\xee\xd0\x80\x0c\x8c\x59\xa9\x2d\x8a\x15\xc1\x5a\x1d\xe4\x29\x3c\x0a\x9f\xdd\x90\xe3\x4f\xb2\x2c\x61\x83\x80\xcf\x98\x35\xe4\x2f\x57\x18\xdd\x6c\x0b\xaf\x39\x54\x30\x78\x2a\x64\x56\x40\x66\x90\x07\x86\x89\xbb\xdf\xea\xd1\x3e\x0d\x26\xe7\xe4\x48\xf7\xbc\x02\xfd\x48\xef\xf4\xb2\xd7\x58\x57\x47\xe7\x4b\xf7\x7c\xe7\x3f\x17\x71\x24\x73\xf8\x49\x3f\xfa\x97\x52\x73\x25\xb3\x79\xd2\xcf\x68\x87\xc3\x87\xb3\x91\x8a\x1a\xc8\xc4\x4f\xbc\x1f\xae\x12\xff\x2c\xa2\x57\x35\xc3\x35\xb8\x67\x26\xcc\x6e\x08\xfa\x09\x7b\x17\xba\x7b\x67\x7c\x2b\xad\xea\x12\x2b\x54\x2e\x44\x2f\xaf\x1c\x0b\x14\x34\x6f\xf4\x55\x60\x9f\x2f\xa8\x0b\x13\x62\x1b\x47\x3b\x6e\x86\xd7\x19\x4e\x2d\xfb\x35\xfc\x8e\xa3\x8e\xc0\xfe\x6d\xa4\xc3\x4e\x38\x19\x43\xce\xe9\x9a\x97\xb8\xbc\x71\xa1\x5a\xcf\x13\x29\xae\xdf\xed\x92\xd5\x59\x18\xd6\x77\x8b\xc5\x64\xca\x93\x97\xa7\xbc\xae\x4b\x9d\x8c\x55\xd4\x64\x2f\x1a\xb8\x82\xc9\x98\x77\xfd\x17\xdb\x4b\xfd\x95\xcc\x0d\xcd\x2b\x0c\x5f\x7d\xa3\x9e\xd9\x7c\xdc\x3d\xdf\x59\xf6\x8e\x7a\xe5\x60\xec\xd9\x64\xd8\x0b\x9e\x4d\x87\x7e\xe4\x90\x39\xec\xfa\xbc\xb3\x39\x1c\x0e\x7f\x86\x1d\xfc\x74\x0d\x4a\x96\x61\xf2\x79\xa3\xe5\xde\xdc\x89\xa6\xb5\x7d\x90\xd5\xa0\xe7\x32\xcc\x8e\x7d\xd2\xa6\xe2\x6e\xee\x64\x85\xec\xe6\xf3\xfd\xfa\x76\x31\x02\xf2\x57\xef\xd1\xba\xd4\x7a\x15\x6f\xb9\x3b\x95\x7e\x95\x7d\x12\x7a\x1f\xf7\xe5\x6e\xa2\x7f\x18\x91\xa2\xe3\xa0\x34\x42\xfd\x5f\x3c\xf3\xa2\x63\x2e\x81\x0c\xd1\x78\xd1\x3f\xbf\xe7\x9e\x57\x51\x4f\x20\x5e\x93\x39\x77\xd1\x11\x65\x04\x73\x79\x96\x3c\x9d\xbd\xfa\xef\x89\xa2\x5f\xf7\x0e\xe7\x3f\x2f\x7e\x5e\x0c\xa5\xa5\x27\xf7\x35\x20\x4c\x56\xc1\x7d\xb4\x8b\x8d\x2f\x9b\xa6\x20\xc5\xd0\xbe\xa9\xd8\xd0\x9c\x63\xb0\x5b\xba\xfd\x3a\xd1\x4f\x2b\xeb\xbb\x7e\x8d\x7a\x53\x09\x92\x62\xbe\xf0\x68\x6d\x1c\x49\xb1\x82\xef\xf4\x4e\xac\x33\x99\x56\x3b\x76\xe3\xb4\x3c\x05\xa0\x2a\x31\x5c\x42\x8a\xf8\x10\x8f\x2e\xed\x67\x39\x4b\xeb\xba\x7f\xbe\x65\x63\x78\x39\x6d\xf4\x47\x86\x50\xb1\x39\xd4\xdc\x58\xff\x58\xc3\xb1\xce\x4f\x66\x90\x61\xf1\x1d\xc4\xbe\x7e\x9b\x5c\xc2\x6b\xf5\x8b\x00\x3e\x3b\x32\x64\x06\xc9\x3d\xf1\x26\x47\x99\x50\xf9\x5f\x99\xca\xbb\xb1\xb5\xe2\x6a\x7f\x3e\x94\x5f\x9e\xba\x47\x33\xd6\x65\x57\x8f\x8d\x5e\x40\x68\x35\xf3\x2c\xdf\x76\x9f\x0b\xf2\x39\x4d\x60\xdf\x25\x19\x15\x6a\xee\x19\x46\x1c\x9d\x36\xad\xaf\xdf\xe5\xb7\xae\x71\xc1\x35\x64\xf9\x96\x3a\xdb\xc4\x9c\xb6\xa5\x05\xe0\x38\xd3\xfb\x15\x93\xc6\x24\xca\xa7\xb0\xf1\x5d\xd1\x42\xdb\xcd\xff\xa7\xff\x0b\x19\x2d\xbc\x7e\xdd\xed\xd6\xda\x07\xbe\xa5\x09\xd6\x76\xab\xd5\xa8\x47\x38\xb2\x9f\x05\x66\x5a\xe3\xe8\x18\xde\x77\x2e\x38\xee\xe6\x8e\x7a\x76\x72\x95\x0c\x87\x3f\xc6\xe4\x97\x8c\xf7\xe3\x4c\xc6\x15\x0d\x2f\x7a\x87\xc6\x48\x81\x82\xb6\x64\x6d\xfc\xbf\x8a\xc2\x56\xc3\x2f\xad\x3b\x7e\xa8\xe2\x59\x01\x94\x43\xec\xf2\x5d\x2f\x2c\x3a\x64\x0e\x2a\x71\x38\xc4\xff\x0d\x00\x00\xff\xff\x13\xdc\x88\x51\xea\x12\x00\x00") func templateEntTmplBytes() ([]byte, error) { return bindataRead( @@ -836,7 +836,7 @@ func templateEntTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/ent.tmpl", size: 4852, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/ent.tmpl", size: 4842, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/template/ent.tmpl b/entc/gen/template/ent.tmpl index bcda390e9..df6c3cb00 100644 --- a/entc/gen/template/ent.tmpl +++ b/entc/gen/template/ent.tmpl @@ -28,7 +28,7 @@ type {{ $.Name }} struct { // {{ $e.StructField }} holds the value of the {{ $e.Name }} edge. {{ $e.StructField }} {{ if not $e.Unique }}[]{{ end }}*{{ $e.Type.Name }} {{ with $e.StructTag }}`{{ . }}`{{ end }} {{- end }} - } `json:"edges,omitempty"` + } `json:"edges"` {{- end -}} {{- /* Additional fields to add by the storage driver. */}} {{- $tmpl := printf "dialect/%s/model/fields" $.Storage }} diff --git a/entc/integration/customid/ent/group.go b/entc/integration/customid/ent/group.go index 861b45815..737ad2b82 100644 --- a/entc/integration/customid/ent/group.go +++ b/entc/integration/customid/ent/group.go @@ -24,7 +24,7 @@ type Group struct { Edges struct { // Users holds the value of the users edge. Users []*User - } `json:"edges,omitempty"` + } `json:"edges"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/customid/ent/user.go b/entc/integration/customid/ent/user.go index 7817dc309..87272b028 100644 --- a/entc/integration/customid/ent/user.go +++ b/entc/integration/customid/ent/user.go @@ -28,7 +28,7 @@ type User struct { Parent *User // Children holds the value of the children edge. Children []*User - } `json:"edges,omitempty"` + } `json:"edges"` parent_id *int } diff --git a/entc/integration/ent/card.go b/entc/integration/ent/card.go index 6ebde6d07..7ee59cee7 100644 --- a/entc/integration/ent/card.go +++ b/entc/integration/ent/card.go @@ -36,7 +36,7 @@ type Card struct { Owner *User // Spec holds the value of the spec edge. Spec []*Spec - } `json:"edges,omitempty"` + } `json:"edges"` owner_id *string // StaticField defined by templates. diff --git a/entc/integration/ent/file.go b/entc/integration/ent/file.go index ad50047b0..2e2d54c3f 100644 --- a/entc/integration/ent/file.go +++ b/entc/integration/ent/file.go @@ -35,7 +35,7 @@ type File struct { Owner *User // Type holds the value of the type edge. Type *FileType - } `json:"edges,omitempty"` + } `json:"edges"` type_id *string group_file_id *string owner_id *string diff --git a/entc/integration/ent/filetype.go b/entc/integration/ent/filetype.go index d93b13b60..d4a62c846 100644 --- a/entc/integration/ent/filetype.go +++ b/entc/integration/ent/filetype.go @@ -27,7 +27,7 @@ type FileType struct { Edges struct { // Files holds the value of the files edge. Files []*File - } `json:"edges,omitempty"` + } `json:"edges"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/ent/group.go b/entc/integration/ent/group.go index 71449f195..396cbab8f 100644 --- a/entc/integration/ent/group.go +++ b/entc/integration/ent/group.go @@ -42,7 +42,7 @@ type Group struct { Users []*User // Info holds the value of the info edge. Info *GroupInfo - } `json:"edges,omitempty"` + } `json:"edges"` info_id *string } diff --git a/entc/integration/ent/groupinfo.go b/entc/integration/ent/groupinfo.go index f8356a372..cbe4e2bbe 100644 --- a/entc/integration/ent/groupinfo.go +++ b/entc/integration/ent/groupinfo.go @@ -29,7 +29,7 @@ type GroupInfo struct { Edges struct { // Groups holds the value of the groups edge. Groups []*Group - } `json:"edges,omitempty"` + } `json:"edges"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/ent/node.go b/entc/integration/ent/node.go index e764d842e..b1b04b495 100644 --- a/entc/integration/ent/node.go +++ b/entc/integration/ent/node.go @@ -29,7 +29,7 @@ type Node struct { Prev *Node // Next holds the value of the next edge. Next *Node - } `json:"edges,omitempty"` + } `json:"edges"` prev_id *string } diff --git a/entc/integration/ent/pet.go b/entc/integration/ent/pet.go index 47e6a12ce..2108aa82a 100644 --- a/entc/integration/ent/pet.go +++ b/entc/integration/ent/pet.go @@ -29,7 +29,7 @@ type Pet struct { Team *User // Owner holds the value of the owner edge. Owner *User - } `json:"edges,omitempty"` + } `json:"edges"` owner_id *string team_id *string } diff --git a/entc/integration/ent/spec.go b/entc/integration/ent/spec.go index 62bc6ae11..3e0f98472 100644 --- a/entc/integration/ent/spec.go +++ b/entc/integration/ent/spec.go @@ -25,7 +25,7 @@ type Spec struct { Edges struct { // Card holds the value of the card edge. Card []*Card - } `json:"edges,omitempty"` + } `json:"edges"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/ent/user.go b/entc/integration/ent/user.go index bb1821fbe..315f38ea9 100644 --- a/entc/integration/ent/user.go +++ b/entc/integration/ent/user.go @@ -61,7 +61,7 @@ type User struct { Children []*User // Parent holds the value of the parent edge. Parent *User - } `json:"edges,omitempty"` + } `json:"edges"` group_blocked_id *string user_spouse_id *string parent_id *string diff --git a/entc/integration/gremlin/ent/card.go b/entc/integration/gremlin/ent/card.go index 149e12a54..ed650371a 100644 --- a/entc/integration/gremlin/ent/card.go +++ b/entc/integration/gremlin/ent/card.go @@ -35,7 +35,7 @@ type Card struct { Owner *User // Spec holds the value of the spec edge. Spec []*Spec - } `json:"edges,omitempty"` + } `json:"edges"` // StaticField defined by templates. StaticField string `json:"boring,omitempty"` diff --git a/entc/integration/gremlin/ent/file.go b/entc/integration/gremlin/ent/file.go index e055df6f1..efc6d8462 100644 --- a/entc/integration/gremlin/ent/file.go +++ b/entc/integration/gremlin/ent/file.go @@ -34,7 +34,7 @@ type File struct { Owner *User // Type holds the value of the type edge. Type *FileType - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into File. diff --git a/entc/integration/gremlin/ent/filetype.go b/entc/integration/gremlin/ent/filetype.go index ada551940..18ed8fc01 100644 --- a/entc/integration/gremlin/ent/filetype.go +++ b/entc/integration/gremlin/ent/filetype.go @@ -26,7 +26,7 @@ type FileType struct { Edges struct { // Files holds the value of the files edge. Files []*File - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into FileType. diff --git a/entc/integration/gremlin/ent/group.go b/entc/integration/gremlin/ent/group.go index fd3674336..37873e4fd 100644 --- a/entc/integration/gremlin/ent/group.go +++ b/entc/integration/gremlin/ent/group.go @@ -41,7 +41,7 @@ type Group struct { Users []*User // Info holds the value of the info edge. Info *GroupInfo - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into Group. diff --git a/entc/integration/gremlin/ent/groupinfo.go b/entc/integration/gremlin/ent/groupinfo.go index b915d24f0..93f0350bc 100644 --- a/entc/integration/gremlin/ent/groupinfo.go +++ b/entc/integration/gremlin/ent/groupinfo.go @@ -28,7 +28,7 @@ type GroupInfo struct { Edges struct { // Groups holds the value of the groups edge. Groups []*Group - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into GroupInfo. diff --git a/entc/integration/gremlin/ent/node.go b/entc/integration/gremlin/ent/node.go index a431a2854..8c7286509 100644 --- a/entc/integration/gremlin/ent/node.go +++ b/entc/integration/gremlin/ent/node.go @@ -28,7 +28,7 @@ type Node struct { Prev *Node // Next holds the value of the next edge. Next *Node - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into Node. diff --git a/entc/integration/gremlin/ent/pet.go b/entc/integration/gremlin/ent/pet.go index 3c4a95d32..613c55156 100644 --- a/entc/integration/gremlin/ent/pet.go +++ b/entc/integration/gremlin/ent/pet.go @@ -28,7 +28,7 @@ type Pet struct { Team *User // Owner holds the value of the owner edge. Owner *User - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into Pet. diff --git a/entc/integration/gremlin/ent/spec.go b/entc/integration/gremlin/ent/spec.go index 9f6033467..6c7c70e31 100644 --- a/entc/integration/gremlin/ent/spec.go +++ b/entc/integration/gremlin/ent/spec.go @@ -24,7 +24,7 @@ type Spec struct { Edges struct { // Card holds the value of the card edge. Card []*Card - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into Spec. diff --git a/entc/integration/gremlin/ent/user.go b/entc/integration/gremlin/ent/user.go index 0e86c33eb..c8c414bee 100644 --- a/entc/integration/gremlin/ent/user.go +++ b/entc/integration/gremlin/ent/user.go @@ -61,7 +61,7 @@ type User struct { Children []*User // Parent holds the value of the parent edge. Parent *User - } `json:"edges,omitempty"` + } `json:"edges"` } // FromResponse scans the gremlin response data into User. diff --git a/entc/integration/idtype/ent/user.go b/entc/integration/idtype/ent/user.go index e4d3c03af..e2e8e08fd 100644 --- a/entc/integration/idtype/ent/user.go +++ b/entc/integration/idtype/ent/user.go @@ -30,7 +30,7 @@ type User struct { Followers []*User // Following holds the value of the following edge. Following []*User - } `json:"edges,omitempty"` + } `json:"edges"` user_spouse_id *uint64 } diff --git a/entc/integration/migrate/entv1/car.go b/entc/integration/migrate/entv1/car.go index c28759502..7718271fe 100644 --- a/entc/integration/migrate/entv1/car.go +++ b/entc/integration/migrate/entv1/car.go @@ -24,7 +24,7 @@ type Car struct { Edges struct { // Owner holds the value of the owner edge. Owner *User - } `json:"edges,omitempty"` + } `json:"edges"` owner_id *int } diff --git a/entc/integration/migrate/entv1/user.go b/entc/integration/migrate/entv1/user.go index eaa459179..9574ea444 100644 --- a/entc/integration/migrate/entv1/user.go +++ b/entc/integration/migrate/entv1/user.go @@ -44,7 +44,7 @@ type User struct { Spouse *User // Car holds the value of the car edge. Car *Car - } `json:"edges,omitempty"` + } `json:"edges"` parent_id *int user_spouse_id *int } diff --git a/entc/integration/migrate/entv2/car.go b/entc/integration/migrate/entv2/car.go index a61b9b781..647dabbb9 100644 --- a/entc/integration/migrate/entv2/car.go +++ b/entc/integration/migrate/entv2/car.go @@ -24,7 +24,7 @@ type Car struct { Edges struct { // Owner holds the value of the owner edge. Owner *User - } `json:"edges,omitempty"` + } `json:"edges"` owner_id *int } diff --git a/entc/integration/migrate/entv2/user.go b/entc/integration/migrate/entv2/user.go index 2ad69922e..5c6004c8e 100644 --- a/entc/integration/migrate/entv2/user.go +++ b/entc/integration/migrate/entv2/user.go @@ -42,7 +42,7 @@ type User struct { Edges struct { // Car holds the value of the car edge. Car []*Car - } `json:"edges,omitempty"` + } `json:"edges"` } // scanValues returns the types for scanning values from sql.Rows. diff --git a/entc/integration/template/ent/pet.go b/entc/integration/template/ent/pet.go index 23f385785..7ea0039fe 100644 --- a/entc/integration/template/ent/pet.go +++ b/entc/integration/template/ent/pet.go @@ -29,7 +29,7 @@ type Pet struct { Edges struct { // Owner holds the value of the owner edge. Owner *User - } `json:"edges,omitempty"` + } `json:"edges"` owner_id *int } diff --git a/entc/integration/template/ent/user.go b/entc/integration/template/ent/user.go index 52c82a7a2..dd0b53fa3 100644 --- a/entc/integration/template/ent/user.go +++ b/entc/integration/template/ent/user.go @@ -28,7 +28,7 @@ type User struct { Pets []*Pet // Friends holds the value of the friends edge. Friends []*User - } `json:"edges,omitempty"` + } `json:"edges"` } // scanValues returns the types for scanning values from sql.Rows.