From 6a7a5ef439867db706c516455e9632d258116a01 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki Date: Thu, 10 Sep 2020 22:12:57 +0300 Subject: [PATCH] entc/gen: add fields checks for orderfuncs --- entc/gen/internal/bindata.go | 16 +++--- entc/gen/template/base.tmpl | 8 +-- entc/gen/template/dialect/gremlin/by.tmpl | 9 ++- entc/gen/template/dialect/sql/by.tmpl | 15 ++++- entc/gen/template/dialect/sql/query.tmpl | 10 +++- entc/integration/ent/card_query.go | 16 ++++-- entc/integration/ent/comment_query.go | 4 +- entc/integration/ent/ent.go | 20 +++++-- entc/integration/ent/fieldtype_query.go | 4 +- entc/integration/ent/file_query.go | 22 +++++-- entc/integration/ent/filetype_query.go | 10 +++- entc/integration/ent/group_query.go | 28 +++++++-- entc/integration/ent/groupinfo_query.go | 10 +++- entc/integration/ent/item_query.go | 4 +- entc/integration/ent/node_query.go | 16 ++++-- entc/integration/ent/pet_query.go | 16 ++++-- entc/integration/ent/spec_query.go | 10 +++- entc/integration/ent/task_query.go | 4 +- entc/integration/ent/user_query.go | 70 ++++++++++++++++++----- entc/integration/integration_test.go | 4 ++ 20 files changed, 217 insertions(+), 79 deletions(-) diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go index 17d4d061c..be36961e8 100644 --- a/entc/gen/internal/bindata.go +++ b/entc/gen/internal/bindata.go @@ -126,7 +126,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _templateBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x58\x4d\x6f\xdb\x3c\x12\x3e\x5b\xbf\x62\x20\x78\xdf\xb5\x53\x47\x6a\x73\xdb\x02\x39\xa4\x41\xb3\x5b\xa0\x4d\xbb\x48\xb7\x3d\x2e\x18\x69\x24\x13\xa1\x48\x85\xa4\x9c\x18\x82\xff\xfb\x8b\x21\xa9\x2f\xc7\x4d\xd2\xa4\x05\x1a\xd8\x33\xe4\x7c\x3d\xcf\x8c\x46\x6e\xdb\xf4\x28\x3a\x57\xf5\x56\xf3\x72\x6d\xe1\xe4\xed\xbb\x7f\x1d\xd7\x1a\x0d\x4a\x0b\x17\x2c\xc3\x6b\xa5\x6e\xe0\x93\xcc\x12\x38\x13\x02\xdc\x21\x03\xa4\xd7\x1b\xcc\x93\xe8\xfb\x9a\x1b\x30\xaa\xd1\x19\x42\xa6\x72\x04\x6e\x40\xf0\x0c\xa5\xc1\x1c\x1a\x99\xa3\x06\xbb\x46\x38\xab\x59\xb6\x46\x38\x49\xde\x76\x5a\x28\x54\x23\xf3\x88\x4b\xa7\xff\xfc\xe9\xfc\xe3\xe5\xd5\x47\x28\xb8\x40\x08\x32\xad\x94\x85\x9c\x6b\xcc\xac\xd2\x5b\x50\x05\xd8\x91\x33\xab\x11\x93\xe8\x28\xdd\xed\xa2\xa8\x6d\x21\xc7\x82\x4b\x84\xf8\x9a\x19\x8c\x21\x08\xe7\xf5\x4d\x09\xef\x4f\x81\x84\x30\x4f\xce\x95\x2c\x78\x99\x7c\x63\xd9\x0d\x2b\x91\x0e\xb5\x2d\x58\xac\x6a\xc1\x2c\x42\xbc\x46\x96\xa3\x8e\x61\xde\x5d\x1f\x54\xbc\xaa\x95\xb6\x9d\x2a\x4d\x81\xaa\xc3\x04\x67\x06\x0d\x58\x05\x6c\xa3\x78\x0e\xfe\x14\x64\x4a\x16\x82\x67\x96\xf2\x68\x0c\xea\x7f\x1a\x57\x99\x24\xb2\xdb\x1a\x61\x11\xcd\xbe\xd6\xd0\xfd\x3b\x25\x4b\xc9\xd7\x3a\x9a\xfd\x87\xea\x3c\x16\x92\x20\x9a\xfd\x60\xa2\xc1\xb1\xd8\x09\xa2\xd9\x7f\x1b\xd4\xdb\xb1\xdc\x09\xa2\xd9\x37\x25\x78\xb6\x1d\xc9\xbd\x20\x9a\x7d\x69\x2c\xb3\x4a\x0f\x8a\x20\x08\x1a\xae\xe4\x54\xc3\x95\x0c\x2a\xbc\x68\x64\x36\x56\x39\x41\xb4\x74\x85\xf8\xaa\x73\xd4\xee\x00\xab\x6b\xc1\xd1\x00\x93\xa0\x48\xc8\x65\x09\x4a\x02\x72\xbb\x46\x0d\xa5\x66\xf5\x1a\xac\x66\x1b\xd4\x86\x09\x50\x1a\xcc\xad\x00\x83\xc2\xc1\x1b\x8a\x33\x58\x2b\x1a\x99\x2d\x08\xc2\xe4\xca\x2a\xcd\x4a\x4c\x3e\x34\x5c\x10\x9d\x76\xbb\xa5\x43\x47\x33\x59\x22\xcc\x8b\x15\xcc\x9d\x3f\x02\xda\x7f\xd8\xed\xa2\x19\x5d\x2d\xe0\x14\x6a\x66\x32\x26\xe8\x33\x49\xd3\x14\xbc\x62\xb7\xeb\xe3\x25\xaa\x95\x7c\x83\x12\x0a\x8e\x22\x37\x04\x5b\xdb\x42\x53\xd7\xa8\xc3\x51\x67\x36\x89\x66\x14\x54\x6f\x60\x11\x8e\x27\x49\x62\x2c\x65\xbb\x1c\x85\xdf\x46\xb3\x59\xdb\x1e\xc3\x1d\xb7\x6b\xc0\x7b\x8b\x32\x87\x05\x97\x39\xde\xc3\x3c\xb9\x54\x39\x1a\x78\xbb\x84\x98\xce\xc6\x64\x2e\x76\x57\xe3\x2e\x95\x63\x0a\x76\xe6\x92\xb0\x55\x2d\x28\xb5\x5a\x73\x69\x0b\x88\x73\xce\xa8\x64\xe9\x3f\x4c\xaa\xc2\x9d\xae\x44\xe0\x6f\x69\xb4\x8d\x76\x39\xdc\xf7\x0c\xf6\x66\x12\x7f\xa2\x6d\x81\xe2\x71\x4e\x5c\x0f\xd0\xb7\xae\x65\x1e\xf1\x57\x6a\xd5\xd4\xa9\xe1\xa5\x64\xb6\xd1\xb8\xe7\x39\x4d\xe1\xac\x2c\x35\x96\x1d\x63\x46\x84\x60\x41\x41\x2c\x33\x16\x6b\x22\x86\xab\x3b\x59\x3c\xbe\xde\x0e\xc4\x48\x07\x46\xfc\x2a\x01\xc7\xbb\x33\x43\x93\x86\x41\x6d\xb0\xc9\xd5\xc4\x01\xa1\xe4\x3f\x28\x0d\x1a\x25\xab\x88\x8a\x4c\x2a\x47\x44\xff\xb7\x3b\x63\x3c\x42\x59\x63\xac\xaa\x40\xb2\x0a\x4d\x02\x17\x4a\x03\xde\xb3\xaa\x16\xf8\x3e\x4a\xd3\x28\x4d\x67\xff\xa6\x40\x3f\x6c\x3d\xe6\xef\x56\x9e\x2a\x27\xcb\x84\x74\x7d\xd6\x8b\x6e\xe4\xec\x76\xc9\x99\x19\x7f\xbb\x6a\xaa\x70\x75\xb9\x82\xd8\x34\xd5\xff\xfd\xb7\x78\xb9\x82\x67\xdc\x3a\x99\xdc\x3a\x89\x97\xde\xf1\x55\xc6\xe4\x22\xb3\xf7\x2b\xf8\x6b\xb3\xa4\x40\x1d\x3f\xcf\xcc\xa2\x90\x53\x28\x56\x0e\xe1\x8e\xa5\x53\x94\xda\xc8\x11\xd5\xd7\xf7\x11\xd8\x99\xd9\x67\xda\x13\x3c\xdb\x8d\xbb\x94\x2a\xbb\x82\x39\x15\xfb\x82\x72\x20\x86\x75\x98\xe1\xd0\xb0\xd2\x31\x2f\xb4\x2c\xdd\xe9\x55\x4f\xd2\x32\x53\xd2\xd8\xfd\x10\xdb\x16\x78\x01\x6b\x66\xbe\x4f\x03\xec\xda\xe0\x89\xf6\xbc\x64\x15\xb1\xdc\x05\xd2\xf7\xaa\x1c\x75\xe7\xe3\x0d\x16\x22\xe8\xba\xab\x9f\x3e\x72\x7f\xfc\xb4\x2d\xdc\x36\xca\x62\x9f\xf3\x61\x3e\x2b\x57\x6c\x5e\x8c\xeb\xb8\xdb\xed\xcd\x2f\x7a\x4e\xf6\x4e\x91\x65\x6b\xdf\x64\x93\xe9\x45\x01\x2c\x0e\x98\xf2\x06\x3c\x4f\x7a\x1b\x07\x08\xf3\x3b\xa3\x4d\x42\xfc\xb3\x73\x11\x8f\xdd\x3d\x6f\xc6\x79\x70\x0b\x6f\xec\x8f\x0d\xba\x34\x85\x1f\x4c\xf0\xdc\x15\xf8\xa3\xd6\x6e\x50\x90\x31\x03\x77\x6b\x94\xb0\x09\x4a\x9a\x1b\xa1\xac\x05\xe3\xc2\x84\xc7\xd4\xfe\x5d\x63\x75\x93\x59\x68\x23\x7a\xba\x12\x69\x42\x0d\x21\x4d\xc1\x27\x4b\x13\x25\x2f\xd1\x4d\x98\xc4\x1d\x43\xad\xe9\xbf\xd2\x91\x8f\xc7\x5b\xe2\x34\x74\x2a\x94\xd6\x13\x03\xbd\x50\x5a\xd4\x05\xcb\x30\xf1\x1d\xbe\x40\x38\xda\x0b\x61\xe9\xef\x2f\x96\x9d\x67\x1f\x4b\xa8\x10\x26\xa8\x75\x12\x4e\x04\x7f\xff\x93\x77\x9a\xd5\x07\x1d\x9a\xe4\xa7\x66\xee\xf1\xf7\x2c\xcf\xde\xd2\x62\x19\xa2\x7d\xe8\x39\x78\xfc\x64\x7e\x55\x73\x06\xd7\x4a\x09\x64\x12\xb8\xcc\x79\xe6\x0b\x7f\xb7\x46\x37\xaa\x47\x75\xa0\x93\x01\x1a\xda\x2c\x48\x18\x02\x7b\x60\x7b\xd1\xd7\x77\xe9\x8c\x13\x6d\x79\xe1\xaa\x7e\x7a\x0a\x92\x3b\x41\xc7\xa0\x82\x09\x83\x44\x91\xd9\x86\x69\x78\x98\x63\x3f\xeb\x42\x79\xce\x0c\x99\x5f\xc1\x5f\xd8\x55\xf3\x52\xd9\x0b\xda\x67\x0f\x70\xc9\xea\x2d\xa5\x63\x15\x14\x68\xb3\x35\x30\x30\x35\x66\xbc\xe0\x19\x6d\x54\xdc\x6e\x81\xc9\x1c\xb8\x85\x3b\x66\x40\x2a\xeb\x17\xe3\x6e\x09\xce\x99\x65\xb4\xbe\x06\xe6\x4d\xfd\xf4\xbc\x9b\x09\x76\x8d\x22\x60\xff\x32\x42\x4d\x2c\x1f\xa0\x53\x57\x82\x78\x78\x40\xbd\x87\x18\xde\x00\x26\xde\xf9\x1b\x88\x87\xf0\xe3\x1e\xf3\xce\xee\x8b\xc0\x1e\xca\x31\x05\xbb\x33\xfa\x3a\x94\x27\x29\x3f\x8d\xf1\x17\x66\x6e\xfa\x6c\x2a\x66\x6e\x08\x2e\x7d\x20\xbe\xf1\xc1\x71\x84\x5d\x7f\x50\x88\xd3\x1c\x96\xe3\x38\x25\x17\x2e\xca\x21\x9e\x81\x64\x57\x5c\x96\x8d\x60\xfa\x79\x3c\x0b\x87\xc7\x3c\xab\x94\x46\xaa\x32\x3d\x4d\xd0\x51\xee\x09\xba\x4d\x3d\xfe\x61\xc6\x4d\x8c\xbf\x86\x74\x5d\xaa\x13\xde\x75\xd6\x5f\x4c\xbd\xa1\x80\xfb\xec\xeb\x4c\xbf\x9a\x80\x93\x0a\x3c\x6b\xce\x7c\x56\x2c\xc7\xc7\x07\x4d\x89\xd6\x65\x90\x13\xd4\x6c\x98\x2c\xc2\x5d\x05\xda\xb7\xd7\x08\xb7\xf4\xc6\x38\x00\x3d\xb6\x3b\xc0\xec\x9e\x5a\xaf\x44\x79\x64\xf9\xf7\x30\x76\xce\x09\x62\xf7\x61\x9a\xc5\x04\x69\xef\xe1\xc5\x38\x87\xba\x3c\x40\xd9\x9b\x7d\x35\xc6\xa3\xfc\x9f\x46\xf8\x9c\xf6\x58\xcd\xb8\xb4\x8f\x42\x9c\x69\x64\x16\xd3\xa6\xce\x69\xeb\xa1\x5e\x56\xda\x37\xb7\x6b\x76\xff\xde\x95\x93\xc1\xb1\xce\xfd\x86\x82\x5c\x43\xd6\x7b\x31\x6e\xb3\xc1\x7c\xf2\xda\xb3\x82\x0d\x57\xc2\xaf\x9f\xaa\xf0\xe5\x57\x9a\xac\xf9\x65\xa8\x91\xfc\xb6\x41\x89\xa6\xdb\x88\xf6\xa3\x1e\x08\x54\x99\xb2\xe3\xcf\xcc\x6d\x1c\x2f\x5f\x7a\xf6\x9c\x3c\x97\x4b\x43\xae\x21\xd5\x8e\x5e\x95\x29\x5f\xbb\x0c\x3d\x08\xe9\xc1\x32\xd4\x03\x9e\x90\xa2\x27\xed\xaf\x60\xfe\x1d\xea\xee\x25\xd6\x68\xec\xc9\xbb\x67\xfe\x75\x14\xde\x33\xf6\x04\x87\xdb\x36\x3d\x02\xbc\xaf\x59\xf7\x54\x04\x62\x88\xa3\x23\x94\x42\x5d\x33\x01\x6b\x14\x35\x6a\x93\x80\xfb\xf9\xae\x7f\x03\x38\xf8\x02\xe0\x9d\xec\x2d\xff\x8f\xbd\xd7\x1d\x78\x1d\x98\x87\x3b\x0f\x7e\xe7\x38\xfc\xca\xe1\x82\xfc\xf3\x2e\xc3\xc7\xbf\x03\x00\x00\xff\xff\x91\x65\x8f\xc9\x71\x15\x00\x00") +var _templateBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x58\x5f\x6f\xdb\x36\x10\x7f\x96\x3e\xc5\x41\xf0\x3a\x3b\x75\xa4\x36\x6f\x2b\x90\x87\x2c\x68\xb6\x02\x6d\xda\x21\x5d\xfb\x38\x30\xd2\x49\x26\x22\x93\x2a\x49\x39\x31\x04\x7f\xf7\xe1\xf8\x47\x96\x1c\x27\x71\x93\x16\x68\x20\xdf\x91\xf7\xe7\x77\xbf\x3b\x52\xea\xba\xec\x28\x3e\x97\xcd\x5a\xf1\x6a\x61\xe0\xe4\xcd\xdb\x3f\x8e\x1b\x85\x1a\x85\x81\x0b\x96\xe3\xb5\x94\x37\xf0\x41\xe4\x29\x9c\xd5\x35\xd8\x45\x1a\x48\xaf\x56\x58\xa4\xf1\xd7\x05\xd7\xa0\x65\xab\x72\x84\x5c\x16\x08\x5c\x43\xcd\x73\x14\x1a\x0b\x68\x45\x81\x0a\xcc\x02\xe1\xac\x61\xf9\x02\xe1\x24\x7d\x13\xb4\x50\xca\x56\x14\x31\x17\x56\xff\xf1\xc3\xf9\xfb\xcb\xab\xf7\x50\xf2\x1a\xc1\xcb\x94\x94\x06\x0a\xae\x30\x37\x52\xad\x41\x96\x60\x06\xce\x8c\x42\x4c\xe3\xa3\x6c\xb3\x89\xe3\xae\x83\x02\x4b\x2e\x10\x92\x6b\xa6\x31\x01\x2f\x9c\x34\x37\x15\xbc\x3b\x05\x12\xc2\x24\x3d\x97\xa2\xe4\x55\xfa\x85\xe5\x37\xac\x42\x5a\xd4\x75\x60\x70\xd9\xd4\xcc\x20\x24\x0b\x64\x05\xaa\x04\x26\x61\xfb\x56\xc5\x97\x8d\x54\x26\xa8\xb2\x0c\x08\x1d\x56\x73\xa6\x51\x83\x91\xc0\x56\x92\x17\xe0\x56\x41\x2e\x45\x59\xf3\xdc\x50\x1e\xad\x46\xf5\xbb\xb6\xc8\xa4\xb1\x59\x37\x08\xd3\x38\xfa\xdc\x40\xf8\x77\x4a\x96\xd2\xcf\x4d\x1c\xfd\x4d\x38\x0f\x85\x24\x88\xa3\x6f\xac\x6e\x71\x28\xb6\x82\x38\xfa\xa7\x45\xb5\x1e\xca\xad\x20\x8e\xbe\xc8\x9a\xe7\xeb\x81\xdc\x09\xe2\xe8\x53\x6b\x98\x91\x6a\xab\xf0\x02\xaf\xe1\x52\x8c\x35\x5c\x0a\xaf\xc2\x8b\x56\xe4\x43\x95\x15\xc4\x33\x07\xb1\x59\x36\x35\x61\xdc\x28\x2e\x4c\x09\x49\xc1\x59\x8d\xb9\xc9\x7e\xd3\x99\x54\x05\xaa\x4c\xf3\x4a\x30\xd3\x2a\x4c\x60\x92\x5e\x19\xa9\xb6\xd8\xdf\xf5\x08\x3b\x33\x69\x40\x5e\x31\x51\x21\x4c\xca\x39\x4c\xac\x11\x72\xe0\x1e\x36\x9b\x38\x22\xb7\x25\x9c\x42\xc3\x74\xce\x6a\x7a\x26\x69\x96\x81\x53\x6c\x36\xc0\x9a\xa6\xe6\x54\x9a\x05\x42\xc5\x57\x28\xa0\xe4\x58\x17\x9a\x4a\xd2\x75\xd0\x36\x0d\x2a\xbf\xd4\x9a\x4d\xe3\xa8\xa4\x24\x83\x81\xa9\x5f\x9e\xa6\xa9\x36\x8a\x8b\x6a\x06\x9f\x69\x9d\x45\xa2\x8b\xa3\xa8\xeb\x8e\xe1\x96\x9b\x05\xe0\x9d\x41\x51\xc0\x94\x8b\x02\xef\x60\x92\x5e\xca\x02\x35\xbc\x99\x41\x42\x6b\x13\x32\x97\xd8\xad\x49\x48\xe5\x98\x82\x8d\xa2\x83\xb0\x2b\x9d\x8d\x21\x6c\x51\x14\x29\x34\xad\xb2\x89\xec\x05\xd0\xda\xa6\xa0\xac\x27\x0b\x34\xfd\x0a\x3d\x61\x17\xee\xf5\x59\x29\xd9\x36\x0f\xd6\x2b\xcb\xe0\xac\xaa\x14\x56\x81\x11\x01\x64\x26\x80\x79\x05\xb1\x48\x1b\x6c\x40\xba\x16\xb6\x16\x8f\xaf\xd7\x60\x14\x5b\xa1\xd2\xac\xce\x34\xd6\xb6\xa1\xd3\x87\x09\x60\x5d\x69\x9a\x24\x0c\x1a\x8d\x6d\x21\x47\x0e\x08\x14\xf7\x20\x15\x28\x14\x6c\xc9\x45\x05\x4c\x48\xb3\x40\x05\xee\x6f\x58\xa3\x5d\x95\xf2\x56\x1b\xb9\x04\xc1\x96\xa8\x53\xb8\x90\x0a\xf0\x8e\x2d\x9b\x1a\xdf\xc5\x59\x16\x67\x59\xf4\x17\x05\xfa\xe7\xda\xd5\xfd\xed\xdc\xd1\xe5\x64\x96\x92\xae\xcf\x7a\x1a\x46\xca\x66\x93\x9e\xe9\xe1\xaf\xab\x76\xe9\xb7\xce\xe6\x90\xe8\x76\xf9\x9f\xfb\x95\xcc\xe6\x70\xc0\xae\x93\xd1\xae\x93\x64\xe6\x1c\x5f\xe5\x4c\x4c\x73\x73\x37\x87\x57\xab\x19\x05\x6a\x39\x7a\xa6\xa7\xa5\x18\x97\x62\x6e\x0b\x1c\x98\x3a\xae\x52\x17\x5b\xb2\x3e\x59\x76\xa6\x77\x89\xf6\x04\xcd\x46\x9d\x4a\xc8\xce\x61\x42\x60\x5f\x50\x0e\xc4\xea\x50\x33\xdc\x36\xad\xb0\x6c\xf7\x6d\x4b\x7b\x7a\xd5\x23\xad\xe0\xe2\xcb\xa5\xd0\x66\x37\xc4\xae\x03\x5e\xc2\x82\xe9\xaf\xe3\x00\x43\x17\x3c\xd1\xa2\x97\x6c\x49\x2c\xb7\x81\xf4\xfd\x2a\x06\x1d\xfa\x78\x7f\xf9\x08\x42\x73\xf5\x13\x48\xec\x8e\xa0\xae\x83\x1f\xad\x34\xd8\xe7\xbc\x9f\xcf\xd2\x82\xcd\xcb\x21\x8e\x9b\xcd\xce\x0c\xa3\x73\xb0\x77\x8a\x2c\x5f\xb8\x26\x1b\x4d\x30\x0a\x60\xba\xc7\x94\x33\xe0\x78\xd2\xdb\xd8\x43\x98\x9f\x19\x6f\x02\x92\xef\xc1\x45\x32\x74\x77\xd8\x9c\x73\xc5\xfd\xd5\x73\x2e\xcb\xe0\x1b\xab\x79\x61\x01\x7e\xaf\x94\x1d\x14\x64\x4c\xc3\xed\x02\x05\xac\xbc\x92\xe6\x86\x87\xb5\x64\xbc\xd6\xfe\x8c\xde\xdd\xab\x8d\x6a\x73\x03\x5d\x4c\xa7\x27\x91\xc6\x63\x08\x59\x06\x2e\x59\x9a\x28\x45\x85\x76\xc2\xa4\x76\x19\x2a\x45\xff\xa5\x8a\x5d\x3c\xce\x12\xa7\xa1\xb3\x44\x61\x1c\x31\xd0\x09\x85\x41\x55\xb2\x1c\x53\xd7\xe1\x53\x84\xa3\x9d\x10\x66\x6e\xff\x74\x16\x3c\xbb\x58\x3c\x42\x98\xa2\x52\xa9\x5f\xe1\xfd\xfd\x2b\x6e\x15\x6b\xf6\x3a\xd4\xe9\x77\xc5\xec\x11\x78\x90\x67\x67\x69\x3a\xf3\xd1\xde\xf7\xec\x3d\x7e\xd0\x0f\x61\xce\xe0\x5a\xca\x1a\x99\x00\x2e\x0a\x9e\x3b\xe0\x6f\x17\x68\x47\xf5\x00\x07\x5a\xe9\x4b\x23\x85\x13\xfa\xc0\xee\xd9\x9e\xf6\xf8\xce\xac\x71\xa2\x2d\x2f\x2d\xea\xa7\xa7\x20\xb8\x15\x04\x06\x95\xac\xd6\x48\x14\x89\x56\x4c\xc1\xfd\x1c\xfb\x59\xe7\xe1\x39\xd3\x64\x7e\x0e\xaf\x30\xa0\x79\x29\xcd\x05\xdd\x57\xf7\x70\xc9\xa8\x35\xa5\x63\x24\x94\x68\xf2\x05\x30\xd0\x0d\xe6\xbc\xe4\x39\xdd\x98\xb8\x59\x03\x13\x05\x70\x03\xb7\x4c\x83\x90\xc6\x5d\x7c\xc3\x25\xb7\x60\x86\xd1\xf5\xd4\x33\x6f\xec\xa7\xe7\x5d\x54\xb3\x6b\xac\x7d\xed\x9f\x47\xa8\x91\xe5\x3d\x74\x0a\x10\x24\xdb\x03\xea\x1d\x24\xf0\x1a\x30\x75\xce\x5f\x43\xb2\x0d\x3f\xe9\x6b\x1e\xec\x3e\xab\xd8\x5b\x38\xc6\xc5\x0e\x46\x5f\x56\xe5\x51\xca\x4f\xd7\xf8\x13\xd3\x37\x7d\x36\x4b\xa6\x6f\xa8\x5c\x6a\x4f\x7c\xc3\x85\xc3\x08\x43\x7f\x50\x88\xe3\x1c\x66\xc3\x38\x05\xaf\x6d\x94\xdb\x78\xb6\x24\xbb\xe2\xa2\x6a\x6b\xa6\x0e\xe3\x99\x5f\x3c\xe4\xd9\x52\x2a\x24\x94\xe9\x34\x41\x4b\xb9\x27\xe8\x36\xf6\xf8\x8b\x19\x37\x32\xfe\x12\xd2\x85\x54\x47\xbc\x0b\xd6\x9f\x4d\xbd\x2d\x80\xbb\xec\x0b\xa6\x5f\x4c\xc0\x11\x02\x07\xcd\x99\x8f\x92\x15\xf8\xf8\xa0\xa9\xd0\xd8\x0c\x0a\x2a\x35\xdb\x4e\x96\xda\x6e\x05\xba\x6f\x2f\x10\x7e\xd0\x1b\xe1\xb6\xd0\x43\xbb\xdb\x32\xdb\x53\xeb\x85\x55\x1e\x58\xfe\xb9\x1a\x5b\xe7\x54\x62\xfb\x30\xce\x62\x54\x69\xe7\xe1\xd9\x75\xf6\xb8\xdc\xab\xb2\x33\xfb\xe2\x1a\x0f\xf2\x7f\xba\xc2\xe7\x74\x8f\x55\x8c\x0b\xf3\x68\x89\x73\x85\xcc\x60\xd6\x36\x05\xdd\x7a\xa8\x97\xa5\x72\xcd\x6d\x9b\xdd\xbd\x77\x15\x64\x70\xa8\xb3\xdf\x48\x90\x2b\xc8\x7b\x2f\xda\xde\x6c\xb0\x18\xbd\xf6\xcc\x61\xc5\x65\xed\xae\x9f\xb2\x74\xf0\x4b\x45\xd6\xdc\x65\xa8\x15\xfc\x47\x8b\x02\x75\xb8\x11\xed\x46\xbd\x25\xd0\x52\x57\x81\x3f\x91\xbd\x71\x3c\xff\xd2\xb3\xe3\xe4\x50\x2e\x6d\x73\xf5\xa9\x06\x7a\x2d\x75\xf5\xd2\xcb\xd0\xbd\x90\xee\x5d\x86\xfa\x82\xa7\xa4\xe8\x49\xfb\x50\x99\x7f\x86\xba\x3b\x89\xb5\x0a\x7b\xf2\xee\x98\x7f\x19\x85\x77\x8c\x3d\xc1\xe1\xae\xcb\x8e\x00\xef\x1a\x16\x4e\x45\x20\x86\x58\x3a\x42\x55\xcb\x6b\x56\xc3\x02\xeb\x06\x95\x4e\xc1\x7e\x9e\x7b\xfc\xa3\x83\x73\x72\xff\xdb\xd0\x83\xef\x75\x7b\x5e\x07\x26\x7e\xcf\x81\x9f\x39\x6c\x90\xbf\xde\xa5\x7f\xfc\x3f\x00\x00\xff\xff\x93\x28\x28\x2b\x51\x15\x00\x00") func templateBaseTmplBytes() ([]byte, error) { return bindataRead( @@ -141,7 +141,7 @@ func templateBaseTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/base.tmpl", size: 5489, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/base.tmpl", size: 5457, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -326,7 +326,7 @@ func templateContextTmpl() (*asset, error) { return a, nil } -var _templateDialectGremlinByTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\x41\x6f\xe3\x46\x0f\x3d\x5b\xbf\x82\x30\x72\xb0\x0c\x5b\xda\x2f\xb7\xaf\x40\x0e\x6e\xba\x01\x02\x04\xdb\x02\x9b\xb6\x47\x87\x9e\xa1\xe4\x41\xc6\x33\x2a\x87\xf2\xd6\x10\xf4\xdf\x8b\x19\xd9\xb2\x76\xb3\x6d\xf6\x64\x88\x1c\x92\xef\x91\x8f\x74\xd7\x95\xcb\xec\xde\x37\x27\x36\xf5\x5e\xe0\xf6\xc3\xff\xfe\xbf\x6e\x98\x02\x39\x81\x07\x54\xb4\xf3\xfe\x15\x1e\x9d\x2a\x60\x63\x2d\xa4\x47\x01\xa2\x9f\x8f\xa4\x8b\xec\x79\x6f\x02\x04\xdf\xb2\x22\x50\x5e\x13\x98\x00\xd6\x28\x72\x81\x34\xb4\x4e\x13\x83\xec\x09\x36\x0d\xaa\x3d\xc1\x6d\xf1\xe1\xe2\x85\xca\xb7\x4e\x67\xc6\x25\xff\xd3\xe3\xfd\xc7\x4f\x9f\x3f\x42\x65\x2c\xc1\xd9\xc6\xde\x0b\x68\xc3\xa4\xc4\xf3\x09\x7c\x05\x32\x29\x26\x4c\x54\x64\xcb\xb2\xef\xb3\xac\xeb\x40\x53\x65\x1c\xc1\x5c\x1b\xb4\xa4\xa4\xac\x99\x0e\xd6\xb8\xd2\xb3\x26\x9e\xc3\xba\xef\xb3\x59\xd7\xad\xe1\x26\x19\xe0\xa7\x3b\xb8\x29\x3e\x2b\xdf\x50\xf1\x6b\x32\xa4\x07\x55\xeb\xd4\x42\x18\x96\x3a\xd8\xe2\x99\xf1\x48\x1c\xd0\xe6\xd0\x65\xb3\x59\xe5\x19\xb6\x2b\xa8\x62\x28\xa3\xab\x09\x2a\x43\x56\x87\xe4\x9c\x09\x17\x3f\x9f\x16\xd5\x0a\x62\x64\xd7\x41\x83\x41\xa1\xbd\x54\xeb\xfb\x3c\x9b\xcd\xfa\x6c\xd6\x67\x11\x03\x39\x0d\x03\xec\x72\x09\xaa\x0d\xe2\x0f\x10\x4c\xed\x50\x5a\x8e\x7d\x61\xa8\xd9\xb7\xcd\x7a\x77\x82\x88\x48\x8c\x77\x90\x88\xfe\x07\xcf\x14\x51\x8e\x59\xce\x8c\xcb\x12\x1e\x05\x6a\x92\x00\xf2\xc5\x83\xc5\x1d\xd9\x00\x18\xa0\x41\xc6\x03\x09\x71\x28\xe0\x79\x1f\xb9\x70\x10\x68\xe3\xd0\xce\xdd\x7f\xd9\x84\x17\x08\x42\x4d\x02\x14\x2d\x0d\x93\x36\x0a\x85\x56\x29\x31\x3a\x9d\xcc\x81\x94\x77\x3a\xce\x1d\x1d\xf8\x26\xa2\x45\x0b\x0e\x0f\x34\x46\x3a\xfa\x5b\xae\xe1\x01\x16\x9e\x93\xcf\xa2\x10\x43\x1b\xb0\xa6\xbc\xc8\x66\x72\x6a\x08\x36\x75\xcd\x54\xa3\xd0\x43\xeb\x54\xe2\xbf\x08\xc2\xc6\xd5\x2b\x18\x7e\x73\x18\x0d\xdf\xcc\xe9\x9b\xe6\xbe\xd3\x2b\x0c\xf3\xc9\xd4\x83\x20\xcb\x0a\xb6\xef\x16\x49\xf3\x66\x92\x96\x1d\x54\xee\x12\x47\x4e\xe7\x6f\xc7\xfb\x0e\x82\x58\x78\x2a\xcd\xca\x4d\x75\x99\xf8\x5f\x9d\x5f\x8c\xec\x1f\xa2\xe2\xa6\x6f\xfe\x1c\x8d\x6f\x98\x44\x14\x3f\xc4\xc5\x54\xe9\xed\xdd\x1d\xcc\xe7\x83\x98\xd3\x27\xfc\x42\x15\xb6\x56\xba\x2e\x01\xeb\xfb\xa7\x28\x9e\x41\xc6\x17\xfe\xe4\xf4\x0a\xb6\xdb\x62\x13\x86\xaa\x79\x94\xbe\xa9\xa6\x60\xfb\xfe\x77\x57\x79\xab\x17\x79\xf1\x07\xda\x96\xc2\x22\xad\x4d\x7a\x39\xe4\x5d\xe4\x5d\x07\x64\x03\x41\xdf\x5f\x8d\x11\xe8\x93\x57\x68\x93\x37\x75\x34\x96\xf9\x7e\x9f\xcb\xe5\x55\x78\xca\xbb\x20\xe8\x24\x7c\xbd\x48\x7a\x60\x03\xc7\x04\xa2\xf8\xc1\x7d\x4a\xc9\xde\x19\xd1\xe8\x4b\x92\x9f\x78\x3f\xc5\xef\xd1\xdb\xbc\xd6\xd1\xb9\xc3\x40\x70\x53\xdc\x7b\x57\x99\xba\xf8\x0d\xd5\x2b\xd6\xc3\xab\xb2\xfc\x7e\xcb\xe3\x66\xc5\x25\xba\x30\x48\x4b\xfc\xf5\x7e\x8d\x01\x80\xe7\xed\x89\x27\xe3\x72\x3b\x8a\xcb\x1d\x08\x7b\xdf\x5a\x0d\x3b\x1a\x16\x1d\x87\xbc\x41\xb8\x55\xb2\x16\xac\x53\x3e\x4d\xca\xeb\x24\x16\xcf\x80\x70\xc0\x06\x5e\xe9\x94\x5c\xc6\x09\x31\x0e\xf7\x28\x4e\x78\xb8\xd2\x49\x0a\xa4\xe3\x7f\x42\xe3\x5d\xa0\x73\x39\x07\xc3\xed\x13\x1f\xe1\xfd\xd5\x7a\xa1\x73\x8b\xfa\x1e\x6e\x63\xf2\x83\xe7\xf1\x88\xc6\x63\x82\x47\x6f\x74\x9c\x5f\x65\x8d\x92\x04\xa1\x0d\x34\x1c\xa3\xc8\x30\x76\x70\x50\xc1\xe4\xeb\xaa\x98\x41\x57\x2b\x98\x0f\x17\x75\x1b\x6b\xcd\xf3\x97\x84\x66\x3c\xa3\x09\xf6\xf9\xe4\x26\x30\x66\x82\xd3\x1f\x89\xd9\xc4\xff\x30\x29\xb2\x59\x9a\xfd\xbf\x8c\xe4\xee\x2d\xa7\xa9\x24\xff\x09\x00\x00\xff\xff\xaa\x0e\xab\x7f\x54\x07\x00\x00") +var _templateDialectGremlinByTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x55\xcd\x6e\xe3\x46\x0c\x3e\x5b\x4f\x41\x18\x39\xd8\x86\x2d\x6d\x73\x6b\x81\x1c\xdc\x74\x03\x04\x08\xb6\x05\x36\x6d\x8f\x0e\x3d\x43\xc9\x83\x8c\x67\x54\x0e\xe5\xad\x21\xe8\xdd\x8b\x19\xd9\xb2\x36\x49\x9b\xa0\x27\x41\xfc\xfd\x48\x7e\xe4\xb4\x6d\xb1\xc8\x6e\x7d\x7d\x64\x53\xed\x04\xae\x3f\xfd\xf0\xe3\xaa\x66\x0a\xe4\x04\xee\x50\xd1\xd6\xfb\x67\xb8\x77\x2a\x87\xb5\xb5\x90\x8c\x02\x44\x3d\x1f\x48\xe7\xd9\xe3\xce\x04\x08\xbe\x61\x45\xa0\xbc\x26\x30\x01\xac\x51\xe4\x02\x69\x68\x9c\x26\x06\xd9\x11\xac\x6b\x54\x3b\x82\xeb\xfc\xd3\x59\x0b\xa5\x6f\x9c\xce\x8c\x4b\xfa\x87\xfb\xdb\xcf\x5f\xbe\x7e\x86\xd2\x58\x82\x93\x8c\xbd\x17\xd0\x86\x49\x89\xe7\x23\xf8\x12\x64\x94\x4c\x98\x28\xcf\x16\x45\xd7\x65\x59\xdb\x82\xa6\xd2\x38\x82\xa9\x36\x68\x49\x49\x51\x31\xed\xad\x71\x85\x67\x4d\x5c\x04\x53\x39\x94\x86\x69\x0a\xab\xae\xcb\x26\x45\x01\xbf\x46\xc5\x5d\xe3\x14\x60\x5d\x5b\x43\x01\xd0\x41\xb2\x36\xae\x02\xdf\x43\xa8\x18\xeb\x1d\x08\xe3\x81\x38\xa0\xcd\xb3\x89\x1c\x6b\x1a\xf9\x96\x8d\x53\xb3\x85\x0e\x36\x7f\x3c\x1b\xcd\xb3\xb6\x5d\x01\x39\x0d\x1f\x82\x16\x23\x9c\x50\x45\xbf\xab\x24\x85\x9f\x6e\xe0\x2a\xff\xaa\x7c\x4d\x79\x4a\xd6\x1b\xa4\x6c\xc2\xf0\x22\x21\x10\xb3\x67\x68\xb3\xc9\xa4\xf4\x0c\x9b\x25\x94\x31\x00\xa3\xab\x08\x4a\x43\x56\x87\xa4\x9c\x08\xe7\x3f\x1f\x67\xe5\x12\xa2\x7f\xdb\x42\x8d\x41\xa1\x3d\xe7\xec\xba\x79\x36\x99\x74\xd9\xa4\x7b\x51\x41\xb1\x00\xd5\x04\xf1\x7b\x18\xfa\x08\x31\x51\xc5\xbe\xa9\x57\xdb\x63\xea\x82\x18\xef\x20\x8d\xe3\x3f\x4a\x4e\x1e\x6f\x4d\xe3\x5e\xa0\x22\x09\x20\xdf\x3c\x58\xdc\x92\x0d\x80\x01\x6a\x64\xdc\x93\x10\x87\x1c\x1e\x77\xb1\x16\x0e\x02\x4d\xa4\xd6\x89\x23\x4f\xeb\xf0\x04\x41\xa8\x4e\x80\xa2\xa4\x66\xd2\x46\xa1\xd0\x32\x05\x46\xa7\x93\x38\x90\xf2\x4e\x47\x76\xc6\x31\xd7\x11\x2d\x5a\x70\xb8\xa7\xc1\xd3\xd1\xdf\x72\x71\x0f\x30\xf3\x9c\x74\x16\x85\x18\x9a\x80\x15\xcd\xcf\x0c\x58\x57\x15\x53\x85\x42\x17\x16\x04\x89\xcc\x59\x42\xff\x9d\xc3\x20\xf8\x9f\xf4\xe8\x7b\x85\x61\x3a\x9a\x7d\x10\x64\x59\xc2\xe6\xdd\x24\x69\xde\x4c\xd2\xb0\x83\xd2\x9d\xfd\xc8\xe9\xf9\xeb\xf1\xbe\x83\xe0\x25\x41\x4b\x37\x66\x67\xaa\xff\xa2\xfc\x66\x64\x77\x17\x19\x37\xb6\xf9\x73\x10\xbe\xaa\x24\xa2\xf8\x50\x2d\xa6\x4c\xb6\x37\x37\x30\x9d\xf6\x64\x4e\xbf\xf0\x0b\x95\xd8\x58\x69\xdb\x04\xac\xeb\x1e\x22\x79\x7a\x1a\x9f\xeb\x27\xa7\x97\xb0\xd9\xe4\xeb\xd0\x67\x9d\x47\xea\x9b\x72\x0c\xb6\xeb\x7e\x77\xa5\xb7\x7a\x36\xcf\xff\x40\xdb\x50\x98\xa5\xb5\x49\x96\x7d\xdc\xd9\xbc\x6d\x81\x6c\x20\xe8\xba\x8b\x30\x02\x7d\xf0\x0a\x6d\xd2\xa6\x8e\xc6\x34\x6f\xf7\xb9\x58\x5c\x88\xa7\xbc\x0b\x82\x4e\xc2\xf7\x8b\xa4\xfb\x6a\xe0\x90\x40\xe4\x1f\xdc\xa7\x14\xec\x9d\x11\x0d\xba\x44\xf9\x91\xf6\x4b\xfc\x1f\xb4\xf5\x73\x15\x95\x5b\x0c\x04\x57\xf9\xad\x77\xa5\xa9\xf2\xdf\x50\x3d\x63\xd5\x5b\x15\xc5\xdb\x2d\x8f\x9b\x15\x97\xe8\x5c\x41\x5a\xe2\xef\xf7\x6b\x70\x00\x3c\x6d\x4f\x3c\x19\xe7\xdb\x91\x9f\xef\x40\xd8\xf9\xc6\x6a\xd8\x52\xbf\xe8\xd8\xc7\x0d\xc2\x8d\x92\x95\x60\x95\xe2\x69\x52\x5e\x27\xb2\x78\x06\x84\x3d\xd6\xf0\x4c\xc7\xa4\x32\x4e\x88\xb1\xbf\x47\x71\xc2\xfd\x5b\x92\xa8\x40\x3a\xbe\x5c\xb5\x77\x81\x4e\xe9\x4e\x27\x1f\xc4\x47\x78\x7f\x35\x5e\xe8\xd4\xa2\xae\x83\xeb\x18\x7c\xef\x79\x38\xa2\xf1\x98\xe0\xc1\x1b\x1d\xe7\x57\x5a\xa3\x24\x41\x68\x02\xf5\xc7\x28\x56\x18\x3b\xd8\xb3\x60\xf4\x77\x61\x4c\xcf\xab\x25\x4c\xfb\x8b\xba\x89\xb9\xa6\xf3\xa7\x84\x66\x38\xa3\x09\xf6\xe9\xe4\x26\x30\x66\x84\xd3\x1f\x88\xd9\xc4\x97\x56\xf2\x6c\x92\x66\xff\x2f\x23\xb9\x79\x5d\xd3\x98\x92\xff\x04\x00\x00\xff\xff\x90\x79\xdd\xbf\xfa\x07\x00\x00") func templateDialectGremlinByTmplBytes() ([]byte, error) { return bindataRead( @@ -341,7 +341,7 @@ func templateDialectGremlinByTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/by.tmpl", size: 1876, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/by.tmpl", size: 2042, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -586,7 +586,7 @@ func templateDialectGremlinUpdateTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlByTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x92\xcf\x8b\xdb\x3e\x10\xc5\xcf\xd6\x5f\xf1\x30\x7b\xb0\xc3\xc6\xde\xef\xde\xbe\x85\x1e\xd2\xb0\x81\x85\xfe\x38\xa4\xd0\x63\xf1\x4a\x23\x47\xd4\x95\x1c\x49\xde\x62\x84\xfe\xf7\x22\x79\x9b\xa6\x69\x1b\x7a\x33\x7a\x33\xf3\x79\x6f\xc6\x21\xb4\x2b\xb6\x35\xe3\x6c\x55\x7f\xf0\xb8\xbf\xfb\xef\xff\xf5\x68\xc9\x91\xf6\xd8\x75\x9c\x9e\x8c\xf9\x82\x47\xcd\x1b\x6c\x86\x01\xb9\xc8\x21\xe9\xf6\x99\x44\xc3\x3e\x1e\x94\x83\x33\x93\xe5\x04\x6e\x04\x41\x39\x0c\x8a\x93\x76\x24\x30\x69\x41\x16\xfe\x40\xd8\x8c\x1d\x3f\x10\xee\x9b\xbb\x1f\x2a\xa4\x99\xb4\x60\x4a\x67\xfd\xed\xe3\xf6\xe1\xfd\xfe\x01\x52\x0d\x84\x97\x37\x6b\x8c\x87\x50\x96\xb8\x37\x76\x86\x91\xf0\x67\x30\x6f\x89\x1a\xb6\x6a\x63\x64\x2c\x04\x08\x92\x4a\x13\x4a\xa1\xba\x81\xb8\x6f\xdd\x71\x68\x8d\x15\x64\x4b\xac\x63\x64\x45\x08\x6b\xdc\x48\xbc\x7a\x8d\x9b\x66\xcf\xcd\x48\xcd\x6e\xd2\x7c\xd1\xe4\xa4\x79\xe5\xb0\x72\xc7\xa1\xd9\xd3\x90\x79\x35\x02\x2b\x0a\x69\x2c\x3e\xdf\x22\xf7\xd9\x4e\xf7\x04\xa9\x68\x10\x2e\x8b\x85\x6b\x3e\x24\xc2\x9b\xb9\x4a\x9d\x21\x24\x40\x8c\x95\xac\x6b\x56\x14\x91\x15\x91\x25\x2a\x69\x81\xc5\x64\xbb\x02\x9f\x9c\x37\x5f\xe1\x54\xaf\x3b\x3f\xd9\xb4\x05\x8b\xde\x9a\x69\x5c\x3f\xcd\x48\x46\xbc\x32\x1a\x39\xd6\x5f\x52\xe5\xea\xf6\x34\xe1\x25\x9f\x9f\x47\xc2\xa6\xef\x2d\xf5\x9d\xa7\x9c\x2d\xc7\xba\x08\xe5\xbc\x55\xba\xbf\xf0\x75\x05\xd3\xb9\xf2\xda\x8e\x96\x71\xcb\x36\x2c\xf9\xc9\x6a\xa4\x82\x8d\xab\xa4\xae\x5c\x7d\x9b\x20\xf5\xef\x8b\xb8\x02\x4c\x9c\x5f\x4e\xa6\xff\x7c\xb3\x2c\x7e\x53\xfe\xb0\x4b\x07\x39\xaf\xf9\x74\x7a\xfc\x37\xe3\x67\xbe\x43\x80\x92\xa0\x63\xc6\x96\xef\xa8\xd3\x25\x62\xdc\x3c\xf7\x21\x80\x06\x47\x88\x31\x5f\x59\x2f\x1f\x4b\xa0\x6a\xe9\x3a\x33\x13\xa3\x6b\xb6\x55\xfe\x53\xea\x9f\x9d\xe5\xaa\x3c\xf5\x5c\xee\xe4\x7b\x00\x00\x00\xff\xff\x8f\xca\xf5\x46\x85\x03\x00\x00") +var _templateDialectSqlByTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x52\x4d\x6b\xdc\x30\x14\x3c\xdb\xbf\x62\x30\x69\xb1\x97\x5d\x3b\xcd\xad\x81\x1e\xb6\x21\x81\x40\x9b\x1e\x52\xda\x63\x71\xa4\x27\xaf\x88\x22\x79\x25\x39\x65\x11\xfa\xef\xc5\x52\xb2\x5d\xf2\xd1\xe6\xb0\xb0\xbc\x99\xa7\x19\xcf\x9b\x10\xba\x45\x79\x66\xc6\x9d\x95\xc3\xc6\xe3\xe4\xf8\xc3\xc7\xd5\x68\xc9\x91\xf6\xb8\xe8\x19\xdd\x18\x73\x8b\x4b\xcd\x5a\xac\x95\x42\x22\x39\xcc\xb8\xbd\x27\xde\x96\xdf\x37\xd2\xc1\x99\xc9\x32\x02\x33\x9c\x20\x1d\x94\x64\xa4\x1d\x71\x4c\x9a\x93\x85\xdf\x10\xd6\x63\xcf\x36\x84\x93\xf6\xf8\x11\x85\x30\x93\xe6\xa5\xd4\x09\xff\x72\x79\x76\x7e\x75\x7d\x0e\x21\x15\xe1\x61\x66\x8d\xf1\xe0\xd2\x12\xf3\xc6\xee\x60\x04\xfc\x81\x98\xb7\x44\x6d\xb9\xe8\x62\x2c\xcb\x10\xc0\x49\x48\x4d\xa8\xb8\xec\x15\x31\xdf\xb9\xad\xea\x8c\xe5\x64\x3b\x27\x07\xdd\xfb\xc9\x52\x85\x55\x8c\x65\xd1\x75\xf8\x36\x03\x17\x93\x66\xe8\xc7\x51\x49\x72\xe8\x35\x12\x5b\xea\x01\x26\xcb\xbb\xad\x82\x23\x95\xd4\xdb\xb2\xf0\xbb\x91\x0e\x16\xc5\xa4\x59\xbd\x70\x5b\xd5\x5e\x3f\x70\x96\x79\xe6\xfc\xfc\x48\x83\x1b\x63\x54\x53\x86\xb0\x02\x69\x8e\xff\xba\x9c\x77\x1f\x0c\xce\x3b\x47\x02\xa7\x9f\x70\xd4\x5e\x33\x33\x52\x9b\x14\x13\x96\x25\xf0\x44\x98\x6d\x88\xdd\xbe\x20\x8f\x50\x16\x85\x30\x16\xbf\x96\x48\x0f\xda\x5e\x0f\x04\x21\x49\x71\x97\xc0\x42\x8a\xbc\x5d\x8b\xcc\x2e\x0a\xd7\xa6\xaf\xfc\xbc\xab\x67\x91\x10\x66\x2f\x31\xd6\xa2\x69\x66\x38\x82\x94\xa3\x3d\x75\xcd\xf9\xb9\xb5\xc6\xd6\xef\x7f\xf4\x4a\xf2\xde\x4b\xa3\xd3\x20\x5c\xf5\x77\x74\x0a\xb1\x04\x59\x7b\x0a\x71\xe7\xdb\x34\x17\x75\x25\xf5\xfd\xcc\xcd\x36\xf0\x6e\x8b\xd9\xe1\x63\xfa\xd5\x12\xa2\x89\x59\xaa\x4c\xbf\xf8\x24\xc4\x6e\x01\x36\x39\x6f\xee\xb0\xbf\x6c\x7a\x61\xb0\x66\x1a\x57\x37\xbb\x94\xc3\xec\x03\xa9\x1c\xaf\xa4\x9e\xd8\xcf\xba\x91\x8e\xbc\x1e\x06\x4b\x43\xef\xe9\x95\x43\x37\xc8\x21\xbf\xe5\xb8\x59\xa6\x77\xd5\xeb\xe7\x7b\x7c\x2e\x67\x6a\xc9\x4f\x56\xcf\xe5\x6b\xd7\xae\x16\xba\x76\xcd\x72\x16\x69\x9e\x07\xf1\x0f\xc1\x67\x6d\xd2\x2f\xd7\x29\x81\xbf\xa5\xdf\x5c\xa4\x5b\x1c\x70\x7e\xee\x87\x6f\x33\x7e\xe0\x3b\x04\x48\x01\xda\x26\xd9\xea\x2b\xf5\xba\x42\x8c\xeb\xfb\x21\x84\x5c\x9e\x18\x53\xab\x74\xfe\x93\x3f\xa8\xce\x5b\x07\x66\x62\x74\xed\x59\x9d\x4a\xd2\xfc\xdd\xac\x16\xd5\x7e\xe7\x69\x26\x7f\x02\x00\x00\xff\xff\x53\xc1\x90\x2a\xcb\x04\x00\x00") func templateDialectSqlByTmplBytes() ([]byte, error) { return bindataRead( @@ -601,7 +601,7 @@ func templateDialectSqlByTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/by.tmpl", size: 901, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/dialect/sql/by.tmpl", size: 1227, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -786,7 +786,7 @@ func templateDialectSqlPredicateTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\x6d\x6f\xdb\x46\xd2\x9f\xa9\x5f\x31\x25\xfc\x14\x92\xa1\xd0\x4e\x9e\xc3\x01\xa7\xc0\x07\xf8\xe2\x04\x10\xd2\xa6\xb9\x3a\x6d\x3f\x08\x42\xcb\x90\x43\x79\x21\x6a\xc9\x90\x2b\xc7\x81\xc2\xff\x7e\x98\xd9\x17\x2e\x45\x4a\xb6\x93\x6b\x7b\x38\xdc\x87\xc4\xd2\xee\xcc\xce\xec\xbc\xcf\xac\x76\xbb\xb3\xd3\xd1\x8b\xa2\xfc\x54\x89\xd5\x8d\x82\x67\xe7\x4f\xff\xf6\xa4\xac\xb0\x46\xa9\xe0\x55\x9c\xe0\xfb\xa2\x58\xc3\x5c\x26\x11\x5c\xe6\x39\x30\x50\x0d\xb4\x5f\xdd\x62\x1a\x8d\xde\xdd\x88\x1a\xea\x62\x5b\x25\x08\x49\x91\x22\x88\x1a\x72\x91\xa0\xac\x31\x85\xad\x4c\xb1\x02\x75\x83\x70\x59\xc6\xc9\x0d\xc2\xb3\xe8\xdc\xee\x42\x56\x6c\x65\x3a\x12\x92\xf7\xbf\x9b\xbf\x78\xf9\xe6\xfa\x25\x64\x22\x47\x30\x6b\x55\x51\x28\x48\x45\x85\x89\x2a\xaa\x4f\x50\x64\xa0\x3c\x62\xaa\x42\x8c\x46\xa7\x67\x4d\x33\x1a\xd1\x1d\xe0\x32\x4d\x85\x12\x85\x8c\x73\xc8\x04\xe6\x69\x0d\x59\xa1\x89\xbf\xdf\x8a\x3c\xc5\x2a\x02\x86\xde\xed\x20\xc5\x4c\x48\x84\x30\x15\x71\x8e\x89\x3a\xab\x3f\xe4\x67\x1f\xb6\x58\x7d\x3a\xd3\x98\x21\x34\xcd\x28\xd8\xed\x9e\xc0\x47\xa1\x6e\xe0\x24\x7a\x55\x54\x28\x56\xf2\x35\x7e\xaa\x79\x2b\xa0\xf5\x57\xaf\x6b\x78\x5f\x14\xb9\x86\x44\x99\x02\x9f\xee\x3e\x1e\xa5\x14\x6a\x60\x38\x29\xd7\x2b\x98\x5d\xc0\x49\x74\x9d\x14\x25\x46\x6f\xe3\x64\x1d\xaf\xd0\xee\x1a\xd6\x09\xa2\x8c\xeb\x24\xce\x1d\xe0\x3f\xcc\x8e\x01\xac\x30\x41\x71\xab\x21\xdd\x67\x87\x4e\xdc\x64\x5b\x99\xc0\xb8\x03\xdb\x34\x70\xea\x53\x69\x9a\x09\xd4\x1f\xf2\xcb\x3c\x1f\x27\xea\x0e\x92\x42\x2a\xbc\x53\xd1\x0b\xfd\x77\x02\xe3\xc5\x92\xe1\xa3\x37\xf1\x86\x58\x9c\x02\x56\x55\x51\x4d\x60\x37\x0a\x6e\xe3\x0a\xc6\xa3\x20\x90\x45\x8a\x35\x5c\xc0\x1e\xe8\x8e\xa4\x76\x4c\xa2\x4e\xa4\x17\xb0\xc7\x63\x64\x76\xcc\x01\x46\xba\x41\xf0\x6b\x5d\x62\x32\x00\xce\xf2\xbd\x2e\x31\x19\x4f\xba\x34\x5f\xa6\x2b\xb4\xd4\xf2\x22\x4e\x31\x7d\xf7\xa9\xd4\xcc\xee\x76\x90\xa3\x84\x08\x9a\x66\x49\x3a\xdd\x11\x0c\xe3\x56\xb1\x5c\x21\x9c\x20\x09\x36\x32\xc8\xb4\xd3\x67\x71\xb7\x73\x3a\x42\x7b\x6d\xf8\xe6\x02\xa4\xc8\xa7\xee\x38\xc7\x7d\xd0\xec\xdd\x67\x72\xdc\xe2\x3a\x9b\xaf\xfd\xab\x04\x22\x23\x19\x18\x46\xc5\xd4\x63\x76\xb7\x03\x91\xc1\x4a\xc1\x89\x80\x73\x62\xe7\xf3\x67\x02\xd5\x24\x1f\x79\x07\x87\x07\x5a\x38\x9e\xc2\x54\xb5\x45\x5e\x73\x8c\xb6\xd7\x14\x19\x58\x40\x8d\xc7\x6a\x8b\xde\x14\x29\x46\x2f\x8a\x7c\xbb\x91\x74\x42\x5c\x96\x28\xd3\x71\x7f\x6f\xca\xea\xf5\xdc\xc2\x97\x4c\x14\x45\x13\x23\x4a\x9f\xa8\x3e\xe5\x3a\x89\xe5\xcf\x71\xbe\x65\x05\x93\xf1\x8f\x27\xb0\x58\x0a\xa9\xb0\xca\xe2\x04\x77\xfa\x1e\x64\xae\x24\xad\x6f\x3b\xc6\x9a\x14\x32\x13\xab\x59\xcf\xb4\xf4\x7a\xe3\x99\xb9\x61\x9c\xbf\x4e\x81\xfe\x10\x47\xb7\x9a\xee\xec\x82\x57\xa2\xda\xb1\xb2\x6f\x92\x7d\x35\xf7\xe4\x75\x6b\xef\x60\x48\xe9\xef\x9a\x56\x94\xad\xed\xb9\x9e\x2c\xba\x1a\xa8\x50\x6d\x2b\x09\x1a\x6d\x14\x38\xf9\x5c\xd6\xb5\x58\x49\x2b\x1b\x43\x25\x8a\x22\x4f\x42\x13\xed\xdf\xcc\x88\xc8\xc8\x43\xf4\x45\x27\x70\x71\x01\xe7\x9a\x3f\x73\x7c\xb6\x51\xd1\x4b\x02\xce\xc6\xa1\x0d\x6b\x4d\x33\x03\x43\x25\x89\xf3\x1c\x53\xbe\x59\xb1\x55\xfc\x55\xc8\x15\xb4\x3a\x0a\x89\xf9\xc6\x53\x08\x13\x5a\xb4\x24\x9f\x3c\x5d\x1e\xf6\x66\x96\x05\x2f\x44\x5d\xc7\xf6\xbe\x1d\x90\x0b\xa3\xc6\xcc\xa5\x11\xa5\x16\x85\x96\x67\x33\xa2\x8b\x63\xc5\x71\xb5\xfe\x90\xaf\xaa\xb8\xbc\x89\xfe\x49\x11\x86\xac\xb4\xa6\x38\x39\xed\x99\x49\x5a\xd1\xa7\x29\xb0\xa0\x27\xcf\x19\x5f\x3b\x11\xcb\xcc\x52\x16\x39\x07\x50\x4b\x65\x48\xbc\x1e\x93\xa4\x72\x91\x8f\xac\xb1\xfb\x71\xa9\x23\x0c\x27\x22\xbc\x53\x74\xd9\x13\x08\x7f\xc4\x24\xf4\x38\x0c\x09\x3a\x24\x5c\x1b\x59\x40\xe1\xa6\xcc\x63\x35\x98\x13\x31\x5e\x61\x45\x82\x14\x72\x15\xda\x18\xe8\x8b\xd2\xff\xdc\x67\xf8\x51\xa9\xe7\x45\xb1\x95\xea\x40\xf2\x11\x52\xf9\x09\x47\x87\xff\xd9\x3d\xf1\xdf\xf0\xe3\x54\xc7\x04\x1e\xac\xba\xc7\x31\xff\xf2\x4e\xd4\x87\x98\xa7\xa4\xe2\x73\x2f\xa7\xd6\xaa\xf6\x39\xf0\xa5\x30\x71\xe6\xd7\x37\x9f\x2c\xce\x6b\x9c\x1e\x74\xbc\xe4\x06\x93\x35\x20\xb1\x84\x32\xc1\x19\xfc\xdf\x6d\xc8\x34\xb5\x55\x5b\x3d\xc1\xdf\xe1\xfc\xb1\x7a\xf2\x04\x0c\xa7\x5d\xa7\xa0\xd5\x8e\x72\xbe\xed\xef\xd3\x1d\x48\x03\x33\x6f\x93\xbe\xdb\xbd\xe0\x5d\xfc\x3e\xc7\x59\x2f\xf0\xf3\x32\x67\x52\x93\x1b\xfa\x20\x36\x69\x10\xd0\xfc\xca\x27\xf0\x8a\x0a\x3b\x47\x21\xa0\x88\x30\xd3\x75\x62\xc4\x87\xcc\xaf\x22\x5a\x23\x8d\xd5\xca\x96\x37\x0c\xaa\xcf\xec\xd3\xb2\x68\x8c\x11\x4b\x65\x11\xf8\x7f\xfe\xef\x55\x55\x6c\xfa\x39\xa4\xfe\xc0\xe5\xc0\x4f\x52\x7c\xd8\xe2\x8c\x73\xe7\xd4\x86\x80\xb2\x1e\xb2\x88\xb2\xc2\x54\x24\xb1\xc2\xfa\x39\x07\x89\xb2\x9e\x90\xda\xd8\x18\x74\x2c\x7f\x6b\x21\x6c\x38\xaf\x31\xe7\xb2\x99\xf5\x13\x5d\x9b\x6f\x13\x1d\xb2\xa9\x2e\x16\x5c\x28\x72\x0c\x29\x6d\xa6\x29\xeb\x85\x58\x3a\x54\x97\x4d\x1a\x17\xa0\xc4\x46\xa8\x21\x06\x79\xe3\xb9\xd9\xf7\x2c\x55\x33\xf7\x1d\x2f\x5f\xc0\x29\xef\xdb\xc3\x8a\x2c\xab\x71\xf0\x34\xbd\xf3\xdc\x42\xf4\xce\xfb\x41\xaf\x5f\xc0\xa9\x86\x38\x2e\xbc\xa2\x4a\xb1\x3a\x24\xb7\x1f\x68\xf3\xf7\x93\x99\x71\x32\xa6\xf5\xb8\x50\xc2\xce\x62\xdc\xcb\xb1\x42\x24\xbd\x86\x80\xb6\xae\x74\xb4\xde\x3f\xd3\x84\x31\xb7\x3d\x99\x8c\x02\xf5\x94\x90\x6c\x2f\xc4\xce\x34\x1e\x74\xb1\xc9\x28\x70\xa2\xf0\x30\x34\x17\x63\xf5\xd4\x7a\x59\x0f\xdb\xac\x53\xe6\xe4\x7f\x64\xff\x63\xf5\x54\x07\xb1\x01\x37\xf0\x55\xeb\x28\x0e\x06\x44\x0f\xc0\xf2\xe1\xbe\x3f\x90\x1b\x56\x08\x69\xf1\xd7\x29\x94\xad\x22\x0f\xfb\x1a\xb3\x55\xfa\xaa\x7d\xd0\x01\x6c\x6f\x83\xb8\x5f\x68\xf4\x67\x67\xc6\xb1\x44\x0d\x9b\x58\xa6\x31\x77\xc3\xc4\x88\x81\x4d\xf2\x78\x5b\x63\x04\xbf\x20\xd4\x2a\xae\x94\xc6\xe1\x12\x20\xc5\x2c\xde\xe6\x4a\x17\x7f\x53\x88\x65\x0a\xc5\x2d\x56\x95\xa0\x46\x5d\xc1\x7b\xcc\x8b\x8f\xd4\x21\x48\xc4\x94\xba\x79\x4f\xcc\xda\xcb\xc6\xc6\xc7\x26\xda\x8b\xc7\x9b\x58\xdd\x44\xdf\xc7\x77\x73\xa9\xfe\xff\xd9\xe4\x8b\x03\x83\xa3\xa2\x4f\xd5\x91\xa1\x93\x98\x2c\xc4\x88\xdb\xdb\xb6\xa3\x3e\x3b\xd5\xe9\xe7\xac\x8c\xf5\xfd\x84\xc4\x9a\xbb\x7c\x5e\x86\x15\x4a\xac\x62\x25\x0a\xc9\x22\x62\xa8\x22\x83\x18\x56\xe2\x16\x25\x60\xba\xc2\x87\xcc\x01\x08\xaf\x9d\x02\x9c\x48\xae\xb2\xb8\xf7\x21\x0e\x88\x1c\xd7\xa9\x1f\x8d\xc8\x3d\x06\xb2\xaa\xd8\x18\x0a\x1a\x17\xfd\xf6\x9e\x2a\xaf\xce\x31\xc4\x10\x1d\x43\x1a\x00\x55\x30\xff\xab\x8a\x22\x39\xed\x32\xfb\xaa\xe8\x9c\x27\x52\x94\xca\x3f\x73\xce\x0b\x4f\x1c\x80\x3f\x0a\xb0\x30\x3f\xb6\x4a\x19\x05\xb5\xc2\xb2\x53\xcf\xbe\xc1\x8f\xd7\x0a\x4b\x6a\xdf\xdb\x84\x49\xce\x4b\xfa\x94\xfd\x1c\x0c\xbd\x75\xbd\xb0\x97\x0d\x87\x3c\xd9\x04\xb6\xc9\xd4\xa7\xf5\xae\x60\x4a\xa8\x53\xf0\x30\xb9\xfe\xa6\xb7\xda\x25\xdc\x3d\x9c\x44\x3e\x76\xdf\x34\xd2\x8f\x98\x33\xa2\xe3\x12\xa3\x79\x3d\x97\xb7\x58\xd5\xed\x5a\xef\x82\xa8\xf9\xd9\x4f\xf8\x24\x74\x91\xd1\xf6\xf7\xcf\xbe\xd7\x7a\x30\x13\x82\x81\x13\xde\xbe\xf6\xd0\xa3\x28\x72\x0d\x73\x5e\xe3\x7d\xb8\x3a\xa2\x79\xf8\x7e\xb7\xad\x71\xe9\xea\x3c\x48\xb0\x76\xd2\x34\xe0\x29\xfa\x1a\xd5\x1b\x14\xab\x9b\xf7\x45\x55\xdf\x9b\x33\xa6\x40\x86\x32\x39\xe0\x7f\x64\xe7\xf7\xfb\x5f\xac\x5d\xce\xf3\x0d\xe7\x8a\xdc\x78\x3d\x64\x24\x57\x15\x9b\xff\x4a\x57\x64\x30\x91\x0e\xc5\xcd\xf9\xd5\x1f\xe8\xa5\x22\xfd\x9f\x37\xfe\x29\xde\xf8\x95\xae\x78\xc4\x67\xba\x2d\xfb\x51\xfb\x3f\x6e\xa9\x0c\x20\x32\xe3\x50\x03\x96\x7a\x68\x68\xf8\xdc\xa0\x78\x49\xbf\xab\x19\x2d\xaf\x6c\xcd\x45\xfb\x26\x5e\xe3\x78\xb1\x34\xd7\xfe\x59\x57\x2b\xe7\x53\x6f\x24\xc2\x95\xb5\x48\x5b\xe8\x4d\x5c\x2e\xfc\xce\x0d\x9a\x66\x7f\x38\xbd\x87\x6d\x6a\x37\x3b\x60\xd2\xe5\x9b\x9e\xe3\xe9\x5a\x5e\xa4\xf5\x82\xa3\xd2\xfc\x6a\x09\x7a\x02\xc5\xeb\xc4\xa4\x1b\xbf\x65\x6b\x3b\x7b\x9b\x5f\xb9\x72\xdf\x4d\xbf\x83\x80\xa2\x08\xf1\xb9\x58\x76\x3d\xc2\xf0\xe8\x60\xe8\xc8\xce\x45\x7a\xa0\xcb\xbd\x11\x3a\x53\xe3\xff\x06\xba\x6b\xd2\x66\xa7\xc3\x0e\x02\x5a\x9a\xed\x81\xb4\xbb\x81\x71\xb0\xd9\x90\xc7\x69\x88\x03\x7d\xf8\x11\xe7\x3b\xd2\x9a\x0f\x38\x9c\x46\x31\x7f\x5c\x0b\x3b\x33\xdd\xd8\x60\x1b\x16\x04\x75\xf4\xcb\x0d\x56\x1c\x43\xa2\xb9\x1d\xd9\x3d\x80\xd8\x42\xcf\xc2\xf7\x6e\xfa\x94\x3c\x2a\xe7\x8f\xe7\xce\xb9\x96\x53\xc8\xd6\xdc\x38\x4c\x7c\x0e\xe9\xd0\x62\xcb\xf1\x3e\x24\xea\x6f\xb6\x79\x3e\x97\xea\xaf\x7f\x09\xdd\xa4\x9d\xad\xf1\xa7\x1a\xab\x2b\x76\x4d\x3b\x65\x27\xac\x0b\xbd\x49\x48\x46\xbf\xad\x33\xdb\xd3\x85\x3c\x7a\x78\x6b\x21\x7d\x12\x42\x12\x85\x16\xe2\x20\x9d\x76\xe4\x3a\x73\x53\xf1\x67\xfe\x58\xdc\xc8\xd9\xd4\xe1\x7b\x7b\xdf\xda\xeb\x34\xcd\xae\x99\xea\xa9\xb9\x90\xfc\xad\xf1\x65\xa5\xc7\xbe\x86\x42\xb1\x55\x53\x10\x12\x0e\x4c\x96\xc9\x21\x18\xa4\x58\xd3\xf5\x8b\xad\x8a\xc6\xa7\x2d\x1d\xad\x03\x0a\x42\xdf\x14\x6b\xf8\xfc\x19\x90\xc5\xd9\xc6\x95\x60\x78\x0a\xbd\x95\x78\x57\x62\xa2\x30\x05\x91\xea\x0e\x88\x4b\x12\x72\xbe\x27\xc5\x56\x85\xe6\x60\xf3\xa2\x83\x42\x5a\x0e\x84\x34\x0c\xf0\xcd\xfa\xf4\x49\xd6\x5f\x47\x5e\xc8\x3d\xea\xc5\x56\xb1\x52\x4c\x88\xdd\x9b\xdf\x5e\x56\xab\x10\x42\xba\x77\x08\x21\x4f\xb2\x42\xb6\x26\x08\xad\x9a\x43\xa7\x95\x87\xcf\x72\xcf\x36\xcf\x36\x7a\xf0\x1d\xda\xc7\x22\xcf\x4e\x02\x21\xef\xe7\x48\x48\x8f\x21\x67\x7c\x1d\xb6\xb4\x75\xfc\xdb\xb8\xa2\xc8\xeb\xf4\x94\xd6\x0b\x2b\xb8\x65\x47\x4b\x0f\xd3\x0b\x67\x02\x91\x92\x69\x72\x44\x36\x33\x52\x7b\xe4\x9e\x7d\x98\xb8\xee\x12\x81\x59\x20\xcb\xf6\xc1\xf9\xa4\x85\x59\x5b\x76\xc1\xdb\xf5\xf6\xa9\x28\xf0\xdf\x03\x3c\x17\xb2\x8f\x41\x83\x6f\x0f\x3c\xee\xff\xa2\xb7\x87\xee\xeb\x83\x27\x98\xdf\x74\xbe\xd6\xa9\x29\xd4\x01\xd4\x24\x9e\x90\x04\xf3\x9b\x1d\x1e\x1b\xd6\x18\xdc\xc4\xe2\xe1\x8a\x70\x7e\x35\x97\x56\x4a\x2e\x98\x4a\x5b\xf3\xb8\xf9\xb7\x3e\xc8\xbc\x39\x4f\xbc\x5b\x1f\xe4\x9a\xdf\x4c\x0c\x1b\x36\xa9\x7b\x19\xdd\x52\x30\x98\xe6\x29\x42\x9b\x8c\xd6\x02\xd5\xc0\xcb\x51\xdf\x5e\x0e\x89\xc6\xb3\x99\x3d\xc9\x68\x1b\xd2\x78\x98\x6a\x31\x49\x5b\x19\x18\xd3\xd9\x1b\x1d\xfa\x15\x87\x66\x6e\x21\x96\xe6\xf1\x4a\x1f\x7e\xad\xaa\x6d\xa2\xd8\xad\x74\xc5\xe8\x3f\x32\x1e\x07\x9e\x82\xf4\x48\xbb\x87\x1a\xca\x70\x3a\x83\xfc\xf0\x51\xbe\x7a\x6d\x9f\x1a\x53\xbf\xf8\x1a\xac\x41\x86\xaa\x30\xfa\x38\x54\x89\x3d\xac\x80\x39\x22\x0d\x91\x41\xb6\x6e\xdf\xfe\xc4\xb2\x7b\xc5\xd7\xf6\x92\xcf\x09\xac\x63\x1d\x41\xc7\x33\xd9\x2b\x4f\xb3\xf5\xa4\x95\x31\x85\x8a\xd3\x6c\xbd\xec\x0a\xd3\xae\x4e\x1d\xc5\x3d\xe1\x3d\xd4\xca\xff\x83\x2c\xdc\xde\xeb\x2b\x6c\x3c\xd3\x8f\xd2\x4f\xd6\xf8\xc9\xda\xfb\xbe\x0a\xc2\xdf\xdd\xe6\xe5\x01\x33\xfe\x92\xbe\xe1\x90\xc5\x1e\xec\x1d\xee\xb3\xd4\xe1\x8e\x80\x2f\x65\xe5\xe0\xf4\xd0\x6e\xd8\xa6\x82\xbe\xee\x59\x58\xff\xb7\x14\xbe\xe5\xb9\xa1\xb4\xdf\x65\x1b\x56\xc7\xc7\xaa\xe5\x47\x14\xcb\xbd\x76\xb6\x5b\x04\x37\x7f\x96\x71\x9b\x88\x70\x20\x14\x78\x71\xa3\x5b\x92\x1d\x32\xf3\x07\xd9\xb6\xa8\xf9\x28\x62\x8e\xe3\xfb\xa0\x89\xfb\x95\x88\x1f\x4c\xfe\x18\x9f\xdb\x63\xee\x34\x5b\x0f\x73\x78\xdc\xc9\x5c\x63\xa1\x5f\x23\xa1\x69\x64\xdb\x10\x79\x81\xf2\x9e\x8c\xd3\xa9\xd1\xf6\x7f\x1d\xd0\x7c\xd1\xd4\xc2\x2f\x03\xdd\x90\x22\xae\x3a\xbf\x95\xbb\xac\x56\xed\x1e\xbf\xe5\xfa\xbb\xad\x89\xe8\xb9\xe1\x36\xcf\x15\xf9\xba\x07\xe2\x35\x49\x23\x3b\x9e\xb8\x89\xeb\xb7\x15\x66\xe2\xce\x43\xa1\x8e\x2c\x34\x33\x1d\x92\x81\x7e\x37\xb6\xd8\x9a\x10\x33\xe7\x26\x7f\xde\x00\x49\xcb\x58\x16\xca\xe1\x89\x3c\xa7\xe6\x19\x9a\xe6\xb4\xf3\x63\xac\xd8\xbb\x4f\xff\xe7\x84\xff\x0a\x00\x00\xff\xff\x8b\x13\x66\xeb\xa9\x29\x00\x00") +var _templateDialectSqlQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3a\xeb\x6f\xdb\x46\xf2\x9f\xa9\xbf\x62\x4a\xf8\x57\x48\x86\x42\x3b\xf9\x1d\x0e\x38\x05\x3e\xc0\x17\x27\x80\x90\x36\xcd\xd5\x69\xfb\xc1\x10\x5a\x86\x1c\xca\x0b\x51\x4b\x86\x5c\x39\x0e\x14\xfe\xef\x87\x99\x7d\x68\xf9\x90\x2c\x27\xbd\xf6\x70\xb8\x0f\x89\xa5\xdd\x79\xed\xbc\x76\x66\x56\xdb\xed\xd9\xe9\xe8\x45\x51\x7e\xaa\xc4\xf2\x56\xc1\xb3\xf3\xa7\x7f\x7b\x52\x56\x58\xa3\x54\xf0\x2a\x4e\xf0\x7d\x51\xac\x60\x2e\x93\x08\x2e\xf3\x1c\x18\xa8\x06\xda\xaf\xee\x30\x8d\x46\xef\x6e\x45\x0d\x75\xb1\xa9\x12\x84\xa4\x48\x11\x44\x0d\xb9\x48\x50\xd6\x98\xc2\x46\xa6\x58\x81\xba\x45\xb8\x2c\xe3\xe4\x16\xe1\x59\x74\x6e\x77\x21\x2b\x36\x32\x1d\x09\xc9\xfb\xdf\xcd\x5f\xbc\x7c\x73\xfd\x12\x32\x91\x23\x98\xb5\xaa\x28\x14\xa4\xa2\xc2\x44\x15\xd5\x27\x28\x32\x50\x1e\x33\x55\x21\x46\xa3\xd3\xb3\xa6\x19\x8d\xe8\x0c\x70\x99\xa6\x42\x89\x42\xc6\x39\x64\x02\xf3\xb4\x86\xac\xd0\xcc\xdf\x6f\x44\x9e\x62\x15\x01\x43\x6f\xb7\x90\x62\x26\x24\x42\x98\x8a\x38\xc7\x44\x9d\xd5\x1f\xf2\xb3\x0f\x1b\xac\x3e\x9d\x69\xcc\x10\x9a\x66\x14\x6c\xb7\x4f\xe0\xa3\x50\xb7\x70\x12\xbd\x2a\x2a\x14\x4b\xf9\x1a\x3f\xd5\xbc\x15\xd0\xfa\xab\xd7\x35\xbc\x2f\x8a\x5c\x43\xa2\x4c\x81\xa9\xbb\x8f\x07\x39\x85\x1a\x18\x4e\xca\xd5\x12\x66\x17\x70\x12\x5d\x27\x45\x89\xd1\xdb\x38\x59\xc5\x4b\xb4\xbb\x46\x74\x82\x28\xe3\x3a\x89\x73\x07\xf8\x0f\xb3\x63\x00\x2b\x4c\x50\xdc\x69\x48\xf7\xd9\xa1\x93\x34\xd9\x46\x26\x30\x6e\xc1\x36\x0d\x9c\xfa\x5c\x9a\x66\x02\xf5\x87\xfc\x32\xcf\xc7\x89\xba\x87\xa4\x90\x0a\xef\x55\xf4\x42\xff\x9d\xc0\xf8\x66\xc1\xf0\xd1\x9b\x78\x4d\x22\x4e\x01\xab\xaa\xa8\x26\xb0\x1d\x05\x77\x71\x05\xe3\x51\x10\xc8\x22\xc5\x1a\x2e\xa0\x03\xba\x25\xad\x1d\xd2\xa8\x53\xe9\x05\x74\x64\x8c\xcc\x8e\x21\x60\xb4\x1b\x04\xbf\xd6\x25\x26\x03\xe0\xac\xdf\xeb\x12\x93\xf1\xa4\xcd\xf3\x65\xba\x44\xcb\x2d\x2f\xe2\x14\xd3\x77\x9f\x4a\x2d\xec\x76\x0b\x39\x4a\x88\xa0\x69\x16\x64\xd3\x2d\xc1\x30\x6e\x15\xcb\x25\xc2\x09\x92\x62\x23\x83\x4c\x3b\x7d\x11\xb7\x5b\x67\x23\xb4\xc7\x86\x6f\x2e\x40\x8a\x7c\xea\xc8\x39\xe9\x83\xa6\x73\x9e\xc9\x61\x8f\x6b\x6d\xbe\xf6\x8f\x12\x88\x8c\x74\x60\x04\x15\x53\x4f\xd8\xed\x16\x44\x06\x4b\x05\x27\x02\xce\x49\x9c\xcf\x9f\x09\x54\xb3\x7c\xe4\x19\x1c\x1e\x68\xe5\x78\x06\x53\xd5\x06\x79\xcd\x09\xba\x3b\xa6\xc8\xc0\x02\x6a\x3c\x36\x5b\xf4\xa6\x48\x31\x7a\x51\xe4\x9b\xb5\x24\x0a\x71\x59\xa2\x4c\xc7\xfd\xbd\x29\x9b\xd7\x0b\x0b\x5f\x33\x51\x14\x4d\x8c\x2a\x7d\xa6\x9a\xca\x75\x12\xcb\x9f\xe3\x7c\xc3\x06\x26\xe7\x1f\x4f\xe0\x66\x21\xa4\xc2\x2a\x8b\x13\xdc\xea\x73\x90\xbb\x92\xb6\xbe\x6d\x39\x6b\x52\xc8\x4c\x2c\x67\x3d\xd7\xd2\xeb\x8d\xe7\xe6\x46\x70\xfe\x3a\x05\xfa\x43\x12\xdd\x69\xbe\xb3\x0b\x5e\x89\x6a\x27\x4a\xd7\x25\xfb\x66\xee\xe9\xeb\xce\x9e\xc1\xb0\xd2\xdf\x35\xaf\x28\x5b\x59\xba\x9e\x2e\xda\x16\xa8\x50\x6d\x2a\x09\x1a\x6d\x14\x38\xfd\x5c\xd6\xb5\x58\x4a\xab\x1b\xc3\x25\x8a\x22\x4f\x43\x13\x1d\xdf\x2c\x88\xc8\x28\x42\xf4\x41\x27\x70\x71\x01\xe7\x5a\x3e\x43\x3e\x5b\xab\xe8\x25\x01\x67\xe3\xd0\xa6\xb5\xa6\x99\x81\xe1\x92\xc4\x79\x8e\x29\x9f\xac\xd8\x28\xfe\x2a\xe4\x12\x76\x36\x0a\x49\xf8\xc6\x33\x08\x33\xba\xd9\xb1\x7c\xf2\x74\xb1\x3f\x9a\x59\x17\xbc\x10\xb5\x03\xdb\xfb\xb6\x47\x2f\x8c\x1a\xb3\x94\x46\x95\x5a\x15\x5a\x9f\xcd\x88\x0e\x8e\x15\xe7\xd5\xfa\x43\xbe\xac\xe2\xf2\x36\xfa\x27\x65\x18\xf2\xd2\x9a\xf2\xe4\xb4\xe7\x26\x69\x45\x9f\xa6\xc0\x8a\x9e\x3c\x67\x7c\x1d\x44\xac\x33\xcb\x59\xe4\x9c\x40\x2d\x97\x21\xf5\x7a\x42\x92\xc9\x45\x3e\xb2\xce\xee\xe7\xa5\x96\x32\x9c\x8a\xf0\x5e\xd1\x61\x4f\x20\xfc\x11\x93\xd0\x93\x30\x24\xe8\x90\x70\x6d\x66\x01\x85\xeb\x32\x8f\xd5\xe0\x9d\x88\xf1\x12\x2b\x52\xa4\x90\xcb\xd0\xe6\x40\x5f\x95\xfe\xe7\xbe\xc0\x8f\xba\x7a\x5e\x14\x1b\xa9\xf6\x5c\x3e\x42\x2a\xff\xc2\xd1\xe9\x7f\xf6\x40\xfe\x37\xf2\x38\xd3\x31\x83\xa3\x4d\xf7\x38\xe1\x5f\xde\x8b\x7a\x9f\xf0\x74\xa9\xf8\xd2\xcb\xa9\xf5\xaa\xae\x04\xbe\x16\x26\xce\xfd\xfa\xee\x93\xc5\x79\x8d\xd3\xbd\x81\x97\xdc\x62\xb2\x02\x24\x91\x50\x26\x38\x83\xff\xbb\x0b\x99\xa7\xf6\x6a\x6b\x27\xf8\x3b\x9c\x3f\xd6\x4e\x9e\x82\xe1\xb4\x1d\x14\xb4\xda\x32\xce\xb7\xfd\x7d\x3a\x03\x59\x60\xe6\x6d\xd2\x77\xbb\x17\xbc\x8b\xdf\xe7\x38\xeb\x25\x7e\x5e\xe6\x9b\xd4\xdc\x0d\x7d\x10\x7b\x69\x10\xd0\xfc\xca\x67\xf0\x8a\x0a\x3b\xc7\x21\xa0\x8c\x30\xd3\x75\x62\xc4\x44\xe6\x57\x11\xad\x91\xc5\x6a\x65\xcb\x1b\x06\xd5\x34\xfb\xbc\x2c\x1a\x63\xc4\x52\x59\x04\xfe\x9f\xff\x7b\x55\x15\xeb\xfe\x1d\x52\x7f\xe0\x72\xe0\x27\x29\x3e\x6c\x70\xc6\x77\xe7\xd4\xa6\x80\xb2\x1e\xf2\x88\xb2\xc2\x54\x24\xb1\xc2\xfa\x39\x27\x89\xb2\x9e\x90\xd9\xd8\x19\x74\x2e\x7f\x6b\x21\x6c\x3a\xaf\x31\xe7\xb2\x99\xed\x13\x5d\x9b\x6f\x13\x9d\xb2\xa9\x2e\x16\x5c\x28\x72\x0e\x29\xed\x4d\x53\xd6\x37\x62\xe1\x50\xdd\x6d\xd2\xb8\x04\x25\xd6\x42\x0d\x09\xc8\x1b\xcf\xcd\xbe\xe7\xa9\x5a\xb8\xef\x78\xf9\x02\x4e\x79\xdf\x12\x2b\xb2\xac\xc6\x41\x6a\x7a\xe7\xb9\x85\xe8\xd1\xfb\x41\xaf\x5f\xc0\xa9\x86\x38\xac\xbc\xa2\x4a\xb1\xda\xa7\xb7\x1f\x68\xf3\x77\xd4\x59\xbf\x5a\xf9\x39\xce\x45\xaa\x5d\xa8\xa3\x50\x13\x81\x2c\xc8\xe3\xf2\x0c\x47\x92\x89\x3d\x27\x27\xc9\xe3\x75\x0b\xb4\x75\xa5\x53\x79\x97\xa6\xc9\x71\x6e\x7b\x32\x19\x05\xea\x29\x21\xd9\x46\x89\x23\x6d\x3c\x18\x7f\x93\x51\xe0\xf4\xe4\x61\x68\x29\xc6\xea\xa9\x0d\xc1\x1e\xb6\x59\xa7\x6b\x95\xff\x51\x70\x8c\xd5\x53\x9d\xe1\x06\x62\xc4\xb7\xbb\xe3\x38\x98\x2d\x3d\x00\x2b\x87\xfb\x7e\xa4\x34\x6c\x10\x32\xf1\xaf\x53\x28\x77\x56\xde\x1f\x88\x2c\x56\xe9\xc7\xca\x51\x04\xd8\x19\x3b\xb8\x0f\xf9\xcc\x97\x87\xcb\xd9\x99\x09\x49\x51\xc3\x3a\x96\x69\xcc\x7d\x34\x49\x69\x60\x93\x3c\xde\xd4\x18\xc1\x2f\x08\xb5\x8a\x2b\xa5\x71\xb8\x78\x48\x31\x8b\x37\xb9\xd2\x65\xe3\x14\x62\x99\x42\x71\x87\x55\x25\xa8\xc5\x57\xf0\x1e\xf3\xe2\x23\xf5\x16\x12\x31\xc5\x34\xf2\x6d\xa0\xe3\x73\x6c\xa2\x73\xa2\xe3\x7f\xbc\x8e\xd5\x6d\xf4\x7d\x7c\x3f\x97\xea\xff\x9f\x4d\xbe\x38\xa5\x38\x2e\x9a\xaa\xce\x29\xad\x2b\xcd\x42\x8c\xb8\x31\xde\xf5\xe2\x67\xa7\xfa\xe2\x3a\x2b\x63\x7d\x3e\x21\xb1\xe6\xf9\x00\x2f\xc3\x12\x25\x56\xb1\x12\x85\x64\x15\x31\x54\x91\x41\x0c\x4b\x71\x87\x12\x30\x5d\xe2\x31\x13\x04\xc2\xdb\xcd\x0f\x4e\x24\xd7\x67\xdc\x35\x91\x04\xc4\x8e\x2b\xdc\x8f\x46\xe5\x9e\x00\x59\x55\xac\x0d\x07\x8d\x8b\xfe\x60\x80\x6a\xb6\x16\x19\x12\x88\xc8\x90\x05\x40\x15\x2c\xff\xb2\xa2\x3b\x80\x76\x59\x7c\x55\xb4\xe8\x89\x14\xa5\xf2\x69\xce\x79\xe1\x89\x03\xf0\x87\x08\x16\xe6\xc7\x9d\x51\xda\xa1\x3f\x10\x89\x26\x31\xb5\x6a\x66\x6b\xaf\x97\x55\x35\x3e\xae\x14\xae\x15\x96\xad\x72\xfb\x0d\x7e\xbc\x56\x58\x8e\xc9\xfc\xee\x3e\xa7\xf4\x41\x22\xc8\x7e\x89\x00\xbd\x75\xbd\xd0\xb9\xac\x9d\x6c\x93\xa9\x4f\xf9\x5d\xc1\x74\x51\xd7\x03\xc3\xc4\xfb\x9b\xde\x6a\x9b\x4d\x9b\x38\x59\x71\xec\xbe\x69\xa4\x1f\x31\x67\x44\x96\x49\x2f\xcd\xeb\xb9\xbc\xc3\xaa\xde\xad\xf5\x8e\x83\x5a\x9e\x6e\xf5\x41\x76\x14\x19\x6d\x7f\xff\xec\x7b\x6d\x5a\x33\xae\x18\xa0\xf0\xf6\xb5\x87\x1e\x45\x91\xeb\xde\xf3\x1a\x1f\xc2\xd5\xf9\xc9\xc3\xf7\x5b\x7f\x8d\x4b\x47\xe7\xa9\x86\x75\xbd\xa6\x01\xcf\xac\xd7\xa8\xde\xa0\x58\xde\xbe\x2f\xaa\xfa\xc1\x3b\x6a\x0a\xe4\x16\x93\x3d\x21\x4d\xa1\xf3\x70\x48\xc7\x3a\x8a\xbd\x70\x73\xd1\xcd\x5d\xe0\x31\xf3\xc1\xaa\x58\xff\x57\x46\x37\x83\x89\x74\x28\xb0\xe7\x57\x7f\x60\x4c\x8a\xf4\x7f\xd1\xf8\xa7\x44\xe3\x57\x86\xe2\x81\x98\x69\xcf\x0f\x0e\xfa\xff\x61\x4f\x65\x00\x91\x99\x80\x1a\xf0\xd4\x7d\x13\xcc\xe7\x06\xc5\xbb\x78\xda\x96\xd1\xfa\xca\x56\xdc\x41\xac\xe3\x15\x8e\x6f\x16\xe6\xd8\x3f\xeb\x02\xe8\x7c\xea\xcd\x67\xb8\x92\x17\xe9\x0e\x7a\x1d\x97\x37\x7e\x1b\x09\x4d\xd3\x9d\x94\x77\xb0\x4d\xad\x68\xa7\x5d\xba\x5c\xd4\x43\x45\xdd\x58\x88\xb4\xbe\xe1\xac\x34\xbf\x5a\x80\x1e\x87\xf1\x3a\x09\xe9\x66\x81\xd9\xca\x0e\x02\xe7\x57\xae\xbd\x70\xa3\xf8\x20\xa0\x2c\x42\x72\xde\x2c\xda\x11\x61\x64\x74\x30\x44\xb2\x75\x90\x1e\xe8\xa2\x33\xcf\x67\x6e\xfc\xdf\x40\xab\x4f\xd6\x6c\xb5\xfb\x41\x40\x4b\xb3\x0e\xc8\x6e\x37\x30\x01\x36\x1b\x8a\x38\x0d\xb1\x67\x28\x70\x20\xf8\x0e\xcc\x09\x06\x02\x4e\xa3\x98\x3f\xae\x9f\x9e\x99\xd6\x70\xb0\x27\x0c\x82\x3a\xfa\xe5\x16\x2b\xce\x21\xd1\xdc\xce\x0f\x8f\x60\x76\xa3\x07\xf3\x9d\x93\x3e\xa5\x88\xca\xf9\xe3\xb9\x0b\xae\xc5\x14\xb2\x15\x37\x2a\x13\x5f\x42\x22\x5a\x6c\x38\xdf\x87\xc4\xfd\xcd\x26\xcf\xe7\x52\xfd\xf5\x2f\xa1\x1b\xfb\xb3\x37\xfe\x54\x63\x75\xc5\xa1\x69\x47\xfe\x84\x75\xa1\x37\x09\xc9\xd8\x77\x17\xcc\x96\xba\x90\x07\x89\xef\x3c\xa4\xcf\x42\x48\xe2\xb0\x83\xd8\xcb\x67\x37\xff\x9d\xb9\x11\xfd\x33\x7f\x46\x6f\xf4\x6c\xca\xc4\xce\xde\xb7\xf6\x38\x4d\xb3\x6d\xa6\x7a\x84\x2f\x24\x7f\x6b\x7c\x5d\xe9\x19\xb4\xe1\x50\x6c\xd4\x14\x84\x84\x3d\x63\x6e\x0a\x08\x06\x29\x56\x74\xfc\x62\xa3\xa2\xf1\xe9\x8e\x8f\xb6\x01\x25\xa1\x6f\x8a\x15\x7c\xfe\x0c\xc8\xea\xdc\xe5\x95\x60\x78\x24\xbe\x91\x78\x5f\x62\xa2\x30\x05\x91\xea\xa6\x8a\x4b\x12\x0a\xbe\x27\xc5\x46\x85\x86\xb0\x79\x5e\x42\x21\xad\x04\x42\x1a\x01\xf8\x64\x7d\xfe\xa4\xeb\xaf\x63\x2f\x64\x87\x7b\xb1\x51\x6c\x14\x93\x62\x3b\xc3\xe4\xcb\x6a\x19\x42\x48\xe7\x0e\x21\xe4\xb1\x5a\xc8\xde\x04\xa1\x35\x73\xe8\xac\x72\xfc\x60\xf9\x6c\xfd\x6c\xad\xa7\xf0\xa1\x7d\xb9\xf2\xfc\x24\x10\xf2\x61\x89\x84\xf4\x04\x72\xce\xd7\x12\x4b\x7b\xc7\xef\x26\x15\x65\x5e\x67\xa7\xb4\xbe\xb1\x8a\x5b\xb4\xac\x74\x9c\x5d\xf8\x26\x10\x29\xb9\x26\x67\x64\x33\xb0\xb5\x24\x3b\xfe\x61\xf2\xba\xbb\x08\xcc\x02\x79\xb6\x0f\xce\x94\x6e\xcc\xda\xa2\x0d\xbe\x5b\xdf\xbd\x5b\x05\x7e\x47\xe6\x85\x90\x7d\x99\x1a\x7c\x08\xe1\xb7\x87\x2f\x7a\x08\x69\xf7\x7f\x9e\x62\x7e\xd3\xf7\xb5\xbe\x9a\x42\x9d\x40\xcd\xc5\x13\x92\x62\x7e\xb3\x93\x6c\x23\x1a\x83\x9b\x5c\x3c\x5c\x11\xce\xaf\xe6\xd2\x6a\xc9\x25\x53\x69\x6b\x1e\x37\x8c\xd7\x84\xcc\x03\xf8\xc4\x3b\xf5\x5e\xa9\xb9\x6b\x35\x62\xd8\x4b\xdd\xbb\xd1\x2d\x07\x83\x69\xde\x45\xb4\xcb\x68\x2b\x50\x0d\xbc\x18\xf5\xfd\x65\x9f\x6a\x3c\x9f\xe9\x68\x46\xfb\x90\xc6\xc3\x54\xab\x49\xda\xca\xc0\xb8\x4e\x67\x8e\xe9\x57\x1c\x5a\xb8\x1b\xb1\x30\x2f\x69\x9a\xf8\xb5\xaa\x36\x89\xe2\xb0\xd2\x15\xa3\xff\xe2\x79\x18\x78\x0a\xd2\x63\xed\x5e\x8d\xe8\x86\xd3\x37\xc8\x0f\x1f\xe5\xab\xd7\xf6\xdd\x33\xf5\x8b\xaf\xc1\x1a\x64\xa8\x0a\xa3\x8f\x43\x95\xd8\x71\x05\xcc\x01\x6d\x88\x0c\xb2\xd5\xee\x21\x52\x2c\xda\x47\x7c\x6d\x0f\xf9\x9c\xc0\x5a\xde\x11\xb4\x22\x93\xa3\xf2\x34\x5b\x4d\x76\x3a\xa6\x54\x71\x9a\xad\x16\x6d\x65\xda\xd5\xa9\xe3\xd8\x51\xde\xb1\x5e\xfe\x1f\xe4\xe1\xf6\x5c\x5f\xe1\xe3\x99\x7e\x21\x7f\xb2\xc2\x4f\xd6\xdf\xbb\x26\x08\xff\xed\x3e\x2f\xf7\xb8\xf1\x97\xf4\x0d\xfb\x3c\x76\x6f\xef\xf0\x90\xa7\x0e\x77\x04\x7c\x28\xab\x07\x67\x87\xdd\x86\x6d\x2a\xe8\x6b\xc7\xc3\xfa\x3f\xec\xf0\x3d\xcf\x0d\xc1\xfd\x2e\xdb\x88\x3a\x3e\x54\x2d\x3f\xa2\x58\xee\xb5\xb3\xed\x22\xb8\xf9\xb3\x9c\xdb\x64\x84\x3d\xa9\xc0\xcb\x1b\xed\x92\x6c\x9f\x9b\x1f\xe5\xdb\xa2\x66\x52\x24\x1c\xe7\xf7\x41\x17\xf7\x2b\x11\x3f\x99\xfc\x31\x31\xd7\x11\xee\x34\x5b\x0d\x4b\x78\x38\xc8\x5c\x63\xa1\x9f\x46\xa1\x69\xe4\xae\x21\xf2\x12\xe5\x03\x37\x4e\xab\x46\xeb\xfe\x54\xa1\xf9\xa2\xa9\x85\x5f\x06\xba\x21\x45\x5c\xb5\x7e\xb8\x77\x59\x2d\x77\x7b\xfc\xb0\xec\xef\xee\x5c\x44\xcf\x0d\x37\x79\xae\x28\xd6\x3d\x10\xaf\x49\x1a\xd9\xf1\xc4\x6d\x5c\xbf\xad\x30\x13\xf7\x1e\x0a\x75\x64\xa1\x99\xe9\x90\x0e\xf4\x23\xb6\xc5\xd6\x8c\x58\x38\x37\xf9\xf3\x06\x48\x5a\xc7\xb2\x50\x0e\x4f\xe4\x39\x35\xcf\xd0\x34\xa7\xad\x5f\x86\xc5\xde\x79\xfa\xbf\x6d\xfc\x57\x00\x00\x00\xff\xff\x33\x6c\xeb\xf3\x36\x2a\x00\x00") func templateDialectSqlQueryTmplBytes() ([]byte, error) { return bindataRead( @@ -801,7 +801,7 @@ func templateDialectSqlQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 10665, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/dialect/sql/query.tmpl", size: 10806, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/template/base.tmpl b/entc/gen/template/base.tmpl index 60e2715bc..7fb1eae88 100644 --- a/entc/gen/template/base.tmpl +++ b/entc/gen/template/base.tmpl @@ -23,21 +23,21 @@ type ( MutateFunc = ent.MutateFunc ) -// OrderFunc applies an ordering on either graph traversal or sql selector. -type OrderFunc func({{ $.Storage.Builder }}) +{{ $tmpl := printf "dialect/%s/order/signature" $.Storage }} +{{ xtemplate $tmpl . }} {{ range $f, $order := order }} {{ $f = pascal $f }} // {{ $f }} applies the given fields in {{ upper $f }} order. func {{ $f }}(fields ...string) OrderFunc { {{- with extend (index $.Nodes 0) "Func" $f "Order" $order -}} - {{ $tmpl := printf "dialect/%s/order" $.Storage }} + {{ $tmpl := printf "dialect/%s/order/func" $.Storage }} return {{ xtemplate $tmpl . }} {{ end -}} } {{ end }} -{{ $tmpl := printf "dialect/%s/group/signature" $.Storage }} +{{ $tmpl = printf "dialect/%s/group/signature" $.Storage }} // AggregateFunc applies an aggregation step on the group-by traversal/selector. {{ xtemplate $tmpl . }} diff --git a/entc/gen/template/dialect/gremlin/by.tmpl b/entc/gen/template/dialect/gremlin/by.tmpl index 41ba887cc..98e23e249 100644 --- a/entc/gen/template/dialect/gremlin/by.tmpl +++ b/entc/gen/template/dialect/gremlin/by.tmpl @@ -4,9 +4,14 @@ This source code is licensed under the Apache 2.0 license found in the LICENSE file in the root directory of this source tree. */}} -{{ define "dialect/gremlin/order" -}} +{{ define "dialect/gremlin/order/signature" -}} + // OrderFunc applies an ordering on the graph traversal. + type OrderFunc func(*dsl.Traversal) +{{- end }} + +{{ define "dialect/gremlin/order/func" -}} {{- $order := $.Scope.Order -}} - func(tr *dsl.Traversal) { + func(tr *dsl.Traversal) error { for _, f := range fields { tr.By(f, dsl.{{ pascal $order }}) } diff --git a/entc/gen/template/dialect/sql/by.tmpl b/entc/gen/template/dialect/sql/by.tmpl index f14fa3b3b..c7f9baabd 100644 --- a/entc/gen/template/dialect/sql/by.tmpl +++ b/entc/gen/template/dialect/sql/by.tmpl @@ -4,11 +4,20 @@ This source code is licensed under the Apache 2.0 license found in the LICENSE file in the root directory of this source tree. */}} -{{ define "dialect/sql/order" -}} +{{ define "dialect/sql/order/signature" -}} + // OrderFunc applies an ordering on the sql selector. + type OrderFunc func(*sql.Selector, func(string) bool) +{{- end }} + +{{ define "dialect/sql/order/func" -}} {{- $f := $.Scope.Func -}} - func(s *sql.Selector) { + func(s *sql.Selector, check func(string) bool) { for _, f := range fields { - s.OrderBy(sql.{{ $f }}(f)) + if check(f) { + s.OrderBy(sql.{{ $f }}(f)) + } else { + s.AddError(&ValidationError{Name: f, err: fmt.Errorf("invalid field %q for ordering", f)}) + } } } {{- end }} diff --git a/entc/gen/template/dialect/sql/query.tmpl b/entc/gen/template/dialect/sql/query.tmpl index 186536d67..d36788616 100644 --- a/entc/gen/template/dialect/sql/query.tmpl +++ b/entc/gen/template/dialect/sql/query.tmpl @@ -118,7 +118,7 @@ func ({{ $receiver }} *{{ $builder }}) querySpec() *sqlgraph.QuerySpec { if ps := {{ $receiver }}.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, {{ $.Package }}.ValidColumn) } } } @@ -137,7 +137,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector { p(selector) } for _, p := range {{ $receiver }}.order { - p(selector) + p(selector, {{ $.Package }}.ValidColumn) } if offset := {{ $receiver }}.offset; offset != nil { // limit is mandatory for offset clause. We start @@ -157,8 +157,12 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector { {{- $e := $.Scope.Edge }} {{/* the edge we need to genegrate the path to. */}} {{- $ident := $.Scope.Ident -}} {{- $receiver := $.Scope.Receiver }} + selector := {{ $receiver }}.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From({{ $n.Package }}.Table, {{ $n.Package }}.{{ $n.ID.Constant }}, {{ $receiver }}.sqlQuery()), + sqlgraph.From({{ $n.Package }}.Table, {{ $n.Package }}.{{ $n.ID.Constant }}, selector), sqlgraph.To({{ $e.Type.Package }}.Table, {{ $e.Type.Package }}.{{ $e.Type.ID.Constant }}), sqlgraph.Edge(sqlgraph.{{ $e.Rel.Type }}, {{ $e.IsInverse }}, {{ $n.Package }}.{{ $e.TableConstant }}, {{- if $e.M2M -}} diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index f6ab6fd6f..8999fa63d 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -70,8 +70,12 @@ func (cq *CardQuery) QueryOwner() *UserQuery { if err := cq.prepareQuery(ctx); err != nil { return nil, err } + selector := cq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), + sqlgraph.From(card.Table, card.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.O2O, true, card.OwnerTable, card.OwnerColumn), ) @@ -88,8 +92,12 @@ func (cq *CardQuery) QuerySpec() *SpecQuery { if err := cq.prepareQuery(ctx); err != nil { return nil, err } + selector := cq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(card.Table, card.FieldID, cq.sqlQuery()), + sqlgraph.From(card.Table, card.FieldID, selector), sqlgraph.To(spec.Table, spec.FieldID), sqlgraph.Edge(sqlgraph.M2M, true, card.SpecTable, card.SpecPrimaryKey...), ) @@ -535,7 +543,7 @@ func (cq *CardQuery) querySpec() *sqlgraph.QuerySpec { if ps := cq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, card.ValidColumn) } } } @@ -554,7 +562,7 @@ func (cq *CardQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range cq.order { - p(selector) + p(selector, card.ValidColumn) } if offset := cq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index 3149bac86..21649d597 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -366,7 +366,7 @@ func (cq *CommentQuery) querySpec() *sqlgraph.QuerySpec { if ps := cq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, comment.ValidColumn) } } } @@ -385,7 +385,7 @@ func (cq *CommentQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range cq.order { - p(selector) + p(selector, comment.ValidColumn) } if offset := cq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/ent.go b/entc/integration/ent/ent.go index 269b07103..5c52af2fc 100644 --- a/entc/integration/ent/ent.go +++ b/entc/integration/ent/ent.go @@ -29,23 +29,31 @@ type ( MutateFunc = ent.MutateFunc ) -// OrderFunc applies an ordering on either graph traversal or sql selector. -type OrderFunc func(*sql.Selector) +// OrderFunc applies an ordering on the sql selector. +type OrderFunc func(*sql.Selector, func(string) bool) // Asc applies the given fields in ASC order. func Asc(fields ...string) OrderFunc { - return func(s *sql.Selector) { + return func(s *sql.Selector, check func(string) bool) { for _, f := range fields { - s.OrderBy(sql.Asc(f)) + if check(f) { + s.OrderBy(sql.Asc(f)) + } else { + s.AddError(&ValidationError{Name: f, err: fmt.Errorf("invalid field %q for ordering", f)}) + } } } } // Desc applies the given fields in DESC order. func Desc(fields ...string) OrderFunc { - return func(s *sql.Selector) { + return func(s *sql.Selector, check func(string) bool) { for _, f := range fields { - s.OrderBy(sql.Desc(f)) + if check(f) { + s.OrderBy(sql.Desc(f)) + } else { + s.AddError(&ValidationError{Name: f, err: fmt.Errorf("invalid field %q for ordering", f)}) + } } } } diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index ee66e96c7..f07d0c0a4 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -374,7 +374,7 @@ func (ftq *FieldTypeQuery) querySpec() *sqlgraph.QuerySpec { if ps := ftq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, fieldtype.ValidColumn) } } } @@ -393,7 +393,7 @@ func (ftq *FieldTypeQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range ftq.order { - p(selector) + p(selector, fieldtype.ValidColumn) } if offset := ftq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index e0433ae57..e82d7ae71 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -72,8 +72,12 @@ func (fq *FileQuery) QueryOwner() *UserQuery { if err := fq.prepareQuery(ctx); err != nil { return nil, err } + selector := fq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(file.Table, file.FieldID, fq.sqlQuery()), + sqlgraph.From(file.Table, file.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.M2O, true, file.OwnerTable, file.OwnerColumn), ) @@ -90,8 +94,12 @@ func (fq *FileQuery) QueryType() *FileTypeQuery { if err := fq.prepareQuery(ctx); err != nil { return nil, err } + selector := fq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(file.Table, file.FieldID, fq.sqlQuery()), + sqlgraph.From(file.Table, file.FieldID, selector), sqlgraph.To(filetype.Table, filetype.FieldID), sqlgraph.Edge(sqlgraph.M2O, true, file.TypeTable, file.TypeColumn), ) @@ -108,8 +116,12 @@ func (fq *FileQuery) QueryField() *FieldTypeQuery { if err := fq.prepareQuery(ctx); err != nil { return nil, err } + selector := fq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(file.Table, file.FieldID, fq.sqlQuery()), + sqlgraph.From(file.Table, file.FieldID, selector), sqlgraph.To(fieldtype.Table, fieldtype.FieldID), sqlgraph.Edge(sqlgraph.O2M, false, file.FieldTable, file.FieldColumn), ) @@ -557,7 +569,7 @@ func (fq *FileQuery) querySpec() *sqlgraph.QuerySpec { if ps := fq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, file.ValidColumn) } } } @@ -576,7 +588,7 @@ func (fq *FileQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range fq.order { - p(selector) + p(selector, file.ValidColumn) } if offset := fq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index 49a45834a..bd3e4e868 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -67,8 +67,12 @@ func (ftq *FileTypeQuery) QueryFiles() *FileQuery { if err := ftq.prepareQuery(ctx); err != nil { return nil, err } + selector := ftq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(filetype.Table, filetype.FieldID, ftq.sqlQuery()), + sqlgraph.From(filetype.Table, filetype.FieldID, selector), sqlgraph.To(file.Table, file.FieldID), sqlgraph.Edge(sqlgraph.O2M, false, filetype.FilesTable, filetype.FilesColumn), ) @@ -432,7 +436,7 @@ func (ftq *FileTypeQuery) querySpec() *sqlgraph.QuerySpec { if ps := ftq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, filetype.ValidColumn) } } } @@ -451,7 +455,7 @@ func (ftq *FileTypeQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range ftq.order { - p(selector) + p(selector, filetype.ValidColumn) } if offset := ftq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index afad0d3e2..5e640555d 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -73,8 +73,12 @@ func (gq *GroupQuery) QueryFiles() *FileQuery { if err := gq.prepareQuery(ctx); err != nil { return nil, err } + selector := gq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.From(group.Table, group.FieldID, selector), sqlgraph.To(file.Table, file.FieldID), sqlgraph.Edge(sqlgraph.O2M, false, group.FilesTable, group.FilesColumn), ) @@ -91,8 +95,12 @@ func (gq *GroupQuery) QueryBlocked() *UserQuery { if err := gq.prepareQuery(ctx); err != nil { return nil, err } + selector := gq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.From(group.Table, group.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.O2M, false, group.BlockedTable, group.BlockedColumn), ) @@ -109,8 +117,12 @@ func (gq *GroupQuery) QueryUsers() *UserQuery { if err := gq.prepareQuery(ctx); err != nil { return nil, err } + selector := gq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.From(group.Table, group.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.M2M, true, group.UsersTable, group.UsersPrimaryKey...), ) @@ -127,8 +139,12 @@ func (gq *GroupQuery) QueryInfo() *GroupInfoQuery { if err := gq.prepareQuery(ctx); err != nil { return nil, err } + selector := gq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(group.Table, group.FieldID, gq.sqlQuery()), + sqlgraph.From(group.Table, group.FieldID, selector), sqlgraph.To(groupinfo.Table, groupinfo.FieldID), sqlgraph.Edge(sqlgraph.M2O, false, group.InfoTable, group.InfoColumn), ) @@ -654,7 +670,7 @@ func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec { if ps := gq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, group.ValidColumn) } } } @@ -673,7 +689,7 @@ func (gq *GroupQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range gq.order { - p(selector) + p(selector, group.ValidColumn) } if offset := gq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index e8918388e..92c6ed4d7 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -67,8 +67,12 @@ func (giq *GroupInfoQuery) QueryGroups() *GroupQuery { if err := giq.prepareQuery(ctx); err != nil { return nil, err } + selector := giq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(groupinfo.Table, groupinfo.FieldID, giq.sqlQuery()), + sqlgraph.From(groupinfo.Table, groupinfo.FieldID, selector), sqlgraph.To(group.Table, group.FieldID), sqlgraph.Edge(sqlgraph.O2M, true, groupinfo.GroupsTable, groupinfo.GroupsColumn), ) @@ -432,7 +436,7 @@ func (giq *GroupInfoQuery) querySpec() *sqlgraph.QuerySpec { if ps := giq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, groupinfo.ValidColumn) } } } @@ -451,7 +455,7 @@ func (giq *GroupInfoQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range giq.order { - p(selector) + p(selector, groupinfo.ValidColumn) } if offset := giq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index 0a8cc7abb..a569af881 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -342,7 +342,7 @@ func (iq *ItemQuery) querySpec() *sqlgraph.QuerySpec { if ps := iq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, item.ValidColumn) } } } @@ -361,7 +361,7 @@ func (iq *ItemQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range iq.order { - p(selector) + p(selector, item.ValidColumn) } if offset := iq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index ed0959663..7d0b10cb7 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -68,8 +68,12 @@ func (nq *NodeQuery) QueryPrev() *NodeQuery { if err := nq.prepareQuery(ctx); err != nil { return nil, err } + selector := nq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.From(node.Table, node.FieldID, selector), sqlgraph.To(node.Table, node.FieldID), sqlgraph.Edge(sqlgraph.O2O, true, node.PrevTable, node.PrevColumn), ) @@ -86,8 +90,12 @@ func (nq *NodeQuery) QueryNext() *NodeQuery { if err := nq.prepareQuery(ctx); err != nil { return nil, err } + selector := nq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(node.Table, node.FieldID, nq.sqlQuery()), + sqlgraph.From(node.Table, node.FieldID, selector), sqlgraph.To(node.Table, node.FieldID), sqlgraph.Edge(sqlgraph.O2O, false, node.NextTable, node.NextColumn), ) @@ -498,7 +506,7 @@ func (nq *NodeQuery) querySpec() *sqlgraph.QuerySpec { if ps := nq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, node.ValidColumn) } } } @@ -517,7 +525,7 @@ func (nq *NodeQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range nq.order { - p(selector) + p(selector, node.ValidColumn) } if offset := nq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index b5654ebe8..edc1c6b5f 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -68,8 +68,12 @@ func (pq *PetQuery) QueryTeam() *UserQuery { if err := pq.prepareQuery(ctx); err != nil { return nil, err } + selector := pq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.From(pet.Table, pet.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.O2O, true, pet.TeamTable, pet.TeamColumn), ) @@ -86,8 +90,12 @@ func (pq *PetQuery) QueryOwner() *UserQuery { if err := pq.prepareQuery(ctx); err != nil { return nil, err } + selector := pq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(pet.Table, pet.FieldID, pq.sqlQuery()), + sqlgraph.From(pet.Table, pet.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.M2O, true, pet.OwnerTable, pet.OwnerColumn), ) @@ -495,7 +503,7 @@ func (pq *PetQuery) querySpec() *sqlgraph.QuerySpec { if ps := pq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, pet.ValidColumn) } } } @@ -514,7 +522,7 @@ func (pq *PetQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range pq.order { - p(selector) + p(selector, pet.ValidColumn) } if offset := pq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/spec_query.go b/entc/integration/ent/spec_query.go index eeb54c2c4..4f06016c1 100644 --- a/entc/integration/ent/spec_query.go +++ b/entc/integration/ent/spec_query.go @@ -67,8 +67,12 @@ func (sq *SpecQuery) QueryCard() *CardQuery { if err := sq.prepareQuery(ctx); err != nil { return nil, err } + selector := sq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(spec.Table, spec.FieldID, sq.sqlQuery()), + sqlgraph.From(spec.Table, spec.FieldID, selector), sqlgraph.To(card.Table, card.FieldID), sqlgraph.Edge(sqlgraph.M2M, false, spec.CardTable, spec.CardPrimaryKey...), ) @@ -443,7 +447,7 @@ func (sq *SpecQuery) querySpec() *sqlgraph.QuerySpec { if ps := sq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, spec.ValidColumn) } } } @@ -462,7 +466,7 @@ func (sq *SpecQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range sq.order { - p(selector) + p(selector, spec.ValidColumn) } if offset := sq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/task_query.go b/entc/integration/ent/task_query.go index 192c9bfab..d82b4f42e 100644 --- a/entc/integration/ent/task_query.go +++ b/entc/integration/ent/task_query.go @@ -366,7 +366,7 @@ func (tq *TaskQuery) querySpec() *sqlgraph.QuerySpec { if ps := tq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, task.ValidColumn) } } } @@ -385,7 +385,7 @@ func (tq *TaskQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range tq.order { - p(selector) + p(selector, task.ValidColumn) } if offset := tq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 517e9d1c6..43cec939b 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -81,8 +81,12 @@ func (uq *UserQuery) QueryCard() *CardQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(card.Table, card.FieldID), sqlgraph.Edge(sqlgraph.O2O, false, user.CardTable, user.CardColumn), ) @@ -99,8 +103,12 @@ func (uq *UserQuery) QueryPets() *PetQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(pet.Table, pet.FieldID), sqlgraph.Edge(sqlgraph.O2M, false, user.PetsTable, user.PetsColumn), ) @@ -117,8 +125,12 @@ func (uq *UserQuery) QueryFiles() *FileQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(file.Table, file.FieldID), sqlgraph.Edge(sqlgraph.O2M, false, user.FilesTable, user.FilesColumn), ) @@ -135,8 +147,12 @@ func (uq *UserQuery) QueryGroups() *GroupQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(group.Table, group.FieldID), sqlgraph.Edge(sqlgraph.M2M, false, user.GroupsTable, user.GroupsPrimaryKey...), ) @@ -153,8 +169,12 @@ func (uq *UserQuery) QueryFriends() *UserQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.M2M, false, user.FriendsTable, user.FriendsPrimaryKey...), ) @@ -171,8 +191,12 @@ func (uq *UserQuery) QueryFollowers() *UserQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.M2M, true, user.FollowersTable, user.FollowersPrimaryKey...), ) @@ -189,8 +213,12 @@ func (uq *UserQuery) QueryFollowing() *UserQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.M2M, false, user.FollowingTable, user.FollowingPrimaryKey...), ) @@ -207,8 +235,12 @@ func (uq *UserQuery) QueryTeam() *PetQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(pet.Table, pet.FieldID), sqlgraph.Edge(sqlgraph.O2O, false, user.TeamTable, user.TeamColumn), ) @@ -225,8 +257,12 @@ func (uq *UserQuery) QuerySpouse() *UserQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.O2O, false, user.SpouseTable, user.SpouseColumn), ) @@ -243,8 +279,12 @@ func (uq *UserQuery) QueryChildren() *UserQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.O2M, true, user.ChildrenTable, user.ChildrenColumn), ) @@ -261,8 +301,12 @@ func (uq *UserQuery) QueryParent() *UserQuery { if err := uq.prepareQuery(ctx); err != nil { return nil, err } + selector := uq.sqlQuery() + if err := selector.Err(); err != nil { + return nil, err + } step := sqlgraph.NewStep( - sqlgraph.From(user.Table, user.FieldID, uq.sqlQuery()), + sqlgraph.From(user.Table, user.FieldID, selector), sqlgraph.To(user.Table, user.FieldID), sqlgraph.Edge(sqlgraph.M2O, false, user.ParentTable, user.ParentColumn), ) @@ -1170,7 +1214,7 @@ func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec { if ps := uq.order; len(ps) > 0 { _spec.Order = func(selector *sql.Selector) { for i := range ps { - ps[i](selector) + ps[i](selector, user.ValidColumn) } } } @@ -1189,7 +1233,7 @@ func (uq *UserQuery) sqlQuery() *sql.Selector { p(selector) } for _, p := range uq.order { - p(selector) + p(selector, user.ValidColumn) } if offset := uq.offset; offset != nil { // limit is mandatory for offset clause. We start diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go index b6c54912d..33c9c1c10 100644 --- a/entc/integration/integration_test.go +++ b/entc/integration/integration_test.go @@ -596,6 +596,10 @@ func Relation(t *testing.T, client *ent.Client) { require.EqualError(err, "invalid field \"unknown_field\" for selection") _, err = client.Group.Query().GroupBy("unknown_field").String(ctx) require.EqualError(err, "invalid field \"unknown_field\" for group-by") + _, err = client.User.Query().Order(ent.Asc("invalid")).Only(ctx) + require.EqualError(err, "invalid field \"invalid\" for ordering") + _, err = client.User.Query().Order(ent.Asc("invalid")).QueryFollowing().Only(ctx) + require.EqualError(err, "invalid field \"invalid\" for ordering") t.Log("query using edge-with predicate") require.Len(usr.QueryGroups().Where(group.HasInfoWith(groupinfo.Desc("group info"))).AllX(ctx), 1)