diff --git a/ent.go b/ent.go index 7b7dd5f3b..65c3324eb 100644 --- a/ent.go +++ b/ent.go @@ -20,7 +20,7 @@ type ( Name() string Type() field.Type IsUnique() bool - IsNullable() bool + IsNillable() bool IsOptional() bool HasDefault() bool Value() interface{} diff --git a/entc/gen/bindata.go b/entc/gen/bindata.go index ebfde5e6b..e00dddcfe 100644 --- a/entc/gen/bindata.go +++ b/entc/gen/bindata.go @@ -184,7 +184,7 @@ func templateBuilderQueryTmpl() (*asset, error) { return a, nil } -var _templateBuilderSetterTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x4d\x6f\xdb\x38\x10\x3d\xcb\xbf\x62\x56\xd0\x2e\x24\x23\xa1\xb1\xd7\x00\xbe\x2c\xbc\x41\x7d\x49\x0f\x6e\x4f\x86\x51\xc8\xe6\xc8\x9d\x56\xa1\x1c\x51\x72\x11\xa8\xfa\xef\x05\x3f\x24\xca\xb4\xec\x38\x28\x7a\x93\xc8\xf9\xe2\xbc\x37\x8f\x6c\x1a\xe0\x98\x91\x40\x08\x25\x56\x15\x96\x21\xb4\xed\xa4\x69\x20\xda\xd6\x94\x73\x2c\xe1\x61\x0e\x87\x54\xee\xd2\x1c\x22\xb6\xda\x15\x07\x64\xff\xd9\x1d\x6b\x58\xe2\x0e\xe9\x68\x2c\xfb\xef\xde\xbd\x6d\x27\xca\xaa\x4c\xc5\x1e\x21\xfa\x72\x07\x51\xa6\x0c\x23\xf6\x48\x98\x73\xa9\xf6\x03\x15\xe5\x70\xea\x9e\xb1\x4f\xaf\x07\x64\xab\xaa\x24\xb1\xef\x8d\xb2\x5a\xec\x74\x41\x25\x89\x0a\xc2\x15\x56\x21\xc4\x5d\x75\x19\x7b\x4a\x9f\x31\xd1\xc6\xb3\x19\xf4\xf6\x6d\x0b\x12\x2b\x09\xd5\x57\x34\x8b\xda\x4e\x2d\x67\xaa\x04\x36\x09\xb4\x59\x7c\x72\x96\xb6\x85\xe9\xb0\x0b\x6d\x9b\x0c\x23\xc6\xa6\xe4\xb6\xb5\x11\x55\xb1\xda\xc6\x73\x82\x66\x12\x04\x5e\x60\x66\x5c\x56\x55\x59\xef\x2a\xdd\x05\x65\x38\x87\x7f\xba\x98\x93\x20\x28\xb1\xaa\x4b\x01\x9e\xe7\x24\xd0\x7d\x98\x4d\x21\x3d\x16\xc4\x61\x8f\x02\xcb\x4a\x35\x48\x50\x9e\xa7\xdb\x1c\xc1\x80\x28\x21\x2b\x4a\x90\x39\xed\x50\xc2\x16\x77\x69\x2d\x51\x9f\x5f\x50\x0e\xc7\x34\xaf\xd1\x19\x00\x49\xb5\x44\x1c\xa6\x33\xdb\x67\xca\x20\x15\x1c\x62\x51\x54\x0e\x09\x65\x9b\x40\x5c\x68\x70\x3e\x1e\x2a\x2a\x84\xed\x7a\x6d\x73\x47\x19\xfb\x90\xca\x05\x66\x69\x9d\x57\x06\x07\x7d\xf6\xae\xb8\xc7\x33\xf4\x9e\xec\xce\x05\x14\x3b\x18\x4f\x02\xbc\x01\xa7\x2a\x5e\x6d\xed\xe9\x88\xc2\x9e\x95\x24\xa8\xa3\x08\xca\xd9\x24\x78\x0f\xda\x5e\x62\x87\xfa\xf4\x06\xd8\x03\xca\xa0\x77\xf8\x6b\xae\x7b\xaf\xd7\xc7\x09\x61\x53\x4c\x3b\x97\x44\x99\xaa\x26\x5c\x24\x83\x61\x03\xa0\xe0\x76\x14\xed\x97\x37\x6f\x68\xe6\xed\x7f\xbe\x47\x37\x6e\x85\x9e\xb7\x30\xe5\x5c\x0d\xbc\xc1\x3c\x42\xf6\x59\xd0\x4b\x8d\x66\x45\xd9\xcc\xb5\x2c\x58\x13\x1b\x5e\xfb\x13\x97\xa7\x70\xf6\x00\x16\x87\x04\x62\x49\x62\x5f\xe7\x69\xa9\x62\x6a\x78\x7e\x5a\x11\x49\x20\x5c\x2e\xe4\xe5\x9c\x5d\xdc\xf1\xb0\xdd\x0f\x5a\x92\x84\xcb\x85\x57\x9b\x65\x4c\x17\xc6\x0e\x68\xa1\x1a\xea\x28\x83\x3d\x65\x90\xef\x11\xaa\xc2\xae\x6a\xa2\x77\x5b\xdb\x57\x20\x6e\x8a\xd4\x73\x30\x28\x54\xf6\x09\xdf\x27\x1e\xae\xaa\xf8\xfc\xf4\x3a\x19\xe6\xd2\x7c\x4b\x60\x8c\xf5\x69\xb4\x37\x5b\x2e\xae\x13\xce\xf2\xcd\x67\x16\x9e\x49\xcd\x80\x8b\xb7\x39\xc0\x73\xfa\x1d\xe3\xe7\xf4\xb0\xf6\x0a\xd9\x48\x6d\xd9\x68\xb6\xda\x79\x3f\x39\xd7\xbd\x26\xea\x4d\x69\xd6\xc4\x37\x30\x87\x2e\x62\x63\xc2\xdd\x9b\x9e\xd8\x38\x4a\xb5\x48\xdf\x14\x9a\xdf\xaa\x4f\x97\x47\x6a\x24\x81\x5c\xd3\xe6\x2c\x49\xd0\x67\xb2\x24\xba\x2e\xbf\x9d\x3c\xba\x43\x46\xe8\x04\xf1\x4c\xf5\x96\x0b\x79\x93\xf0\x79\x9c\x3e\x57\xbf\x2e\x90\x2f\x80\xb7\xb3\xf9\x8f\x68\xa3\x2b\x2b\x56\x77\xc8\x4d\x4c\x55\x54\x25\x7e\x59\x14\x35\xe7\xc6\x20\x1d\x4c\xd0\x94\xf8\x7b\x25\xd2\x3d\x34\xf2\xe2\x07\x96\x10\x6b\x40\x32\x08\xff\x66\xff\xca\xf0\xa4\x67\x09\xb8\xbb\x10\x5f\x94\xd7\x49\x47\x4c\xa0\x39\x84\xc7\xd0\xfe\x0e\x53\x64\x57\x94\xd1\x87\x7b\xe4\xb5\xf2\xa6\x62\x35\x8d\x2f\x4a\x43\x4d\x1a\x67\xc0\xef\x3f\x73\x46\x84\x70\xa8\x51\x53\x2f\xe7\x95\xd7\xd0\x98\x42\x8c\x23\xe8\x83\xde\xd5\xc3\x96\x8b\x64\x44\x1e\x94\x1e\x3c\x58\xb5\x5a\x6f\x3c\x2a\xde\x41\x8e\xa2\x8f\x90\x24\x9d\x2e\x69\x3d\x09\xc9\xdd\x49\x0a\x6f\x32\x56\x66\x7f\x0e\xe1\xb7\xc1\x3d\x33\xd0\x22\xb3\xdf\xb6\x4e\x92\x5c\xc7\x34\xab\x95\xe4\x74\x46\x1b\x4b\x6a\xb5\xed\x16\xd9\x72\xf1\x06\x8d\xfd\x26\x10\x97\x8c\xb1\xc4\x13\xad\xe1\x0b\xc0\x7d\xfd\x0a\x00\x00\xff\xff\x44\xd3\xdd\xc8\xe0\x0b\x00\x00") +var _templateBuilderSetterTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x4d\x8f\xda\x3a\x14\x5d\x87\x5f\x71\x5f\x94\xf7\x94\xa0\x19\xa3\xb7\x1d\x89\x4d\x45\x47\x65\xd3\x2e\x68\x57\x08\x55\x01\xdf\x50\xb7\x19\x87\x89\x1d\xaa\x51\x9a\xff\x5e\xf9\x2b\x0e\x26\x30\x8c\xaa\xee\x12\xfb\x7e\xf9\x9e\x73\x8f\xdd\xb6\x40\xb1\x60\x1c\x21\x16\x28\x25\xd6\x31\x74\xdd\xa4\x6d\x21\xd9\x36\xac\xa4\x58\xc3\xc3\x1c\x0e\xb9\xd8\xe5\x25\x24\x64\xb5\xab\x0e\x48\xde\xd9\x1d\x6b\x58\xe3\x0e\xd9\xd1\x58\xf6\xdf\xbd\x7b\xd7\x4d\x94\x55\x9d\xf3\x3d\x42\xf2\xf5\x0e\x92\x42\x19\x26\xe4\x91\x61\x49\x85\xda\x8f\x54\x94\xc3\xa9\x7b\x41\x3e\xbf\x1c\x90\xac\x64\xcd\xf8\xbe\x37\x2a\x1a\xbe\xd3\x05\xd5\x8c\x4b\x88\x57\x28\x63\x48\x5d\x75\x05\xf9\x98\x3f\x61\xa6\x8d\x67\x33\xe8\xed\xbb\x0e\x04\x4a\x01\xf2\x1b\x9a\x45\x6d\xa7\x96\x0b\x55\x02\x99\x44\xda\x2c\x3d\x39\x4b\xd7\xc1\x74\xd8\x85\xae\xcb\x86\x11\x53\x53\x72\xd7\xd9\x88\xaa\x58\x6d\x13\x38\x41\x3b\x89\xa2\x20\x30\x31\x2e\x2b\x59\x37\x3b\xa9\xbb\xa0\x0c\xe7\xf0\x9f\x8b\x39\x89\xa2\x1a\x65\x53\x73\x08\x3c\x27\x91\xee\xc3\x6c\x0a\xf9\xb1\x62\x14\xf6\xc8\xb1\x96\xaa\x41\x9c\x95\x65\xbe\x2d\x11\x0c\x88\x02\x8a\xaa\x06\x51\xb2\x1d\x0a\xd8\xe2\x2e\x6f\x04\xea\xf3\x73\x56\xc2\x31\x2f\x1b\xf4\x06\xc0\x84\x5a\x62\x14\xa6\x33\xdb\x67\x56\x40\xce\x29\xa4\xbc\x92\x1e\x09\x65\x9b\x41\x5a\x69\x70\x3e\x1d\x24\xab\xb8\xed\xba\xcb\x9d\x14\xe4\x43\x2e\x16\x58\xe4\x4d\x29\x0d\x0e\xfa\xec\xae\xb8\xc7\x33\xf4\x9c\xeb\x05\x14\x1d\x8c\x27\x01\x5e\x81\x53\x15\xaf\xb6\xf6\xec\x88\xdc\x9e\x95\x09\x50\x47\xe1\xac\x24\x93\xe8\x2d\x68\x07\x89\x3d\xea\xd3\x1b\x60\x8f\x58\x01\xbd\xc3\x3f\x73\xdd\x7b\xbd\x3e\x4e\x08\x9b\x62\xea\x5c\x32\x65\xaa\x9a\x70\x91\x0c\x86\x0d\x80\x9c\xda\x51\xb4\x5f\xc1\xbc\xa1\x99\xb7\xf7\x74\x8f\x7e\xdc\x2a\x3d\x6f\x71\x4e\xa9\x1a\x78\x83\x79\x82\xe4\x0b\x67\xcf\x0d\x9a\x15\x65\x33\xd7\xb2\x60\x4d\x6c\x78\xed\xcf\xa8\x38\x85\xb3\x07\xb0\x3a\x64\x90\x0a\xc6\xf7\x4d\x99\xd7\x2a\xa6\x86\xe7\x97\x15\x91\x0c\xe2\xe5\x42\x5c\xce\xe9\xe2\x8e\x87\x75\x3f\x68\x49\x12\x2f\x17\x41\x6d\x96\x31\x2e\x8c\x1d\xd0\x4a\x35\xd4\x53\x06\x7b\xca\x20\xdd\x23\xc8\xca\xae\x6a\xa2\xbb\xad\xed\x0b\x30\x6a\x8a\xd4\x73\x30\x28\x54\xf4\x09\xdf\x26\x1e\xbe\xaa\xf4\xfc\xf4\x3a\x19\x96\xc2\x7c\x0b\x20\x84\xf4\x69\xb4\x37\x59\x2e\xae\x13\xce\xf2\x2d\x64\x16\x9e\x49\xcd\x80\x8b\xb7\x39\xc0\x53\xfe\x03\xd3\xa7\xfc\xb0\x0e\x0a\xd9\x08\x6d\xd9\x6a\xb6\xda\x79\x3f\x39\xd7\xbd\x26\xea\x4d\x69\xd6\x8c\x6e\x60\x0e\x2e\x62\x6b\xc2\xdd\x9b\x9e\xd8\x38\x4a\xb5\x98\xbe\x29\x34\xbf\x55\x9f\x2e\x8f\xd4\x48\x02\xb1\x66\x9b\xb3\x24\x51\x9f\xc9\x92\xe8\xba\xfc\x3a\x79\xf4\x87\x4c\xd0\x0b\xe2\x99\xea\x2d\x17\xe2\x26\xe1\x0b\x38\x7d\xae\x7e\x2e\x50\x28\x80\xb7\xb3\xf9\xaf\x68\xa3\x2f\x2b\x55\x77\xc8\x4d\x4c\x55\x54\x65\xf4\xb2\x28\x6a\xce\x8d\x41\x3a\x98\xa0\x29\xa3\x6f\x95\x48\xff\xd0\x28\xab\x9f\x58\x43\xaa\x01\x29\x20\xfe\x97\xfc\x2f\xe2\x93\x9e\x65\xe0\xef\x42\x7c\x56\x5e\x27\x1d\x31\x81\xe6\x10\x1f\x63\xfb\x3b\x4c\x51\x5c\x51\xc6\x10\xee\x91\xd7\xca\xab\x8a\xd5\xb6\xa1\x28\x0d\x35\x69\x9c\x01\x7f\xfe\xcc\x19\x11\xc2\xa1\x46\x4d\x83\x9c\x57\x5e\x43\x63\x0a\x31\x8e\x60\x08\xba\xab\x87\x2c\x17\xd9\x88\x3c\x28\x3d\x78\xb0\x6a\xb5\xde\x04\x54\xbc\x83\x12\x79\x1f\x21\xcb\x9c\x2e\x69\x3d\x89\x99\xbf\x93\x14\xde\xcc\x58\x99\xfd\x39\xc4\xdf\x07\xf7\xcc\x40\x8b\xcc\x7e\xd7\x79\x49\xf2\x1d\xd3\xac\x56\x92\xe3\x8c\x36\x96\xd4\x6a\xdb\x2f\x92\xe5\xe2\x15\x1a\x87\x4d\x60\x54\x10\x42\xb2\x40\xb4\x86\x2f\x00\xff\xf5\x3b\x00\x00\xff\xff\x13\x51\x8c\xa0\xe0\x0b\x00\x00") func templateBuilderSetterTmplBytes() ([]byte, error) { return bindataRead( @@ -199,7 +199,7 @@ func templateBuilderSetterTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/setter.tmpl", size: 3040, mode: os.FileMode(420), modTime: time.Unix(1564668403, 0)} + info := bindataFileInfo{name: "template/builder/setter.tmpl", size: 3040, mode: os.FileMode(420), modTime: time.Unix(1565180155, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -324,7 +324,7 @@ func templateDialectGremlinCreateTmpl() (*asset, error) { return a, nil } -var _templateDialectGremlinDecodeTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x94\x41\x6f\x9c\x3c\x10\x86\xcf\xf8\x57\xcc\x87\x50\x04\x11\xeb\xfd\x0e\x55\x0f\x5b\xed\x0d\x45\xe2\xd0\x1c\x92\xb4\x97\xaa\x4a\x5c\x18\x52\x57\xc6\x20\xdb\x8b\x1a\x59\xfe\xef\x95\x0d\xac\xd8\x2d\xca\x56\xed\xa9\x52\x6f\x78\x66\xfc\xce\xcc\x03\x2f\xd6\x42\x8d\x0d\x97\x08\x71\xcd\x99\xc0\xca\x6c\x9f\x15\xb6\x82\xcb\x6d\x8d\x55\x57\xe3\xb6\x93\x18\x83\x73\xc4\x5a\x48\x14\x56\xc8\x07\x54\xb0\xdb\x43\x42\xef\xe6\x93\x73\x84\x6c\xb7\x70\xa3\xba\xf6\x0e\x75\xdf\x49\x8d\xa0\x2b\x26\x35\x98\xaf\x08\x93\x1e\xa8\x39\x55\x33\xc3\x80\x4b\xd3\x81\xd7\xa4\xb7\xac\x45\x70\x8e\x92\xe6\x20\x2b\x48\x4f\xfa\x38\x07\xd7\xcb\xa2\xec\xa4\x49\xaa\x50\xc3\xf5\xa4\x4f\xe7\x68\x06\xa8\x54\xa7\xc0\x92\x68\x68\x59\x9f\xfb\xa3\x1f\x58\xa1\xa6\x77\xc8\xea\x8f\x4c\x1c\xf0\x3d\xeb\xd3\x8c\x44\xbc\x09\xd9\xff\xf6\x20\xb9\xf0\x37\x22\x85\xe6\xa0\xa4\x8f\x92\xc8\x91\xc8\xda\x0d\x24\x7e\x17\xaf\xd0\x2b\x2e\x0d\xc4\x43\x7c\x32\x21\x89\x06\xa6\xc2\x2a\xa1\xce\x39\xd0\x46\x1d\x2a\x13\xe4\xca\x02\x60\x5c\xb3\x2c\xe8\xc3\x4b\xef\x97\x00\x78\xfa\xa6\x3b\xb9\x8b\x79\x9d\x77\x2d\x37\xd8\xf6\xe6\x25\x7e\x22\x51\x64\x2d\x28\x26\x9f\x11\x92\xc7\x1c\x92\x66\xc4\x7c\xc3\x51\xd4\x3a\x34\x8a\xc2\x3c\x3d\xd3\x15\x13\x90\x34\x33\x15\xdf\x80\x37\x3e\x50\xea\x07\x1e\x42\x5c\x9a\xb7\x6f\xac\x05\x14\xda\x1f\x8f\x05\xb7\x07\x21\xd8\x17\xe1\x63\x1e\x2c\xca\x7a\xcc\x26\xcd\x3c\xdd\x31\x3a\x4f\x39\x66\xa7\x56\x3f\x0f\x3c\x16\x07\x58\x13\xcd\xdd\x1e\x3c\x78\x5a\x84\x0f\x28\xbd\x5a\xa0\xc9\xde\x5d\xe4\x7d\xc2\x96\x96\x05\xec\x97\x6c\x69\x59\x90\xcb\x98\xc2\x5b\x5b\xca\x58\xbb\x42\xcd\x0b\x6f\xce\xc1\x19\xde\x22\xfd\x20\xf9\xf7\x74\xd9\x75\x15\x7b\x0e\xff\x67\xb0\x64\xbc\xb9\x70\x61\x41\x6b\x7a\xdc\xf8\xe7\x09\x81\xe4\x82\x04\x9b\x4d\x35\xe4\xb2\x37\x5b\x26\x5f\x7e\xc1\x9c\x61\x13\xc1\x2b\x1c\x53\xf7\x55\xd7\x23\xbd\x0f\x81\x3f\xb2\xae\x9e\x24\x5e\xb5\xee\x5c\xf4\x77\x58\xf7\xd3\xe7\x7f\xe6\xfd\x6d\xf3\x36\x9d\x82\xc7\x1c\x86\xf0\xca\x02\x8a\x25\x5a\x7f\xe1\xfa\xfc\x13\xd9\x03\xeb\x7b\x94\x75\x7a\x9e\xc9\xe1\x6a\xf9\xe3\xf7\x97\xa3\xb2\xd8\xc1\x40\xcb\x22\x1f\x61\x5e\xc2\xbd\xce\x7b\xf7\xba\xeb\x87\xd5\x7f\xc5\x99\xd5\xd7\x8b\x8e\x3c\xe7\xf9\x8e\x0e\x8f\x5c\x16\x00\xad\x3b\xfd\x47\x00\x00\x00\xff\xff\x5e\x9a\x20\xa9\x84\x07\x00\x00") +var _templateDialectGremlinDecodeTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x94\x41\x6f\x9c\x3c\x10\x86\xcf\xf8\x57\xcc\x87\x50\x04\x11\xeb\xfd\x0e\x55\x0f\x5b\xed\x0d\x45\xe2\xd0\x1c\x92\xb4\x97\xaa\x4a\x5c\x18\x52\x57\xc6\x20\xdb\x8b\x1a\x59\xfe\xef\x95\x0d\xac\xd8\x2d\xca\x56\xed\xa9\x52\x6f\x78\x66\xfc\xce\xcc\x03\x2f\xd6\x42\x8d\x0d\x97\x08\x71\xcd\x99\xc0\xca\x6c\x9f\x15\xb6\x82\xcb\x6d\x8d\x55\x57\xe3\xb6\x93\x18\x83\x73\xc4\x5a\x48\x14\x56\xc8\x07\x54\xb0\xdb\x43\x42\xef\xe6\x93\x73\x84\x6c\xb7\x70\xa3\xba\xf6\x0e\x75\xdf\x49\x8d\xa0\x2b\x26\x35\x98\xaf\x08\x93\x1e\xa8\x39\x55\x33\xc3\x80\x4b\xd3\x81\xd7\xa4\xb7\xac\x45\x70\x8e\x92\xe6\x20\x2b\x48\x4f\xfa\x38\x07\xd7\xcb\xa2\xec\xa4\x49\xaa\x50\xc3\xf5\xa4\x4f\xe7\x68\x06\xa8\x54\xa7\xc0\x92\x68\x68\x59\x9f\xfb\xa3\x1f\x58\xa1\xa6\x77\xc8\xea\x8f\x4c\x1c\xf0\x3d\xeb\xd3\x8c\x44\xbc\x09\xd9\xff\xf6\x20\xb9\xf0\x37\x22\x85\xe6\xa0\xa4\x8f\x92\xc8\x91\xc8\xda\x0d\x24\x7e\x17\xaf\xd0\x2b\x2e\x0d\xc4\x43\x7c\x32\x21\x89\x06\xa6\xc2\x2a\xa1\xce\x39\xd0\x46\x1d\x2a\x13\xe4\xca\x02\x60\x5c\xb3\x2c\xe8\xc3\x4b\xef\x97\x00\x78\xfa\xa6\x3b\xb9\x8b\x79\x9d\x77\x2d\x37\xd8\xf6\xe6\x25\x7e\x22\x51\x64\x2d\x28\x26\x9f\x11\x92\xc7\x1c\x92\x66\xc4\x7c\xc3\x51\xd4\x3a\x34\x8a\xc2\x3c\x3d\xd3\x15\x13\x90\x34\x33\x15\xdf\x80\x37\x3e\x50\xea\x07\x1e\x42\x5c\x9a\xb7\x6f\xac\x05\x14\xda\x1f\x8f\x05\xb7\x5c\x08\xf6\x45\xf8\x98\x07\x8b\xb2\x1e\xb3\x49\x33\x4f\x77\x8c\xce\x53\x8e\xd9\xa9\xd5\xcf\x03\x8f\xc5\x01\xd6\x44\x73\xb7\x07\x0f\x9e\x16\xe1\x03\x4a\xaf\x16\x68\xb2\x77\x17\x79\x9f\xb0\xa5\x65\x01\xfb\x25\x5b\x5a\x16\xe4\x32\xa6\xf0\xd6\x96\x32\xd6\xae\x50\xf3\xc2\x9b\x73\x70\x86\xb7\x48\x3f\x48\xfe\x3d\x5d\x76\x5d\xc5\x9e\xc3\xff\x19\x2c\x19\x6f\x2e\x5c\x58\xd0\x9a\x1e\x37\xfe\x79\x42\x20\xb9\x20\xc1\x66\x53\x0d\xb9\xec\xcd\x96\xc9\x97\x5f\x30\x67\xd8\x44\xf0\x0a\xc7\xd4\x7d\xd5\xf5\x48\xef\x43\xe0\x8f\xac\xab\x27\x89\x57\xad\x3b\x17\xfd\x1d\xd6\xfd\xf4\xf9\x9f\x79\x7f\xdb\xbc\x4d\xa7\xe0\x31\x87\x21\xbc\xb2\x80\x62\x89\xd6\x5f\xb8\x3e\xff\x44\xf6\xc0\xfa\x1e\x65\x9d\x9e\x67\x72\xb8\x5a\xfe\xf8\xfd\xe5\xa8\x2c\x76\x30\xd0\xb2\xc8\x47\x98\x97\x70\xaf\xf3\xde\xbd\xee\xfa\x61\xf5\x5f\x71\x66\xf5\xf5\xa2\x23\xcf\x79\xbe\xa3\xc3\x23\x97\x05\x40\xeb\x4e\xff\x11\x00\x00\xff\xff\xb7\xf1\xab\xf7\x84\x07\x00\x00") func templateDialectGremlinDecodeTmplBytes() ([]byte, error) { return bindataRead( @@ -339,7 +339,7 @@ func templateDialectGremlinDecodeTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/decode.tmpl", size: 1924, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/decode.tmpl", size: 1924, mode: os.FileMode(420), modTime: time.Unix(1565180189, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -424,7 +424,7 @@ func templateDialectGremlinMetaTmpl() (*asset, error) { return a, nil } -var _templateDialectGremlinPredicateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x56\x5d\x8b\xeb\x36\x10\x7d\x76\x7e\xc5\x10\x16\x6a\x07\xaf\xdc\xe7\x42\x1e\x6e\xdb\x6d\x1b\x28\x1b\xda\x5b\xb6\x0f\xcb\x12\x74\xed\x71\x22\xae\x57\x32\xd2\xd8\xfb\x60\xf4\xdf\x8b\x24\xc7\x76\x3e\x6e\x13\xb2\xfd\xe0\x3e\xc5\x78\x46\x33\x67\xce\x39\xce\xa8\xeb\xa0\xc0\x52\x48\x84\x79\x21\x78\x85\x39\x65\x5b\x8d\xaf\x95\x90\x59\xad\xb1\x10\x39\x27\xcc\x44\x31\x87\x7b\x6b\x67\x51\xd9\xc8\x3c\x26\x58\x14\xa6\x62\x7f\x68\xde\xa2\x36\xbc\x4a\xa0\x9b\x45\x11\xb1\x5f\xb8\x59\xfd\x18\x8b\x22\x99\x45\x76\xd6\x75\xf7\x80\xb2\x00\x6b\x67\xb3\x2b\x7b\x64\xaa\x36\xa1\x8f\x3b\x7c\xa7\x6a\xf8\x6e\x09\x77\xec\x63\xae\x6a\x64\xeb\x7a\x8c\x70\xbd\x9d\x86\x3e\xe8\xed\x45\x74\xee\x9c\x28\x5d\x51\xf6\xc4\xb5\xe0\x85\xc8\x1d\xb4\x28\x8a\x5a\x57\xea\x95\x7f\xc6\xf8\xf9\x45\x48\x42\x5d\xf2\x1c\x3b\x9b\x42\x85\x32\xee\xba\xd0\xcd\xda\x24\x71\xc9\xa5\xd2\x20\xdc\x01\xcd\xe5\x16\xa1\xf5\xb5\xa3\xa8\x7d\x16\x2f\xb0\x84\x31\xfb\x59\xbc\xb8\x80\xed\x3b\xf7\x44\x8c\x24\xd5\xcc\xe5\xaa\x9a\xfd\x1c\x78\x00\x6b\x5d\xaf\x53\x84\x2d\x63\x2e\x15\x2b\x83\x60\xed\xd8\xc0\xbd\xf3\x45\x93\xdb\xd8\x2e\x05\x56\x7b\x51\x3d\xa7\xe5\x94\xd1\x9f\x5c\xf4\x3a\xc5\xe3\x5f\xf9\x27\xac\x52\x3f\x7b\xc9\x7e\x50\xd2\x10\x97\x04\xd6\xa6\x50\xb3\x87\xdf\xe2\xf6\x3d\x00\x47\x47\xfc\x3d\xc8\x2f\xfb\xe5\x0a\x4f\x48\x45\x9e\xf5\x47\x51\x8d\xb6\xb8\x3c\xdb\xa9\x80\xed\x59\x05\x7b\x01\x07\xb1\x82\x21\x82\x9e\xfb\x46\xbe\x4f\xe8\x96\x9c\x77\xc6\x61\xff\xe4\xc8\x57\x37\xf0\x8b\xc5\x16\xb3\x1d\x3f\xa0\x17\xa7\x04\x3e\x14\x5b\x9c\xc4\x2a\x07\xce\xc7\x71\x44\x32\x86\x0b\xa1\x31\x27\xa1\xa4\x4b\x99\xaf\x1b\x9a\xd4\x75\x9c\x20\x5b\x99\x95\x74\xec\xf7\x45\x8f\x8f\x2d\x61\xbe\x92\xf3\x21\x96\x2d\x80\xb7\x4a\x14\x90\x0b\x9d\x37\x15\xd7\x50\x60\x8d\xb2\xc0\x5c\xa0\x81\x45\x36\x96\x08\xc0\x3c\xae\xbe\xc1\x29\x3c\xc7\xcc\x35\x6e\xc8\x16\x0e\xac\xa0\x6f\x0c\x70\x09\x8e\x22\x78\x13\xb4\x03\x83\x55\x79\xaf\xb1\x44\x8d\x32\xc7\x14\x88\x7f\x46\xa0\x1d\x02\xbd\x29\x68\x51\x93\xc8\x0f\x51\x85\x91\x3f\x62\x55\xfe\x8e\x65\xff\x47\x43\xec\x7b\x45\x3b\x2f\x66\xc0\x3c\xd1\x71\xb0\x43\x44\x5e\xff\x91\x17\x6b\x1f\x0e\x8f\x9c\xc4\x9f\xe2\x7f\xd0\x0e\x6e\xdc\xff\xc0\x12\x77\x22\x48\xb5\x39\x4c\x1a\x1c\x70\xab\x6d\xce\x56\x3e\xe8\xfe\xbf\x79\xeb\xd8\x12\x1e\x87\x33\x96\xc6\x12\x5e\x91\x4b\x03\x82\xc0\xec\x54\x53\x15\xf0\x09\x81\x74\x83\x20\x24\x28\x89\xa0\x4a\xef\xb6\x61\xa4\x01\x65\x24\x64\x0a\xaa\x21\xc7\xde\x66\xc3\x56\xf2\x29\x4e\x52\xf7\xb4\x6e\x28\xf8\xc2\xaf\xac\x4d\x0a\xf5\xb8\xb5\x9c\xea\xa6\xdf\x5c\x75\x2c\x64\xd2\x3f\xa9\x86\x92\xfd\xd6\x8a\x88\xfd\xb9\x43\x8d\xb1\x8f\xb9\x82\x3a\x3c\x46\xa1\xf8\xb1\x29\x43\xb2\x90\x49\x3a\x64\xad\xe4\xf9\x24\xd7\x26\x64\x85\x9f\x73\x1f\x81\xee\x07\x72\xe7\x4f\x05\xdd\x7b\xfe\xe2\x6c\xa4\xa7\x03\x5d\xfa\xb0\x02\x3c\xd2\xff\xd2\x27\xc6\xe5\xe1\x2d\x4a\x9f\x5f\xaa\xda\x7c\xe9\x42\xf2\x6d\xb8\x93\x0c\x15\x8d\x5f\x27\xe7\x39\x08\x09\x81\x88\xbd\x3b\x1e\xf1\x2d\xd0\x56\xc7\x41\x68\xd7\x6b\x09\xbc\x76\xe6\x8f\x49\x9b\x14\xfc\x7b\xbf\x96\x74\x4f\xc7\x66\xc3\x3e\x84\x28\x63\xec\xc6\x5d\xae\xf4\xd7\x39\xf8\x5a\xbf\x6f\x6e\xa9\xe8\x9a\xc1\x8f\x50\xf6\x20\xa7\x40\x1e\x15\xc5\x74\x0c\xe2\xaf\x00\x00\x00\xff\xff\x9d\x7b\x7e\x88\xba\x0b\x00\x00") +var _templateDialectGremlinPredicateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x56\x4d\x6f\xe3\x36\x10\x3d\xcb\xbf\x62\x60\x04\xa8\x14\x28\x74\xcf\x05\x72\xd8\x6e\x53\xd4\x40\x11\xa3\x4d\x91\x1e\x82\xc0\xe0\x8a\x23\x9b\x58\x86\x14\xc8\xb1\x72\x10\xf8\xdf\x0b\x92\xb2\x2c\x39\x5e\xd8\x48\xfa\x81\x9e\x2c\x68\x86\x33\x6f\xde\x7b\xf2\xb0\xeb\x40\x60\x2d\x35\xc2\x5c\x48\xae\xb0\xa2\xc5\xc6\xe2\x8b\x92\x7a\xd1\x58\x14\xb2\xe2\x84\x0b\x29\xe6\x70\xe3\xfd\x2c\xab\x77\xba\xca\x09\xae\x85\x53\xec\x0f\xcb\x5b\xb4\x8e\xab\x02\xba\x59\x96\x11\xfb\x85\xbb\xe5\x4f\xb9\x14\xc5\x2c\xf3\xb3\xae\xbb\x01\xd4\x02\xbc\x9f\xcd\x2e\xec\xb1\x30\x8d\xeb\xfb\x84\xd3\x57\xa6\x81\x1f\x6e\xe1\x8a\x3d\x54\xa6\x41\xb6\x6a\x46\x21\x6e\x37\xe3\xd8\x27\xbb\x19\x05\x1d\x19\xcb\x37\x38\x4e\x78\xe8\x5f\x9d\x1b\x22\x9c\x97\x75\x68\xcd\x1e\xb9\x95\x5c\xc8\x2a\x4c\x90\x65\x59\x1b\xca\xbd\xf0\xaf\x98\x3f\x3d\x4b\x4d\x68\x6b\x5e\x61\xe7\x4b\x50\xa8\xf3\xae\x4b\x90\xbc\x2f\x8a\x90\x5c\x1b\x0b\x32\x1c\xb0\x5c\x6f\x10\xda\x58\x3b\xcb\xda\x27\xf9\x0c\xb7\x70\xc8\x7e\x92\xcf\x21\xe0\xfb\xce\x3d\x5f\x07\x2e\x1b\xd6\x75\x50\x71\xa5\x86\xa1\xd8\xaa\xf9\x6c\x04\x46\x72\xbc\x0f\x8d\xdf\xc2\x6d\x19\x0b\xe7\x50\x39\x04\xef\x0f\xdd\xc2\xbb\xd8\xa1\x78\x9f\x42\xb5\x44\x25\xc6\x02\xd5\x63\x8a\x7f\x0e\xd1\xcb\x5c\x92\xff\xca\xbf\xa0\x2a\x23\x11\x35\xfb\x6c\xb4\x23\xae\x09\xbc\x2f\xa1\x61\x77\xbf\xe5\xed\x47\x00\x1e\xbb\xe8\x5b\x20\xcf\x59\xec\xe3\x2e\xd2\x86\xa2\x34\xf7\x52\x1d\x8c\x74\x9e\x80\x33\x92\xb7\x27\x35\xef\x25\x1f\xe4\x4d\x7e\x4a\x0e\xd8\x77\x8d\x4d\x53\xeb\xe2\x02\x63\x4d\x91\x15\x47\x1e\x7d\x87\x3c\x28\x36\xb8\xd8\xf2\x89\x3a\x13\x7e\xef\xc4\x9e\xdc\x18\x53\x01\x69\x8c\xe3\x01\xc9\x21\x2c\xa4\xc5\x8a\xa4\xd1\x21\x65\xbe\xda\xd1\xa8\x6e\x20\x08\xd9\xd2\x2d\x75\xd0\xa5\x2f\x7a\x7c\xec\x16\xe6\x4b\x3d\x1f\x62\x8b\x6b\xe0\xad\x91\x02\x2a\x69\xab\x9d\xe2\x16\x04\x36\xa8\x05\x56\x12\x1d\x5c\x2f\x0e\x25\x12\xb0\x88\xab\x6f\xf0\x16\x5e\x60\xe6\x12\x9f\x2c\xae\x03\x58\x49\xdf\x39\xe0\x1a\x02\x45\xf0\x2a\x69\x0b\x0e\x55\x7d\x63\xb1\x46\x8b\xba\xc2\x12\x88\x7f\x45\xa0\x2d\x02\xbd\x1a\x68\xd1\x92\xac\xa6\xa8\xd2\xc8\x0f\xa8\xea\xdf\xb1\xee\xff\xb4\x88\xfd\x68\x68\x1b\xc5\x4c\x98\x47\x3a\x0e\xde\xc8\x28\x98\x61\xc4\x8b\xf7\x77\xd3\x23\x6f\xe2\x8f\xf9\xdf\x68\x87\x30\xee\xbf\x60\x89\x2b\x99\xa4\x5a\x4f\x93\x06\x07\xbc\xd7\x36\x27\x2b\x4f\xba\xff\x67\xde\x3a\xb6\x44\xc4\x11\x8c\x65\xb1\x86\x17\xe4\xda\x81\x24\x70\x5b\xb3\x53\x02\xbe\x20\x90\xdd\x21\x48\x0d\x46\x23\x98\x3a\xba\x6d\x18\x69\x40\x99\x49\x5d\x82\xd9\x51\x60\x6f\xbd\x66\x4b\xfd\x98\x17\x65\x78\x5a\xed\x28\xf9\x22\xae\xbf\x75\x09\xcd\x61\x03\x06\xd5\x5d\xbf\x05\x9b\x5c\xea\xa2\x7f\x32\x3b\x2a\xf6\x1b\x30\x23\xf6\xe7\x16\x2d\xe6\x31\x16\x0a\xda\xf4\x98\xa5\xe2\xc7\xa6\x4c\xc9\x52\x17\xe5\x90\xb5\xd4\xa7\x93\x42\x9b\x94\x95\x7e\x4e\x7d\x04\xb6\x1f\x28\x9c\x7f\x2b\xe8\xde\xf3\x67\x67\x23\x3b\x1e\xe8\xdc\x87\x95\xe0\x91\xfd\x87\x3e\x31\xae\xa7\x17\x37\x7b\x7a\x27\x5b\xf7\xad\xcb\xcd\xf7\xe9\x7e\x33\x54\x74\x71\xb7\x9c\xe6\x20\x25\x24\x22\xf6\xee\xb8\xc7\xd7\x44\x5b\x93\x27\xa1\x43\xaf\x5b\xe0\x4d\x30\x7f\x4e\xd6\x95\x10\xdf\xc7\x1d\x65\x7b\x3a\xd6\x6b\xf6\x29\x45\x19\x63\xef\xbc\x0a\x18\xfb\xff\x1c\x7c\x65\x3f\x36\xb7\x36\x74\xc9\xe0\x47\x28\x7b\x90\x63\x20\xf7\x86\x72\x3a\x06\xf1\x57\x00\x00\x00\xff\xff\x9f\xef\x8b\x09\x2d\x0c\x00\x00") func templateDialectGremlinPredicateTmplBytes() ([]byte, error) { return bindataRead( @@ -439,7 +439,7 @@ func templateDialectGremlinPredicateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/gremlin/predicate.tmpl", size: 3002, mode: os.FileMode(420), modTime: time.Unix(1565168181, 0)} + info := bindataFileInfo{name: "template/dialect/gremlin/predicate.tmpl", size: 3117, mode: os.FileMode(420), modTime: time.Unix(1565183614, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -504,7 +504,7 @@ func templateDialectSqlByTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlCreateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x58\x5d\x6f\xdb\x36\x14\x7d\x96\x7e\xc5\x9d\xe1\x16\x52\xe0\x30\x69\x1f\xb3\x65\x40\xd7\xa4\x80\xb1\x75\x69\xe3\x74\x7b\x68\x8b\x81\x96\x2e\x1d\x22\x32\xe5\x90\xb4\xe3\xc0\xd0\x7f\x1f\x2e\x65\x59\xb2\x2c\x7f\xc4\x0d\xea\x6d\x98\x5e\x12\xc9\xf7\x8b\xe7\x1e\xde\x43\x69\x36\x83\x18\x85\x54\x08\xad\x58\xf2\x04\x23\x7b\x62\xee\x93\x93\x48\x23\xb7\xd8\x82\x2c\xf3\x67\x33\x68\xf7\xc7\x32\x89\x51\xc3\xd9\x39\x8c\xb8\x89\x78\x02\x6d\xd6\x8b\xd2\x11\xb2\x5f\xe6\xbf\xcc\x0d\x35\x46\x28\x27\xb9\xe5\xe2\xff\x85\x7b\x96\xf9\xbe\x18\xab\x08\x82\x25\xdb\x2c\x83\xa3\x6a\x96\x2c\x0b\xc1\xdc\x27\x3d\x3e\xc1\x20\xb2\x53\x88\x52\x65\x71\x6a\xd9\xdb\xfc\x6f\x08\x81\x33\x67\xbf\xf3\x21\x42\x96\x75\x00\xb5\x4e\x75\x08\x33\xdf\x9b\x70\x0d\x81\xef\x79\x1a\x0d\x85\x60\xd7\x68\xc6\x89\xf5\x3d\xcf\x39\x5c\x57\x32\x9e\xc3\xcb\x6a\x90\x59\x94\x2a\x21\x07\x67\x50\xab\x8c\xe5\xcf\x33\xdf\x0b\x7d\xcf\x4e\x5d\x2e\x5a\x5c\xdd\x2c\xd6\xf4\x1f\xbb\x99\x52\xc5\xa1\xef\x49\xe1\x2c\x7f\x38\x07\x25\x13\xaa\xcc\xd3\x68\xc7\x5a\xd1\xad\x0b\xe2\x7b\x99\xef\x55\x70\xa5\x6a\xbb\xca\xa0\xb6\x0e\x1c\xf6\x81\x47\x77\x7c\x40\xa5\xb1\x1b\xde\x4f\x30\x64\x17\x28\xf8\x38\xb1\x75\xec\x8a\xd4\x17\x79\xfb\x82\x30\xf4\xbd\xd9\xec\x18\x34\x57\x03\x84\xf6\x5f\x1d\x68\x0b\x4a\xd0\x66\xef\x24\x26\xb1\xa1\x2e\x78\x54\x5f\x3d\x0e\x39\xb5\x05\xeb\x59\x3d\x8e\xac\xb3\x25\x9c\x2a\x2b\x28\xca\x65\x3d\x5c\x2d\x92\xee\x05\xb5\xc8\x58\xae\xac\x6b\xcb\xd1\x6a\x86\xd5\x04\x21\x05\xae\x77\x87\x2c\x0b\xa2\x89\xa2\x45\xe0\x50\x97\x02\x54\x6a\xdd\xe3\x71\x92\x10\x32\x90\x65\x94\x09\x15\x85\xdb\x25\xa5\xef\x11\xf6\xb4\xdc\xdc\xc7\xf7\xee\xc7\xa8\x1f\x3b\xc0\xf5\xc0\x10\x54\xc5\x3a\x3f\xd2\xe3\xa0\xec\xe6\xd9\x39\xd8\x29\xbb\x9c\x62\x44\x5d\xee\x40\xc5\xad\x03\x2f\x35\x9a\xf0\xc7\x4d\x5d\xd7\x69\x92\xf4\x79\x74\x17\xcc\x79\x14\x3a\x0e\xc8\x78\x41\x2a\x8d\x86\xfd\xc6\x8d\xcd\x79\xd0\x8d\x83\xad\x44\x6a\x0e\xb9\x02\x67\xf7\x62\x01\x5e\x9b\x75\x2f\x58\xd7\xf4\xac\x96\x6a\x00\x59\x66\xac\x8e\x52\x35\x61\xef\x52\x3d\xe4\xb6\xab\x6c\x40\x05\xbd\x3a\x0d\x09\xd2\xc4\x10\xba\xd2\x3d\x0c\x17\x18\xaf\xf0\x0b\x73\x7e\x5d\xc6\x03\x2c\xe9\x95\xa0\x5a\xa1\x2a\xdd\x63\x9d\x00\xf0\x33\x9c\xe6\xfc\xa2\xb0\x52\x00\x57\x31\x99\x7d\x52\xf2\x7e\x8c\xce\x01\x13\x71\x8d\xc2\xb5\xf7\xe4\x08\xae\x5e\x5f\xc1\x83\xb4\xb7\x60\x30\x11\xa0\x51\xa0\x46\x15\x21\x1c\x9d\xb8\xdc\x9e\x27\x52\x0d\x28\x63\x07\xa9\xab\x72\x97\x3a\xf2\x12\xf2\x22\x2c\x0e\x47\x09\xb7\x8d\x43\xf1\x84\xe0\x42\x6d\x65\xdc\xa2\x95\x1f\xcf\x73\xd6\x39\x44\xfb\xf9\xd3\x28\xe6\x16\x1b\xb7\x0a\xe6\xbb\xba\xb2\x5f\x42\x96\xc7\xf1\xbc\x75\xdb\x0b\xd9\xdb\x34\x19\x0f\xd5\xd2\x26\x43\x19\x97\x9e\x7f\xde\xa2\xc6\x80\x52\x5f\x7e\x6c\x0c\x41\xcd\x5f\x72\x97\x71\x18\x96\x3c\xa7\x6b\x7f\xae\xd3\xb5\x85\x9c\x74\x35\xe0\xf5\xfd\xe0\xda\x88\x16\xb2\x9b\xc7\x11\x36\xe4\xa6\xa7\x75\xe4\x1c\xf0\x6f\x54\x1c\x84\xac\x6b\x68\x16\xed\x5a\xc4\xa1\x00\xe7\x42\x60\x64\x71\x79\xdc\x5c\xa7\x0f\xe6\xcd\xfc\x87\x5a\x41\x7b\x27\x92\x02\x68\x64\x14\xf9\x42\xf8\xe9\x09\xc3\x60\x6b\xba\x97\x97\x5a\x3b\x34\x35\x97\xca\xbe\xe3\x32\xc1\x78\x36\x34\x83\x33\x10\x43\xcb\x7a\x23\x2d\x95\x15\x41\xeb\x4b\x2b\x8f\x3f\x17\x8f\x2f\x2d\x08\x5e\x4c\x42\xe0\x89\x46\x1e\x3f\xd2\x99\x42\xb9\xea\xc0\xa6\xc0\x21\x96\xc2\x4d\x11\x0b\xb9\x5f\xe9\xd6\xca\x3b\x9d\x2d\x2d\x31\x2b\xa6\x95\x9b\x90\x34\x55\x91\xbd\x7f\xfd\x1e\xe0\x90\x03\x88\x62\x72\x4a\x79\x3a\xd7\xc1\x3e\xdd\xbc\x72\x37\xc7\xf3\x22\xbb\xa6\x4b\xbe\x6e\xac\xe7\xf6\x85\x05\x99\x2f\x5c\x8b\x39\xbf\x66\xae\xad\x39\xa7\x6c\xdb\xa8\xf9\x4e\x30\x6b\xfc\x3e\xfc\x5a\x71\xfa\x9c\x17\x97\x65\x5f\x3b\xb0\xab\x79\x9f\xcc\xcb\x6c\x7f\xf0\x64\x8c\xc6\xa9\xd9\xd2\x8c\x2c\xc1\xa8\xc9\x0a\xa9\xc9\xb1\x46\x01\x39\xcc\x06\xec\x2d\x02\x3a\x4d\x93\x0a\xfa\xa9\xbd\x85\x07\xfe\x68\x58\xa9\x33\x95\x34\x48\x79\xea\x69\xaa\x30\x7a\xde\x21\x36\x7d\x33\x51\xaf\x0e\xca\xd3\x67\x13\xca\xbd\x75\x72\x4f\x99\xf4\xff\x59\x7d\xbc\x7a\xfd\xbe\xe8\xe3\xa8\x00\xf2\xc3\xbc\xae\x83\x34\x76\xc4\xae\x74\x10\xee\x2d\xa6\xe5\x42\x9f\x8d\x22\x7b\x1e\x0d\x4a\x7e\x90\xbe\x8f\x3a\xf9\xd0\x7b\xa2\xc8\x17\xc1\xaa\x74\xf9\x26\xb6\x6c\x27\x4b\x0e\xde\xae\x3a\xdf\x28\xf3\xbb\x26\x79\x0e\x8d\xff\x56\x89\x4f\x15\x42\x2a\x60\x55\xe9\x5f\x4c\xf6\xd2\xf9\x3b\x7c\x34\xbb\xad\xa0\x38\x0e\x2c\x6f\xcb\xca\xeb\xc9\x42\x22\x0a\xb5\x59\xd0\xbe\xf2\xea\x95\xa3\x80\x95\x17\xc0\xe2\x65\xec\x8d\x4d\x65\xb0\x7b\x39\x9f\x4f\xbf\xee\x7c\x74\x73\x9f\x1e\xca\x3e\x56\x8a\x5f\x94\x43\x95\x3c\x29\xb9\xdf\x20\x78\xcd\x67\x8e\x7f\xb5\x02\xec\x7b\xda\x6f\xd0\x8d\x15\xd8\x0f\x03\xc9\x26\x44\xbe\xdb\xcb\xd0\x3a\x78\x4a\x2e\xfd\x3f\x36\xff\xab\x63\x53\x35\x7f\x8f\x5b\x6a\xf8\xdb\x74\x38\x94\x36\xd8\xfc\x6d\xad\xf8\xa2\x3a\x7f\x56\xff\x02\xd6\x21\x2b\x3f\xf3\xfd\xf2\xe5\xc6\xdf\xf8\xe9\xbb\x7a\xc6\x29\xbe\x78\x6d\x98\xe3\x6b\x87\xf8\xfc\x60\xd3\x40\x9a\x6d\x94\x59\x86\xa4\xac\xfb\xef\x00\x00\x00\xff\xff\x5f\x7f\x6f\x8c\xb2\x17\x00\x00") +var _templateDialectSqlCreateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x58\x5d\x6f\xdb\x36\x17\xbe\x96\x7e\xc5\x79\x0d\xb7\x90\x02\x87\x49\x7b\x99\x77\x19\xd0\x35\x29\x60\x6c\x6d\xda\xa4\xdd\x2e\xda\x62\x60\xa4\x43\x87\x28\x4d\x39\x24\xed\x3a\x30\xf4\xdf\x87\x43\x59\x96\x2c\xcb\x1f\x75\x83\x7a\x1b\xa6\x9b\x44\xf2\xf9\xe2\x73\x1e\x9e\x87\xd2\x6c\x06\x29\x0a\xa9\x11\x3a\xa9\xe4\x0a\x13\x77\x62\xef\xd5\x49\x62\x90\x3b\xec\x40\x9e\x87\xb3\x19\x74\x6f\xc7\x52\xa5\x68\xe0\xec\x1c\x46\xdc\x26\x5c\x41\x97\xdd\x24\xd9\x08\xd9\x2f\xf3\x5f\xe6\x86\x06\x13\x94\x93\xc2\x72\xf1\xff\xc2\x3d\xcf\xc3\x50\x8c\x75\x02\xd1\x92\x6d\x9e\xc3\x51\x3d\x4b\x9e\xc7\x60\xef\xd5\x0d\x9f\x60\x94\xb8\x29\x24\x99\x76\x38\x75\xec\x65\xf1\x37\x86\xc8\x9b\xb3\x37\x7c\x88\x90\xe7\x3d\x40\x63\x32\x13\xc3\x2c\x0c\x26\xdc\x40\x14\x06\x81\x41\x4b\x21\xd8\x35\xda\xb1\x72\x61\x10\x78\x87\xeb\x5a\xc6\x73\x78\x5a\x0f\x32\x4b\x32\x2d\xe4\xe0\x0c\x1a\x95\xb1\xe2\x79\x1e\x06\x71\x18\xb8\xa9\xcf\x45\x8b\x6b\x9a\xa5\x86\xfe\x63\xef\xa7\x54\x71\x1c\x06\x52\x78\xcb\xff\x9d\x83\x96\x8a\x2a\x0b\x0c\xba\xb1\xd1\x74\xeb\x83\x84\x41\x1e\x06\x35\x5c\xa9\xda\xbe\xb6\x68\x9c\x07\x87\xbd\xe5\xc9\x17\x3e\xa0\xd2\xd8\x7b\x7e\xab\x30\x66\x17\x28\xf8\x58\xb9\x26\x76\x65\xea\x8b\xa2\x7d\x51\x1c\x87\xc1\x6c\x76\x0c\x86\xeb\x01\x42\xf7\xcf\x1e\x74\x05\x25\xe8\xb2\x57\x12\x55\x6a\xa9\x0b\x01\xd5\xd7\x8c\x43\x4e\x5d\xc1\x6e\x9c\x19\x27\xce\xdb\x12\x4e\xb5\x15\x94\xe5\xb2\x1b\x5c\x2d\x92\xee\x05\xb5\xc8\x3a\xae\x9d\x6f\xcb\xd1\x6a\x86\xd5\x04\x31\x05\x6e\x76\x87\x2c\x4b\xa2\x89\xb2\x45\xe0\x51\x97\x02\x74\xe6\xfc\x63\xa9\x14\x21\x03\x79\x4e\x99\x50\x53\xb8\x5d\x52\x86\x01\x61\x4f\xcb\x2d\x7c\xc2\xe0\x7e\x8c\xe6\xa1\x07\xdc\x0c\x2c\x41\x55\xae\xf3\x1d\x3d\x8e\xaa\x6e\x9e\x9d\x83\x9b\xb2\xcb\x29\x26\xd4\xe5\x1e\xd4\xdc\x7a\xf0\xd4\xa0\x8d\xff\xbf\xa9\xeb\x26\x53\xea\x96\x27\x5f\xa2\x39\x8f\x62\xcf\x01\x99\x2e\x48\x65\xd0\xb2\xdf\xb8\x75\x05\x0f\xfa\x69\xb4\x95\x48\xed\x21\x57\xe0\xec\x5f\x2c\xc0\xeb\xb2\xfe\x05\xeb\xdb\x1b\x67\xa4\x1e\x40\x9e\x5b\x67\x92\x4c\x4f\xd8\xab\xcc\x0c\xb9\xeb\x6b\x17\x51\x41\xcf\x4e\x63\x82\x54\x59\x42\x57\xfa\x87\xf1\x02\xe3\x15\x7e\x61\xc1\xaf\xcb\x74\x80\x15\xbd\x14\xea\x15\xaa\xd2\x3d\x36\x09\x00\x3f\xc3\x69\xc1\x2f\x0a\x2b\x05\x70\x9d\x92\xd9\x07\x2d\xef\xc7\xe8\x1d\x50\x89\x6b\x14\xbe\xbd\x27\x47\x70\xf5\xfc\x0a\xbe\x4a\x77\x07\x16\x95\x00\x83\x02\x0d\xea\x04\xe1\xe8\xc4\xe7\x0e\x02\x91\x19\x40\x99\x7a\x48\x7d\x95\xbb\xd4\x51\x94\x50\x14\xe1\x70\x38\x52\xdc\xb5\x0e\xc5\x13\x82\x0b\x8d\x93\x69\x87\x56\x7e\x3c\xcf\xd9\xe4\x10\xed\xe7\x0f\xa3\x94\x3b\x6c\xdd\x2a\x58\xec\xea\xda\x7e\x89\x59\x11\x27\x08\xd6\x6d\x2f\x64\x2f\x33\x35\x1e\xea\xa5\x4d\x86\x32\xad\x3c\xff\xb8\x43\x83\x11\xa5\xbe\x7c\xd7\x1a\x82\x9a\xbf\xe4\x2e\xd3\x38\xae\x78\x4e\xd7\xfe\x5c\xa7\x6b\x0b\x39\xe9\x6a\xc1\xeb\xc7\xc1\xb5\x11\x2d\x64\xef\x1f\x46\xd8\x92\x9b\x9e\x36\x91\xf3\xc0\xbf\xd0\x69\x14\xb3\xbe\x7d\x33\x56\x6a\xd7\x22\x0e\x05\x38\x17\x02\x13\x87\xcb\xe3\xe6\x3a\xfb\x6a\x5f\xcc\x7f\x68\x14\xb4\x77\x22\x29\x80\x46\x46\x99\x2f\x86\x9f\xbe\x61\x18\x6c\x4d\xf7\xf4\xd2\x18\x8f\xa6\xe1\x52\xbb\x57\x5c\x2a\x4c\x67\x43\x3b\x38\x03\x31\x74\xec\x66\x64\xa4\x76\x22\xea\x7c\xea\x14\xf1\xe7\xe2\xf1\xa9\x03\xd1\x93\x49\x0c\x5c\x19\xe4\xe9\x03\x9d\x29\xb4\xaf\x0e\x5c\x06\x1c\x52\x29\xfc\x14\x71\x50\xf8\x55\x6e\x9d\xa2\xd3\xf9\xd2\x12\xf3\x72\x5a\xf9\x09\x49\x53\x15\xd9\xeb\xe7\xaf\x01\x0e\x39\x80\x28\x26\xa7\x94\xa7\x73\x1d\xbc\xa5\x9b\x67\xfe\xe6\x78\x5e\x64\xdf\xf6\xc9\xd7\x8f\xf5\xc2\xbe\xb4\x20\xf3\x85\x6b\x39\xe7\xd7\xcc\xb5\x35\xe7\x94\x6d\x1b\xb5\xd8\x09\x76\x8d\xdf\xdb\x5f\x6b\x4e\x1f\x8b\xe2\xf2\xfc\x73\x0f\x76\x35\xbf\x25\xf3\x2a\xdb\xef\x5c\x8d\xd1\x7a\x35\x5b\x9a\x91\x15\x18\x0d\x59\x21\x35\x39\x36\x28\xa0\x80\xd9\x82\xbb\x43\x40\xaf\x69\x52\xc3\x6d\xe6\xee\xe0\x2b\x7f\xb0\xac\xd2\x99\x5a\x1a\xa4\x3c\xcd\x34\x75\x18\x83\xe0\x10\x9b\xbe\x9d\xa8\x57\x07\xe5\xe9\xa3\x09\xe5\xde\x3a\xb9\xa7\x4c\x86\x7f\xaf\x3e\x5e\x3d\x7f\x5d\xf6\x71\x54\x02\xf9\x76\x5e\xd7\x41\x1a\x3b\x62\x57\x26\x8a\xf7\x16\xd3\x6a\xa1\x8f\x46\x91\x3d\x8f\x06\x15\x3f\x48\xdf\x47\xbd\x62\xe8\x7d\xa3\xc8\x97\xc1\xea\x74\xf9\x2e\xb6\x6c\x27\x4b\x01\xde\xae\x3a\xdf\x2a\xf3\xbb\x26\x79\x0c\x8d\xff\x5e\x89\xcf\x34\x42\x26\x60\x55\xe9\x9f\x4c\xf6\xd2\xf9\x2f\xf8\x60\x77\x5b\x41\x79\x1c\x58\xde\x96\xb5\xd7\x93\x85\x44\x94\x6a\xb3\xa0\x7d\xed\xd5\xab\x40\x01\x6b\x2f\x80\xe5\xcb\xd8\x0b\x97\xc9\x68\xf7\x72\x3e\x9e\x7e\xde\xf9\xe8\xe6\x3f\x3d\x54\x7d\xac\x15\xbf\x28\x87\x2a\xf9\xa6\xe4\x61\x8b\xe0\xb5\x9f\x39\xfe\xd1\x0a\xb0\xef\x69\xbf\x45\x37\x56\x60\x3f\x0c\x24\x9b\x10\xf9\x61\x2f\x43\xeb\xe0\xa9\xb8\xf4\xdf\xd8\xfc\xb7\x8e\x4d\xdd\xfe\x3d\x6e\xa9\xe1\x2f\xb3\xe1\x50\xba\x68\xf3\xb7\xb5\xf2\x8b\xea\xfc\x59\xf3\x0b\x58\x8f\xac\xc2\x3c\x0c\xab\x97\x9b\x70\xe3\xa7\xef\xfa\x19\xa7\xfc\xe2\xb5\x61\x8e\xaf\x1d\xe2\xf3\x83\x4d\x0b\x69\xb6\x51\x66\x19\x92\xaa\xee\xbf\x02\x00\x00\xff\xff\x0a\x50\x51\x40\xb2\x17\x00\x00") func templateDialectSqlCreateTmplBytes() ([]byte, error) { return bindataRead( @@ -519,12 +519,12 @@ func templateDialectSqlCreateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/create.tmpl", size: 6066, mode: os.FileMode(420), modTime: time.Unix(1564868040, 0)} + info := bindataFileInfo{name: "template/dialect/sql/create.tmpl", size: 6066, mode: os.FileMode(420), modTime: time.Unix(1565180278, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _templateDialectSqlDecodeTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x55\xcb\x6e\xdb\x3a\x10\x5d\x4b\x5f\x31\xd7\x50\x2e\xa4\x20\xa5\xf6\x29\xbc\xaa\x11\x40\x9b\xb4\x88\x83\x6e\x1b\x46\x1a\x25\x44\x69\x52\x21\x69\xa7\x01\xcb\x7f\x2f\x48\x49\x31\xe5\x38\xb1\xd0\xee\xf8\x18\xce\x9c\x73\xe6\x41\x6b\xa1\xc1\x96\x09\x84\x45\xc3\x28\xc7\xda\x94\xfa\x89\x97\x0d\xd6\xb2\xc1\x52\x0a\x5c\x80\x73\xa9\xb5\x90\x29\xac\x91\xed\x50\xc1\xe5\x12\x32\x72\x33\xee\x9c\x4b\xd3\xb2\x84\x2b\x25\x37\x37\xf2\x59\x83\xae\xa9\xd0\x60\x1e\x11\xf4\x13\x07\x85\xba\x93\x42\x23\x34\xd4\x50\x60\xc2\x48\xf0\xbe\xc8\x35\xdd\x20\x38\x47\xd2\x76\x2b\x6a\xc8\x27\xfe\x9d\x83\xf3\xd8\xa8\x78\x75\x9e\x2b\x1f\xe1\x5c\x3f\x71\xe2\xb7\x05\xa0\x52\x52\x81\x4d\x13\x6b\x3f\x41\xe6\x43\x7b\x74\x9d\x62\xc2\xc0\x62\xb7\x98\x38\x4d\x93\x1d\x55\x21\x7a\xb0\x73\x0e\xb4\x51\xdb\xda\xf8\xe7\x49\xb5\x02\xf0\x77\xac\x85\x8c\x54\x2b\x52\xe9\xb5\x51\x4c\x3c\x80\x73\x4c\x18\x6b\x01\xb9\xf6\x58\x02\xae\x6a\x45\x6e\x5f\xba\x61\x8b\xa2\x09\xce\x13\x6b\x41\x51\xf1\x80\x90\xfd\xb8\x80\xac\xed\x65\xba\x62\xc8\x1b\xdd\x1b\x04\x90\x1d\xd5\x35\xe5\x90\xb5\x23\xbb\x21\xaa\x54\xe1\x6c\xcb\x39\xbd\xe7\xe8\xd7\x5f\x3b\xc3\xa4\xa0\x7c\x88\xda\x5f\x46\x71\xf7\x80\xda\x77\xe0\x8c\x6b\x97\x26\x65\x19\x52\x22\x55\x83\x0a\x1e\x51\x21\xe8\x47\xb9\xe5\x0d\xdc\x63\x9f\x2b\x0f\x86\x6a\x60\x22\x6c\xef\x02\xcf\x6f\xb4\xfe\x49\x1f\x42\x9e\xbe\x48\xbe\xdd\x08\x7d\x47\xd2\x84\xb5\x5e\x76\x4f\xcf\x67\x83\xac\x6b\x2a\x72\xcf\xee\xff\x48\x5a\x52\xad\x2e\x46\xc6\x27\x44\x99\xbe\x3b\x2a\xd1\xab\xab\x91\x50\xf1\x39\x40\xf8\x6f\x09\x82\xf1\x90\x3f\x85\x66\xab\x84\x3f\x0d\x74\x0f\xea\x89\x54\x2b\x58\xbe\x93\x5e\x6d\x54\x2d\xc5\x8e\x54\x46\xd2\x7c\x4a\xa1\x98\xca\xbc\xbf\x88\xb4\x3d\xcd\xd0\x5b\xf8\xb8\x51\x76\xf7\xe5\xd0\x5f\x54\xfa\x96\x6d\xc6\xe3\x37\xe0\xad\x3d\x52\x35\x4b\x38\xd0\xed\xad\xcd\xab\x6a\x3d\x85\xe0\x9b\xb5\x70\x52\x6e\xf2\x9d\x72\xd6\x04\x59\xe7\xa3\x11\xf8\x9c\x4f\x6a\xb1\xe8\x9f\x9f\xcf\x7c\xef\x8f\x7d\xdb\xb6\xb0\x38\xd3\xe4\x4c\x2f\x06\x90\xf9\xd4\xb8\x80\xdf\x71\x2b\x04\x9d\x47\x6e\xee\xb0\x4c\xf6\xec\x7b\x99\xa3\x8e\x4a\xe7\x33\xfb\x67\x64\x07\x39\x98\x1f\xf6\x54\x76\x63\xae\xf1\x7a\x68\x06\xc1\x78\x1a\x46\xf7\x70\x9e\x7e\x3c\xeb\x37\x54\xbc\xcc\x18\xf6\x01\x17\x67\x35\xf6\x57\xeb\x5a\x76\x48\xd6\xe1\xe0\xaf\xbe\x02\x3d\x3c\xfd\xf0\x2b\x18\x8d\xe6\x7c\x05\xad\x54\xfd\x64\xba\xc6\x5f\x26\x2f\x42\x1d\xcf\xfa\x1e\x92\xf8\x6f\xb8\x1c\x1a\x6c\x94\xdb\x7a\x83\xfd\xe8\x8b\xb3\x33\x81\xf4\x76\x34\x4d\x66\x53\x28\xd2\xc3\x9e\x80\x25\xd0\xae\x43\xd1\xe4\x87\x37\x17\x71\xa0\x22\x8c\xb6\xe3\xc9\xfd\x13\x00\x00\xff\xff\x07\xc9\x26\x4a\xc7\x07\x00\x00") +var _templateDialectSqlDecodeTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x55\xcb\x6e\xdb\x3a\x10\x5d\x4b\x5f\x31\xd7\x50\x2e\xa4\x20\xa5\xf6\x29\xbc\xaa\x11\x40\x9b\xb4\x88\x83\x6e\x1b\x46\x1a\x25\x44\x69\x52\x21\x69\xa7\x01\xcb\x7f\x2f\x48\x49\x31\xe5\x38\xb1\xd0\xee\xf8\x18\xce\x9c\x73\xe6\x41\x6b\xa1\xc1\x96\x09\x84\x45\xc3\x28\xc7\xda\x94\xfa\x89\x97\x0d\xd6\xb2\xc1\x52\x0a\x5c\x80\x73\xa9\xb5\x90\x29\xac\x91\xed\x50\xc1\xe5\x12\x32\x72\x33\xee\x9c\x4b\xd3\xb2\x84\x2b\x25\x37\x37\xf2\x59\x83\xae\xa9\xd0\x60\x1e\x11\xf4\x13\x07\x85\xba\x93\x42\x23\x34\xd4\x50\x60\xc2\x48\xf0\xbe\xc8\x35\xdd\x20\x38\x47\xd2\x76\x2b\x6a\xc8\x27\xfe\x9d\x83\xf3\xd8\xa8\x78\x75\x9e\x2b\x1f\xe1\x5c\x3f\x71\xe2\xb7\x05\xa0\x52\x52\x81\x4d\x13\x6b\x3f\x41\xe6\x43\x7b\x74\x9d\x62\xc2\xc0\x62\xb7\x98\x38\x4d\x93\x1d\x55\x21\x7a\xb0\x73\x0e\xb4\x51\xdb\xda\xf8\xe7\x49\xb5\x02\xf0\x77\xac\x85\x8c\x54\x2b\x52\xe9\xb5\x51\x4c\x3c\x80\x73\x4c\x18\x6b\x01\xb9\xf6\x58\x02\xae\x6a\x45\x6e\x5f\xba\x61\x8b\xa2\x09\xce\x13\x6b\x41\x51\xf1\x80\x90\xfd\xb8\x80\xac\xed\x65\xba\x62\xc8\x1b\xdd\x1b\x04\x90\x1d\xd5\x35\xe5\x90\xb5\x23\xbb\x21\xaa\x54\xe1\x8c\x71\x4e\xef\x39\xfa\xf5\xd7\xce\x30\x29\x28\x1f\xa2\xb6\xe4\x7a\xcb\x79\x14\x77\x0f\xa8\x7d\x07\xce\xb8\x76\x69\x52\x96\x21\x25\x52\x35\xa8\xe0\x11\x15\x82\x7e\x94\x5b\xde\xc0\x3d\xf6\xb9\xf2\x60\xa8\x06\x26\xc2\xf6\x2e\xf0\xfc\x46\xeb\x9f\xf4\x21\xe4\xe9\x8b\xe4\xdb\x8d\xd0\x77\x24\x4d\x58\xeb\x65\xf7\xf4\x7c\x36\xc8\xba\xa6\x22\xf7\xec\xfe\x8f\xa4\x25\xd5\xea\x62\x64\x7c\x42\x94\xe9\xbb\xa3\x12\xbd\xba\x1a\x09\x15\x9f\x03\x84\xff\x96\x20\x18\x0f\xf9\x53\x68\xb6\x4a\xf8\xd3\x40\xf7\xa0\x9e\x48\xb5\x82\xe5\x3b\xe9\xd5\x46\xd5\x52\xec\x48\x65\x24\xcd\xa7\x14\x8a\xa9\xcc\xfb\x8b\x48\xdb\xd3\x0c\xbd\x85\x8f\x1b\x65\x77\x5f\x0e\xfd\x45\xa5\x6f\xd9\x66\x3c\x7e\x03\xde\xda\x23\x55\xb3\x84\x03\xdd\xde\xda\xbc\xaa\xd6\x53\x08\xbe\x59\x0b\x27\xe5\x26\xdf\x29\x67\x4d\x90\x75\x3e\x1a\x81\xcf\xf9\xa4\x16\x8b\xfe\xf9\xf9\xcc\xf7\xfe\xd8\xb7\x6d\x0b\x8b\x33\x4d\xce\xf4\x62\x00\x99\x4f\x8d\x0b\xf8\x1d\xb7\x42\xd0\x79\xe4\xe6\x0e\xcb\x64\xcf\xbe\x97\x39\xea\xa8\x74\x3e\xb3\x7f\x46\x76\x90\x83\xf9\x61\x4f\x65\x37\xe6\x1a\xaf\x87\x66\x10\x8c\xa7\x61\x74\x0f\xe7\xe9\xc7\xb3\x7e\x43\xc5\xcb\x8c\x61\x1f\x70\x71\x56\x63\x7f\xb5\xae\x65\x87\x64\x1d\x0e\xfe\xea\x2b\xd0\xc3\xd3\x0f\xbf\x82\xd1\x68\xce\x57\xd0\x4a\xd5\x4f\xa6\x6b\xfc\x65\xf2\x22\xd4\xf1\xac\xef\x21\x89\xff\x86\xcb\xa1\xc1\x46\xb9\xad\x37\xd8\x8f\xbe\x38\x3b\x13\x48\x6f\x47\xd3\x64\x36\x85\x22\x3d\xec\x09\x58\x02\xed\x3a\x14\x4d\x7e\x78\x73\x11\x07\x2a\xc2\x68\x3b\x9e\xdc\x3f\x01\x00\x00\xff\xff\x2b\xbc\xe3\xde\xc7\x07\x00\x00") func templateDialectSqlDecodeTmplBytes() ([]byte, error) { return bindataRead( @@ -539,7 +539,7 @@ func templateDialectSqlDecodeTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/decode.tmpl", size: 1991, mode: os.FileMode(420), modTime: time.Unix(1564480239, 0)} + info := bindataFileInfo{name: "template/dialect/sql/decode.tmpl", size: 1991, mode: os.FileMode(420), modTime: time.Unix(1565180221, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -624,7 +624,7 @@ func templateDialectSqlMetaTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlPredicateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x57\x5d\x4f\xeb\x46\x10\x7d\x36\xbf\x62\x84\x22\xd5\x46\x61\x03\x01\x5e\x2a\x51\x09\x51\x90\xd2\x16\xd2\x8a\xab\xf6\x01\xa1\xab\xad\x3d\x0e\x7b\x6b\x76\xcd\xee\x26\x08\xf9\xfa\xbf\x57\xb3\xde\xf8\x23\x71\x20\x37\xa5\xea\x4b\x9f\xb0\xb3\xb3\x33\xe7\x9c\x39\xb3\x5e\x8a\x02\x12\x4c\x85\x44\xd8\x4f\x04\xcf\x30\xb6\x23\xf3\x9c\x8d\x72\x8d\x89\x88\xb9\xc5\x91\x48\xf6\xe1\xb0\x2c\xf7\x82\x74\x2e\xe3\xd0\xc0\x81\x79\xce\xd8\x1d\x52\xa4\xd2\x11\x14\x7b\x41\x50\x14\x87\x20\x52\x18\xb0\xc9\x8f\x6c\x62\xee\xac\x16\x72\x06\x65\x29\x92\x21\x7c\x86\xef\xcf\xc1\x58\x1d\x2b\xb9\x60\x17\x56\x89\x50\x24\x11\xc5\xa3\x4c\x80\xb2\x06\x86\xfd\xf1\x88\x1a\x43\x4a\x7b\xf5\x5b\x68\xd8\x65\x58\x14\x55\xae\x4b\x25\x8d\xe5\xd2\x42\x59\x46\x43\x10\x49\x14\xed\x05\xe5\x5e\x6b\xf7\xde\x16\xe8\x47\x2a\x37\x9e\x01\xed\x1c\xa8\x9c\x20\x0d\xd8\x5d\xac\x72\x64\xd3\xbc\xb5\xc4\xf5\xac\xbd\x76\xa1\x67\xdb\x32\x57\x39\xfb\x9d\x6b\xc1\x13\x11\x57\xac\x82\xd1\x88\x16\xa4\xb2\xc0\xf5\x6c\xfe\x84\xd2\x1a\x78\x41\x8d\x90\x6b\xb5\x10\x09\x26\x43\xe0\x79\x4e\x3c\xec\x23\xc2\xf5\xc5\x2f\x77\x57\x10\x7b\xbe\x66\xe8\x33\x18\x21\x63\x84\x17\x84\x98\xcb\xef\x2c\x6d\xc8\x5e\x61\x7f\x72\x0b\x61\xb4\xcf\xe0\xd3\xa3\x30\xf0\x22\xb2\x0c\x9e\xf8\x5f\x08\x96\x5e\x6b\xe6\x90\xf2\xcc\xbc\x32\x4a\x24\x52\xc8\x50\x3a\x55\x89\x61\x59\x46\x70\x7e\x0e\x47\x8e\x40\x57\xff\x6b\x9e\x19\x0c\x49\xe6\x20\x08\x34\xda\xb9\x96\xf4\xe8\x08\x2d\x48\x1a\x2a\x14\xde\x3f\x08\x69\x51\xa7\x3c\xc6\xa2\x1c\xae\xe6\x76\x9b\x53\xa5\x41\xd0\x06\xcd\xe5\x0c\x61\xe1\x6b\x15\x45\x9f\x4f\x16\xf7\xe2\x81\x9c\xb2\x62\x94\x26\xe7\xbd\x78\x88\x8a\x02\x30\x33\xe8\xc3\xe1\x1c\x3a\xcb\xb4\xba\x34\x94\x83\xeb\x4c\x42\xf1\x3d\xf5\x9c\x26\xbd\xde\x6c\xd1\x58\xe6\xe8\xb3\x29\x85\xa9\x9c\xdd\xf2\x27\xc2\xf3\x86\x65\x3d\xdf\xae\x3b\x16\x8c\xb1\x86\x8d\x48\x6a\xec\x3b\xd8\x3b\x15\x98\x25\x6d\x77\xa7\x6d\x03\x5f\xd3\xea\x7b\x16\xde\x30\x7f\xe9\x0a\x95\xc5\xae\xe8\x56\xe7\x6f\x13\xc2\xff\x87\x73\xf7\xe1\xfc\x56\xa7\x76\x9b\x5b\xb9\x94\xd4\x70\xb1\x22\xf3\x4a\x0d\x61\xd1\x6b\x60\xef\x5f\x57\xef\x9f\x98\x17\x93\x19\x8e\x1e\x79\xc7\x1d\xd8\xee\xf1\x55\x32\xc3\x6d\x9b\x8c\xec\x66\x7c\x03\xbe\xbf\xf6\xd8\x8d\x36\xfb\xc4\xff\xcc\x30\x74\x8a\x2d\x55\xa9\x64\x7d\xce\xd8\x44\x56\xcf\x81\x3d\xde\x34\xbf\xd5\x7a\x53\xd3\x45\x21\xfb\xf5\xe7\x56\xd4\xbd\x97\x08\xd9\xc4\x4c\xe4\x02\xb5\x9b\xea\xe3\x66\xc0\x8f\x6a\x89\x1e\x22\x76\xad\xd5\x93\x6b\x4c\x85\xac\xca\xe7\x9e\xdb\x85\x7d\xe5\xea\x4f\xb4\x72\x9a\x29\x5d\x91\x9d\x42\xc8\x65\x42\xcf\xd3\xf1\xb4\x53\x3f\x72\x7d\x19\x1d\x00\x05\x7d\xfd\x0a\x21\x05\xbc\x08\xfb\x08\xc2\x03\x24\xe5\x23\x38\x18\xbd\xab\x16\x41\xbd\x55\xf6\x76\x9e\x65\x61\xad\x13\xb2\x4b\x95\xcd\x9f\x64\x07\x72\x07\xa6\xaf\x3f\x1d\xdf\x74\xeb\x73\x63\x54\xbc\x7d\xf5\x0f\xe8\xd5\x3a\x52\x56\x45\x06\x5b\xb6\x62\x19\xbe\xae\xc7\x46\x29\x7a\xbb\xe7\xa7\x73\xc7\x11\x21\xf5\x3e\x7e\x4c\x88\x81\xfb\x4a\x1f\x57\x93\x3c\xf8\x42\x2f\x47\xee\xe5\xb0\xc7\xd5\x55\xfc\x32\x82\xc2\xeb\xad\xc4\xe8\x70\x63\x43\xed\xd8\xfd\x54\x8b\xed\x2f\x03\xae\x86\x44\x18\x54\x3f\xbb\x06\xbc\xe6\xbe\x0b\xcb\x74\x15\x4c\x64\x1e\xc6\x6a\x87\xea\x54\xce\x78\xf5\x1e\x17\xd6\xac\x35\xe8\x2a\x3c\x27\x5d\x3c\x1b\x9a\xef\x42\x4f\x97\xa1\xde\x57\xf6\xa4\x1e\x83\xb5\x83\x60\xf0\xc5\x8d\xb9\x37\x8d\x73\x98\x3d\xf1\x6f\x3f\x29\x21\x43\x3b\xf6\x6f\x53\xf9\x76\x22\xe1\x12\x0d\xc1\x8e\xeb\x20\x27\xcd\x8a\xed\x2b\x88\x67\x2b\x10\xfd\x39\x63\xc7\xf5\x5d\xec\xf3\x10\xf2\xe6\x3a\x46\xfe\x32\xfe\x0b\x93\x87\xf6\x2c\xaa\x2f\x79\xf6\xd4\x6d\x5d\x52\x3d\x5b\x3b\x0c\x26\x32\xdc\x3c\x83\x60\x4f\xa3\xff\xe4\xb8\x6a\xfc\xd5\x19\xfe\x3e\xc5\x56\x8f\xe0\x7f\xdf\x8a\xfd\xe6\xea\xf5\xe6\x76\xfd\x1a\x37\xfd\xda\xd4\x9a\xbe\x73\x89\xcc\xf4\xa1\xc7\xf4\x06\xd5\x7b\x8e\xdc\x2d\xcf\xda\x8f\x62\xdf\x63\xcc\x16\xf3\xdd\x4e\x62\x2e\xdf\xff\x3f\xb8\x1f\xbb\xdb\xef\x09\xe4\xa1\x21\x1c\xdf\x5e\x5e\xe9\xad\xaa\x8b\x37\xab\x8b\x14\x04\xfc\xd0\xba\x5c\x4e\x75\xd8\xa8\xb9\x33\x36\xa9\xec\xbb\xe0\xf2\xd0\xd0\x87\x33\x5c\xbb\x26\xfe\x1d\x00\x00\xff\xff\x94\x88\xdf\x11\x80\x10\x00\x00") +var _templateDialectSqlPredicateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x57\x4d\x6f\xe3\x36\x10\x3d\xcb\xbf\x62\x10\x18\xa8\x14\x38\x74\xe2\x24\x97\x02\x29\x10\xa4\x09\xe0\xb6\x89\x5b\x78\xd1\x1e\x82\x60\xc1\x4a\x23\x9b\x5b\x86\x54\x48\xda\x41\xa0\xd5\x7f\x2f\x48\xd1\xfa\xb0\xe5\xc4\xf5\x26\xe8\x65\x4f\x16\xc5\xe1\xcc\x9b\x37\x6f\x46\x74\x9e\x43\x82\x29\x13\x08\x07\x09\xa3\x1c\x63\x33\xd4\x4f\x7c\x98\x29\x4c\x58\x4c\x0d\x0e\x59\x72\x00\x47\x45\xd1\x0b\xd2\x85\x88\x43\x0d\x87\xfa\x89\x93\x29\x5a\x4b\xa9\x22\xc8\x7b\x41\x90\xe7\x47\xc0\x52\xe8\x93\xf1\xcf\x64\xac\xa7\x46\x31\x31\x83\xa2\x60\xc9\x00\x3e\xc3\x8f\x17\xa0\x8d\x8a\xa5\x58\x92\x4b\x23\x59\xc8\x92\xc8\xda\xa3\x48\xc0\x7a\x0d\x34\xf9\x6b\x8e\x0a\x43\xeb\xf6\xfa\x8f\x50\x93\xab\x30\xcf\x4b\x5f\x57\x52\x68\x43\x85\x81\xa2\x88\x06\xc0\x92\x28\xea\x05\x45\xaf\x71\xba\xb7\x03\xfa\xa1\xcc\xb4\xcf\xc0\x9e\xec\xcb\xcc\x42\xea\x93\x69\x2c\x33\x24\x93\xac\xb1\x45\xd5\xac\xb9\x77\xa9\x66\x8d\x4d\x6d\xa4\xa2\x33\x6c\x1a\x4c\xfd\xab\x1d\xe9\x91\x19\xf9\x93\x2a\x46\x13\x16\x97\xa9\x07\xc3\xa1\xdd\x10\xd2\x00\x55\xb3\xc5\x23\x0a\xa3\xe1\x19\x15\x42\xa6\xe4\x92\x25\x98\x0c\x80\x66\x99\x4d\xd6\xcc\x11\x6e\x2e\x7f\x9b\x5e\x43\xec\x49\xd1\x03\xef\x41\x33\x11\x23\x3c\x23\xc4\x54\xfc\x60\xec\x01\xfe\x02\x07\xe3\x3b\x08\xa3\x03\x02\x9f\xe6\x4c\xc3\x33\xe3\x1c\x1e\xe9\x3f\x08\xc6\x2e\x2b\x7a\x20\xa5\x5c\xbf\x10\xeb\x88\xa5\xc0\x51\x38\xea\x2d\x0d\x45\x11\xc1\xc5\x05\x1c\xbb\x04\xda\x45\xba\xa1\x5c\x63\x68\x6b\x11\x04\x81\x42\xb3\x50\xc2\x3e\xba\x84\x96\x96\x1e\x1b\x28\xbc\x7f\x60\xc2\xa0\x4a\x69\x8c\x79\x31\x58\xf7\xed\x0e\xa7\x52\x01\xb3\x07\x14\x15\x33\x84\xa5\x8f\x95\xe7\x5d\x62\x5a\xde\xb3\x07\x2b\xa7\x35\x35\xd5\x3e\xef\xd9\x43\x94\xe7\x80\x5c\xa3\x37\x87\x0b\x68\x6d\xdb\xdd\x95\xea\x1c\x5c\xa7\x24\x6b\xdf\x11\xcf\x71\xd2\x29\xe0\x46\x1a\x2b\x1f\x5d\x5a\xce\x73\x88\x29\xe7\x95\x70\xc8\x24\xbb\x92\x09\x3a\x01\x16\xc5\x2b\x3a\xf7\xf9\xb7\xd5\xb2\x24\x84\xd4\xd9\xb1\xa4\xca\x65\x8f\x9e\x48\x19\xf2\xa4\xd9\x12\x69\x53\xd4\x37\x76\xf7\x2d\x49\x6f\x69\xda\x74\x2d\x95\xe5\xbe\xe8\xd6\x9b\x76\x1b\xc2\xef\x1d\xfd\xc1\x1d\xfd\xad\xf2\x6e\x2b\xa2\x94\xb6\x65\xc7\x52\x77\xc7\xb8\x67\x6e\x00\xcb\x4e\xd5\x7b\xd1\xbb\xf8\xdf\xa2\x78\x4c\x66\x38\x9c\xd3\x96\xa4\x5a\x75\xbf\x4e\x76\x2f\x3a\x92\xdb\xd1\x2d\xf8\x7a\x9b\x13\x37\x1f\xc8\x27\xfa\x37\xc7\xd0\x31\xb8\x62\xa9\xa4\xf9\x89\x93\xb1\x28\x9f\x03\x73\xb2\xad\xe9\xcb\xfd\x3a\xa6\xb3\x42\xf2\xfb\xaf\x0d\xab\x7b\x4f\x11\x92\xb1\x1e\x8b\x25\x2a\x37\x0a\x4e\xea\xa9\x70\x5c\x51\xf4\x10\x91\x1b\x25\x1f\x5d\xa1\x4a\x64\xa5\x3f\xf7\xdc\x0c\xec\x23\x97\x3f\xd1\xda\x48\x94\xaa\x4c\x76\x02\x21\x15\x89\x7d\x9e\x8c\x26\xad\xf8\x91\xab\xcb\xf0\x10\xac\xd1\xd7\xaf\x10\x5a\x83\x67\x66\xe6\xc0\x3c\x40\xcb\x7c\x04\x87\xc3\x37\xd9\xb2\x50\xef\xa4\xb9\x5b\x70\x1e\x56\x3c\x21\xb9\x92\x7c\xf1\x28\x5a\x90\x5b\x30\x7d\xfc\xc9\xe8\xb6\x1d\x9f\x6a\x2d\xe3\xdd\xa3\xbf\x43\xad\x36\x91\x92\xd2\x32\xd8\xb1\x14\x2b\xf3\x4d\x3e\xb6\x52\xd1\x59\x3d\xdf\xad\x7b\xb6\x88\x65\xef\xfd\xdb\xc4\x66\xe0\x3e\xf5\x27\x65\x27\xf7\xbf\xd8\xc5\xb1\x5b\x1c\x75\xa8\xba\xb4\x5f\x59\x58\xf3\xea\xa8\xcd\xe8\x68\x6b\x41\xcd\xc8\xbd\xaa\xc8\xf6\x37\x0a\x17\x43\x20\xf4\xcb\xd7\xae\x00\x2f\x99\xaf\xc2\xca\x5d\x09\x13\x89\x87\xb1\x5e\xa1\xca\x95\x13\x5e\x75\xc6\x99\xd5\x7b\x35\xba\x12\xcf\x69\x1b\xcf\x96\xe2\x3b\xd3\xb3\x95\xa9\xd7\x95\x39\xad\xda\x60\x63\x10\xf4\xbf\xb8\x36\xf7\xa2\x71\x0a\x33\xa7\x7e\xf5\x8b\x64\x22\x34\x23\xbf\x9a\x88\xd7\x1d\x31\xe7\x68\x00\x66\x54\x19\x39\x6a\xd6\x64\x5f\x42\x3c\x5f\x83\xe8\xe7\x8c\x19\x55\x17\xba\xcf\x03\xc8\xea\x3b\x9d\xd5\x97\xf6\x5f\x9c\x2c\x34\xe7\x51\x75\x53\x34\x67\xee\xe8\x2a\xd5\xf3\x8d\x61\x30\x16\xe1\xf6\x1e\x04\x73\x16\xfd\x2f\xe3\xaa\xd6\x57\xab\xf9\xbb\x18\x5b\x1f\xc1\x1f\x2f\xc5\x6e\x71\x75\x6a\x73\xb7\x7a\x8d\xea\x7a\x6d\x2b\x4d\xd7\x5c\xb2\x62\x7a\xd7\x31\xbd\x85\xf5\x8e\x91\xbb\xe3\xac\x7d\xaf\xec\x3b\x84\xd9\xc8\x7c\xbf\x49\x4c\xc5\xdb\xff\xb8\xbb\xb1\xbb\xf3\x3e\x81\x2c\xd4\x16\xc7\x7f\x0f\x2f\xd5\x4e\xd1\xd9\xab\xd1\x59\x0a\x0c\x7e\x6a\x5c\x36\x27\x2a\xac\xd9\xdc\x1b\x9b\x90\xe6\x4d\x70\x59\xa8\xed\x87\x33\xdc\xb8\x26\xfe\x1b\x00\x00\xff\xff\xb6\xb6\x8e\x9a\xea\x10\x00\x00") func templateDialectSqlPredicateTmplBytes() ([]byte, error) { return bindataRead( @@ -639,7 +639,7 @@ func templateDialectSqlPredicateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/predicate.tmpl", size: 4224, mode: os.FileMode(420), modTime: time.Unix(1565168189, 0)} + info := bindataFileInfo{name: "template/dialect/sql/predicate.tmpl", size: 4330, mode: os.FileMode(420), modTime: time.Unix(1565183595, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -664,7 +664,7 @@ func templateDialectSqlQueryTmpl() (*asset, error) { return a, nil } -var _templateDialectSqlUpdateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5d\x6f\xdb\x3a\xd2\xbe\x96\x7f\xc5\xbc\x46\x9a\x23\x05\xae\x92\xf6\x32\xe7\x75\x81\x6e\x93\x02\xc1\xa2\x75\x4f\xdc\xb3\x7b\x91\x13\x14\xb4\x34\x4a\x88\xc8\x94\x43\xd2\x4e\xb2\x86\xfe\xfb\x62\x48\x7d\x50\xb2\x9c\xda\x71\xd0\xe6\xa0\x7b\x11\xc4\x92\x48\xce\xd7\x33\xcf\x0c\x29\x2d\x97\x10\x63\xc2\x05\x42\x3f\xe6\x2c\xc5\x48\x1f\xaa\xdb\xf4\x70\x3e\x8b\x99\xc6\x3e\xe4\x79\x6f\xb9\x84\xbd\xd9\xcd\x15\x1c\x0f\x61\x2f\x1c\x47\xd9\x0c\xc3\x2f\x2c\xba\x61\x57\x58\x3e\x9d\xcc\x79\x1a\xa3\xa4\x11\x33\xa6\x22\x96\x56\x03\xff\x51\x3c\x29\x06\x4a\x8c\x90\x2f\xec\xc8\xea\x77\x35\xbd\x18\x94\x09\xa4\xe7\xd7\x4c\x8d\xe7\x49\xc2\xef\xeb\x01\xfd\x91\x28\x55\x7a\x0d\x7b\xff\x41\x99\xd1\xc0\x23\xc8\xf3\xe5\x12\x78\x62\xa7\x9a\x0b\xfb\x70\x08\x7d\xc1\xd3\xbe\xbd\x85\x22\xae\xa6\x4a\xd4\x34\xb3\x2f\xfa\x5d\x73\xe9\x29\xd9\x7a\x5e\x6a\xe8\xce\xef\x25\x73\x11\x81\xdf\xb0\x26\xcf\xe1\xc0\xf5\x43\x9e\x07\xa0\x6e\xd3\x31\x5b\xa0\x1f\xe9\x7b\x88\x32\xa1\xf1\x5e\x87\x1f\xec\xff\xa0\x9c\xae\x69\x66\x43\xbc\x59\x26\xfc\xcc\xa6\x85\x2e\x98\x2a\xfa\xc5\x85\xae\x34\x18\x00\x4a\x49\x7f\x99\x0c\x60\xd9\xf3\x14\x52\xd0\x32\xe3\x53\x75\x9b\x86\x63\x73\x6d\x24\x38\x71\x0a\x1b\x62\x3e\x64\xe9\x7c\x2a\x54\x18\x86\xb5\x0c\x33\xe1\xec\x84\x94\x54\x9a\x09\xed\x5a\x1d\x84\x1f\x65\x36\xf5\x69\xf9\xaf\x6c\x92\xe2\xca\xea\xe6\x6e\x10\xf4\x3c\x72\x6f\x2d\xa7\xe7\x79\xed\x91\x67\x27\x6d\xdf\x85\x3c\x0e\xfc\xd2\x8a\x62\x89\x42\xa7\x9e\xe7\x25\x99\x84\x6f\x03\x98\x19\xc8\x30\x71\x85\xd0\x9e\x3e\x93\x18\xf3\x88\x69\x54\xe4\x0e\xcf\x9b\xb9\x8b\x79\x79\xb1\xa0\x8d\x9e\x27\xb3\x3b\x45\x4b\xed\x93\x2d\xe7\xd9\x9d\x5a\xe6\x3d\xef\x76\x8e\xf2\x61\x00\x4c\x5e\x99\x67\xe5\xf4\xf0\x0f\xba\xef\x07\x3d\x8f\x27\xc6\xe9\xc3\x15\xd9\xb1\xa4\x5f\xc5\xc0\x48\xdf\x0f\xc0\x59\x6b\x00\x24\x2d\xf8\xdd\xcc\xfd\xbf\x21\x08\x9e\x1a\x0d\x25\xea\xb9\x14\x50\xc1\xb4\x88\x69\x8f\x74\x8d\x31\x41\x69\xe6\x85\x1f\xd2\x4c\x21\x49\x5f\x30\x09\x3c\x56\x70\x71\xc9\x85\xee\x19\x8f\x98\x01\x9f\xf1\x5e\xfb\x06\x03\xc5\x10\x30\xcf\x57\x63\x60\x83\xe0\xc0\x19\x86\xb0\xdf\x40\x5a\x94\x89\x84\x5f\x1d\xaf\xd8\x67\xef\x9b\x35\x0a\x1f\x1c\x5b\x27\xb8\xab\x19\x70\x90\x2f\xfd\x6e\x7b\xbb\x2d\x4e\xa6\x3a\x3c\x25\x14\x27\x7e\xbf\xa4\x98\x3c\x3f\x86\x84\xf1\x14\x63\x50\x11\x13\x82\x8b\x2b\x32\x95\xec\xca\xc0\x55\xf8\x18\x5e\x2d\xfa\xc6\x6b\x14\x63\xcf\x2a\x18\x43\x87\x6e\xa5\x33\x08\xda\x67\x6a\xac\x25\xad\x99\xe7\x3c\xf6\x83\x1a\xfb\x67\x27\x75\x82\x7b\x2d\x00\x3a\x86\x1b\xaf\x8f\x23\x26\xfc\x7d\x1e\x3f\x93\x9d\x12\x59\x4c\x2a\xf1\xb8\xc3\x26\x17\xb9\x1e\x41\x60\x08\x6c\x36\x43\x11\xfb\x3c\x56\x03\xe0\x71\xd0\x2b\x01\xde\x08\xb8\xba\xe3\x3a\xba\x06\x41\x4a\xa7\x28\x68\x74\xf0\xbb\xd1\x31\x62\x0a\x41\xc0\x70\x08\x47\xc7\xbd\x2d\x35\x76\x03\x00\x22\xd3\x90\x64\x73\x11\xc3\x1d\xd7\xd7\xb5\xfa\x1d\xc9\x5d\x8b\x7d\x07\x6f\xb6\x96\x3a\xcd\x24\x82\xbe\x66\x02\xc8\xbc\x86\x0e\x46\xb2\xbe\x46\x50\x74\xe3\x3b\x2a\xe4\x6d\x66\xe1\x49\xe5\x1b\xe3\x0f\x1b\xc3\x2e\xd5\x04\x4f\x57\x99\x64\xb9\x3c\x3c\x20\xaf\xeb\x6b\x94\xf8\x9b\x02\x95\x4d\x51\x5f\x53\x28\x75\x06\xb6\x7c\x0e\x40\x69\x26\x35\x30\xd0\x92\x09\xc5\x22\xcd\x33\x11\xc2\xc1\x21\xcd\x27\xb2\x70\x12\xaa\x83\x55\xbe\xde\x13\xa5\xd4\xf4\xb3\x21\x85\x54\x88\xff\xc8\x31\x8d\x95\x35\x96\x08\xc2\x27\xfb\xac\x66\x30\xc9\xb2\xd4\x9a\xab\x4c\xd5\x38\x47\x35\x4f\x89\x3c\xbc\xb2\x88\xd9\x6a\xf2\xa7\x19\xbe\x86\xef\xc3\x7f\x93\xed\xa6\x2c\x9c\x89\x33\xa1\x55\x57\xd5\x69\x17\x15\x82\x2d\x55\x1e\xaa\x16\x5e\x50\x80\xdc\x32\xfb\xde\xb7\x01\xec\x25\xb6\xd1\x70\x95\x27\x07\xb4\x7d\x44\xd7\x49\x38\xd6\x72\x1e\x69\x33\x96\x00\xd1\x48\xc6\xc2\xd2\x21\x68\x39\x47\x73\xa7\x30\x2d\x1c\x63\x67\x7d\xdc\x4b\x9a\x7a\x1e\x6c\x22\xd3\xe4\x6a\x07\xe5\xd6\xf7\x92\xf0\xf3\x3c\x4d\xc9\x61\xd5\xa3\x15\x42\xa6\xa5\xcb\xd6\x29\xa9\xf0\xbd\x8a\x8c\x2e\x0d\x6a\x69\x0e\x69\x6d\x21\x63\x23\x33\x1d\x21\xa2\xba\x6e\x5e\xae\x12\x56\x52\xe4\x81\x0d\x48\xab\xca\x96\xc1\xa8\x8a\xac\xcb\xb4\xfa\x3e\x3c\xbd\xc7\xa8\xa3\xa4\xee\x4b\xdc\xb8\xc4\xc8\x2c\x4d\x27\x2c\xba\xf1\x8b\x5c\xab\x78\xd5\xe5\x02\x93\x2a\xa7\xf1\x15\x2a\xd3\xf1\x1c\x1e\x00\x0a\x6d\xa8\x25\x9b\x6b\x48\x0c\x0c\x07\x30\x99\xdb\x7b\x80\x66\xa4\x4d\x61\x93\x55\xed\x0c\x6a\x72\x44\x03\xda\x68\xa1\x5d\x0a\x73\x4a\x35\x86\x9f\xde\x7e\xaa\xc1\x4e\xbc\xd4\x8e\x8a\xc4\x69\xb6\xc0\xd8\x09\x22\x96\x41\x0c\xe0\x5d\x49\x5f\x66\xc5\x3d\xe6\xf4\xc5\x7b\x13\xba\x78\x53\x37\xba\x18\x9e\xa9\x33\xb1\x40\x59\xb5\x7d\x0c\xaa\x01\x7b\x13\xa8\x66\x3a\x91\x46\x2a\x3e\xc7\x43\x98\xb2\x1b\xf4\x4d\x1f\x32\xd8\x5a\x49\x9b\x29\xd4\xbd\x20\x8f\xd7\xb7\x73\x8f\x2c\x51\x98\x68\x6c\xd4\x38\x9d\xa5\x84\xad\x8e\x6d\xcb\x61\x94\x91\x7d\x9a\xc7\x7d\x72\xfa\xeb\x12\xbe\xd8\x28\xa1\x68\x6a\x28\xda\xea\x50\xf4\x10\x2b\xad\xe0\x6d\x1a\x9e\x60\x8a\x1d\x14\x48\xd7\x68\x89\xd0\x61\x8d\x20\xb4\xa2\x36\x62\x46\x0c\xbf\xfc\xd3\x99\x7b\x61\x63\x91\xe7\x97\x35\x47\xee\xba\xdc\xc4\x2e\x87\xad\xf5\x9c\xa4\xdb\x29\xeb\x36\x4f\x3b\x2f\x6f\x10\x25\xd2\x3e\x25\x39\xc7\xa4\x4c\x3a\xc2\xbf\x49\x30\x85\x69\x02\x92\xda\x60\x14\x11\x9a\x4c\x33\x03\xbe\x8e\x4e\x46\xc7\x30\x57\x08\xa3\x73\xe0\xc2\xd4\x7d\xd3\x56\xb0\x49\xb6\xc0\xb2\xaa\xb6\x63\xb8\x43\x08\x77\x76\x7a\xcb\xe7\x3b\x63\xa2\x1d\xc4\x46\x14\x77\x8c\xe3\x36\x91\x74\x63\xd9\x41\xff\x25\xa9\x62\x38\x7a\x26\x4e\xfb\x95\xd9\x67\x4d\x03\xf6\x38\x74\xc7\xa8\xa9\xe7\x58\x33\xcb\xee\xfe\x9f\x4e\x5a\x2b\xf3\x37\xa3\x2b\x0c\xbf\x3e\x34\xce\x8e\x42\xe7\x6e\xbb\x47\x7c\x29\x84\xd5\xda\x0f\x1a\x26\x1a\xbd\x1d\x41\x26\xe1\xd3\xdb\x51\x45\x3a\x1d\x0d\x6a\x94\x22\x93\x8f\x22\xe9\x25\x46\x7b\xab\x20\xbd\x90\x18\xad\x2f\x2a\x14\xa9\x75\x45\x65\x5d\xad\x78\x52\x08\x9e\x1a\x83\xe7\x4b\xb9\x66\x31\xd8\xad\x16\x6c\x51\x0a\x36\xdd\x08\x74\xd1\xb5\x35\xad\xb5\x9d\xaa\x69\xbf\x88\x2a\x13\x31\x0d\xfb\x53\xf0\xdb\x39\x3e\x25\xc6\x3c\x69\x1f\x84\x98\x83\x88\x8d\xc1\xb6\xee\x60\x22\x62\xe2\x37\x0d\x29\x17\x37\x46\x07\xda\x18\xc0\x5f\x7d\x6b\x54\x91\xe8\x7f\xf5\x41\x67\xf0\x2a\x06\x53\x0f\x22\x54\xe0\xbf\x83\x37\x41\x7f\x00\x22\x70\x01\xfc\xdd\xb2\xd4\xe5\xaa\x5d\xeb\xd1\x73\xd1\x8f\x01\xff\xe6\xb8\xa5\x92\x57\xcd\xac\xe1\x7f\xfa\xc7\xc6\x87\x07\x17\x47\x97\x41\x10\xfe\x4c\xbc\x3f\x1b\x6d\x6c\xe7\xba\xc2\xf6\xf5\xde\xdb\xb6\xc4\x06\xe1\x7b\x11\xfb\x41\x78\xa6\xb6\x22\xaf\x9f\xec\x7c\x96\x24\x18\x69\x8c\xab\xf3\x33\x89\xca\x9c\xe5\xbf\x2f\x1e\xb4\x14\xdb\x59\x20\x4f\x80\x0b\xed\x97\x72\x03\xf8\xff\x2d\xf8\x6c\x63\xb1\xfb\xa7\x52\x1a\x2f\x4b\xc6\x85\xfe\x68\x8e\x87\x97\x53\x75\x75\x6c\x18\x68\x3c\x93\x5c\xe8\xc4\xef\xaf\x52\x8c\xff\x6a\x11\x00\x4b\x25\xb2\xf8\x01\xa2\x4c\x08\xa3\x25\x31\x0f\x83\x98\x27\x86\x10\x75\x41\x4d\xf5\xb4\xbe\x45\x40\xde\x30\x35\xef\x79\x2b\x5d\x3c\xed\xcc\xca\x73\x80\x05\x4b\xe7\xe8\xf6\xe2\x45\x37\x7e\x34\xa8\xe8\xb5\x6e\xb4\xbf\x11\x62\x6b\x4e\xa3\xf6\xb7\x70\xc6\x4e\x7c\xf7\x64\xc2\x2b\xb5\xaf\x7a\x70\x7b\x3d\xb0\x2f\x56\x96\x3c\x36\x1e\xc9\x07\xd0\xd5\x4f\xd8\x31\x48\x83\x78\xec\xbc\x19\x33\x35\x88\x4a\xcf\x6b\x89\x09\x44\x12\xcd\x8b\x28\xda\x9c\xda\x93\x22\x2e\x60\x92\xe9\x6b\xb8\x63\x0f\xca\xdd\xa4\xe6\xad\xfe\xe5\xf9\xcf\x6c\x9c\xb7\xb2\xb6\xbf\x50\x28\xd7\x91\xcd\x3a\x82\x2a\x5e\x14\x6e\xbb\x53\xdd\x6a\xa3\xdc\x00\xcc\xa2\xc6\x44\x11\xad\x22\xea\xe5\x71\xe1\xbf\xcc\x5d\x7f\x71\x71\x74\x39\x80\xc5\xc5\x9b\xcb\x47\xf6\x4f\x1d\x47\x8c\x3f\xb4\x31\x5d\x49\xa4\x51\x19\x9b\xbf\x77\xc1\x7f\x72\xbd\xdf\xed\x7d\xc1\x4b\xe8\x74\xbb\xe2\x5a\x1f\x73\x7c\x87\xf6\x66\xa5\xdb\xbf\x94\xda\xff\x24\x22\x9c\x85\x23\xe9\x07\x4f\xee\x1a\xd6\xb6\x42\x3f\x0e\x55\x9d\xa0\xa2\x66\x66\x36\xb0\x6c\xb7\x65\x47\xf3\x22\xc0\xf5\x8b\x77\x36\x99\x40\xc8\x92\x8e\x3d\xd4\xab\xc5\x93\xda\x9b\x1b\x7c\x50\x9b\x99\xf2\x68\x17\xe4\xec\x33\xab\xf2\xfd\x78\x9e\x57\x6f\x60\xcb\x0c\x72\x3e\x3c\x28\x7c\x66\x1a\x09\x55\x44\x59\x69\x49\x99\x1a\xbe\xd7\x19\xf7\x37\xd7\x9a\xf6\x02\xf5\xd9\xaf\x7a\x9e\x43\xdd\x8e\x17\x89\x05\x41\x6d\xa5\x98\xb3\x96\x88\x57\x5e\x89\x36\xdb\x99\x42\xcc\xdf\x75\x3f\xfa\xe4\x4d\x54\x29\xb4\x41\x39\xab\xee\xff\x49\x7e\x79\xd4\x2d\x3f\x6c\xa3\xb9\xde\x47\x0e\xac\xfe\x47\xd3\xbf\x38\x4d\x97\x58\x68\x7d\xa2\x53\x7d\xb6\xa7\xef\xc3\x0f\xd9\x74\xca\xb5\xbf\xdd\xd7\x78\xf5\xb3\xe6\x17\xa2\xed\x4f\x43\x6d\xbe\x96\x3b\x60\xe7\x53\x4d\xc1\xd3\x5e\xde\xeb\x39\x9f\x8f\x3e\xfa\xbd\xad\xdb\xb0\xe5\xee\xa7\x3c\xdd\x85\x64\x7d\x11\x29\xba\xb4\xae\xb2\x60\x3d\xd2\x08\xbc\x2a\x01\x57\xd9\x7b\x78\x00\xc5\x6f\xae\xcc\xa7\x5e\x37\xe2\x2e\x13\xc0\x34\xe8\x6b\xae\x60\x96\x71\xa1\xab\xdd\x6c\xd3\xeb\x95\xad\xff\x0d\x00\x00\xff\xff\x2e\x27\xac\xfd\x5a\x2c\x00\x00") +var _templateDialectSqlUpdateTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5d\x6f\xdb\x3a\xd2\xbe\x96\x7f\xc5\xbc\x46\x9a\x23\x05\xae\x92\xf6\x32\xe7\x75\x81\x6e\x93\x02\xc1\xa2\x75\x4f\xdc\xb3\x7b\x91\x13\x14\xb4\x34\x4a\x88\xc8\x94\x43\xd2\x4e\xb2\x86\xfe\xfb\x62\x48\x7d\x50\xb2\x9c\xda\x71\xd0\xe6\xa0\x7b\x11\xc4\x92\x48\xce\xd7\x33\xcf\x0c\x29\x2d\x97\x10\x63\xc2\x05\x42\x3f\xe6\x2c\xc5\x48\x1f\xaa\xdb\xf4\x70\x3e\x8b\x99\xc6\x3e\xe4\x79\x6f\xb9\x84\xbd\xd9\xcd\x15\x1c\x0f\x61\x2f\x1c\x47\xd9\x0c\xc3\x2f\x2c\xba\x61\x57\x58\x3e\x9d\xcc\x79\x1a\xa3\xa4\x11\x33\xa6\x22\x96\x56\x03\xff\x51\x3c\x29\x06\x4a\x8c\x90\x2f\xec\xc8\xea\x77\x35\xbd\x18\x94\x09\xa4\xe7\xd7\x4c\x8d\xe7\x49\xc2\xef\xeb\x01\xfd\x91\x28\x55\x7a\x0d\x7b\xff\x41\x99\xd1\xc0\x23\xc8\xf3\xe5\x12\x78\x62\xa7\x9a\x0b\xfb\x70\x08\x7d\xc1\xd3\xbe\xbd\x85\x22\xae\xa6\x4a\xd4\x34\xb3\x2f\xfa\x5d\x73\xe9\x29\xd9\x7a\x5e\x6a\xe8\xce\xef\x25\x73\x11\x81\xdf\xb0\x26\xcf\xe1\xc0\xf5\x43\x9e\x07\xa0\x6e\xd3\x31\x5b\xa0\x1f\xe9\x7b\x88\x32\xa1\xf1\x5e\x87\x1f\xec\xff\xa0\x9c\xae\x69\x66\x43\xbc\x59\x26\xfc\xcc\xa6\x85\x2e\x98\x2a\xfa\xc5\x85\xae\x34\x18\x00\x4a\x49\x7f\x99\x0c\x60\xd9\xf3\x14\x52\xd0\x32\xe3\x53\x75\x9b\x86\x63\x73\x6d\x24\x38\x71\x0a\x1b\x62\x3e\x64\xe9\x7c\x2a\x54\x18\x86\xb5\x0c\x33\xe1\xec\x84\x94\x54\x9a\x09\xed\x5a\x1d\x84\x1f\x65\x36\xf5\x69\xf9\xaf\x6c\x92\xe2\xca\xea\xe6\x6e\x10\xf4\x3c\x72\x6f\x2d\xa7\xe7\x79\xed\x91\x67\x27\x6d\xdf\x85\x3c\x0e\xfc\xd2\x8a\x62\x89\x42\xa7\x9e\xe7\x25\x99\x84\x6f\x03\x98\x19\xc8\x30\x71\x85\xd0\x9e\x3e\x93\x18\xf3\x88\x69\x54\xe4\x0e\xcf\x9b\xb9\x8b\x79\x79\xb1\xa0\x8d\x9e\x27\xb3\x3b\x45\x4b\xed\x93\x2d\xe7\xd9\x9d\x5a\xe6\x3d\xef\x76\x8e\xf2\x61\x00\x4c\x5e\x99\x67\xe5\xf4\xf0\x0f\xba\xef\x07\x3d\x8f\x27\xc6\xe9\xc3\x15\xd9\xb1\xa4\x5f\xc5\xc0\x48\xdf\x0f\xc0\x59\x6b\x00\x24\x2d\xf8\xdd\xcc\xfd\xbf\x21\x08\x9e\x1a\x0d\x25\xea\xb9\x14\x50\xc1\xb4\x88\x69\x8f\x74\x8d\x31\x41\x69\xe6\x85\x1f\xd2\x4c\x21\x49\x5f\x30\x09\x3c\x56\x70\x71\xc9\x85\xee\x19\x8f\x98\x01\x9f\xf1\x5e\xfb\x06\x03\xc5\x10\x30\xcf\x57\x63\x60\x83\xe0\xc0\x19\x86\xb0\xdf\x40\x5a\x94\x89\x84\x5f\x1d\xaf\xd8\x67\xef\x9b\x35\x0a\x1f\x1c\x5b\x27\xb8\xab\x19\x70\x90\x2f\xfd\x6e\x7b\xbb\x2d\x4e\xa6\x3a\x3c\x25\x14\x27\x7e\xbf\xa4\x98\x3c\x3f\x86\x84\xf1\x14\x63\x50\x11\x13\x82\x8b\x2b\x32\x95\xec\xca\xc0\x55\xf8\x18\x5e\x2d\xfa\xc6\x6b\x14\x63\xcf\x2a\x18\x43\x87\x6e\xa5\x33\x08\xda\x67\x6a\xac\x25\xad\x99\xe7\x3c\xf6\x83\x1a\xfb\x67\x27\x75\x82\x7b\x2d\x00\x3a\x86\x1b\xaf\x8f\x23\x26\xfc\x7d\x1e\x3f\x93\x9d\x12\x59\x4c\x2a\xf1\xb8\xc3\x26\x17\xb9\x1e\x41\x60\x08\x6c\x36\x43\x11\xfb\x3c\x56\x03\xe0\x71\xd0\x2b\x01\xde\x08\xb8\xba\xe3\x3a\xba\x06\x41\x4a\xa7\x28\x68\x74\xf0\xbb\xd1\x31\x62\x0a\x41\xc0\x70\x08\x47\xc7\xbd\x2d\x35\x76\x03\x00\x22\xd3\x90\x64\x73\x11\xc3\x1d\xd7\xd7\xb5\xfa\x1d\xc9\x5d\x8b\x7d\x07\x6f\xb6\x96\x3a\xcd\x24\x82\xbe\x66\x02\xc8\xbc\x86\x0e\x46\xb2\xbe\x46\x50\x74\xe3\x3b\x2a\xe4\x6d\x66\xe1\x49\xe5\x1b\xe3\x0f\x1b\xc3\x2e\xd5\x04\x4f\x57\x99\x64\xb9\x3c\x3c\x20\xaf\xeb\x6b\x94\xf8\x9b\x02\x95\x4d\x51\x5f\x53\x28\x75\x06\xb6\x7c\x0e\x40\x69\x26\x35\x30\xd0\x92\x09\xc5\x22\xcd\x33\x11\xc2\xc1\x21\xcd\x27\xb2\x70\x12\xaa\x83\x55\xbe\xde\x13\xa5\xd4\xf4\xb3\x21\x85\x54\x88\xff\xc8\x31\x8d\x95\x35\x96\x08\xc2\x27\xfb\xac\x66\x30\xc9\xb2\xd4\x9a\xab\x4c\xd5\x38\x47\x35\x4f\x89\x3c\xbc\xb2\x88\xd9\x6a\xf2\xa7\x19\xbe\x86\xef\xc3\x7f\x93\xed\xa6\x2c\x9c\x89\x33\xa1\x55\x57\xd5\x69\x17\x15\x82\x2d\x55\x1e\xaa\x16\x5e\x50\x80\xdc\x32\xfb\xde\xb7\x01\xec\x25\xb6\xd1\x70\x95\x27\x07\xb4\x7d\x44\xd7\x49\x38\xd6\x72\x1e\x69\x33\x96\x00\xd1\x48\xc6\xc2\xd2\x21\x68\x39\x47\x73\xa7\x30\x2d\x1c\x63\x67\x7d\xdc\x4b\x9a\x7a\x1e\x6c\x22\xd3\xe4\x6a\x07\xe5\xd6\xf7\x92\xf0\x33\x4f\x53\x72\x58\xf5\x68\x85\x90\x69\xe9\xb2\x75\x4a\x2a\x7c\xaf\x22\xa3\x4b\x83\x5a\x9a\x43\x5a\x5b\xc8\xd8\xc8\x4c\x47\x88\xa8\xae\x9b\x97\xab\x84\x95\x14\x79\x60\x03\xd2\xaa\xb2\x65\x30\xaa\x22\xeb\x32\xad\xbe\x0f\x4f\xef\x31\xea\x28\xa9\xfb\x12\x37\x2e\x31\x32\x4b\xd3\x09\x8b\x6e\xfc\x22\xd7\x2a\x5e\x75\xb9\xc0\xa4\xca\x69\x7c\x85\xca\x74\x3c\x87\x07\x80\x42\x1b\x6a\xc9\xe6\x1a\x12\x03\xc3\x01\x4c\xe6\xf6\x1e\xa0\x19\x69\x53\xd8\x64\x55\x3b\x83\x9a\x1c\xd1\x80\x36\x5a\x68\x97\xc2\x9c\x52\x8d\xe1\xa7\xb7\x9f\x6a\xb0\x13\x2f\xb5\xa3\x22\x71\x9a\x2d\x30\x76\x82\x88\x65\x10\x03\x78\x57\xd2\x97\x59\x71\x8f\x39\x7d\xf1\xde\x84\x2e\xde\xd4\x8d\x2e\x86\x67\xea\x4c\x2c\x50\x56\x6d\x1f\x83\x6a\xc0\xde\x04\xaa\x99\x4e\xa4\x91\x8a\xcf\xf1\x10\xa6\xec\x06\x7d\xd3\x87\x0c\xb6\x56\xd2\x66\x0a\x75\x2f\xc8\xe3\xf5\xed\xdc\x23\x4b\x14\x26\x1a\x1b\x35\x4e\x67\x29\x61\xab\x63\xdb\x72\x18\x65\x64\x9f\xe6\x71\x9f\x9c\xfe\xba\x84\x2f\x36\x4a\x28\x9a\x1a\x8a\xb6\x3a\x14\x3d\xc4\x4a\x2b\x78\x9b\x86\x27\x98\x62\x07\x05\xd2\x35\x5a\x22\x74\x58\x23\x08\xad\xa8\x8d\x98\x11\xc3\x2f\xff\x74\xe6\x5e\xd8\x58\xe4\xf9\x65\xcd\x91\xbb\x2e\x37\xb1\xcb\x61\x6b\x3d\x27\xe9\x76\xca\xba\xcd\xd3\xce\xcb\x1b\x44\x89\xb4\x4f\x49\xce\x31\x29\x93\x8e\xf0\x6f\x12\x4c\x61\x9a\x80\xa4\x36\x18\x45\x84\x26\xd3\xcc\x80\xaf\xa3\x93\xd1\x31\xcc\x15\xc2\xe8\x1c\xb8\x30\x75\xdf\xb4\x15\x6c\x92\x2d\xb0\xac\xaa\xed\x18\xee\x10\xc2\x9d\x9d\xde\xf2\xf9\xce\x98\x68\x07\xb1\x11\xc5\x1d\xe3\xb8\x4d\x24\xdd\x58\x76\xd0\x7f\x49\xaa\x18\x8e\x9e\x89\xd3\x7e\x65\xf6\x59\xd3\x80\x3d\x0e\xdd\x31\xea\xcf\xf3\x34\x5d\x33\xcb\xee\xfe\x9f\x4e\x5a\x2b\xf3\x37\xa3\x2b\x0c\xbf\x3e\x34\xce\x8e\x42\xe7\x6e\xbb\x47\x7c\x29\x84\xd5\xda\x0f\x1a\x26\x1a\xbd\x1d\x41\x26\xe1\xd3\xdb\x51\x45\x3a\x1d\x0d\x6a\x94\x22\x93\x8f\x22\xe9\x25\x46\x7b\xab\x20\xbd\x90\x18\xad\x2f\x2a\x14\xa9\x75\x45\x65\x5d\xad\x78\x52\x08\x9e\x1a\x83\xe7\x4b\xb9\x66\x31\xd8\xad\x16\x6c\x51\x0a\x36\xdd\x08\x74\xd1\xb5\x35\xad\xb5\x9d\xaa\x69\xbf\x88\x2a\x13\x31\x0d\xfb\x53\xf0\xdb\x39\x3e\x25\xc6\x3c\x69\x1f\x84\x98\x83\x88\x8d\xc1\xb6\xee\x60\x22\x62\xe2\x37\x0d\x29\x17\x37\x46\x07\xda\x18\xc0\x5f\x7d\x6b\x54\x91\xe8\x7f\xf5\x41\x67\xf0\x2a\x06\x53\x0f\x22\x54\xe0\xbf\x83\x37\x41\x7f\x00\x22\x70\x01\xfc\xdd\xb2\xd4\xe5\xaa\x5d\xeb\xd1\x73\xd1\x8f\x01\xff\xe6\xb8\xa5\x92\x57\xcd\xac\xe1\x7f\xfa\xc7\xc6\x87\x07\x17\x47\x97\x41\x10\xfe\x4c\xbc\x3f\x1b\x6d\x6c\xe7\xba\xc2\xf6\xf5\xde\xdb\xb6\xc4\x06\xe1\x7b\x11\xfb\x41\x78\xa6\xb6\x22\xaf\x9f\xec\x7c\x96\x24\x18\x69\x8c\xab\xf3\x33\x89\xca\x9c\xe5\xbf\x2f\x1e\xb4\x14\xdb\x59\x20\x4f\x80\x0b\xed\x97\x72\x03\xf8\xff\x2d\xf8\x6c\x63\xb1\xfb\xa7\x52\x1a\x2f\x4b\xc6\x85\xfe\x68\x8e\x87\x97\x53\x75\x75\x6c\x18\x68\x3c\x93\x5c\xe8\xc4\xef\xaf\x52\x8c\xff\x6a\x11\x00\x4b\x25\xb2\xf8\x01\xa2\x4c\x08\xa3\x25\x31\x0f\x83\x98\x27\x86\x10\x75\x41\x4d\xf5\xb4\xbe\x45\x40\xde\x30\x35\xef\x79\x2b\x5d\x3c\xed\xcc\xca\x73\x80\x05\x4b\xe7\xe8\xf6\xe2\x45\x37\x7e\x34\xa8\xe8\xb5\x6e\xb4\xbf\x11\x62\x6b\x4e\xa3\xf6\xb7\x70\xc6\x4e\x7c\xf7\x64\xc2\x2b\xb5\xaf\x7a\x70\x7b\x3d\xb0\x2f\x56\x96\x3c\x36\x1e\xc9\x07\xd0\xd5\x4f\xd8\x31\x48\x83\x78\xec\xbc\x19\x33\x35\x88\x4a\xcf\x6b\x89\x09\x44\x12\xcd\x8b\x28\xda\x9c\xda\x93\x22\x2e\x60\x92\xe9\x6b\xb8\x63\x0f\xca\xdd\xa4\xe6\xad\xfe\xe5\xf9\xcf\x6c\x9c\xb7\xb2\xb6\xbf\x50\x28\xd7\x91\xcd\x3a\x82\x2a\x5e\x14\x6e\xbb\x53\xdd\x6a\xa3\xdc\x00\xcc\xa2\xc6\x44\x11\xad\x22\xea\xe5\x71\xe1\xbf\xcc\x5d\x7f\x71\x71\x74\x39\x80\xc5\xc5\x9b\xcb\x47\xf6\x4f\x1d\x47\x8c\x3f\xb4\x31\x5d\x49\xa4\x51\x19\x9b\xbf\x77\xc1\x7f\x72\xbd\xdf\xed\x7d\xc1\x4b\xe8\x74\xbb\xe2\x5a\x1f\x73\x7c\x87\xf6\x66\xa5\xdb\xbf\x94\xda\xff\x24\x22\x9c\x85\x23\xe9\x07\x4f\xee\x1a\xd6\xb6\x42\x3f\x0e\x55\x9d\xa0\xa2\x66\x66\x36\xb0\x6c\xb7\x65\x47\xf3\x22\xc0\xf5\x8b\x77\x36\x99\x40\xc8\x92\x8e\x3d\xd4\xab\xc5\x93\xda\x9b\x1b\x7c\x50\x9b\x99\xf2\x68\x17\xe4\xec\x33\xab\xf2\xfd\x78\x9e\x57\x6f\x60\xcb\x0c\x72\x3e\x3c\x28\x7c\x66\x1a\x09\x55\x44\x59\x69\x49\x99\x1a\xbe\xd7\x19\xf7\x37\xd7\x9a\xf6\x02\xf5\xd9\xaf\x7a\x9e\x43\xdd\x8e\x17\x89\x05\x41\x6d\xa5\x98\xb3\x96\x88\x57\x5e\x89\x36\xdb\x99\x42\xcc\xdf\x75\x3f\xfa\xe4\x4d\x54\x29\xb4\x41\x39\xab\xee\xff\x49\x7e\x79\xd4\x2d\x3f\x6c\xa3\xb9\xde\x47\x0e\xac\xfe\x47\xd3\xbf\x38\x4d\x97\x58\x68\x7d\xa2\x53\x7d\xb6\xa7\xef\xc3\x0f\xd9\x74\xca\xb5\xbf\xdd\xd7\x78\xf5\xb3\xe6\x17\xa2\xed\x4f\x43\x6d\xbe\x96\x3b\x60\xe7\x53\x4d\xc1\xd3\x5e\xde\xeb\x39\x9f\x8f\x3e\xfa\xbd\xad\xdb\xb0\xe5\xee\xa7\x3c\xdd\x85\x64\x7d\x11\x29\xba\xb4\xae\xb2\x60\x3d\xd2\x08\xbc\x2a\x01\x57\xd9\x7b\x78\x00\xc5\x6f\xae\xcc\xa7\x5e\x37\xe2\x2e\x13\xc0\x34\xe8\x6b\xae\x60\x96\x71\xa1\xab\xdd\x6c\xd3\xeb\x95\xad\xff\x0d\x00\x00\xff\xff\x1f\x36\x08\x43\x5a\x2c\x00\x00") func templateDialectSqlUpdateTmplBytes() ([]byte, error) { return bindataRead( @@ -679,12 +679,12 @@ func templateDialectSqlUpdateTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/dialect/sql/update.tmpl", size: 11354, mode: os.FileMode(420), modTime: time.Unix(1565169540, 0)} + info := bindataFileInfo{name: "template/dialect/sql/update.tmpl", size: 11354, mode: os.FileMode(420), modTime: time.Unix(1565180203, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _templateEntTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x56\x4d\x8f\xdb\x36\x13\x3e\x4b\xbf\x62\x22\x38\x2f\x2c\xc3\x91\xef\x79\xb1\x87\x36\xdb\x02\x7b\x49\x3f\x36\x41\x0f\x41\x90\xa5\xc5\x91\xc4\x2e\x45\x2a\x24\xe5\xb5\x21\xe8\xbf\x17\x43\x4a\x5a\xc9\x76\x93\x4d\x4f\x96\xc9\xe1\xcc\x33\xcf\x7c\x76\x1d\x70\x2c\x84\x42\x48\x6a\xcd\x51\x26\xd0\xf7\x71\xdc\x75\xb0\x6a\x1e\x4b\x78\x7b\x03\x7b\x66\x11\x56\xd9\x3b\xad\x0a\x51\x66\xbf\xb3\xfc\x91\x95\x48\x42\x5d\x07\x0e\xeb\x46\x32\x87\x90\x54\xc8\x38\x9a\x04\x56\xe3\xf3\xe7\x2b\x51\x37\xda\xb8\xf1\x6a\xb7\x03\x52\x9e\xbd\x67\x35\x69\x01\x61\xc1\x55\x08\xde\x36\xa0\x72\xc2\x9d\xa0\xd0\xc6\x1f\x2e\x04\x6d\x5e\x61\xcd\xb2\xd8\x9d\x9a\xf3\x1b\x67\xda\xdc\x41\x17\x47\xb9\x07\x19\x47\xbb\x1d\xdc\xdd\x82\x2e\xbc\x16\x54\x2e\x8b\xa3\xbb\xdb\xf0\xe8\xee\x36\xfb\x40\x1a\xfa\x1e\x1e\xfe\xb6\x5a\xbd\x4d\x04\xdf\xea\x5a\x10\x5e\x77\x4a\x1e\xe2\xa8\xeb\xc0\x30\x55\x22\xac\xbe\x6c\x61\x55\x10\x07\xab\xec\x57\x81\x92\x5b\x78\xd3\xf7\x71\x14\x05\x1f\x1a\x66\x73\x26\x61\x55\x4c\x40\x2a\x4d\x32\x64\xf3\xc0\x64\x8b\x23\x80\x84\x0c\x4f\x52\x09\x14\xa4\x2b\x8b\x01\x00\xa2\xab\x7a\xba\x0e\x44\xe1\x0f\x5a\x29\xd9\x5e\xd2\xe1\xa6\xeb\x00\x15\x87\xbe\x0f\xda\x26\x27\xc2\xdf\x7b\xcf\xc1\x07\x56\x42\xdf\x07\x1f\x48\xd8\xc3\x5d\xfa\x83\xc1\x9f\x5f\x78\x89\xa3\x3b\x5d\xb7\xdb\x80\x28\x95\x36\x08\x25\x2a\x34\xcc\x09\x55\x02\xf2\x12\x03\x56\x0b\x9b\xdd\x20\xf9\x06\x9e\x84\xab\x60\x85\x33\x8b\x41\xcb\x19\x2b\xf8\x3d\x56\x08\xf7\xb3\x10\x19\xcb\xe0\xc3\x24\x64\xd1\x81\xd3\xa0\x84\xdc\x02\x53\x1c\x6c\xa5\x5b\xc9\x61\x8f\xd0\x36\x9c\x39\xe4\x50\x33\xd5\x32\x29\x4f\x19\xd9\xbe\x6a\x38\xd0\xa8\xb4\xa3\xc3\x8f\x4a\x7c\x6d\xe9\xf8\xd3\xe7\x89\xc9\x4d\xc0\x40\x54\x4e\x8f\x1e\xc2\xd9\x19\x9f\xe7\x84\x8e\xdf\x21\xd7\x67\xf4\x5a\xa7\x0d\xd5\x87\x27\xf9\x7e\xf8\x33\x3c\x5a\xb9\xba\x91\x74\xd3\x18\xa1\x5c\x01\x09\x17\x4c\x62\xee\x76\xaf\xed\x8e\x63\xae\x39\xee\xb4\xc2\xe4\x59\xc9\xf0\xee\x38\xd5\x52\xd0\xb0\x1a\xaa\x2f\x38\x11\x8a\xd5\x60\x8e\xe2\x80\x26\x18\xfe\x73\xfc\xd7\x5f\x00\x5c\xc4\x7f\x04\x56\xb4\x2a\x9f\x80\x41\xf2\x47\x8b\xe6\x94\xc0\x7a\x49\x69\xea\xc5\x87\xfa\xf5\x2f\xfa\x1e\xbe\xb6\x68\x04\xda\x7f\x89\xe8\x3c\xd6\xe3\x45\x16\x47\xfe\xf1\x7a\x01\xbb\xef\x61\x33\x97\x4a\xe7\x56\xd6\x29\x9c\x87\xaa\xef\x3d\x48\x2a\xfa\xc8\xa0\x6b\x8d\x82\xf5\xff\xe6\x0a\xde\x49\x81\xca\x75\x70\x66\x25\x0b\x2d\xa2\x4f\xb3\xb9\xfe\x33\xa1\x34\x8e\x16\x04\xef\x76\xf0\xd1\x67\x1d\x04\x53\x16\x18\xec\x5b\x21\x39\x1a\xdf\xab\x7c\x4a\x52\xc9\xb8\x4a\xd8\x33\x67\x77\x3b\x78\xaf\x1d\x82\xab\x98\xdb\xc2\x49\xb7\xa0\x10\x39\xe5\x76\xce\xa4\x5c\x0a\x7f\x54\x4f\x86\x35\xeb\x14\xf6\x58\x50\x31\x92\xc4\xa4\xb6\x46\x57\x69\xbe\xa5\x94\xbe\x30\x43\x56\x9e\x98\x1d\xe0\x21\x87\xc2\xe8\x1a\x18\x38\xc3\x94\x65\xb9\x13\x5a\x85\x32\xa2\x60\xcc\x0e\xfd\xa3\x5c\xd7\xb5\x70\x54\x52\xda\x80\xd1\x52\x22\x87\x3d\xcb\x1f\xb3\xf8\x45\x71\x0a\xcc\x8c\x21\x1a\xcf\xc3\xe9\x6f\x0a\x29\x42\xff\x2d\x40\x93\x8a\xcb\xf0\x0c\x31\xf1\x74\x41\xeb\x7f\xec\xd8\xeb\x69\x80\x10\xd9\xdf\x23\x04\x58\xe1\xd0\x80\x08\x82\xb9\xd4\x16\xf9\x96\xd4\x5a\x1d\xde\x53\x78\x14\x1e\xdd\x94\xe3\x4f\x42\x4a\xea\x40\x78\xc4\xbc\x25\xbe\x5c\x65\x74\x5b\x56\xde\x32\x37\x1e\xdd\x53\x25\xf2\x0a\x72\x83\x2c\x08\x2c\xe8\x7e\x29\xa3\x63\x1a\x2c\xce\x89\x48\x77\xdc\x82\x7e\xa4\x4a\xbd\xce\x5a\x16\x50\x64\xeb\x8d\x3b\xde\xfa\xcf\x34\x8e\x44\x01\xaf\xf4\xa3\xaf\x94\x86\x29\x91\xaf\x93\x71\xba\xf7\xfd\xdb\x8b\x61\x4c\xed\x72\xc1\x13\x1b\xc7\x72\xe2\xcb\x22\xfa\xa6\x65\xb8\x01\x77\xcc\xb8\x39\x4c\x41\x3f\x13\x1f\x42\x77\xef\x0c\x25\xb6\xa8\x1b\x89\x35\x2a\x17\xa2\x57\xd4\x2e\x0b\x37\x68\x5e\xc8\x55\x10\x5f\xa7\xb4\x04\x90\xc6\x2e\x8e\xf6\xad\x9f\xd9\xfb\x93\x43\x9b\xbd\xc7\xa7\x9f\xdb\xa2\x40\xb3\x56\x42\xa6\xfe\x32\xfb\xcb\x08\x87\xc3\xc3\x64\xae\x6e\x9d\x5c\x91\xf0\xa0\x42\xc7\x5e\x27\x82\xdf\xbc\x3e\x24\xdb\x0b\xfa\xef\x6e\xd3\x34\xf6\xe3\x71\x68\xb5\xe2\x62\x75\x98\x06\xe8\xc5\x68\xa7\x01\x26\x0a\x38\x5c\x8b\xeb\xb5\xfd\xe0\xff\x70\x80\x57\x37\x34\x1b\x7d\x50\xa3\x6f\x43\x0e\x60\xa7\xc7\x01\xff\xe6\x40\x78\xa3\x68\xc4\x84\xd2\x8e\x48\x7e\x5c\xd9\x4b\x30\x7b\x73\xde\x52\xe8\xa9\x8b\xef\x8b\xa0\xa4\x14\x88\x21\x81\xe8\x72\x8c\x72\x98\xb7\x81\x42\xda\xe4\xee\xec\x90\x48\xa1\x05\x0a\x3e\x35\x68\x4a\x27\x9a\x65\x06\x1b\x83\x16\x95\x63\xbe\xe6\x87\x79\x74\x77\x3b\x2e\x61\x2f\x4a\x32\xc1\xd7\xa9\xd7\xd6\xc5\x91\xe0\x5b\xf8\x42\x91\xb2\xce\xe4\x5a\x1d\xb2\x9f\x9c\x16\xe7\x0a\x28\x1f\x26\x07\x04\x8f\xfb\x78\xe6\xae\x9f\xd7\x56\x8a\xdc\x8f\xe2\x46\xb6\x86\x98\x9a\xb7\xf2\x67\x81\x50\x93\x0c\x1a\x66\xac\xcf\x96\x70\xac\x8b\xb3\x29\x33\x2d\xc5\xd3\xb3\x4f\x9f\x17\x4e\xfc\xc8\x9e\xe2\x37\x3c\x3c\x3a\xc2\xbb\x82\xe4\x9e\x54\x26\xcf\xaa\xc3\x36\xf4\x82\x65\xa6\x66\xea\x74\xb6\xcd\x5c\x5b\x67\x32\x98\x2d\x55\xcb\xcd\xe6\x7a\x74\xe6\x7e\xa6\x10\xfa\xcf\x3a\x2f\xca\xe1\x33\xa5\x30\xd1\x58\x16\x04\x2f\xf8\x7c\xa1\x62\x70\x62\x76\xf6\x49\x7c\x1e\x7a\x19\xdc\x40\x5e\x94\xd4\xec\xe6\x60\xfe\x09\x00\x00\xff\xff\x02\x51\x67\xf7\x29\x0d\x00\x00") +var _templateEntTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x56\x4d\x8f\xdb\x36\x13\x3e\x4b\xbf\x62\x22\x38\x2f\x2c\xc3\x91\xef\x79\xb1\x87\x36\xdb\x02\x7b\x49\x3f\x36\x41\x0f\x41\x90\xa5\xc5\x91\xc4\x2e\x45\x2a\x24\xe5\xb5\x21\xe8\xbf\x17\x43\x4a\x5a\xc9\x76\x93\x4d\x4f\x96\xc9\xe1\xcc\x33\xcf\x7c\x76\x1d\x70\x2c\x84\x42\x48\x6a\xcd\x51\x26\xd0\xf7\x71\xdc\x75\xb0\x6a\x1e\x4b\x78\x7b\x03\x7b\x66\x11\x56\xd9\x3b\xad\x0a\x51\x66\xbf\xb3\xfc\x91\x95\x48\x42\x5d\x07\x0e\xeb\x46\x32\x87\x90\x54\xc8\x38\x9a\x04\x56\xe3\xf3\xe7\x2b\x51\x37\xda\xb8\xf1\x6a\xb7\x03\x52\x9e\xbd\x67\x35\x69\x01\x61\xc1\x55\x08\xde\x36\xa0\x72\xc2\x9d\xa0\xd0\xc6\x1f\x2e\x04\x6d\x5e\x61\xcd\xb2\xd8\x9d\x9a\xf3\x1b\x67\xda\xdc\x41\x17\x47\xb9\x07\x19\x47\xbb\x1d\xdc\xdd\x82\x2e\xbc\x16\x54\x2e\x8b\xa3\xbb\xdb\xf0\xe8\xee\x36\xfb\x40\x1a\xfa\x1e\x1e\xfe\xb6\x5a\xbd\x4d\x04\xdf\xea\x5a\x10\x5e\x77\x4a\x1e\xe2\xa8\xeb\xc0\x30\x55\x22\xac\xbe\x6c\x61\x55\x10\x07\xab\xec\x57\x81\x92\x5b\x78\xd3\xf7\x71\x14\x05\x1f\x1a\x66\x73\x26\x61\x55\x4c\x40\x2a\x4d\x32\x64\xf3\xc0\x64\x8b\x23\x80\x84\x0c\x4f\x52\x09\x14\xa4\x2b\x8b\x01\x00\xa2\xab\x7a\xba\x0e\x44\xe1\x0f\x84\x94\x6c\x2f\xe9\x70\xd3\x75\x80\x8a\x43\xdf\x07\x6d\x93\x13\xe1\xef\xbd\xe7\xe0\x03\x2b\xa1\xef\x83\x0f\x24\xec\xe1\x2e\xfd\xc1\xe0\xcf\x2f\xbc\xc4\xd1\x9d\xae\xdb\x6d\x40\x94\x4a\x1b\x84\x12\x15\x1a\xe6\x84\x2a\x01\x79\x89\x01\xab\x85\xcd\x6e\x90\x7c\x03\x4f\xc2\x55\xb0\xc2\x99\xc5\xa0\xe5\x8c\x15\xfc\x1e\x2b\x84\xfb\x59\x88\x8c\x65\xf0\x61\x12\xb2\xe8\xc0\x69\x50\x42\x6e\x81\x29\x0e\xb6\xd2\xad\xe4\xb0\x47\x68\x1b\xce\x1c\x72\xa8\x99\x6a\x99\x94\xa7\x8c\x6c\x5f\x35\x1c\x68\x54\xda\xd1\xe1\x47\x25\xbe\xb6\x74\xfc\xe9\xf3\xc4\xe4\x26\x60\x20\x2a\xa7\x47\x0f\xe1\xec\x8c\xcf\x73\x42\xc7\xef\x90\xeb\x33\x7a\xad\xd3\x86\xea\xc3\x93\x7c\x3f\xfc\x19\x1e\xad\x5c\xdd\x48\xba\x69\x8c\x50\xae\x80\x84\x0b\x26\x31\x77\xbb\xd7\x76\xc7\x31\xd7\x1c\x77\x5a\x61\xf2\xac\x64\x78\x77\x9c\x6a\x29\x68\x58\x0d\xd5\x17\x9c\x08\xc5\x6a\x30\x47\x71\x40\x13\x0c\xff\x39\xfe\xeb\x2f\x00\x2e\xe2\x3f\x02\x2b\x5a\x95\x4f\xc0\x20\xf9\xa3\x45\x73\x4a\x60\xbd\xa4\x34\xf5\xe2\x43\xfd\xfa\x17\x7d\x0f\x5f\x5b\x34\x02\xed\xbf\x44\x74\x1e\xeb\xf1\x22\x8b\x23\xff\x78\xbd\x80\xdd\xf7\xb0\x99\x4b\xa5\x73\x2b\xeb\x14\xce\x43\xd5\xf7\x1e\x24\x15\x7d\x64\xd0\xb5\x46\xc1\xfa\x7f\x73\x05\xef\xa4\x40\xe5\x3a\x38\xb3\x92\x85\x16\xd1\xa7\xd9\x5c\xff\x99\x50\x1a\x47\x0b\x82\x77\x3b\xf8\xe8\xb3\x0e\x82\x29\x0b\x0c\xf6\xad\x90\x1c\x8d\xef\x55\x3e\x25\xa9\x64\x5c\x25\xec\x99\xb3\xbb\x1d\xbc\xd7\x0e\xc1\x55\xcc\x6d\xe1\xa4\x5b\x50\x88\x9c\x72\x3b\x67\x52\x2e\x85\x3f\xaa\x27\xc3\x9a\x75\x0a\x7b\x2c\xa8\x18\x49\x62\x52\x5b\xa3\xab\x34\xdf\x52\x4a\x5f\x98\x21\x2b\x4f\xcc\x0e\xf0\x90\x43\x61\x74\x0d\x0c\x9c\x61\xca\xb2\xdc\x09\xad\x42\x19\x51\x30\x66\x87\xfe\x51\xae\xeb\x5a\x38\x2a\x29\x6d\xc0\x68\x29\x91\xc3\x9e\xe5\x8f\x59\xfc\xa2\x38\x05\x66\xc6\x10\x8d\xe7\xe1\xf4\x37\x85\x14\xa1\xff\x16\xa0\x49\xc5\x65\x78\x86\x98\x78\xba\xa0\xf5\x3f\x76\xec\xf5\x34\x40\x88\xec\xef\x11\x02\xac\x70\x68\x40\x04\xc1\x5c\x6a\x8b\x7c\x4b\x6a\xad\x0e\xef\x29\x3c\x0a\x8f\x6e\xca\xf1\x27\x21\x25\x75\x20\x3c\x62\xde\x12\x5f\xae\x32\xba\x2d\x2b\x6f\x99\x1b\x8f\xee\xa9\x12\x79\x05\xb9\x41\x16\x04\x16\x74\xbf\x94\xd1\x31\x0d\x16\xe7\x44\xa4\x3b\x6e\x41\x3f\x52\xa5\x5e\x67\x2d\x0b\x28\xb2\xf5\xc6\x1d\x6f\xfd\x67\x1a\x47\xa2\x80\x57\xfa\xd1\x57\x4a\xc3\x94\xc8\xd7\xc9\x38\xdd\xfb\xfe\xed\xc5\x30\xa6\x76\xb9\xe0\x89\x8d\x63\x39\xf1\x65\x11\x7d\xd3\x32\xdc\x80\x3b\x66\xdc\x1c\xa6\xa0\x9f\x89\x0f\xa1\xbb\x77\x86\x12\x5b\xd4\x8d\xc4\x1a\x95\x0b\xd1\x2b\x6a\x97\x85\x1b\x34\x2f\xe4\x2a\x88\xaf\x53\x5a\x02\x48\x63\x17\x47\xfb\xd6\xcf\xec\xfd\xc9\xa1\xcd\xde\xe3\xd3\xcf\x6d\x51\xa0\x59\x2b\x21\x53\x7f\x99\xfd\x65\x84\xc3\xe1\x61\x32\x57\xb7\x4e\xae\x48\x78\x50\xa1\x63\xaf\x13\xc1\x6f\x5e\x1f\x92\xed\x05\xfd\x77\xb7\x69\x1a\xfb\xf1\x38\xb4\x5a\x71\xb1\x3a\x4c\x03\xf4\x62\xb4\xd3\x00\x13\x05\x1c\xae\xc5\xf5\xda\x7e\xf0\x7f\x38\xc0\xab\x1b\x9a\x8d\x3e\xa8\xd1\xb7\x21\x07\xb0\xd3\xe3\x80\x7f\x73\x20\xbc\x51\x34\x62\x42\x69\x47\x24\x3f\xae\xec\x25\x98\xbd\x39\x6f\x29\xf4\xd4\xc5\xf7\x45\x50\x52\x0a\xc4\x90\x40\x74\x39\x46\x39\xcc\xdb\x40\x21\x6d\x72\x77\x76\x48\xa4\xd0\x02\x05\x9f\x1a\x34\xa5\x13\xcd\x32\x83\x8d\x41\x8b\xca\x31\x5f\xf3\xc3\x3c\xba\xbb\x1d\x97\xb0\x17\x25\x99\xe0\xeb\xd4\x6b\xeb\xe2\x48\xf0\x2d\x7c\xa1\x48\x59\x67\x72\xad\x0e\xd9\x4f\x4e\x8b\x73\x05\x94\x0f\x93\x03\x82\xc7\x7d\x3c\x73\xd7\xcf\x6b\x2b\x45\xee\x47\x71\x23\x5b\x43\x4c\xcd\x5b\xf9\xb3\x40\xa8\x49\x06\x0d\x33\xd6\x67\x4b\x38\xd6\xc5\xd9\x94\x99\x96\xe2\xe9\xd9\xa7\xcf\x0b\x27\x7e\x64\x4f\xf1\x1b\x1e\x1e\x1d\xe1\x5d\x41\x72\x4f\x2a\x93\x67\xd5\x61\x1b\x7a\xc1\x32\x53\x33\x75\x3a\xdb\x66\xae\xad\x33\x19\xcc\x96\xaa\xe5\x66\x73\x3d\x3a\x73\x3f\x53\x08\xfd\x67\x9d\x17\xe5\xf0\x99\x52\x98\x68\x2c\x0b\x82\x17\x7c\xbe\x50\x31\x38\x31\x3b\xfb\x24\x3e\x0f\xbd\x0c\x6e\x20\x2f\x4a\x6a\x76\x73\x30\xff\x04\x00\x00\xff\xff\xa2\x54\xce\x81\x29\x0d\x00\x00") func templateEntTmplBytes() ([]byte, error) { return bindataRead( @@ -699,7 +699,7 @@ func templateEntTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/ent.tmpl", size: 3369, mode: os.FileMode(420), modTime: time.Unix(1564913307, 0)} + info := bindataFileInfo{name: "template/ent.tmpl", size: 3369, mode: os.FileMode(420), modTime: time.Unix(1565180140, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -804,7 +804,7 @@ func templateMigrateMigrateTmpl() (*asset, error) { return a, nil } -var _templateMigrateSchemaTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x56\x4b\x4f\xe4\x38\x10\x3e\x27\xbf\xa2\x14\xf5\x22\x40\xdd\x89\xe0\x18\xa9\x0f\x2b\xd0\x4a\x2b\x24\x16\x2d\x70\x42\x68\x64\x92\x4a\xb7\xd5\x8e\x13\x1c\x37\x33\x3d\x19\xff\xf7\x91\x1f\x79\xf6\x93\x99\x39\x25\xb6\xeb\xab\x72\x7d\xf5\xb9\xec\xba\x86\x14\x33\xca\x11\x82\x2a\x59\x62\x4e\x02\x50\xca\xf7\xeb\x7a\x06\x5f\xa9\x5c\x02\x7e\x93\xc8\x53\x98\x40\xf0\x40\x92\x15\x59\x60\x00\x41\x4e\x17\x82\x48\x0c\x60\xa6\x94\xef\xd5\x35\x48\xcc\x4b\x46\x24\x42\xb0\x44\x92\xa2\x08\x20\xd4\x5e\xea\x1a\x34\x56\xfb\xa3\x79\x59\x08\x09\xe7\xbe\x17\x64\x6f\x49\x84\x5c\x46\x19\x45\x96\x06\xbd\x89\x94\x12\x86\x89\x8c\xaa\x77\x16\xb9\xbd\xf8\x17\xbe\xff\x41\x84\xc6\xf1\x35\x63\xe4\x8d\x21\xcc\x41\x8a\x35\xea\xb8\x33\x10\x84\x2f\x10\x26\x5f\xa6\x30\x91\x10\xcf\x61\x12\x3e\x69\x9b\x4a\xc7\xf4\x8c\xc5\x24\x29\xd8\x3a\xe7\x95\x5e\x2d\x49\x95\x10\x06\x13\x19\xde\x93\x1c\xe1\x07\x94\x82\x72\x99\x41\xf0\x57\x75\x63\xad\x02\x0b\x8c\x22\xa8\xeb\x0e\xaa\x14\x2c\x0b\x96\x56\x20\x97\x08\xcd\x64\x56\x08\x33\x0e\xb4\xa5\xf3\xa8\x54\x00\x52\x6f\x20\x34\xd1\x07\x1e\xe6\xf0\xf2\x7a\x69\xd3\x0a\x6d\xb4\xda\xf7\xbc\x71\x16\x89\xc9\x42\x3a\x0b\x97\x87\xe7\xd5\xa0\xfd\xc7\x36\x58\xd2\x06\x9b\xc2\xd3\xa6\xc4\x18\x0c\x95\xa1\x5d\xd3\x33\xe1\x4d\xc1\x2b\xe9\xac\xa6\xd6\x43\x3d\x03\x9a\x69\x83\x67\x4e\xdf\xd7\x7a\x01\xec\x5f\x6c\xf8\x9c\x76\xc5\x1a\x9a\xff\xcb\x13\x81\x39\x72\xa9\x11\xed\xe0\x08\xe8\xbe\x29\x96\x52\xd0\xfc\xc7\x70\xd6\xd4\x70\x07\xce\x88\x6d\x92\x84\x8f\xf4\xbb\x41\xe9\x6f\xac\xab\xa0\x95\x74\xc0\xfe\x6f\x29\x85\xb6\xd7\x5f\xcb\x4f\x68\x98\xd9\x8f\xb8\xc5\x8c\xac\x99\x49\xc7\xfd\x9e\x86\xbb\x59\x12\x51\xa1\xc1\xb9\xdf\x9d\x38\xb0\x84\x6b\x64\xeb\xa8\x15\xa3\x11\xc7\x11\x29\x1a\x05\x0f\x85\x28\x1b\x2e\x3b\x19\x5a\x25\x01\xe5\x59\x21\x72\x22\x69\xc1\x4f\x53\x64\xeb\x6a\x0e\x67\x4e\x8d\x26\xa0\x11\x63\x4f\x64\x1d\xde\xa4\xe3\xf4\x18\x8f\xce\x85\x59\x7b\x10\x34\x27\x62\x73\x87\x9b\x78\xb7\xc6\xc7\x22\x2f\x57\x4e\xe5\x1d\xb2\x21\xbc\x6f\x4a\xf7\x9f\x87\x56\x6b\xf8\xae\xdd\xd9\xbd\x76\x07\x63\xb8\xc9\x17\x3d\xa4\xa0\xd4\xeb\xa8\xba\xc3\x22\x8d\x87\x36\xb9\x7f\x0a\x81\x74\xc1\xef\x70\x53\xf5\xb3\xeb\xa6\x77\x66\x98\x35\x19\xf6\xe0\x5d\x54\x97\xc2\xe3\x26\x7f\x2b\x98\xe3\x3b\x5b\x85\x76\xdc\x52\xde\x67\x7d\x37\xad\x1e\xc0\x76\x03\xb9\x32\x91\xb3\xd5\x36\x65\xdb\xe4\x5e\xef\x63\x77\x48\x70\x72\xd5\x10\x7c\xfd\x59\x86\xb7\x49\xde\x35\xa3\xa6\x6d\x55\xa3\x4b\x28\x8b\x4a\x96\x05\x47\x10\x98\x09\xe4\x09\xe5\x0b\x90\x05\x90\x8f\x82\xa6\x20\x37\x25\x26\x4b\x4c\x56\x7a\x96\x15\x45\x59\xc1\x65\xd4\x3a\xfa\x1f\xb3\xdf\xe2\xac\xc3\x1f\xa7\xcd\x9a\x9b\xc3\xf3\x6b\x04\x36\x3d\xa0\xef\xe8\xd0\xc5\xf4\x07\x59\x6e\xba\x5a\xb6\x0a\xff\xe3\xcf\x65\x4a\xe4\xf0\xce\x68\x7c\x34\x8b\xb1\xeb\x37\x61\xd3\x90\xfd\x3d\x31\x46\xae\x6f\x91\xe1\x5e\xd7\x76\xf1\x54\xd7\xbd\x7b\x6c\x74\x46\x95\x3f\x98\x8d\x22\x70\x8f\x00\xdb\x2d\x09\x63\xa6\x2d\x4a\x3b\x49\x79\xaf\x7f\x86\xbe\xe7\x6c\xfb\xd7\x73\xdb\x10\x8f\x3f\x31\xbc\x5e\x1d\x0f\xf5\xf2\xa9\x3f\xdc\xba\xd2\x2f\x9b\x6c\xcd\x13\xa0\x9c\xca\xf3\x0b\xa8\x4f\x7e\xd0\x7c\xf6\x0e\x19\xa9\xf7\x40\x6b\xea\xdf\x0f\xfd\xe5\x4e\x78\xad\x50\x61\x0e\xa7\x2a\x78\xbc\x97\x86\x82\xde\xbf\x79\x70\xba\xc1\xcf\x00\x00\x00\xff\xff\x87\xd9\x4c\xf9\x91\x0a\x00\x00") +var _templateMigrateSchemaTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x56\x4b\x4f\xdc\x30\x10\x3e\x27\xbf\x62\x14\x6d\x11\xa0\xdd\x44\x70\x8c\xb4\x87\x0a\x54\xa9\x42\x6a\x51\x81\x13\x42\x95\x49\x26\xbb\xd6\x3a\x76\x70\xbc\xb4\xdb\x34\xff\xbd\xf2\x23\xcf\x7d\xb0\xb4\x3d\x25\xb6\xe7\x9b\xf1\x7c\xf3\x79\xec\xaa\x82\x14\x33\xca\x11\x82\x32\x59\x62\x4e\x02\xa8\x6b\xdf\xaf\xaa\x19\xfc\xa0\x6a\x09\xf8\x53\x21\x4f\x61\x02\xc1\x2d\x49\x56\x64\x81\x01\x04\x39\x5d\x48\xa2\x30\x80\x59\x5d\xfb\x5e\x55\x81\xc2\xbc\x60\x44\x21\x04\x4b\x24\x29\xca\x00\x42\xed\xa5\xaa\x40\x63\xb5\x3f\x9a\x17\x42\x2a\x38\xf5\xbd\x20\x7b\x4e\x22\xe4\x2a\xca\x28\xb2\x34\xe8\x4d\xa4\x94\x30\x4c\x54\x54\xbe\xb0\xc8\xed\xc5\x3f\xf3\xfd\x57\x22\x35\x8e\xaf\x19\x23\xcf\x0c\x61\x0e\x4a\xae\x51\xc7\x9d\x81\x24\x7c\x81\x30\xf9\x3e\x85\x89\x82\x78\x0e\x93\xf0\x5e\xdb\x94\x3a\xa6\x67\x2c\x26\x89\x60\xeb\x9c\x97\x7a\xb5\x20\x65\x42\x18\x4c\x54\xf8\x85\xe4\x08\xbf\xa1\x90\x94\xab\x0c\x82\x0f\xe5\x95\xb5\x0a\x2c\x30\x8a\xa0\xaa\x3a\x68\x5d\xc3\x52\xb0\xb4\x04\xb5\x44\x68\x26\x33\x21\xcd\x38\xd0\x96\xce\x63\x5d\x07\xa0\xf4\x06\x42\x13\x7d\xe0\x61\x0e\x8f\x4f\xe7\x36\xad\xd0\x46\xab\x7c\xcf\x1b\x67\x91\x98\x2c\x94\xb3\x70\x79\x78\x5e\x05\xda\x7f\x6c\x83\x25\x6d\xb0\x29\xdc\x6f\x0a\x8c\xc1\x50\x19\xda\x35\x3d\x13\x5e\x09\x5e\x2a\x67\x35\xb5\x1e\xaa\x19\xd0\x4c\x1b\x3c\x70\xfa\xb2\xd6\x0b\x60\xff\x62\xc3\xe7\xb4\x2b\xd6\xd0\xfc\x33\x4f\x24\xe6\xc8\x95\x46\xb4\x83\x43\x20\x21\xcd\x1e\x9b\x7a\xd5\x35\x34\xff\x31\x9c\x34\x65\xdc\x01\x35\x7a\x9b\x24\xe1\x1d\xfd\x65\x50\xfa\x1b\xeb\x42\x68\x31\x1d\xb0\xff\xa8\x94\xd4\xf6\xfa\x6b\x29\x0a\x0d\x39\xfb\x11\xd7\x98\x91\x35\x33\x19\xb9\xdf\xe3\x70\x57\x4b\x22\x4b\x34\x38\xf7\xbb\x13\x07\x96\x73\x8d\x6c\x1d\xb5\x7a\x34\xfa\x78\x43\x8d\x46\xc4\x43\x2d\xaa\x86\xcb\x4e\x89\x56\x4c\x40\x79\x26\x64\x4e\x14\x15\xfc\x38\x51\xb6\xae\xe6\x70\xe2\x04\x69\x02\x1a\x3d\xf6\x74\xd6\xe1\x4d\x3a\x4e\x92\xf1\xe8\x68\x98\xb5\x5b\x49\x73\x22\x37\x37\xb8\x89\x77\xcb\x7c\xac\xf3\x62\xe5\x84\xde\x21\x1b\xc2\xfb\xa6\x74\xff\x91\x68\xe5\x86\x2f\xda\x9d\xdd\x6b\x77\x36\x86\x9b\x7c\xd4\x43\x0a\x75\xfd\x34\xaa\xee\xb0\x48\xe3\xa1\x4d\xee\x93\x90\x48\x17\xfc\x06\x37\x65\x3f\xbb\x6e\x7a\x67\x86\x59\x93\x61\x0f\xde\x45\x75\x29\xdc\x6d\xf2\x67\xc1\x1c\xdf\xd9\x2a\xb4\xe3\x96\xf2\x3e\xeb\xbb\x69\xf5\x00\xb6\x7b\xc8\x85\x89\x9c\xad\xb6\x29\xdb\x26\xf7\x72\x1f\xbb\x43\x82\x93\x8b\x86\xe0\xcb\xf7\x32\xbc\x4d\xf2\xae\x99\x7a\xda\x56\x35\x3a\x87\x42\x94\xaa\x10\x1c\x41\x62\x26\x91\x27\x94\x2f\x40\x09\x20\xaf\x82\xa6\xa0\x36\x05\x26\x4b\x4c\x56\x7a\x96\x09\x51\x94\x70\x1e\xb5\x8e\xbe\x61\xf6\x4f\x9c\x75\xf8\xb7\x69\xb3\xe6\xe6\xf0\xfc\x1d\x81\x4d\x0f\xe8\x3b\x3a\x74\x37\xfd\x47\x96\x9b\xae\x96\xad\xc2\xaf\xfc\xa1\x48\x89\x1a\x5e\x1b\x8d\x8f\x66\x31\x76\xfd\x26\x6c\x1a\xb2\xbf\x27\xc6\xc8\xf5\x35\x32\xdc\xeb\xda\x2e\x1e\xeb\xba\x77\x95\x8d\xce\x68\xed\x0f\x66\xa3\x08\xdc\x3b\xc0\x76\x4b\xc2\x98\x69\x8b\xca\x4e\x52\xde\xeb\x9f\xa1\xef\x39\xdb\xfe\x0d\xdd\x36\xc4\xb7\x5f\x19\x5e\xaf\x8e\x87\x7a\xf9\xd4\x1f\x6e\xbd\xd6\x8f\x9b\x6c\xcd\x13\xa0\x9c\xaa\xd3\x33\xa8\x8e\x7e\xd3\xbc\xf7\x0e\x19\xa9\xf7\x40\x6b\xea\xdf\x0f\xfd\xe5\x4e\x78\xad\x50\x61\x0e\xc7\x2a\x78\xbc\x97\x86\x82\xde\xbf\x79\x73\xba\xc1\x9f\x00\x00\x00\xff\xff\x72\x0f\x14\x3f\x94\x0a\x00\x00") func templateMigrateSchemaTmplBytes() ([]byte, error) { return bindataRead( @@ -819,7 +819,7 @@ func templateMigrateSchemaTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/migrate/schema.tmpl", size: 2705, mode: os.FileMode(420), modTime: time.Unix(1564915814, 0)} + info := bindataFileInfo{name: "template/migrate/schema.tmpl", size: 2708, mode: os.FileMode(420), modTime: time.Unix(1565180603, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -864,7 +864,7 @@ func templateTxTmpl() (*asset, error) { return a, nil } -var _templateWhereTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x57\x4d\x6f\xe3\x36\x10\x3d\x4b\xbf\x62\x20\x28\xa8\x04\x24\x14\x7a\x2d\xb0\x87\x00\xde\x62\x7d\x49\xb6\x1f\x68\x0f\x41\x50\x70\xa5\x91\x4c\x44\x26\xb9\x24\xad\xec\x82\xd5\x7f\x2f\x48\xca\x92\x12\xdb\x59\x1b\xd9\xa0\x1b\xe4\x16\x91\x33\xc3\x99\xf7\x1e\x5f\x4c\x6b\xa1\xc2\x9a\x71\x84\xe4\x7e\x85\x0a\x13\xe8\xfb\x38\xb6\xf6\x02\xee\x99\x59\x01\x7e\x31\xc8\x2b\x48\x21\xf9\x48\xcb\x3b\xda\x60\x02\x29\x19\xfe\x84\x8b\xbe\x8f\x23\x6b\xc1\xe0\x5a\xb6\xd4\x20\x24\x2b\xa4\x15\xaa\x04\x88\xab\x62\x2d\xb8\xdc\x50\x6f\x16\xc4\xd6\x52\x28\x93\x40\xea\xb7\x8a\x02\x96\x0b\xa8\x59\x6b\x50\x69\xe8\x50\x19\x56\xa2\x86\x4f\x54\x63\x05\x82\x83\x59\x21\x53\xc0\x2a\xe4\x86\xd5\x0c\x15\x89\xeb\x0d\x2f\x61\xb9\xc8\x58\x05\xd6\x42\x4a\x96\x0b\xf2\xe7\x57\x89\xd0\xf7\x39\x48\x85\x15\x2b\xa9\x41\xe2\xb7\xae\xe8\xda\xad\x83\x8d\x23\x85\x66\xa3\xf8\x81\x00\x6b\x81\xd5\xd0\x18\xc8\x5a\xe4\x90\x92\x3f\x8c\x50\xb4\xc1\x1c\x7e\x86\xbe\xff\x88\x6a\xc1\x68\x8b\xa5\x19\x27\xca\xe2\xc8\x0d\xae\x28\x6f\x10\xd2\x7f\xce\x21\xd5\x21\x03\x7e\x79\x37\xa5\x07\x80\x7c\x64\x6a\xd6\xb2\x75\x9b\x52\x31\x6e\x6a\x48\xaa\x50\xb1\x38\xd3\xc5\xd8\x52\xc1\xaa\x64\xaa\xb4\xcd\xbd\x80\x2f\x23\x76\xa1\x8c\x03\xee\x3c\x74\xe0\xda\xf1\xa7\xe4\x71\x80\x79\xd6\x92\x90\xee\x40\x21\xb5\xc7\x08\x06\xb2\x52\xaa\x1a\xb7\x9e\xb8\xc3\xb6\x93\xa7\x42\x92\xbf\xa8\x62\xb4\x62\x65\x58\xf4\x61\x3e\x4a\x0f\x61\x03\x97\xbe\x86\xa7\x60\x36\xcd\x72\x71\xa6\x13\x5f\x65\x00\x34\x8e\x8a\x02\xc6\xc8\xbe\x07\x2a\x65\xcb\x50\x3b\x3a\xfd\xfa\x14\x3a\x51\x32\xd0\x1d\xf4\x80\x6d\x45\xe2\xc8\xa7\xcf\xea\x64\xdb\xd6\x1c\xa9\xfb\x5a\x27\x84\x8c\xbd\x9e\xa0\x8e\xef\x2f\x8f\x13\xf4\x11\xed\xb9\x6e\x97\xaa\x49\xc2\xa4\xc9\xb5\xf4\xd0\x8e\xd1\xa7\xe8\xa9\x10\x52\xef\x68\x6a\xbf\xaa\xc8\xa0\xaa\x87\xba\x7a\xf4\x95\xc7\xd1\xe3\x8b\x3d\x1b\xb2\x0e\xe3\xfd\xea\xc8\xd3\xbb\x62\xa1\xba\xa4\x2d\xa4\xf5\x37\x45\x82\x9f\x37\xb4\x65\xe6\x2b\x94\x2b\x2c\xef\x76\x05\x62\x2d\x7c\xde\x08\xd7\xf9\x58\x6b\x50\x0c\x2c\xcd\x4f\x7a\x70\x0b\x77\x98\x11\xf3\x03\xde\xff\xb6\x4f\x52\x5d\xf8\x7a\x95\x32\xf1\x50\x27\x0e\xf9\xd3\xd5\x51\x0f\xb9\xff\xa7\x38\x76\xec\x2a\xf3\x7e\x55\xe7\x3b\x76\xd5\x1d\xe3\x56\xdd\x37\xcd\x0a\xb2\x87\x32\xcc\x21\xdb\x7a\x51\xfe\x5c\xdf\x3a\x2c\xcb\xfd\x46\xc6\x6a\xe0\xc2\x84\x9a\xac\x7d\x34\xcd\xb1\x06\x37\xea\x76\x5c\x7d\x52\xc0\x8e\xdc\xdd\xa2\x8e\xca\xce\x61\xb4\xa6\x77\x98\xdd\xdc\x32\x6e\x50\xd5\xb4\x44\xdb\x9f\x43\x8b\x7c\x66\xbb\x79\xee\x82\x6b\xa1\x80\xb9\x84\x40\x60\xe7\x6b\x47\x51\x77\xc3\x6e\xe1\x1d\x4c\xd1\x37\xec\xd6\x6d\xf4\xc3\xc9\x5b\x5a\x7e\xb8\x7b\x34\xb3\xdb\xe9\x4a\x3d\xc3\x79\x3d\xed\x2f\x62\xbe\xd1\xa4\xee\x83\x57\x6d\x98\xfb\x7d\xd5\xe0\x61\x1b\xc6\x00\xf7\xbf\xe3\x20\x1f\xa8\x3e\xf3\xf7\xe7\xc9\x4b\xf0\x81\x6a\x57\xf7\x29\xf5\xe3\xa8\x38\xac\x1a\xdc\x27\xfe\x57\xe5\xb1\x6e\xdc\xc4\x81\x7a\xba\x0c\xdc\xfc\xc5\x8a\xbe\x8c\x0a\x02\x9a\x53\x07\x67\xfa\x6f\x66\x56\xc9\x88\xf2\xf7\xa5\x31\xa0\x42\xa1\x61\x1d\x72\x28\x05\xaf\x98\x61\x82\x6b\xc8\x84\x59\xa1\x9a\x0a\xe9\x7c\x1f\xe3\x6e\x5b\x03\x21\xe4\x21\xad\xe8\xdd\x6b\x7b\xd0\x5b\x93\xc5\x7d\xe0\xeb\xc5\xfe\x01\x17\x05\x5c\xf2\x0a\x1a\x25\x36\x52\x43\xcb\xb4\x01\x51\xcf\x98\x0a\x23\x39\xd6\x2f\xaf\x16\x20\x24\x2a\x6a\x84\x82\x4f\x68\xee\x11\xbd\x1c\xd6\xc3\x73\xeb\x92\x57\xd9\x2c\x6f\x87\xc7\x63\x18\x7c\x0d\x2f\x30\xca\x8f\x7b\x82\x91\x43\x4f\xb0\xa2\x80\x6b\x75\x0c\xe2\xd7\xbf\x3f\x09\xf8\xb5\x7a\x13\x78\x0b\xf5\x6c\xb8\xaf\x84\x79\xe0\x6c\xee\x27\xd5\x88\xec\x60\x6a\xc1\xb4\x26\x24\x02\xc6\x57\xc2\x64\xf2\x00\x3e\xaf\x1d\x58\x2e\xcc\xf3\x90\x9d\x6c\xe4\xbf\x00\x00\x00\xff\xff\x94\x69\xf5\x25\x23\x12\x00\x00") +var _templateWhereTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x57\x4d\x6f\xdb\x38\x10\x3d\x4b\xbf\x62\x40\x28\x58\x09\x48\x28\xec\x75\x81\x1e\x02\xb8\x8b\xfa\x92\x74\x3f\xb0\x7b\x08\x82\x05\x2b\x8d\x64\x22\x32\xa9\x92\xb4\xd2\x82\xab\xff\xbe\x20\x29\x4b\x4a\x6c\xa7\x36\x92\x60\x1b\xf4\x56\x93\x33\xc3\x99\xf7\xde\xbc\x46\xd6\x42\x89\x15\x17\x08\xe4\x7e\x85\x0a\x09\xf4\x7d\x1c\x5b\x7b\x01\xf7\xdc\xac\x00\xbf\x18\x14\x25\x24\x40\x3e\xb2\xe2\x8e\xd5\x48\x20\xa1\xc3\x3f\xe1\xa2\xef\xe3\xc8\x5a\x30\xb8\x6e\x1b\x66\x10\xc8\x0a\x59\x89\x8a\x00\x75\x55\xac\x05\x97\x1b\xea\xcd\x82\xf8\xba\x95\xca\x10\x48\xfc\x55\x9e\xc3\x72\x01\x15\x6f\x0c\x2a\x0d\x1d\x2a\xc3\x0b\xd4\xf0\x89\x69\x2c\x41\x0a\x30\x2b\xe4\x0a\x78\x89\xc2\xf0\x8a\xa3\xa2\x71\xb5\x11\x05\x2c\x17\x29\x2f\xc1\x5a\x48\xe8\x72\x41\xff\xfc\xda\x22\xf4\x7d\x06\xad\xc2\x92\x17\xcc\x20\xf5\x57\x57\x6c\xed\xce\xc1\xc6\x91\x42\xb3\x51\xe2\x40\x80\xb5\xc0\x2b\xa8\x0d\xa4\x0d\x0a\x48\xe8\x1f\x46\x2a\x56\x63\x06\x3f\x43\xdf\x7f\x44\xb5\xe0\xac\xc1\xc2\x8c\x13\xa5\x71\xe4\x06\x57\x4c\xd4\x08\xc9\x3f\xe7\x90\xe8\x90\x01\xbf\xbc\x9b\xd2\x03\x40\x3e\x32\x31\xeb\xb6\x71\x97\xad\xe2\xc2\x54\x40\xca\x50\x31\x3f\xd3\xf9\xd8\x52\xce\x4b\x32\x55\xda\xe6\x5e\xc0\x97\x11\xbb\x50\xc6\x01\x77\x1e\x3a\x70\xed\xf8\x57\xb2\x38\xc0\x3c\x6b\x49\xb6\xee\x41\xd9\x6a\x8f\x11\x0c\x64\x25\x4c\xd5\xee\x9c\xb8\xc7\xb6\x93\x27\xb2\xa5\x7f\x31\xc5\x59\xc9\x8b\x70\xe8\xc3\x7c\x94\x1e\xc2\x06\x2e\x7d\x0d\x4f\xc1\x6c\x9a\xe5\xe2\x4c\x13\x5f\x65\x00\x34\x8e\xf2\x1c\xc6\xc8\xbe\x07\xd6\xb6\x0d\x47\xed\xe8\xf4\xe7\x53\xe8\x44\xc9\x40\x77\xd0\x03\x36\x25\x8d\x23\x9f\x3e\xab\x93\x6e\x5b\x73\xa4\xee\x6b\x9d\x52\x3a\xf6\x7a\x82\x3a\x5e\x5e\x1e\x27\xe8\x23\xda\xb3\x6e\x97\xaa\x26\x61\x52\x72\xdd\x7a\x68\x81\x0c\x69\x33\x8d\x6c\x0b\x9c\x22\xb1\x5c\xb6\x7a\x47\x66\xfb\x85\x46\x07\xa1\x3d\x94\xda\xa3\x5f\x59\x1c\x3d\xde\xf5\xd9\xdc\x55\x98\xf8\x57\xc7\xa7\xde\xd5\x0f\xd3\x05\x6b\x20\xa9\xbe\xa9\x1b\xfc\xbc\x61\x0d\x37\x5f\xa1\x58\x61\x71\xb7\xab\x19\x6b\xe1\xf3\x46\xba\xce\xc7\x5a\x83\x88\x60\x69\x7e\xd2\x83\x81\xb8\xc7\x8c\x9c\x3f\xf0\xfe\xb7\x7d\x2a\xeb\xc2\xaf\x37\xa9\x1c\x0f\x35\x71\xc8\x9f\xae\x8e\x6a\xc8\xfd\x3f\xc5\xb1\xe3\x60\xa9\xb7\xb0\x2a\xdb\x71\xb0\xee\x18\x03\xeb\xbe\xe9\x5f\x90\x3e\x94\x61\x06\xe9\xd6\x9e\xb2\xe7\x5a\xd9\x61\x59\xee\xf7\x36\x5e\x81\x90\x26\xd4\xe4\xcd\xa3\x69\x8e\xf5\xbc\x51\xb7\xe3\xe9\x93\x02\x76\xe4\xee\x16\x75\x54\x76\x0e\xa3\x35\xbb\xc3\xf4\xe6\x96\x0b\x83\xaa\x62\x05\xda\xfe\x1c\x1a\x14\x33\x27\xce\x32\x17\x5c\x49\x05\xdc\x25\x04\x02\x3b\x5f\x3b\x8a\xba\x1b\x7e\x0b\xef\x60\x8a\xbe\xe1\xb7\xee\xa2\x1f\x5e\xde\xd2\xf2\xdd\xed\xd1\xcc\x81\xa7\x95\x7a\x59\x33\xf6\x4a\x78\x15\x3f\x8e\x26\xc1\x1f\xdc\xbe\x01\x8a\xf7\x65\x8d\x87\x9d\x19\x03\x03\xff\x8e\x83\x7c\x60\xfa\xcc\xaf\xd4\x93\x7b\xf1\x81\x69\x57\xf7\xa9\x85\xc0\x51\x84\x58\xd6\xb8\x6f\x1f\xde\x94\xed\xba\x71\x89\x03\xf5\x74\x19\xb8\xf9\xf3\x15\x7b\x1d\x15\x04\x34\xa7\x0e\xce\xf4\xdf\xdc\xac\xc8\x88\xf2\xcb\xd2\x18\x50\x61\x50\xf3\x0e\x05\x14\x52\x94\xdc\x70\x29\x34\xa4\xd2\xac\x50\x4d\x85\x74\xb6\x8f\x71\x77\xad\x81\x52\xfa\x90\x56\xf4\x86\xb6\x7d\xe8\x47\x93\xc5\x7d\xe0\xeb\xd5\xfe\x4f\xce\x73\xb8\x14\x25\xd4\x4a\x6e\x5a\x0d\x0d\xd7\x06\x64\x35\x63\x2a\x8c\xe4\x58\xbf\xbc\x5a\x80\x6c\x51\x31\x23\x15\x7c\x42\x73\x8f\xe8\xe5\xb0\x1e\x3e\xca\x2e\x45\x99\xce\xf2\x76\x78\x3c\x86\xc1\xb7\xf0\x9d\xc6\xc4\x71\x1f\x6a\xf4\xd0\x87\x5a\x9e\xc3\xb5\x3a\x06\xf1\xeb\xdf\x9f\x04\xfc\x5a\xfd\x10\x78\x4b\xf5\x6c\xb8\xaf\xa4\x79\xe0\x6c\xee\xaf\xac\x11\xd9\xc1\xd4\x82\x69\x4d\x48\x04\x8c\xaf\xa4\x49\xdb\x03\xf8\xbc\x75\x60\x85\x34\xcf\x43\x76\xb2\x91\xff\x02\x00\x00\xff\xff\x74\x5b\x64\x0e\x49\x12\x00\x00") func templateWhereTmplBytes() ([]byte, error) { return bindataRead( @@ -879,7 +879,7 @@ func templateWhereTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/where.tmpl", size: 4643, mode: os.FileMode(420), modTime: time.Unix(1565167395, 0)} + info := bindataFileInfo{name: "template/where.tmpl", size: 4681, mode: os.FileMode(420), modTime: time.Unix(1565182337, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/func.go b/entc/gen/func.go index eac0a14d9..4e020f143 100644 --- a/entc/gen/func.go +++ b/entc/gen/func.go @@ -55,7 +55,7 @@ func ops(f *Field) (op []Op) { default: op = numericOps } - if f.Nullable || f.Optional { + if f.Nillable || f.Optional { op = append(op, nillableOps...) } return op diff --git a/entc/gen/graph_test.go b/entc/gen/graph_test.go index 3fa8594ff..a3d298383 100644 --- a/entc/gen/graph_test.go +++ b/entc/gen/graph_test.go @@ -17,7 +17,7 @@ var ( Name: "T1", Fields: []*load.Field{ {Name: "age", Type: field.TypeInt, Optional: true}, - {Name: "expired_at", Type: field.TypeTime, Nullable: true}, + {Name: "expired_at", Type: field.TypeTime, Nillable: true}, {Name: "name", Type: field.TypeString, Default: true}, }, Edges: []*load.Edge{ @@ -81,7 +81,7 @@ func TestNewGraph(t *testing.T) { require.Equal(optional, t1.Fields[i].Optional) } for i, nullable := range []bool{false, true, false} { - require.Equal(nullable, t1.Fields[i].Nullable) + require.Equal(nullable, t1.Fields[i].Nillable) } for i, value := range []bool{false, false, true} { require.Equal(value, t1.Fields[i].HasDefault) @@ -157,7 +157,7 @@ func TestGraph_Gen(t *testing.T) { Name: "T1", Fields: []*load.Field{ {Name: "age", Type: field.TypeInt, Optional: true}, - {Name: "expired_at", Type: field.TypeTime, Nullable: true}, + {Name: "expired_at", Type: field.TypeTime, Nillable: true}, {Name: "name", Type: field.TypeString}, }, Edges: []*load.Edge{ diff --git a/entc/gen/predicate.go b/entc/gen/predicate.go index 88849e832..8f04bcb69 100644 --- a/entc/gen/predicate.go +++ b/entc/gen/predicate.go @@ -11,8 +11,8 @@ const ( GTE // >= LT // < LTE // <= - IsNull // IS NULL / has - NotNull // IS NOT NULL / hasNot + IsNil // IS NULL / has + NotNil // IS NOT NULL / hasNot In // within NotIn // without Contains // containing @@ -20,7 +20,7 @@ const ( HasSuffix // endingWith ) -// Name returns the string representation of an operator. +// Name returns the string representation of an predicate. func (o Op) Name() string { if int(o) < len(opText) { return opText[o] @@ -28,14 +28,6 @@ func (o Op) Name() string { return "Unknown" } -// Gremlin returns the gremlin code representation of an operator. -func (o Op) Gremlin() string { - if code := gremlinCode[o]; code != "" { - return code - } - return o.Name() -} - // Variadic reports if the predicate is a variadic function. func (o Op) Variadic() bool { return o == In || o == NotIn @@ -43,7 +35,7 @@ func (o Op) Variadic() bool { // Niladic reports if the predicate is a niladic predicate. func (o Op) Niladic() bool { - return o == IsNull || o == NotNull + return o == IsNil || o == NotNil } var ( @@ -55,27 +47,17 @@ var ( GTE: "GTE", LT: "LT", LTE: "LTE", - IsNull: "IsNull", - NotNull: "NotNull", + IsNil: "IsNil", + NotNil: "NotNil", Contains: "Contains", HasPrefix: "HasPrefix", HasSuffix: "HasSuffix", In: "In", NotIn: "NotIn", } - // operations code in gremlin. - gremlinCode = [...]string{ - IsNull: "HasNot", - NotNull: "Has", - In: "Within", - NotIn: "Without", - Contains: "Containing", - HasPrefix: "StartingWith", - HasSuffix: "EndingWith", - } // operations per type. boolOps = []Op{EQ, NEQ} numericOps = append(boolOps[:], GT, GTE, LT, LTE, In, NotIn) stringOps = append(numericOps[:], Contains, HasPrefix, HasSuffix) - nillableOps = []Op{IsNull, NotNull} + nillableOps = []Op{IsNil, NotNil} ) diff --git a/entc/gen/storage.go b/entc/gen/storage.go index edccf6a90..399c9b646 100644 --- a/entc/gen/storage.go +++ b/entc/gen/storage.go @@ -27,12 +27,13 @@ func (m SchemaMode) Support(mode SchemaMode) bool { return m&mode != 0 } // Storage driver type for codegen. type Storage struct { - Name string // storage name. - Builder reflect.Type // query builder type. - Dialects []string // supported dialects. - IdentName string // identifier name (fields and funcs). - Imports []string // import packages needed. - SchemaMode SchemaMode // schema mode support. + Name string // storage name. + Builder reflect.Type // query builder type. + Dialects []string // supported dialects. + IdentName string // identifier name (fields and funcs). + Imports []string // import packages needed. + SchemaMode SchemaMode // schema mode support. + OpCode func(Op) string // operation code for predicates. } // StorageDrivers holds the storage driver options for entc. @@ -46,6 +47,7 @@ var drivers = []*Storage{ "fbc/ent/dialect/sql", }, SchemaMode: Unique | Cascade | Migrate, + OpCode: opCodes(sqlCode[:]), }, { Name: "gremlin", @@ -61,6 +63,7 @@ var drivers = []*Storage{ "fbc/ent/dialect/gremlin/encoding/graphson", }, SchemaMode: Unique, + OpCode: opCodes(gremlinCode[:]), }, } @@ -78,3 +81,30 @@ func NewStorage(s string) (*Storage, error) { // String implements the fmt.Stringer interface for template usage. func (s *Storage) String() string { return s.Name } + +var ( + // exceptional operation names in sql. + sqlCode = [...]string{ + IsNil: "IsNull", + NotNil: "NotNull", + } + // exceptional operation names in gremlin. + gremlinCode = [...]string{ + IsNil: "HasNot", + NotNil: "Has", + In: "Within", + NotIn: "Without", + Contains: "Containing", + HasPrefix: "StartingWith", + HasSuffix: "EndingWith", + } +) + +func opCodes(codes []string) func(Op) string { + return func(o Op) string { + if int(o) < len(codes) && codes[o] != "" { + return codes[o] + } + return o.Name() + } +} diff --git a/entc/gen/template/builder/setter.tmpl b/entc/gen/template/builder/setter.tmpl index 0d945a8a9..53ebf1894 100644 --- a/entc/gen/template/builder/setter.tmpl +++ b/entc/gen/template/builder/setter.tmpl @@ -11,7 +11,7 @@ return {{ $receiver }} } {{/* avoid generting nillable setters for slices because the nil value for slice is valid */}} - {{ if and (not $f.Type.Slice) (or $f.Optional $f.Nullable $f.HasDefault) }} + {{ if and (not $f.Type.Slice) (or $f.Optional $f.Nillable $f.HasDefault) }} {{ $nillableFunc := print "SetNillable" (pascal $f.Name) }} // {{ $nillableFunc }} sets the {{ $f.Name }} field if the given value is not nil. func ({{ $receiver }} *{{ $builder }}) {{ $nillableFunc }}({{ $p }} *{{ $f.Type }}) *{{ $builder }} { diff --git a/entc/gen/template/dialect/gremlin/decode.tmpl b/entc/gen/template/dialect/gremlin/decode.tmpl index b299a50f6..7bce0bfa4 100644 --- a/entc/gen/template/dialect/gremlin/decode.tmpl +++ b/entc/gen/template/dialect/gremlin/decode.tmpl @@ -11,7 +11,7 @@ func ({{ $receiver }} *{{ $.Name }}) FromResponse(res *gremlin.Response) error { var {{ $scan }} struct { ID {{ $.ID.Type }} `json:"id,omitempty"` {{ range $_, $f := $.Fields }} - {{- pascal $f.Name }} {{ if $f.IsTime }}int64{{ else }}{{ if $f.Nullable }}*{{ end }}{{ $f.Type }}{{ end }} `json:"{{ $f.Name }},omitempty"` + {{- pascal $f.Name }} {{ if $f.IsTime }}int64{{ else }}{{ if $f.Nillable }}*{{ end }}{{ $f.Type }}{{ end }} `json:"{{ $f.Name }},omitempty"` {{ end }} } if err := vmap.Decode(&{{ $scan }}); err != nil { @@ -39,7 +39,7 @@ func ({{ $receiver }} *{{ $slice }}) FromResponse(res *gremlin.Response) error { var {{ $scan }} []struct { ID {{ $.ID.Type }} `json:"id,omitempty"` {{ range $_, $f := $.Fields }} - {{- pascal $f.Name }} {{ if $f.IsTime }}int64{{ else }}{{ if $f.Nullable }}*{{ end }}{{ $f.Type }}{{ end }} `json:"{{ $f.Name }},omitempty"` + {{- pascal $f.Name }} {{ if $f.IsTime }}int64{{ else }}{{ if $f.Nillable }}*{{ end }}{{ $f.Type }}{{ end }} `json:"{{ $f.Name }},omitempty"` {{ end }} } if err := vmap.Decode(&{{ $scan }}); err != nil { diff --git a/entc/gen/template/dialect/gremlin/predicate.tmpl b/entc/gen/template/dialect/gremlin/predicate.tmpl index f3cc7d183..731851c2b 100644 --- a/entc/gen/template/dialect/gremlin/predicate.tmpl +++ b/entc/gen/template/dialect/gremlin/predicate.tmpl @@ -5,8 +5,9 @@ {{- end }} {{ define "dialect/gremlin/predicate/id/ops" -}} -{{- $op := $.Scope.Op -}} -{{- $arg := $.Scope.Arg -}} + {{- $op := $.Scope.Op -}} + {{- $arg := $.Scope.Arg -}} + {{- $storage := $.Scope.Storage -}} func(t *dsl.Traversal) { {{- if $op.Variadic }} v := make([]interface{}, len({{ $arg }})) @@ -14,7 +15,7 @@ v[i] = {{ $arg }}[i] } {{- end }} - t.HasID(p.{{ $op.Gremlin }}({{ if $op.Variadic }}v...{{ else }}{{ $arg }}{{ end }})) + t.HasID(p.{{ call $storage.OpCode $op }}({{ if $op.Variadic }}v...{{ else }}{{ $arg }}{{ end }})) } {{- end }} @@ -28,11 +29,12 @@ {{ define "dialect/gremlin/predicate/field/ops" -}} {{- $f := $.Scope.Field -}} {{- $op := $.Scope.Op -}} + {{- $storage := $.Scope.Storage -}} func(t *dsl.Traversal) { {{- if not $op.Niladic }} - t.Has(Label, {{ $f.Constant }}, p.{{ $op.Gremlin }}(v{{ if $op.Variadic }}...{{ end }})) + t.Has(Label, {{ $f.Constant }}, p.{{ call $storage.OpCode $op }}(v{{ if $op.Variadic }}...{{ end }})) {{- else }} - t.HasLabel(Label).{{ $op.Gremlin }}({{ $f.Constant }}) + t.HasLabel(Label).{{ call $storage.OpCode $op }}({{ $f.Constant }}) {{- end }} } {{- end }} diff --git a/entc/gen/template/dialect/sql/create.tmpl b/entc/gen/template/dialect/sql/create.tmpl index 8e902a2e3..41e3cf4fc 100644 --- a/entc/gen/template/dialect/sql/create.tmpl +++ b/entc/gen/template/dialect/sql/create.tmpl @@ -15,7 +15,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (*{{ $.Name {{- range $_, $f := $.Fields }} if {{ $receiver }}.{{- $f.StructField }} != nil { builder.Set({{ $.Package }}.{{ $f.Constant }}, *{{ $receiver }}.{{ $f.StructField }}) - {{ $.Receiver }}.{{ pascal $f.Name }} = {{ if not $f.Nullable }}*{{ end }}{{ $receiver }}.{{ $f.StructField }} + {{ $.Receiver }}.{{ pascal $f.Name }} = {{ if not $f.Nillable }}*{{ end }}{{ $receiver }}.{{ $f.StructField }} } {{- end }} query, args := builder.Query() diff --git a/entc/gen/template/dialect/sql/decode.tmpl b/entc/gen/template/dialect/sql/decode.tmpl index aa38ca633..0abd93b8a 100644 --- a/entc/gen/template/dialect/sql/decode.tmpl +++ b/entc/gen/template/dialect/sql/decode.tmpl @@ -7,7 +7,7 @@ func ({{ $receiver }} *{{ $.Name }}) FromRows(rows *sql.Rows) error { var {{ $scan }} struct { ID {{ if $.ID.IsString }}int{{ else }}{{ $.ID.Type }}{{ end }} {{ range $_, $f := $.Fields }} - {{- pascal $f.Name }} {{ if or $f.Nullable $f.Optional }}{{ $f.NullType }}{{ else }}{{ $f.Type }}{{ end }} + {{- pascal $f.Name }} {{ if or $f.Nillable $f.Optional }}{{ $f.NullType }}{{ else }}{{ $f.Type }}{{ end }} {{ end }} } // the order here should be the same as in the `{{ $.Package }}.Columns`. @@ -21,7 +21,7 @@ func ({{ $receiver }} *{{ $.Name }}) FromRows(rows *sql.Rows) error { } {{ $receiver }}.ID = {{ if $.ID.IsString }}strconv.Itoa({{ $scan }}.ID){{ else }}{{ $scan }}.ID{{ end }} {{- range $_, $f := $.Fields }} - {{- if $f.Nullable }} + {{- if $f.Nillable }} {{- if $f.IsTime }} {{ $receiver }}.{{ pascal $f.Name }} = &{{ $scan }}.{{ pascal $f.Name }} {{- else }} diff --git a/entc/gen/template/dialect/sql/predicate.tmpl b/entc/gen/template/dialect/sql/predicate.tmpl index b9a89ade8..06105abcc 100644 --- a/entc/gen/template/dialect/sql/predicate.tmpl +++ b/entc/gen/template/dialect/sql/predicate.tmpl @@ -8,6 +8,7 @@ {{ define "dialect/sql/predicate/id/ops" -}} {{- $op := $.Scope.Op -}} {{- $arg := $.Scope.Arg -}} + {{- $storage := $.Scope.Storage -}} func(s *sql.Selector) { {{- if $op.Variadic }} // if not arguments were provided, append the FALSE constants, @@ -23,7 +24,7 @@ {{- else if $.ID.IsString }} id, _ := strconv.Atoi({{ $arg }}) {{- end }} - s.Where(sql.{{ $op.Name }}(s.C({{ $.ID.Constant }}), {{ if $op.Variadic }}v...{{ else }}id{{ end }})) + s.Where(sql.{{ call $storage.OpCode $op }}(s.C({{ $.ID.Constant }}), {{ if $op.Variadic }}v...{{ else }}id{{ end }})) } {{- end }} @@ -38,6 +39,7 @@ {{- $f := $.Scope.Field -}} {{- $op := $.Scope.Op -}} {{- $arg := $.Scope.Arg -}} + {{- $storage := $.Scope.Storage -}} func(s *sql.Selector) { {{- if $op.Variadic }} // if not arguments were provided, append the FALSE constants, @@ -47,7 +49,7 @@ return } {{- end }} - s.Where(sql.{{ $op.Name }}(s.C({{ $f.Constant }}){{ if not $op.Niladic }}, v{{ if $op.Variadic }}...{{ end }}{{ end }})) + s.Where(sql.{{ call $storage.OpCode $op }}(s.C({{ $f.Constant }}){{ if not $op.Niladic }}, v{{ if $op.Variadic }}...{{ end }}{{ end }})) } {{- end }} diff --git a/entc/gen/template/dialect/sql/update.tmpl b/entc/gen/template/dialect/sql/update.tmpl index e6c4acaf9..25ba5b78f 100644 --- a/entc/gen/template/dialect/sql/update.tmpl +++ b/entc/gen/template/dialect/sql/update.tmpl @@ -65,7 +65,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }} update = true builder.Set({{ $.Package }}.{{ $f.Constant }}, *{{ $receiver }}.{{ $f.StructField }}) {{- if $one }} - {{- if $f.Nullable }} + {{- if $f.Nillable }} {{ $.Receiver }}.{{ pascal $f.Name }} = {{ $receiver }}.{{ $f.StructField }} {{- else }} {{ $.Receiver }}.{{ pascal $f.Name }} = *{{ $receiver }}.{{ $f.StructField }} diff --git a/entc/gen/template/ent.tmpl b/entc/gen/template/ent.tmpl index edf794001..8fd960cb1 100644 --- a/entc/gen/template/ent.tmpl +++ b/entc/gen/template/ent.tmpl @@ -12,7 +12,7 @@ type {{ $.Name }} struct { ID {{ $.ID.Type }} `json:"id,omitempty"` {{ range $_, $f := $.Fields -}} // {{ pascal $f.Name }} holds the value of the "{{ $f.Name }}" field. - {{ pascal $f.Name }} {{ if $f.Nullable }}*{{ end }}{{ $f.Type }} `{{ $f.StructTag }}` + {{ pascal $f.Name }} {{ if $f.Nillable }}*{{ end }}{{ $f.Type }} `{{ $f.StructTag }}` {{ end -}} {{ range $_, $e := $.Edges -}} {{/* ignore generating edge fields */}} @@ -62,7 +62,7 @@ func ({{ $receiver }} *{{ $.Name }}) String() string { buf.WriteString("{{ $.Name }}(") buf.WriteString(fmt.Sprintf("id=%v", {{ $receiver }}.ID)) {{- range $i, $f := $.Fields }} - {{- if $f.Nullable }} + {{- if $f.Nillable }} if v := {{ $receiver }}.{{ pascal $f.Name }}; v != nil { buf.WriteString(fmt.Sprintf(", {{ $f.Name }}=%v", *v)) } diff --git a/entc/gen/template/migrate/schema.tmpl b/entc/gen/template/migrate/schema.tmpl index f41920b3c..a4718c2dc 100644 --- a/entc/gen/template/migrate/schema.tmpl +++ b/entc/gen/template/migrate/schema.tmpl @@ -19,7 +19,7 @@ var ( { Name: "{{ $c.Name }}", Type: field.{{ $c.Type.ConstName }}, {{- if $c.Unique }} Unique: true,{{ end }} {{- if $c.Increment }} Increment: true,{{ end }} - {{- if $c.Nullable }} Nullable: &nullable,{{ end }} + {{- if or $c.Nullable }} Nullable: &nullable,{{ end }} {{- with $c.Size }} Size: {{ . }},{{ end }} {{- with $c.Attr }} Attr: "{{ . }}",{{ end }} {{- with $c.Default }} Default: "{{ . }}",{{ end }} diff --git a/entc/gen/template/where.tmpl b/entc/gen/template/where.tmpl index ccbd3d8c7..f82f940b3 100644 --- a/entc/gen/template/where.tmpl +++ b/entc/gen/template/where.tmpl @@ -23,7 +23,7 @@ func ID(id {{ $.ID.Type }}) predicate.{{ $.Name }} { func {{ $func }}({{ $arg }} {{ if $op.Variadic }}...{{ end }}{{ $.ID.Type }}) predicate.{{ $.Name }} { return predicate.{{ $.Name }}{{ if gt (len $.Storage) 1 }}PerDialect{{ end }}( {{ range $_, $storage := $.Storage -}} - {{- with extend $ "Arg" $arg "Op" $op -}} + {{- with extend $ "Arg" $arg "Op" $op "Storage" $storage -}} {{ $tmpl := printf "dialect/%s/predicate/id/ops" $storage }} {{- xtemplate $tmpl . }}, {{ end -}} @@ -61,7 +61,7 @@ func ID(id {{ $.ID.Type }}) predicate.{{ $.Name }} { {{- end }} return predicate.{{ $.Name }}{{ if gt (len $.Storage) 1 }}PerDialect{{ end }}( {{ range $_, $storage := $.Storage -}} - {{- with extend $ "Arg" $arg "Field" $f "Op" $op -}} + {{- with extend $ "Arg" $arg "Field" $f "Op" $op "Storage" $storage -}} {{ $tmpl := printf "dialect/%s/predicate/field/ops" $storage }} {{- xtemplate $tmpl . }}, {{ end -}} diff --git a/entc/gen/type.go b/entc/gen/type.go index 82f8de8ea..b3b26bdd8 100644 --- a/entc/gen/type.go +++ b/entc/gen/type.go @@ -41,8 +41,9 @@ type ( Unique bool // Optional indicates is this field is optional on create. Optional bool - // Nullable indicates that this field can be null. - Nullable bool + // Nillable indicates that this field can be null in the + // database and pointer in the generated entities. + Nillable bool // HasDefault indicates if this field a default value. HasDefault bool // StructTag of the field. default to "json". @@ -114,7 +115,7 @@ func NewType(c Config, schema *load.Schema) (*Type, error) { Name: f.Name, Type: f.Type, Unique: f.Unique, - Nullable: f.Nullable, + Nillable: f.Nillable, Optional: f.Optional, HasDefault: f.Default, StructTag: structTag(f.Name, f.Tag), @@ -208,7 +209,7 @@ func (t Type) Describe(w io.Writer) { b.WriteString(t.Name + ":\n") table := tablewriter.NewWriter(b) table.SetAutoFormatHeaders(false) - table.SetHeader([]string{"Field", "Type", "Unique", "Optional", "Nullable", "HasDefault", "StructTag", "Validators"}) + table.SetHeader([]string{"Field", "Type", "Unique", "Optional", "Nillable", "HasDefault", "StructTag", "Validators"}) for _, f := range append([]*Field{t.ID}, t.Fields...) { v := reflect.ValueOf(*f) row := make([]string, v.NumField()-1) @@ -296,11 +297,20 @@ func (f Field) NullTypeField(rec string) string { // Column returns the table column. It sets it as a primary key (auto_increment) in case of ID field. func (f Field) Column() *schema.Column { - c := &schema.Column{Name: f.Name, Type: f.Type, Unique: f.Unique} - if f.Name == "id" { + pk := f.Name == "id" + c := &schema.Column{ + Name: f.Name, + Type: f.Type, + Unique: f.Unique, + } + if pk { c.Type = field.TypeInt c.Increment = true } + // nullability constraint only to non primary keys. + if nullable := f.Optional; !pk && nullable { + c.Nullable = &nullable + } if f.def != nil { if f.def.Size != nil { c.Size = *f.def.Size diff --git a/entc/gen/type_test.go b/entc/gen/type_test.go index 357494c9f..8d303d412 100644 --- a/entc/gen/type_test.go +++ b/entc/gen/type_test.go @@ -161,13 +161,13 @@ func TestType_Describe(t *testing.T) { ID: &Field{Name: "id", Type: field.TypeInt}, Fields: []*Field{ {Name: "name", Type: field.TypeString, Validators: 1}, - {Name: "age", Type: field.TypeInt, Nullable: true}, + {Name: "age", Type: field.TypeInt, Nillable: true}, }, }, out: ` User: +-------+--------+--------+----------+----------+------------+-----------+------------+ - | Field | Type | Unique | Optional | Nullable | HasDefault | StructTag | Validators | + | Field | Type | Unique | Optional | Nillable | HasDefault | StructTag | Validators | +-------+--------+--------+----------+----------+------------+-----------+------------+ | id | int | false | false | false | false | | 0 | | name | string | false | false | false | false | | 1 | @@ -188,7 +188,7 @@ User: out: ` User: +-------+------+--------+----------+----------+------------+-----------+------------+ - | Field | Type | Unique | Optional | Nullable | HasDefault | StructTag | Validators | + | Field | Type | Unique | Optional | Nillable | HasDefault | StructTag | Validators | +-------+------+--------+----------+----------+------------+-----------+------------+ | id | int | false | false | false | false | | 0 | +-------+------+--------+----------+----------+------------+-----------+------------+ @@ -207,7 +207,7 @@ User: ID: &Field{Name: "id", Type: field.TypeInt}, Fields: []*Field{ {Name: "name", Type: field.TypeString, Validators: 1}, - {Name: "age", Type: field.TypeInt, Nullable: true}, + {Name: "age", Type: field.TypeInt, Nillable: true}, }, Edges: []*Edge{ {Name: "groups", Type: &Type{Name: "Group"}, Rel: Relation{Type: M2M}, Optional: true}, @@ -217,7 +217,7 @@ User: out: ` User: +-------+--------+--------+----------+----------+------------+-----------+------------+ - | Field | Type | Unique | Optional | Nullable | HasDefault | StructTag | Validators | + | Field | Type | Unique | Optional | Nillable | HasDefault | StructTag | Validators | +-------+--------+--------+----------+----------+------------+-----------+------------+ | id | int | false | false | false | false | | 0 | | name | string | false | false | false | false | | 1 | diff --git a/entc/integration/ent/example_test.go b/entc/integration/ent/example_test.go index 0de2f1595..2334f8a3a 100644 --- a/entc/integration/ent/example_test.go +++ b/entc/integration/ent/example_test.go @@ -89,11 +89,11 @@ func ExampleFieldType() { SetOptionalInt16(1). SetOptionalInt32(1). SetOptionalInt64(1). - SetNullableInt(1). - SetNullableInt8(1). - SetNullableInt16(1). - SetNullableInt32(1). - SetNullableInt64(1). + SetNillableInt(1). + SetNillableInt8(1). + SetNillableInt16(1). + SetNillableInt32(1). + SetNillableInt64(1). SaveX(ctx) log.Println("fieldtype created:", ft) diff --git a/entc/integration/ent/fieldtype.go b/entc/integration/ent/fieldtype.go index 345927740..1ae05562e 100644 --- a/entc/integration/ent/fieldtype.go +++ b/entc/integration/ent/fieldtype.go @@ -36,16 +36,16 @@ type FieldType struct { OptionalInt32 int32 `json:"optional_int32,omitempty"` // OptionalInt64 holds the value of the "optional_int64" field. OptionalInt64 int64 `json:"optional_int64,omitempty"` - // NullableInt holds the value of the "nullable_int" field. - NullableInt *int `json:"nullable_int,omitempty"` - // NullableInt8 holds the value of the "nullable_int8" field. - NullableInt8 *int8 `json:"nullable_int8,omitempty"` - // NullableInt16 holds the value of the "nullable_int16" field. - NullableInt16 *int16 `json:"nullable_int16,omitempty"` - // NullableInt32 holds the value of the "nullable_int32" field. - NullableInt32 *int32 `json:"nullable_int32,omitempty"` - // NullableInt64 holds the value of the "nullable_int64" field. - NullableInt64 *int64 `json:"nullable_int64,omitempty"` + // NillableInt holds the value of the "nillable_int" field. + NillableInt *int `json:"nillable_int,omitempty"` + // NillableInt8 holds the value of the "nillable_int8" field. + NillableInt8 *int8 `json:"nillable_int8,omitempty"` + // NillableInt16 holds the value of the "nillable_int16" field. + NillableInt16 *int16 `json:"nillable_int16,omitempty"` + // NillableInt32 holds the value of the "nillable_int32" field. + NillableInt32 *int32 `json:"nillable_int32,omitempty"` + // NillableInt64 holds the value of the "nillable_int64" field. + NillableInt64 *int64 `json:"nillable_int64,omitempty"` } // FromRows scans the sql response data into FieldType. @@ -62,11 +62,11 @@ func (ft *FieldType) FromRows(rows *sql.Rows) error { OptionalInt16 sql.NullInt64 OptionalInt32 sql.NullInt64 OptionalInt64 sql.NullInt64 - NullableInt sql.NullInt64 - NullableInt8 sql.NullInt64 - NullableInt16 sql.NullInt64 - NullableInt32 sql.NullInt64 - NullableInt64 sql.NullInt64 + NillableInt sql.NullInt64 + NillableInt8 sql.NullInt64 + NillableInt16 sql.NullInt64 + NillableInt32 sql.NullInt64 + NillableInt64 sql.NullInt64 } // the order here should be the same as in the `fieldtype.Columns`. if err := rows.Scan( @@ -81,11 +81,11 @@ func (ft *FieldType) FromRows(rows *sql.Rows) error { &vft.OptionalInt16, &vft.OptionalInt32, &vft.OptionalInt64, - &vft.NullableInt, - &vft.NullableInt8, - &vft.NullableInt16, - &vft.NullableInt32, - &vft.NullableInt64, + &vft.NillableInt, + &vft.NillableInt8, + &vft.NillableInt16, + &vft.NillableInt32, + &vft.NillableInt64, ); err != nil { return err } @@ -100,25 +100,25 @@ func (ft *FieldType) FromRows(rows *sql.Rows) error { ft.OptionalInt16 = int16(vft.OptionalInt16.Int64) ft.OptionalInt32 = int32(vft.OptionalInt32.Int64) ft.OptionalInt64 = vft.OptionalInt64.Int64 - if vft.NullableInt.Valid { - ft.NullableInt = new(int) - *ft.NullableInt = int(vft.NullableInt.Int64) + if vft.NillableInt.Valid { + ft.NillableInt = new(int) + *ft.NillableInt = int(vft.NillableInt.Int64) } - if vft.NullableInt8.Valid { - ft.NullableInt8 = new(int8) - *ft.NullableInt8 = int8(vft.NullableInt8.Int64) + if vft.NillableInt8.Valid { + ft.NillableInt8 = new(int8) + *ft.NillableInt8 = int8(vft.NillableInt8.Int64) } - if vft.NullableInt16.Valid { - ft.NullableInt16 = new(int16) - *ft.NullableInt16 = int16(vft.NullableInt16.Int64) + if vft.NillableInt16.Valid { + ft.NillableInt16 = new(int16) + *ft.NillableInt16 = int16(vft.NillableInt16.Int64) } - if vft.NullableInt32.Valid { - ft.NullableInt32 = new(int32) - *ft.NullableInt32 = int32(vft.NullableInt32.Int64) + if vft.NillableInt32.Valid { + ft.NillableInt32 = new(int32) + *ft.NillableInt32 = int32(vft.NillableInt32.Int64) } - if vft.NullableInt64.Valid { - ft.NullableInt64 = new(int64) - *ft.NullableInt64 = vft.NullableInt64.Int64 + if vft.NillableInt64.Valid { + ft.NillableInt64 = new(int64) + *ft.NillableInt64 = vft.NillableInt64.Int64 } return nil } @@ -141,11 +141,11 @@ func (ft *FieldType) FromResponse(res *gremlin.Response) error { OptionalInt16 int16 `json:"optional_int16,omitempty"` OptionalInt32 int32 `json:"optional_int32,omitempty"` OptionalInt64 int64 `json:"optional_int64,omitempty"` - NullableInt *int `json:"nullable_int,omitempty"` - NullableInt8 *int8 `json:"nullable_int8,omitempty"` - NullableInt16 *int16 `json:"nullable_int16,omitempty"` - NullableInt32 *int32 `json:"nullable_int32,omitempty"` - NullableInt64 *int64 `json:"nullable_int64,omitempty"` + NillableInt *int `json:"nillable_int,omitempty"` + NillableInt8 *int8 `json:"nillable_int8,omitempty"` + NillableInt16 *int16 `json:"nillable_int16,omitempty"` + NillableInt32 *int32 `json:"nillable_int32,omitempty"` + NillableInt64 *int64 `json:"nillable_int64,omitempty"` } if err := vmap.Decode(&vft); err != nil { return err @@ -161,11 +161,11 @@ func (ft *FieldType) FromResponse(res *gremlin.Response) error { ft.OptionalInt16 = vft.OptionalInt16 ft.OptionalInt32 = vft.OptionalInt32 ft.OptionalInt64 = vft.OptionalInt64 - ft.NullableInt = vft.NullableInt - ft.NullableInt8 = vft.NullableInt8 - ft.NullableInt16 = vft.NullableInt16 - ft.NullableInt32 = vft.NullableInt32 - ft.NullableInt64 = vft.NullableInt64 + ft.NillableInt = vft.NillableInt + ft.NillableInt8 = vft.NillableInt8 + ft.NillableInt16 = vft.NillableInt16 + ft.NillableInt32 = vft.NillableInt32 + ft.NillableInt64 = vft.NillableInt64 return nil } @@ -202,20 +202,20 @@ func (ft *FieldType) String() string { buf.WriteString(fmt.Sprintf(", optional_int16=%v", ft.OptionalInt16)) buf.WriteString(fmt.Sprintf(", optional_int32=%v", ft.OptionalInt32)) buf.WriteString(fmt.Sprintf(", optional_int64=%v", ft.OptionalInt64)) - if v := ft.NullableInt; v != nil { - buf.WriteString(fmt.Sprintf(", nullable_int=%v", *v)) + if v := ft.NillableInt; v != nil { + buf.WriteString(fmt.Sprintf(", nillable_int=%v", *v)) } - if v := ft.NullableInt8; v != nil { - buf.WriteString(fmt.Sprintf(", nullable_int8=%v", *v)) + if v := ft.NillableInt8; v != nil { + buf.WriteString(fmt.Sprintf(", nillable_int8=%v", *v)) } - if v := ft.NullableInt16; v != nil { - buf.WriteString(fmt.Sprintf(", nullable_int16=%v", *v)) + if v := ft.NillableInt16; v != nil { + buf.WriteString(fmt.Sprintf(", nillable_int16=%v", *v)) } - if v := ft.NullableInt32; v != nil { - buf.WriteString(fmt.Sprintf(", nullable_int32=%v", *v)) + if v := ft.NillableInt32; v != nil { + buf.WriteString(fmt.Sprintf(", nillable_int32=%v", *v)) } - if v := ft.NullableInt64; v != nil { - buf.WriteString(fmt.Sprintf(", nullable_int64=%v", *v)) + if v := ft.NillableInt64; v != nil { + buf.WriteString(fmt.Sprintf(", nillable_int64=%v", *v)) } buf.WriteString(")") return buf.String() @@ -260,11 +260,11 @@ func (ft *FieldTypes) FromResponse(res *gremlin.Response) error { OptionalInt16 int16 `json:"optional_int16,omitempty"` OptionalInt32 int32 `json:"optional_int32,omitempty"` OptionalInt64 int64 `json:"optional_int64,omitempty"` - NullableInt *int `json:"nullable_int,omitempty"` - NullableInt8 *int8 `json:"nullable_int8,omitempty"` - NullableInt16 *int16 `json:"nullable_int16,omitempty"` - NullableInt32 *int32 `json:"nullable_int32,omitempty"` - NullableInt64 *int64 `json:"nullable_int64,omitempty"` + NillableInt *int `json:"nillable_int,omitempty"` + NillableInt8 *int8 `json:"nillable_int8,omitempty"` + NillableInt16 *int16 `json:"nillable_int16,omitempty"` + NillableInt32 *int32 `json:"nillable_int32,omitempty"` + NillableInt64 *int64 `json:"nillable_int64,omitempty"` } if err := vmap.Decode(&vft); err != nil { return err @@ -282,11 +282,11 @@ func (ft *FieldTypes) FromResponse(res *gremlin.Response) error { OptionalInt16: v.OptionalInt16, OptionalInt32: v.OptionalInt32, OptionalInt64: v.OptionalInt64, - NullableInt: v.NullableInt, - NullableInt8: v.NullableInt8, - NullableInt16: v.NullableInt16, - NullableInt32: v.NullableInt32, - NullableInt64: v.NullableInt64, + NillableInt: v.NillableInt, + NillableInt8: v.NillableInt8, + NillableInt16: v.NillableInt16, + NillableInt32: v.NillableInt32, + NillableInt64: v.NillableInt64, }) } return nil diff --git a/entc/integration/ent/fieldtype/fieldtype.go b/entc/integration/ent/fieldtype/fieldtype.go index 67a5b3516..ce75b8c13 100644 --- a/entc/integration/ent/fieldtype/fieldtype.go +++ b/entc/integration/ent/fieldtype/fieldtype.go @@ -27,16 +27,16 @@ const ( FieldOptionalInt32 = "optional_int32" // FieldOptionalInt64 holds the string denoting the optional_int64 vertex property in the database. FieldOptionalInt64 = "optional_int64" - // FieldNullableInt holds the string denoting the nullable_int vertex property in the database. - FieldNullableInt = "nullable_int" - // FieldNullableInt8 holds the string denoting the nullable_int8 vertex property in the database. - FieldNullableInt8 = "nullable_int8" - // FieldNullableInt16 holds the string denoting the nullable_int16 vertex property in the database. - FieldNullableInt16 = "nullable_int16" - // FieldNullableInt32 holds the string denoting the nullable_int32 vertex property in the database. - FieldNullableInt32 = "nullable_int32" - // FieldNullableInt64 holds the string denoting the nullable_int64 vertex property in the database. - FieldNullableInt64 = "nullable_int64" + // FieldNillableInt holds the string denoting the nillable_int vertex property in the database. + FieldNillableInt = "nillable_int" + // FieldNillableInt8 holds the string denoting the nillable_int8 vertex property in the database. + FieldNillableInt8 = "nillable_int8" + // FieldNillableInt16 holds the string denoting the nillable_int16 vertex property in the database. + FieldNillableInt16 = "nillable_int16" + // FieldNillableInt32 holds the string denoting the nillable_int32 vertex property in the database. + FieldNillableInt32 = "nillable_int32" + // FieldNillableInt64 holds the string denoting the nillable_int64 vertex property in the database. + FieldNillableInt64 = "nillable_int64" // Table holds the table name of the fieldtype in the database. Table = "field_types" @@ -55,9 +55,9 @@ var Columns = []string{ FieldOptionalInt16, FieldOptionalInt32, FieldOptionalInt64, - FieldNullableInt, - FieldNullableInt8, - FieldNullableInt16, - FieldNullableInt32, - FieldNullableInt64, + FieldNillableInt, + FieldNillableInt8, + FieldNillableInt16, + FieldNillableInt32, + FieldNillableInt64, } diff --git a/entc/integration/ent/fieldtype/where.go b/entc/integration/ent/fieldtype/where.go index 18aaa2f66..11ce8e538 100644 --- a/entc/integration/ent/fieldtype/where.go +++ b/entc/integration/ent/fieldtype/where.go @@ -276,62 +276,62 @@ func OptionalInt64(v int64) predicate.FieldType { ) } -// NullableInt applies equality check predicate on the "nullable_int" field. It's identical to NullableIntEQ. -func NullableInt(v int) predicate.FieldType { +// NillableInt applies equality check predicate on the "nillable_int" field. It's identical to NillableIntEQ. +func NillableInt(v int) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt), v)) + s.Where(sql.EQ(s.C(FieldNillableInt), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.EQ(v)) + t.Has(Label, FieldNillableInt, p.EQ(v)) }, ) } -// NullableInt8 applies equality check predicate on the "nullable_int8" field. It's identical to NullableInt8EQ. -func NullableInt8(v int8) predicate.FieldType { +// NillableInt8 applies equality check predicate on the "nillable_int8" field. It's identical to NillableInt8EQ. +func NillableInt8(v int8) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt8), v)) + s.Where(sql.EQ(s.C(FieldNillableInt8), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.EQ(v)) + t.Has(Label, FieldNillableInt8, p.EQ(v)) }, ) } -// NullableInt16 applies equality check predicate on the "nullable_int16" field. It's identical to NullableInt16EQ. -func NullableInt16(v int16) predicate.FieldType { +// NillableInt16 applies equality check predicate on the "nillable_int16" field. It's identical to NillableInt16EQ. +func NillableInt16(v int16) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt16), v)) + s.Where(sql.EQ(s.C(FieldNillableInt16), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.EQ(v)) + t.Has(Label, FieldNillableInt16, p.EQ(v)) }, ) } -// NullableInt32 applies equality check predicate on the "nullable_int32" field. It's identical to NullableInt32EQ. -func NullableInt32(v int32) predicate.FieldType { +// NillableInt32 applies equality check predicate on the "nillable_int32" field. It's identical to NillableInt32EQ. +func NillableInt32(v int32) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt32), v)) + s.Where(sql.EQ(s.C(FieldNillableInt32), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.EQ(v)) + t.Has(Label, FieldNillableInt32, p.EQ(v)) }, ) } -// NullableInt64 applies equality check predicate on the "nullable_int64" field. It's identical to NullableInt64EQ. -func NullableInt64(v int64) predicate.FieldType { +// NillableInt64 applies equality check predicate on the "nillable_int64" field. It's identical to NillableInt64EQ. +func NillableInt64(v int64) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt64), v)) + s.Where(sql.EQ(s.C(FieldNillableInt64), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.EQ(v)) + t.Has(Label, FieldNillableInt64, p.EQ(v)) }, ) } @@ -1032,8 +1032,8 @@ func OptionalIntNotIn(vs ...int) predicate.FieldType { ) } -// OptionalIntIsNull applies the IsNull predicate on the "optional_int" field. -func OptionalIntIsNull() predicate.FieldType { +// OptionalIntIsNil applies the IsNil predicate on the "optional_int" field. +func OptionalIntIsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldOptionalInt))) @@ -1044,8 +1044,8 @@ func OptionalIntIsNull() predicate.FieldType { ) } -// OptionalIntNotNull applies the NotNull predicate on the "optional_int" field. -func OptionalIntNotNull() predicate.FieldType { +// OptionalIntNotNil applies the NotNil predicate on the "optional_int" field. +func OptionalIntNotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldOptionalInt))) @@ -1172,8 +1172,8 @@ func OptionalInt8NotIn(vs ...int8) predicate.FieldType { ) } -// OptionalInt8IsNull applies the IsNull predicate on the "optional_int8" field. -func OptionalInt8IsNull() predicate.FieldType { +// OptionalInt8IsNil applies the IsNil predicate on the "optional_int8" field. +func OptionalInt8IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldOptionalInt8))) @@ -1184,8 +1184,8 @@ func OptionalInt8IsNull() predicate.FieldType { ) } -// OptionalInt8NotNull applies the NotNull predicate on the "optional_int8" field. -func OptionalInt8NotNull() predicate.FieldType { +// OptionalInt8NotNil applies the NotNil predicate on the "optional_int8" field. +func OptionalInt8NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldOptionalInt8))) @@ -1312,8 +1312,8 @@ func OptionalInt16NotIn(vs ...int16) predicate.FieldType { ) } -// OptionalInt16IsNull applies the IsNull predicate on the "optional_int16" field. -func OptionalInt16IsNull() predicate.FieldType { +// OptionalInt16IsNil applies the IsNil predicate on the "optional_int16" field. +func OptionalInt16IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldOptionalInt16))) @@ -1324,8 +1324,8 @@ func OptionalInt16IsNull() predicate.FieldType { ) } -// OptionalInt16NotNull applies the NotNull predicate on the "optional_int16" field. -func OptionalInt16NotNull() predicate.FieldType { +// OptionalInt16NotNil applies the NotNil predicate on the "optional_int16" field. +func OptionalInt16NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldOptionalInt16))) @@ -1452,8 +1452,8 @@ func OptionalInt32NotIn(vs ...int32) predicate.FieldType { ) } -// OptionalInt32IsNull applies the IsNull predicate on the "optional_int32" field. -func OptionalInt32IsNull() predicate.FieldType { +// OptionalInt32IsNil applies the IsNil predicate on the "optional_int32" field. +func OptionalInt32IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldOptionalInt32))) @@ -1464,8 +1464,8 @@ func OptionalInt32IsNull() predicate.FieldType { ) } -// OptionalInt32NotNull applies the NotNull predicate on the "optional_int32" field. -func OptionalInt32NotNull() predicate.FieldType { +// OptionalInt32NotNil applies the NotNil predicate on the "optional_int32" field. +func OptionalInt32NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldOptionalInt32))) @@ -1592,8 +1592,8 @@ func OptionalInt64NotIn(vs ...int64) predicate.FieldType { ) } -// OptionalInt64IsNull applies the IsNull predicate on the "optional_int64" field. -func OptionalInt64IsNull() predicate.FieldType { +// OptionalInt64IsNil applies the IsNil predicate on the "optional_int64" field. +func OptionalInt64IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldOptionalInt64))) @@ -1604,8 +1604,8 @@ func OptionalInt64IsNull() predicate.FieldType { ) } -// OptionalInt64NotNull applies the NotNull predicate on the "optional_int64" field. -func OptionalInt64NotNull() predicate.FieldType { +// OptionalInt64NotNil applies the NotNil predicate on the "optional_int64" field. +func OptionalInt64NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldOptionalInt64))) @@ -1616,80 +1616,80 @@ func OptionalInt64NotNull() predicate.FieldType { ) } -// NullableIntEQ applies the EQ predicate on the "nullable_int" field. -func NullableIntEQ(v int) predicate.FieldType { +// NillableIntEQ applies the EQ predicate on the "nillable_int" field. +func NillableIntEQ(v int) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt), v)) + s.Where(sql.EQ(s.C(FieldNillableInt), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.EQ(v)) + t.Has(Label, FieldNillableInt, p.EQ(v)) }, ) } -// NullableIntNEQ applies the NEQ predicate on the "nullable_int" field. -func NullableIntNEQ(v int) predicate.FieldType { +// NillableIntNEQ applies the NEQ predicate on the "nillable_int" field. +func NillableIntNEQ(v int) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NEQ(s.C(FieldNullableInt), v)) + s.Where(sql.NEQ(s.C(FieldNillableInt), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.NEQ(v)) + t.Has(Label, FieldNillableInt, p.NEQ(v)) }, ) } -// NullableIntGT applies the GT predicate on the "nullable_int" field. -func NullableIntGT(v int) predicate.FieldType { +// NillableIntGT applies the GT predicate on the "nillable_int" field. +func NillableIntGT(v int) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GT(s.C(FieldNullableInt), v)) + s.Where(sql.GT(s.C(FieldNillableInt), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.GT(v)) + t.Has(Label, FieldNillableInt, p.GT(v)) }, ) } -// NullableIntGTE applies the GTE predicate on the "nullable_int" field. -func NullableIntGTE(v int) predicate.FieldType { +// NillableIntGTE applies the GTE predicate on the "nillable_int" field. +func NillableIntGTE(v int) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GTE(s.C(FieldNullableInt), v)) + s.Where(sql.GTE(s.C(FieldNillableInt), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.GTE(v)) + t.Has(Label, FieldNillableInt, p.GTE(v)) }, ) } -// NullableIntLT applies the LT predicate on the "nullable_int" field. -func NullableIntLT(v int) predicate.FieldType { +// NillableIntLT applies the LT predicate on the "nillable_int" field. +func NillableIntLT(v int) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LT(s.C(FieldNullableInt), v)) + s.Where(sql.LT(s.C(FieldNillableInt), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.LT(v)) + t.Has(Label, FieldNillableInt, p.LT(v)) }, ) } -// NullableIntLTE applies the LTE predicate on the "nullable_int" field. -func NullableIntLTE(v int) predicate.FieldType { +// NillableIntLTE applies the LTE predicate on the "nillable_int" field. +func NillableIntLTE(v int) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LTE(s.C(FieldNullableInt), v)) + s.Where(sql.LTE(s.C(FieldNillableInt), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.LTE(v)) + t.Has(Label, FieldNillableInt, p.LTE(v)) }, ) } -// NullableIntIn applies the In predicate on the "nullable_int" field. -func NullableIntIn(vs ...int) predicate.FieldType { +// NillableIntIn applies the In predicate on the "nillable_int" field. +func NillableIntIn(vs ...int) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -1702,16 +1702,16 @@ func NullableIntIn(vs ...int) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.In(s.C(FieldNullableInt), v...)) + s.Where(sql.In(s.C(FieldNillableInt), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.Within(v...)) + t.Has(Label, FieldNillableInt, p.Within(v...)) }, ) } -// NullableIntNotIn applies the NotIn predicate on the "nullable_int" field. -func NullableIntNotIn(vs ...int) predicate.FieldType { +// NillableIntNotIn applies the NotIn predicate on the "nillable_int" field. +func NillableIntNotIn(vs ...int) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -1724,112 +1724,112 @@ func NullableIntNotIn(vs ...int) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.NotIn(s.C(FieldNullableInt), v...)) + s.Where(sql.NotIn(s.C(FieldNillableInt), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt, p.Without(v...)) + t.Has(Label, FieldNillableInt, p.Without(v...)) }, ) } -// NullableIntIsNull applies the IsNull predicate on the "nullable_int" field. -func NullableIntIsNull() predicate.FieldType { +// NillableIntIsNil applies the IsNil predicate on the "nillable_int" field. +func NillableIntIsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.IsNull(s.C(FieldNullableInt))) + s.Where(sql.IsNull(s.C(FieldNillableInt))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).HasNot(FieldNullableInt) + t.HasLabel(Label).HasNot(FieldNillableInt) }, ) } -// NullableIntNotNull applies the NotNull predicate on the "nullable_int" field. -func NullableIntNotNull() predicate.FieldType { +// NillableIntNotNil applies the NotNil predicate on the "nillable_int" field. +func NillableIntNotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NotNull(s.C(FieldNullableInt))) + s.Where(sql.NotNull(s.C(FieldNillableInt))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).Has(FieldNullableInt) + t.HasLabel(Label).Has(FieldNillableInt) }, ) } -// NullableInt8EQ applies the EQ predicate on the "nullable_int8" field. -func NullableInt8EQ(v int8) predicate.FieldType { +// NillableInt8EQ applies the EQ predicate on the "nillable_int8" field. +func NillableInt8EQ(v int8) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt8), v)) + s.Where(sql.EQ(s.C(FieldNillableInt8), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.EQ(v)) + t.Has(Label, FieldNillableInt8, p.EQ(v)) }, ) } -// NullableInt8NEQ applies the NEQ predicate on the "nullable_int8" field. -func NullableInt8NEQ(v int8) predicate.FieldType { +// NillableInt8NEQ applies the NEQ predicate on the "nillable_int8" field. +func NillableInt8NEQ(v int8) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NEQ(s.C(FieldNullableInt8), v)) + s.Where(sql.NEQ(s.C(FieldNillableInt8), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.NEQ(v)) + t.Has(Label, FieldNillableInt8, p.NEQ(v)) }, ) } -// NullableInt8GT applies the GT predicate on the "nullable_int8" field. -func NullableInt8GT(v int8) predicate.FieldType { +// NillableInt8GT applies the GT predicate on the "nillable_int8" field. +func NillableInt8GT(v int8) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GT(s.C(FieldNullableInt8), v)) + s.Where(sql.GT(s.C(FieldNillableInt8), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.GT(v)) + t.Has(Label, FieldNillableInt8, p.GT(v)) }, ) } -// NullableInt8GTE applies the GTE predicate on the "nullable_int8" field. -func NullableInt8GTE(v int8) predicate.FieldType { +// NillableInt8GTE applies the GTE predicate on the "nillable_int8" field. +func NillableInt8GTE(v int8) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GTE(s.C(FieldNullableInt8), v)) + s.Where(sql.GTE(s.C(FieldNillableInt8), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.GTE(v)) + t.Has(Label, FieldNillableInt8, p.GTE(v)) }, ) } -// NullableInt8LT applies the LT predicate on the "nullable_int8" field. -func NullableInt8LT(v int8) predicate.FieldType { +// NillableInt8LT applies the LT predicate on the "nillable_int8" field. +func NillableInt8LT(v int8) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LT(s.C(FieldNullableInt8), v)) + s.Where(sql.LT(s.C(FieldNillableInt8), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.LT(v)) + t.Has(Label, FieldNillableInt8, p.LT(v)) }, ) } -// NullableInt8LTE applies the LTE predicate on the "nullable_int8" field. -func NullableInt8LTE(v int8) predicate.FieldType { +// NillableInt8LTE applies the LTE predicate on the "nillable_int8" field. +func NillableInt8LTE(v int8) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LTE(s.C(FieldNullableInt8), v)) + s.Where(sql.LTE(s.C(FieldNillableInt8), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.LTE(v)) + t.Has(Label, FieldNillableInt8, p.LTE(v)) }, ) } -// NullableInt8In applies the In predicate on the "nullable_int8" field. -func NullableInt8In(vs ...int8) predicate.FieldType { +// NillableInt8In applies the In predicate on the "nillable_int8" field. +func NillableInt8In(vs ...int8) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -1842,16 +1842,16 @@ func NullableInt8In(vs ...int8) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.In(s.C(FieldNullableInt8), v...)) + s.Where(sql.In(s.C(FieldNillableInt8), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.Within(v...)) + t.Has(Label, FieldNillableInt8, p.Within(v...)) }, ) } -// NullableInt8NotIn applies the NotIn predicate on the "nullable_int8" field. -func NullableInt8NotIn(vs ...int8) predicate.FieldType { +// NillableInt8NotIn applies the NotIn predicate on the "nillable_int8" field. +func NillableInt8NotIn(vs ...int8) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -1864,112 +1864,112 @@ func NullableInt8NotIn(vs ...int8) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.NotIn(s.C(FieldNullableInt8), v...)) + s.Where(sql.NotIn(s.C(FieldNillableInt8), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt8, p.Without(v...)) + t.Has(Label, FieldNillableInt8, p.Without(v...)) }, ) } -// NullableInt8IsNull applies the IsNull predicate on the "nullable_int8" field. -func NullableInt8IsNull() predicate.FieldType { +// NillableInt8IsNil applies the IsNil predicate on the "nillable_int8" field. +func NillableInt8IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.IsNull(s.C(FieldNullableInt8))) + s.Where(sql.IsNull(s.C(FieldNillableInt8))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).HasNot(FieldNullableInt8) + t.HasLabel(Label).HasNot(FieldNillableInt8) }, ) } -// NullableInt8NotNull applies the NotNull predicate on the "nullable_int8" field. -func NullableInt8NotNull() predicate.FieldType { +// NillableInt8NotNil applies the NotNil predicate on the "nillable_int8" field. +func NillableInt8NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NotNull(s.C(FieldNullableInt8))) + s.Where(sql.NotNull(s.C(FieldNillableInt8))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).Has(FieldNullableInt8) + t.HasLabel(Label).Has(FieldNillableInt8) }, ) } -// NullableInt16EQ applies the EQ predicate on the "nullable_int16" field. -func NullableInt16EQ(v int16) predicate.FieldType { +// NillableInt16EQ applies the EQ predicate on the "nillable_int16" field. +func NillableInt16EQ(v int16) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt16), v)) + s.Where(sql.EQ(s.C(FieldNillableInt16), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.EQ(v)) + t.Has(Label, FieldNillableInt16, p.EQ(v)) }, ) } -// NullableInt16NEQ applies the NEQ predicate on the "nullable_int16" field. -func NullableInt16NEQ(v int16) predicate.FieldType { +// NillableInt16NEQ applies the NEQ predicate on the "nillable_int16" field. +func NillableInt16NEQ(v int16) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NEQ(s.C(FieldNullableInt16), v)) + s.Where(sql.NEQ(s.C(FieldNillableInt16), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.NEQ(v)) + t.Has(Label, FieldNillableInt16, p.NEQ(v)) }, ) } -// NullableInt16GT applies the GT predicate on the "nullable_int16" field. -func NullableInt16GT(v int16) predicate.FieldType { +// NillableInt16GT applies the GT predicate on the "nillable_int16" field. +func NillableInt16GT(v int16) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GT(s.C(FieldNullableInt16), v)) + s.Where(sql.GT(s.C(FieldNillableInt16), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.GT(v)) + t.Has(Label, FieldNillableInt16, p.GT(v)) }, ) } -// NullableInt16GTE applies the GTE predicate on the "nullable_int16" field. -func NullableInt16GTE(v int16) predicate.FieldType { +// NillableInt16GTE applies the GTE predicate on the "nillable_int16" field. +func NillableInt16GTE(v int16) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GTE(s.C(FieldNullableInt16), v)) + s.Where(sql.GTE(s.C(FieldNillableInt16), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.GTE(v)) + t.Has(Label, FieldNillableInt16, p.GTE(v)) }, ) } -// NullableInt16LT applies the LT predicate on the "nullable_int16" field. -func NullableInt16LT(v int16) predicate.FieldType { +// NillableInt16LT applies the LT predicate on the "nillable_int16" field. +func NillableInt16LT(v int16) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LT(s.C(FieldNullableInt16), v)) + s.Where(sql.LT(s.C(FieldNillableInt16), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.LT(v)) + t.Has(Label, FieldNillableInt16, p.LT(v)) }, ) } -// NullableInt16LTE applies the LTE predicate on the "nullable_int16" field. -func NullableInt16LTE(v int16) predicate.FieldType { +// NillableInt16LTE applies the LTE predicate on the "nillable_int16" field. +func NillableInt16LTE(v int16) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LTE(s.C(FieldNullableInt16), v)) + s.Where(sql.LTE(s.C(FieldNillableInt16), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.LTE(v)) + t.Has(Label, FieldNillableInt16, p.LTE(v)) }, ) } -// NullableInt16In applies the In predicate on the "nullable_int16" field. -func NullableInt16In(vs ...int16) predicate.FieldType { +// NillableInt16In applies the In predicate on the "nillable_int16" field. +func NillableInt16In(vs ...int16) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -1982,16 +1982,16 @@ func NullableInt16In(vs ...int16) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.In(s.C(FieldNullableInt16), v...)) + s.Where(sql.In(s.C(FieldNillableInt16), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.Within(v...)) + t.Has(Label, FieldNillableInt16, p.Within(v...)) }, ) } -// NullableInt16NotIn applies the NotIn predicate on the "nullable_int16" field. -func NullableInt16NotIn(vs ...int16) predicate.FieldType { +// NillableInt16NotIn applies the NotIn predicate on the "nillable_int16" field. +func NillableInt16NotIn(vs ...int16) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -2004,112 +2004,112 @@ func NullableInt16NotIn(vs ...int16) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.NotIn(s.C(FieldNullableInt16), v...)) + s.Where(sql.NotIn(s.C(FieldNillableInt16), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt16, p.Without(v...)) + t.Has(Label, FieldNillableInt16, p.Without(v...)) }, ) } -// NullableInt16IsNull applies the IsNull predicate on the "nullable_int16" field. -func NullableInt16IsNull() predicate.FieldType { +// NillableInt16IsNil applies the IsNil predicate on the "nillable_int16" field. +func NillableInt16IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.IsNull(s.C(FieldNullableInt16))) + s.Where(sql.IsNull(s.C(FieldNillableInt16))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).HasNot(FieldNullableInt16) + t.HasLabel(Label).HasNot(FieldNillableInt16) }, ) } -// NullableInt16NotNull applies the NotNull predicate on the "nullable_int16" field. -func NullableInt16NotNull() predicate.FieldType { +// NillableInt16NotNil applies the NotNil predicate on the "nillable_int16" field. +func NillableInt16NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NotNull(s.C(FieldNullableInt16))) + s.Where(sql.NotNull(s.C(FieldNillableInt16))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).Has(FieldNullableInt16) + t.HasLabel(Label).Has(FieldNillableInt16) }, ) } -// NullableInt32EQ applies the EQ predicate on the "nullable_int32" field. -func NullableInt32EQ(v int32) predicate.FieldType { +// NillableInt32EQ applies the EQ predicate on the "nillable_int32" field. +func NillableInt32EQ(v int32) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt32), v)) + s.Where(sql.EQ(s.C(FieldNillableInt32), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.EQ(v)) + t.Has(Label, FieldNillableInt32, p.EQ(v)) }, ) } -// NullableInt32NEQ applies the NEQ predicate on the "nullable_int32" field. -func NullableInt32NEQ(v int32) predicate.FieldType { +// NillableInt32NEQ applies the NEQ predicate on the "nillable_int32" field. +func NillableInt32NEQ(v int32) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NEQ(s.C(FieldNullableInt32), v)) + s.Where(sql.NEQ(s.C(FieldNillableInt32), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.NEQ(v)) + t.Has(Label, FieldNillableInt32, p.NEQ(v)) }, ) } -// NullableInt32GT applies the GT predicate on the "nullable_int32" field. -func NullableInt32GT(v int32) predicate.FieldType { +// NillableInt32GT applies the GT predicate on the "nillable_int32" field. +func NillableInt32GT(v int32) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GT(s.C(FieldNullableInt32), v)) + s.Where(sql.GT(s.C(FieldNillableInt32), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.GT(v)) + t.Has(Label, FieldNillableInt32, p.GT(v)) }, ) } -// NullableInt32GTE applies the GTE predicate on the "nullable_int32" field. -func NullableInt32GTE(v int32) predicate.FieldType { +// NillableInt32GTE applies the GTE predicate on the "nillable_int32" field. +func NillableInt32GTE(v int32) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GTE(s.C(FieldNullableInt32), v)) + s.Where(sql.GTE(s.C(FieldNillableInt32), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.GTE(v)) + t.Has(Label, FieldNillableInt32, p.GTE(v)) }, ) } -// NullableInt32LT applies the LT predicate on the "nullable_int32" field. -func NullableInt32LT(v int32) predicate.FieldType { +// NillableInt32LT applies the LT predicate on the "nillable_int32" field. +func NillableInt32LT(v int32) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LT(s.C(FieldNullableInt32), v)) + s.Where(sql.LT(s.C(FieldNillableInt32), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.LT(v)) + t.Has(Label, FieldNillableInt32, p.LT(v)) }, ) } -// NullableInt32LTE applies the LTE predicate on the "nullable_int32" field. -func NullableInt32LTE(v int32) predicate.FieldType { +// NillableInt32LTE applies the LTE predicate on the "nillable_int32" field. +func NillableInt32LTE(v int32) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LTE(s.C(FieldNullableInt32), v)) + s.Where(sql.LTE(s.C(FieldNillableInt32), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.LTE(v)) + t.Has(Label, FieldNillableInt32, p.LTE(v)) }, ) } -// NullableInt32In applies the In predicate on the "nullable_int32" field. -func NullableInt32In(vs ...int32) predicate.FieldType { +// NillableInt32In applies the In predicate on the "nillable_int32" field. +func NillableInt32In(vs ...int32) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -2122,16 +2122,16 @@ func NullableInt32In(vs ...int32) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.In(s.C(FieldNullableInt32), v...)) + s.Where(sql.In(s.C(FieldNillableInt32), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.Within(v...)) + t.Has(Label, FieldNillableInt32, p.Within(v...)) }, ) } -// NullableInt32NotIn applies the NotIn predicate on the "nullable_int32" field. -func NullableInt32NotIn(vs ...int32) predicate.FieldType { +// NillableInt32NotIn applies the NotIn predicate on the "nillable_int32" field. +func NillableInt32NotIn(vs ...int32) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -2144,112 +2144,112 @@ func NullableInt32NotIn(vs ...int32) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.NotIn(s.C(FieldNullableInt32), v...)) + s.Where(sql.NotIn(s.C(FieldNillableInt32), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt32, p.Without(v...)) + t.Has(Label, FieldNillableInt32, p.Without(v...)) }, ) } -// NullableInt32IsNull applies the IsNull predicate on the "nullable_int32" field. -func NullableInt32IsNull() predicate.FieldType { +// NillableInt32IsNil applies the IsNil predicate on the "nillable_int32" field. +func NillableInt32IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.IsNull(s.C(FieldNullableInt32))) + s.Where(sql.IsNull(s.C(FieldNillableInt32))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).HasNot(FieldNullableInt32) + t.HasLabel(Label).HasNot(FieldNillableInt32) }, ) } -// NullableInt32NotNull applies the NotNull predicate on the "nullable_int32" field. -func NullableInt32NotNull() predicate.FieldType { +// NillableInt32NotNil applies the NotNil predicate on the "nillable_int32" field. +func NillableInt32NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NotNull(s.C(FieldNullableInt32))) + s.Where(sql.NotNull(s.C(FieldNillableInt32))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).Has(FieldNullableInt32) + t.HasLabel(Label).Has(FieldNillableInt32) }, ) } -// NullableInt64EQ applies the EQ predicate on the "nullable_int64" field. -func NullableInt64EQ(v int64) predicate.FieldType { +// NillableInt64EQ applies the EQ predicate on the "nillable_int64" field. +func NillableInt64EQ(v int64) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldNullableInt64), v)) + s.Where(sql.EQ(s.C(FieldNillableInt64), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.EQ(v)) + t.Has(Label, FieldNillableInt64, p.EQ(v)) }, ) } -// NullableInt64NEQ applies the NEQ predicate on the "nullable_int64" field. -func NullableInt64NEQ(v int64) predicate.FieldType { +// NillableInt64NEQ applies the NEQ predicate on the "nillable_int64" field. +func NillableInt64NEQ(v int64) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NEQ(s.C(FieldNullableInt64), v)) + s.Where(sql.NEQ(s.C(FieldNillableInt64), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.NEQ(v)) + t.Has(Label, FieldNillableInt64, p.NEQ(v)) }, ) } -// NullableInt64GT applies the GT predicate on the "nullable_int64" field. -func NullableInt64GT(v int64) predicate.FieldType { +// NillableInt64GT applies the GT predicate on the "nillable_int64" field. +func NillableInt64GT(v int64) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GT(s.C(FieldNullableInt64), v)) + s.Where(sql.GT(s.C(FieldNillableInt64), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.GT(v)) + t.Has(Label, FieldNillableInt64, p.GT(v)) }, ) } -// NullableInt64GTE applies the GTE predicate on the "nullable_int64" field. -func NullableInt64GTE(v int64) predicate.FieldType { +// NillableInt64GTE applies the GTE predicate on the "nillable_int64" field. +func NillableInt64GTE(v int64) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.GTE(s.C(FieldNullableInt64), v)) + s.Where(sql.GTE(s.C(FieldNillableInt64), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.GTE(v)) + t.Has(Label, FieldNillableInt64, p.GTE(v)) }, ) } -// NullableInt64LT applies the LT predicate on the "nullable_int64" field. -func NullableInt64LT(v int64) predicate.FieldType { +// NillableInt64LT applies the LT predicate on the "nillable_int64" field. +func NillableInt64LT(v int64) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LT(s.C(FieldNullableInt64), v)) + s.Where(sql.LT(s.C(FieldNillableInt64), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.LT(v)) + t.Has(Label, FieldNillableInt64, p.LT(v)) }, ) } -// NullableInt64LTE applies the LTE predicate on the "nullable_int64" field. -func NullableInt64LTE(v int64) predicate.FieldType { +// NillableInt64LTE applies the LTE predicate on the "nillable_int64" field. +func NillableInt64LTE(v int64) predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.LTE(s.C(FieldNullableInt64), v)) + s.Where(sql.LTE(s.C(FieldNillableInt64), v)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.LTE(v)) + t.Has(Label, FieldNillableInt64, p.LTE(v)) }, ) } -// NullableInt64In applies the In predicate on the "nullable_int64" field. -func NullableInt64In(vs ...int64) predicate.FieldType { +// NillableInt64In applies the In predicate on the "nillable_int64" field. +func NillableInt64In(vs ...int64) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -2262,16 +2262,16 @@ func NullableInt64In(vs ...int64) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.In(s.C(FieldNullableInt64), v...)) + s.Where(sql.In(s.C(FieldNillableInt64), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.Within(v...)) + t.Has(Label, FieldNillableInt64, p.Within(v...)) }, ) } -// NullableInt64NotIn applies the NotIn predicate on the "nullable_int64" field. -func NullableInt64NotIn(vs ...int64) predicate.FieldType { +// NillableInt64NotIn applies the NotIn predicate on the "nillable_int64" field. +func NillableInt64NotIn(vs ...int64) predicate.FieldType { v := make([]interface{}, len(vs)) for i := range v { v[i] = vs[i] @@ -2284,34 +2284,34 @@ func NullableInt64NotIn(vs ...int64) predicate.FieldType { s.Where(sql.False()) return } - s.Where(sql.NotIn(s.C(FieldNullableInt64), v...)) + s.Where(sql.NotIn(s.C(FieldNillableInt64), v...)) }, func(t *dsl.Traversal) { - t.Has(Label, FieldNullableInt64, p.Without(v...)) + t.Has(Label, FieldNillableInt64, p.Without(v...)) }, ) } -// NullableInt64IsNull applies the IsNull predicate on the "nullable_int64" field. -func NullableInt64IsNull() predicate.FieldType { +// NillableInt64IsNil applies the IsNil predicate on the "nillable_int64" field. +func NillableInt64IsNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.IsNull(s.C(FieldNullableInt64))) + s.Where(sql.IsNull(s.C(FieldNillableInt64))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).HasNot(FieldNullableInt64) + t.HasLabel(Label).HasNot(FieldNillableInt64) }, ) } -// NullableInt64NotNull applies the NotNull predicate on the "nullable_int64" field. -func NullableInt64NotNull() predicate.FieldType { +// NillableInt64NotNil applies the NotNil predicate on the "nillable_int64" field. +func NillableInt64NotNil() predicate.FieldType { return predicate.FieldTypePerDialect( func(s *sql.Selector) { - s.Where(sql.NotNull(s.C(FieldNullableInt64))) + s.Where(sql.NotNull(s.C(FieldNillableInt64))) }, func(t *dsl.Traversal) { - t.HasLabel(Label).Has(FieldNullableInt64) + t.HasLabel(Label).Has(FieldNillableInt64) }, ) } diff --git a/entc/integration/ent/fieldtype_create.go b/entc/integration/ent/fieldtype_create.go index 9a4c5bfd6..c94733624 100644 --- a/entc/integration/ent/fieldtype_create.go +++ b/entc/integration/ent/fieldtype_create.go @@ -29,11 +29,11 @@ type FieldTypeCreate struct { optional_int16 *int16 optional_int32 *int32 optional_int64 *int64 - nullable_int *int - nullable_int8 *int8 - nullable_int16 *int16 - nullable_int32 *int32 - nullable_int64 *int64 + nillable_int *int + nillable_int8 *int8 + nillable_int16 *int16 + nillable_int32 *int32 + nillable_int64 *int64 } // SetInt sets the int field. @@ -136,72 +136,72 @@ func (ftc *FieldTypeCreate) SetNillableOptionalInt64(i *int64) *FieldTypeCreate return ftc } -// SetNullableInt sets the nullable_int field. -func (ftc *FieldTypeCreate) SetNullableInt(i int) *FieldTypeCreate { - ftc.nullable_int = &i +// SetNillableInt sets the nillable_int field. +func (ftc *FieldTypeCreate) SetNillableInt(i int) *FieldTypeCreate { + ftc.nillable_int = &i return ftc } -// SetNillableNullableInt sets the nullable_int field if the given value is not nil. -func (ftc *FieldTypeCreate) SetNillableNullableInt(i *int) *FieldTypeCreate { +// SetNillableNillableInt sets the nillable_int field if the given value is not nil. +func (ftc *FieldTypeCreate) SetNillableNillableInt(i *int) *FieldTypeCreate { if i != nil { - ftc.SetNullableInt(*i) + ftc.SetNillableInt(*i) } return ftc } -// SetNullableInt8 sets the nullable_int8 field. -func (ftc *FieldTypeCreate) SetNullableInt8(i int8) *FieldTypeCreate { - ftc.nullable_int8 = &i +// SetNillableInt8 sets the nillable_int8 field. +func (ftc *FieldTypeCreate) SetNillableInt8(i int8) *FieldTypeCreate { + ftc.nillable_int8 = &i return ftc } -// SetNillableNullableInt8 sets the nullable_int8 field if the given value is not nil. -func (ftc *FieldTypeCreate) SetNillableNullableInt8(i *int8) *FieldTypeCreate { +// SetNillableNillableInt8 sets the nillable_int8 field if the given value is not nil. +func (ftc *FieldTypeCreate) SetNillableNillableInt8(i *int8) *FieldTypeCreate { if i != nil { - ftc.SetNullableInt8(*i) + ftc.SetNillableInt8(*i) } return ftc } -// SetNullableInt16 sets the nullable_int16 field. -func (ftc *FieldTypeCreate) SetNullableInt16(i int16) *FieldTypeCreate { - ftc.nullable_int16 = &i +// SetNillableInt16 sets the nillable_int16 field. +func (ftc *FieldTypeCreate) SetNillableInt16(i int16) *FieldTypeCreate { + ftc.nillable_int16 = &i return ftc } -// SetNillableNullableInt16 sets the nullable_int16 field if the given value is not nil. -func (ftc *FieldTypeCreate) SetNillableNullableInt16(i *int16) *FieldTypeCreate { +// SetNillableNillableInt16 sets the nillable_int16 field if the given value is not nil. +func (ftc *FieldTypeCreate) SetNillableNillableInt16(i *int16) *FieldTypeCreate { if i != nil { - ftc.SetNullableInt16(*i) + ftc.SetNillableInt16(*i) } return ftc } -// SetNullableInt32 sets the nullable_int32 field. -func (ftc *FieldTypeCreate) SetNullableInt32(i int32) *FieldTypeCreate { - ftc.nullable_int32 = &i +// SetNillableInt32 sets the nillable_int32 field. +func (ftc *FieldTypeCreate) SetNillableInt32(i int32) *FieldTypeCreate { + ftc.nillable_int32 = &i return ftc } -// SetNillableNullableInt32 sets the nullable_int32 field if the given value is not nil. -func (ftc *FieldTypeCreate) SetNillableNullableInt32(i *int32) *FieldTypeCreate { +// SetNillableNillableInt32 sets the nillable_int32 field if the given value is not nil. +func (ftc *FieldTypeCreate) SetNillableNillableInt32(i *int32) *FieldTypeCreate { if i != nil { - ftc.SetNullableInt32(*i) + ftc.SetNillableInt32(*i) } return ftc } -// SetNullableInt64 sets the nullable_int64 field. -func (ftc *FieldTypeCreate) SetNullableInt64(i int64) *FieldTypeCreate { - ftc.nullable_int64 = &i +// SetNillableInt64 sets the nillable_int64 field. +func (ftc *FieldTypeCreate) SetNillableInt64(i int64) *FieldTypeCreate { + ftc.nillable_int64 = &i return ftc } -// SetNillableNullableInt64 sets the nullable_int64 field if the given value is not nil. -func (ftc *FieldTypeCreate) SetNillableNullableInt64(i *int64) *FieldTypeCreate { +// SetNillableNillableInt64 sets the nillable_int64 field if the given value is not nil. +func (ftc *FieldTypeCreate) SetNillableNillableInt64(i *int64) *FieldTypeCreate { if i != nil { - ftc.SetNullableInt64(*i) + ftc.SetNillableInt64(*i) } return ftc } @@ -292,25 +292,25 @@ func (ftc *FieldTypeCreate) sqlSave(ctx context.Context) (*FieldType, error) { builder.Set(fieldtype.FieldOptionalInt64, *ftc.optional_int64) ft.OptionalInt64 = *ftc.optional_int64 } - if ftc.nullable_int != nil { - builder.Set(fieldtype.FieldNullableInt, *ftc.nullable_int) - ft.NullableInt = ftc.nullable_int + if ftc.nillable_int != nil { + builder.Set(fieldtype.FieldNillableInt, *ftc.nillable_int) + ft.NillableInt = ftc.nillable_int } - if ftc.nullable_int8 != nil { - builder.Set(fieldtype.FieldNullableInt8, *ftc.nullable_int8) - ft.NullableInt8 = ftc.nullable_int8 + if ftc.nillable_int8 != nil { + builder.Set(fieldtype.FieldNillableInt8, *ftc.nillable_int8) + ft.NillableInt8 = ftc.nillable_int8 } - if ftc.nullable_int16 != nil { - builder.Set(fieldtype.FieldNullableInt16, *ftc.nullable_int16) - ft.NullableInt16 = ftc.nullable_int16 + if ftc.nillable_int16 != nil { + builder.Set(fieldtype.FieldNillableInt16, *ftc.nillable_int16) + ft.NillableInt16 = ftc.nillable_int16 } - if ftc.nullable_int32 != nil { - builder.Set(fieldtype.FieldNullableInt32, *ftc.nullable_int32) - ft.NullableInt32 = ftc.nullable_int32 + if ftc.nillable_int32 != nil { + builder.Set(fieldtype.FieldNillableInt32, *ftc.nillable_int32) + ft.NillableInt32 = ftc.nillable_int32 } - if ftc.nullable_int64 != nil { - builder.Set(fieldtype.FieldNullableInt64, *ftc.nullable_int64) - ft.NullableInt64 = ftc.nullable_int64 + if ftc.nillable_int64 != nil { + builder.Set(fieldtype.FieldNillableInt64, *ftc.nillable_int64) + ft.NillableInt64 = ftc.nillable_int64 } query, args := builder.Query() if err := tx.Exec(ctx, query, args, &res); err != nil { @@ -375,20 +375,20 @@ func (ftc *FieldTypeCreate) gremlin() *dsl.Traversal { if ftc.optional_int64 != nil { v.Property(dsl.Single, fieldtype.FieldOptionalInt64, *ftc.optional_int64) } - if ftc.nullable_int != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt, *ftc.nullable_int) + if ftc.nillable_int != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt, *ftc.nillable_int) } - if ftc.nullable_int8 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt8, *ftc.nullable_int8) + if ftc.nillable_int8 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt8, *ftc.nillable_int8) } - if ftc.nullable_int16 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt16, *ftc.nullable_int16) + if ftc.nillable_int16 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt16, *ftc.nillable_int16) } - if ftc.nullable_int32 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt32, *ftc.nullable_int32) + if ftc.nillable_int32 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt32, *ftc.nillable_int32) } - if ftc.nullable_int64 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt64, *ftc.nullable_int64) + if ftc.nillable_int64 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt64, *ftc.nillable_int64) } return v.ValueMap(true) } diff --git a/entc/integration/ent/fieldtype_update.go b/entc/integration/ent/fieldtype_update.go index c6c628f9c..5afbce038 100644 --- a/entc/integration/ent/fieldtype_update.go +++ b/entc/integration/ent/fieldtype_update.go @@ -30,11 +30,11 @@ type FieldTypeUpdate struct { optional_int16 *int16 optional_int32 *int32 optional_int64 *int64 - nullable_int *int - nullable_int8 *int8 - nullable_int16 *int16 - nullable_int32 *int32 - nullable_int64 *int64 + nillable_int *int + nillable_int8 *int8 + nillable_int16 *int16 + nillable_int32 *int32 + nillable_int64 *int64 predicates []predicate.FieldType } @@ -144,72 +144,72 @@ func (ftu *FieldTypeUpdate) SetNillableOptionalInt64(i *int64) *FieldTypeUpdate return ftu } -// SetNullableInt sets the nullable_int field. -func (ftu *FieldTypeUpdate) SetNullableInt(i int) *FieldTypeUpdate { - ftu.nullable_int = &i +// SetNillableInt sets the nillable_int field. +func (ftu *FieldTypeUpdate) SetNillableInt(i int) *FieldTypeUpdate { + ftu.nillable_int = &i return ftu } -// SetNillableNullableInt sets the nullable_int field if the given value is not nil. -func (ftu *FieldTypeUpdate) SetNillableNullableInt(i *int) *FieldTypeUpdate { +// SetNillableNillableInt sets the nillable_int field if the given value is not nil. +func (ftu *FieldTypeUpdate) SetNillableNillableInt(i *int) *FieldTypeUpdate { if i != nil { - ftu.SetNullableInt(*i) + ftu.SetNillableInt(*i) } return ftu } -// SetNullableInt8 sets the nullable_int8 field. -func (ftu *FieldTypeUpdate) SetNullableInt8(i int8) *FieldTypeUpdate { - ftu.nullable_int8 = &i +// SetNillableInt8 sets the nillable_int8 field. +func (ftu *FieldTypeUpdate) SetNillableInt8(i int8) *FieldTypeUpdate { + ftu.nillable_int8 = &i return ftu } -// SetNillableNullableInt8 sets the nullable_int8 field if the given value is not nil. -func (ftu *FieldTypeUpdate) SetNillableNullableInt8(i *int8) *FieldTypeUpdate { +// SetNillableNillableInt8 sets the nillable_int8 field if the given value is not nil. +func (ftu *FieldTypeUpdate) SetNillableNillableInt8(i *int8) *FieldTypeUpdate { if i != nil { - ftu.SetNullableInt8(*i) + ftu.SetNillableInt8(*i) } return ftu } -// SetNullableInt16 sets the nullable_int16 field. -func (ftu *FieldTypeUpdate) SetNullableInt16(i int16) *FieldTypeUpdate { - ftu.nullable_int16 = &i +// SetNillableInt16 sets the nillable_int16 field. +func (ftu *FieldTypeUpdate) SetNillableInt16(i int16) *FieldTypeUpdate { + ftu.nillable_int16 = &i return ftu } -// SetNillableNullableInt16 sets the nullable_int16 field if the given value is not nil. -func (ftu *FieldTypeUpdate) SetNillableNullableInt16(i *int16) *FieldTypeUpdate { +// SetNillableNillableInt16 sets the nillable_int16 field if the given value is not nil. +func (ftu *FieldTypeUpdate) SetNillableNillableInt16(i *int16) *FieldTypeUpdate { if i != nil { - ftu.SetNullableInt16(*i) + ftu.SetNillableInt16(*i) } return ftu } -// SetNullableInt32 sets the nullable_int32 field. -func (ftu *FieldTypeUpdate) SetNullableInt32(i int32) *FieldTypeUpdate { - ftu.nullable_int32 = &i +// SetNillableInt32 sets the nillable_int32 field. +func (ftu *FieldTypeUpdate) SetNillableInt32(i int32) *FieldTypeUpdate { + ftu.nillable_int32 = &i return ftu } -// SetNillableNullableInt32 sets the nullable_int32 field if the given value is not nil. -func (ftu *FieldTypeUpdate) SetNillableNullableInt32(i *int32) *FieldTypeUpdate { +// SetNillableNillableInt32 sets the nillable_int32 field if the given value is not nil. +func (ftu *FieldTypeUpdate) SetNillableNillableInt32(i *int32) *FieldTypeUpdate { if i != nil { - ftu.SetNullableInt32(*i) + ftu.SetNillableInt32(*i) } return ftu } -// SetNullableInt64 sets the nullable_int64 field. -func (ftu *FieldTypeUpdate) SetNullableInt64(i int64) *FieldTypeUpdate { - ftu.nullable_int64 = &i +// SetNillableInt64 sets the nillable_int64 field. +func (ftu *FieldTypeUpdate) SetNillableInt64(i int64) *FieldTypeUpdate { + ftu.nillable_int64 = &i return ftu } -// SetNillableNullableInt64 sets the nullable_int64 field if the given value is not nil. -func (ftu *FieldTypeUpdate) SetNillableNullableInt64(i *int64) *FieldTypeUpdate { +// SetNillableNillableInt64 sets the nillable_int64 field if the given value is not nil. +func (ftu *FieldTypeUpdate) SetNillableNillableInt64(i *int64) *FieldTypeUpdate { if i != nil { - ftu.SetNullableInt64(*i) + ftu.SetNillableInt64(*i) } return ftu } @@ -320,25 +320,25 @@ func (ftu *FieldTypeUpdate) sqlSave(ctx context.Context) (n int, err error) { update = true builder.Set(fieldtype.FieldOptionalInt64, *ftu.optional_int64) } - if ftu.nullable_int != nil { + if ftu.nillable_int != nil { update = true - builder.Set(fieldtype.FieldNullableInt, *ftu.nullable_int) + builder.Set(fieldtype.FieldNillableInt, *ftu.nillable_int) } - if ftu.nullable_int8 != nil { + if ftu.nillable_int8 != nil { update = true - builder.Set(fieldtype.FieldNullableInt8, *ftu.nullable_int8) + builder.Set(fieldtype.FieldNillableInt8, *ftu.nillable_int8) } - if ftu.nullable_int16 != nil { + if ftu.nillable_int16 != nil { update = true - builder.Set(fieldtype.FieldNullableInt16, *ftu.nullable_int16) + builder.Set(fieldtype.FieldNillableInt16, *ftu.nillable_int16) } - if ftu.nullable_int32 != nil { + if ftu.nillable_int32 != nil { update = true - builder.Set(fieldtype.FieldNullableInt32, *ftu.nullable_int32) + builder.Set(fieldtype.FieldNillableInt32, *ftu.nillable_int32) } - if ftu.nullable_int64 != nil { + if ftu.nillable_int64 != nil { update = true - builder.Set(fieldtype.FieldNullableInt64, *ftu.nullable_int64) + builder.Set(fieldtype.FieldNillableInt64, *ftu.nillable_int64) } if update { query, args := builder.Query() @@ -402,20 +402,20 @@ func (ftu *FieldTypeUpdate) gremlin() *dsl.Traversal { if ftu.optional_int64 != nil { v.Property(dsl.Single, fieldtype.FieldOptionalInt64, *ftu.optional_int64) } - if ftu.nullable_int != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt, *ftu.nullable_int) + if ftu.nillable_int != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt, *ftu.nillable_int) } - if ftu.nullable_int8 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt8, *ftu.nullable_int8) + if ftu.nillable_int8 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt8, *ftu.nillable_int8) } - if ftu.nullable_int16 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt16, *ftu.nullable_int16) + if ftu.nillable_int16 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt16, *ftu.nillable_int16) } - if ftu.nullable_int32 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt32, *ftu.nullable_int32) + if ftu.nillable_int32 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt32, *ftu.nillable_int32) } - if ftu.nullable_int64 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt64, *ftu.nullable_int64) + if ftu.nillable_int64 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt64, *ftu.nillable_int64) } v.Count() trs = append(trs, v) @@ -436,11 +436,11 @@ type FieldTypeUpdateOne struct { optional_int16 *int16 optional_int32 *int32 optional_int64 *int64 - nullable_int *int - nullable_int8 *int8 - nullable_int16 *int16 - nullable_int32 *int32 - nullable_int64 *int64 + nillable_int *int + nillable_int8 *int8 + nillable_int16 *int16 + nillable_int32 *int32 + nillable_int64 *int64 } // SetInt sets the int field. @@ -543,72 +543,72 @@ func (ftuo *FieldTypeUpdateOne) SetNillableOptionalInt64(i *int64) *FieldTypeUpd return ftuo } -// SetNullableInt sets the nullable_int field. -func (ftuo *FieldTypeUpdateOne) SetNullableInt(i int) *FieldTypeUpdateOne { - ftuo.nullable_int = &i +// SetNillableInt sets the nillable_int field. +func (ftuo *FieldTypeUpdateOne) SetNillableInt(i int) *FieldTypeUpdateOne { + ftuo.nillable_int = &i return ftuo } -// SetNillableNullableInt sets the nullable_int field if the given value is not nil. -func (ftuo *FieldTypeUpdateOne) SetNillableNullableInt(i *int) *FieldTypeUpdateOne { +// SetNillableNillableInt sets the nillable_int field if the given value is not nil. +func (ftuo *FieldTypeUpdateOne) SetNillableNillableInt(i *int) *FieldTypeUpdateOne { if i != nil { - ftuo.SetNullableInt(*i) + ftuo.SetNillableInt(*i) } return ftuo } -// SetNullableInt8 sets the nullable_int8 field. -func (ftuo *FieldTypeUpdateOne) SetNullableInt8(i int8) *FieldTypeUpdateOne { - ftuo.nullable_int8 = &i +// SetNillableInt8 sets the nillable_int8 field. +func (ftuo *FieldTypeUpdateOne) SetNillableInt8(i int8) *FieldTypeUpdateOne { + ftuo.nillable_int8 = &i return ftuo } -// SetNillableNullableInt8 sets the nullable_int8 field if the given value is not nil. -func (ftuo *FieldTypeUpdateOne) SetNillableNullableInt8(i *int8) *FieldTypeUpdateOne { +// SetNillableNillableInt8 sets the nillable_int8 field if the given value is not nil. +func (ftuo *FieldTypeUpdateOne) SetNillableNillableInt8(i *int8) *FieldTypeUpdateOne { if i != nil { - ftuo.SetNullableInt8(*i) + ftuo.SetNillableInt8(*i) } return ftuo } -// SetNullableInt16 sets the nullable_int16 field. -func (ftuo *FieldTypeUpdateOne) SetNullableInt16(i int16) *FieldTypeUpdateOne { - ftuo.nullable_int16 = &i +// SetNillableInt16 sets the nillable_int16 field. +func (ftuo *FieldTypeUpdateOne) SetNillableInt16(i int16) *FieldTypeUpdateOne { + ftuo.nillable_int16 = &i return ftuo } -// SetNillableNullableInt16 sets the nullable_int16 field if the given value is not nil. -func (ftuo *FieldTypeUpdateOne) SetNillableNullableInt16(i *int16) *FieldTypeUpdateOne { +// SetNillableNillableInt16 sets the nillable_int16 field if the given value is not nil. +func (ftuo *FieldTypeUpdateOne) SetNillableNillableInt16(i *int16) *FieldTypeUpdateOne { if i != nil { - ftuo.SetNullableInt16(*i) + ftuo.SetNillableInt16(*i) } return ftuo } -// SetNullableInt32 sets the nullable_int32 field. -func (ftuo *FieldTypeUpdateOne) SetNullableInt32(i int32) *FieldTypeUpdateOne { - ftuo.nullable_int32 = &i +// SetNillableInt32 sets the nillable_int32 field. +func (ftuo *FieldTypeUpdateOne) SetNillableInt32(i int32) *FieldTypeUpdateOne { + ftuo.nillable_int32 = &i return ftuo } -// SetNillableNullableInt32 sets the nullable_int32 field if the given value is not nil. -func (ftuo *FieldTypeUpdateOne) SetNillableNullableInt32(i *int32) *FieldTypeUpdateOne { +// SetNillableNillableInt32 sets the nillable_int32 field if the given value is not nil. +func (ftuo *FieldTypeUpdateOne) SetNillableNillableInt32(i *int32) *FieldTypeUpdateOne { if i != nil { - ftuo.SetNullableInt32(*i) + ftuo.SetNillableInt32(*i) } return ftuo } -// SetNullableInt64 sets the nullable_int64 field. -func (ftuo *FieldTypeUpdateOne) SetNullableInt64(i int64) *FieldTypeUpdateOne { - ftuo.nullable_int64 = &i +// SetNillableInt64 sets the nillable_int64 field. +func (ftuo *FieldTypeUpdateOne) SetNillableInt64(i int64) *FieldTypeUpdateOne { + ftuo.nillable_int64 = &i return ftuo } -// SetNillableNullableInt64 sets the nullable_int64 field if the given value is not nil. -func (ftuo *FieldTypeUpdateOne) SetNillableNullableInt64(i *int64) *FieldTypeUpdateOne { +// SetNillableNillableInt64 sets the nillable_int64 field if the given value is not nil. +func (ftuo *FieldTypeUpdateOne) SetNillableNillableInt64(i *int64) *FieldTypeUpdateOne { if i != nil { - ftuo.SetNullableInt64(*i) + ftuo.SetNillableInt64(*i) } return ftuo } @@ -732,30 +732,30 @@ func (ftuo *FieldTypeUpdateOne) sqlSave(ctx context.Context) (ft *FieldType, err builder.Set(fieldtype.FieldOptionalInt64, *ftuo.optional_int64) ft.OptionalInt64 = *ftuo.optional_int64 } - if ftuo.nullable_int != nil { + if ftuo.nillable_int != nil { update = true - builder.Set(fieldtype.FieldNullableInt, *ftuo.nullable_int) - ft.NullableInt = ftuo.nullable_int + builder.Set(fieldtype.FieldNillableInt, *ftuo.nillable_int) + ft.NillableInt = ftuo.nillable_int } - if ftuo.nullable_int8 != nil { + if ftuo.nillable_int8 != nil { update = true - builder.Set(fieldtype.FieldNullableInt8, *ftuo.nullable_int8) - ft.NullableInt8 = ftuo.nullable_int8 + builder.Set(fieldtype.FieldNillableInt8, *ftuo.nillable_int8) + ft.NillableInt8 = ftuo.nillable_int8 } - if ftuo.nullable_int16 != nil { + if ftuo.nillable_int16 != nil { update = true - builder.Set(fieldtype.FieldNullableInt16, *ftuo.nullable_int16) - ft.NullableInt16 = ftuo.nullable_int16 + builder.Set(fieldtype.FieldNillableInt16, *ftuo.nillable_int16) + ft.NillableInt16 = ftuo.nillable_int16 } - if ftuo.nullable_int32 != nil { + if ftuo.nillable_int32 != nil { update = true - builder.Set(fieldtype.FieldNullableInt32, *ftuo.nullable_int32) - ft.NullableInt32 = ftuo.nullable_int32 + builder.Set(fieldtype.FieldNillableInt32, *ftuo.nillable_int32) + ft.NillableInt32 = ftuo.nillable_int32 } - if ftuo.nullable_int64 != nil { + if ftuo.nillable_int64 != nil { update = true - builder.Set(fieldtype.FieldNullableInt64, *ftuo.nullable_int64) - ft.NullableInt64 = ftuo.nullable_int64 + builder.Set(fieldtype.FieldNillableInt64, *ftuo.nillable_int64) + ft.NillableInt64 = ftuo.nillable_int64 } if update { query, args := builder.Query() @@ -820,20 +820,20 @@ func (ftuo *FieldTypeUpdateOne) gremlin(id string) *dsl.Traversal { if ftuo.optional_int64 != nil { v.Property(dsl.Single, fieldtype.FieldOptionalInt64, *ftuo.optional_int64) } - if ftuo.nullable_int != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt, *ftuo.nullable_int) + if ftuo.nillable_int != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt, *ftuo.nillable_int) } - if ftuo.nullable_int8 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt8, *ftuo.nullable_int8) + if ftuo.nillable_int8 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt8, *ftuo.nillable_int8) } - if ftuo.nullable_int16 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt16, *ftuo.nullable_int16) + if ftuo.nillable_int16 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt16, *ftuo.nillable_int16) } - if ftuo.nullable_int32 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt32, *ftuo.nullable_int32) + if ftuo.nillable_int32 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt32, *ftuo.nillable_int32) } - if ftuo.nullable_int64 != nil { - v.Property(dsl.Single, fieldtype.FieldNullableInt64, *ftuo.nullable_int64) + if ftuo.nillable_int64 != nil { + v.Property(dsl.Single, fieldtype.FieldNillableInt64, *ftuo.nillable_int64) } v.ValueMap(true) trs = append(trs, v) diff --git a/entc/integration/ent/file/where.go b/entc/integration/ent/file/where.go index 5e6a17c9d..0bed1ea1f 100644 --- a/entc/integration/ent/file/where.go +++ b/entc/integration/ent/file/where.go @@ -624,8 +624,8 @@ func UserHasSuffix(v string) predicate.File { ) } -// UserIsNull applies the IsNull predicate on the "user" field. -func UserIsNull() predicate.File { +// UserIsNil applies the IsNil predicate on the "user" field. +func UserIsNil() predicate.File { return predicate.FilePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldUser))) @@ -636,8 +636,8 @@ func UserIsNull() predicate.File { ) } -// UserNotNull applies the NotNull predicate on the "user" field. -func UserNotNull() predicate.File { +// UserNotNil applies the NotNil predicate on the "user" field. +func UserNotNil() predicate.File { return predicate.FilePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldUser))) @@ -800,8 +800,8 @@ func GroupHasSuffix(v string) predicate.File { ) } -// GroupIsNull applies the IsNull predicate on the "group" field. -func GroupIsNull() predicate.File { +// GroupIsNil applies the IsNil predicate on the "group" field. +func GroupIsNil() predicate.File { return predicate.FilePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldGroup))) @@ -812,8 +812,8 @@ func GroupIsNull() predicate.File { ) } -// GroupNotNull applies the NotNull predicate on the "group" field. -func GroupNotNull() predicate.File { +// GroupNotNil applies the NotNil predicate on the "group" field. +func GroupNotNil() predicate.File { return predicate.FilePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldGroup))) diff --git a/entc/integration/ent/group/where.go b/entc/integration/ent/group/where.go index 83f5bfcb4..380eef106 100644 --- a/entc/integration/ent/group/where.go +++ b/entc/integration/ent/group/where.go @@ -509,8 +509,8 @@ func TypeHasSuffix(v string) predicate.Group { ) } -// TypeIsNull applies the IsNull predicate on the "type" field. -func TypeIsNull() predicate.Group { +// TypeIsNil applies the IsNil predicate on the "type" field. +func TypeIsNil() predicate.Group { return predicate.GroupPerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldType))) @@ -521,8 +521,8 @@ func TypeIsNull() predicate.Group { ) } -// TypeNotNull applies the NotNull predicate on the "type" field. -func TypeNotNull() predicate.Group { +// TypeNotNil applies the NotNil predicate on the "type" field. +func TypeNotNil() predicate.Group { return predicate.GroupPerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldType))) @@ -649,8 +649,8 @@ func MaxUsersNotIn(vs ...int) predicate.Group { ) } -// MaxUsersIsNull applies the IsNull predicate on the "max_users" field. -func MaxUsersIsNull() predicate.Group { +// MaxUsersIsNil applies the IsNil predicate on the "max_users" field. +func MaxUsersIsNil() predicate.Group { return predicate.GroupPerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldMaxUsers))) @@ -661,8 +661,8 @@ func MaxUsersIsNull() predicate.Group { ) } -// MaxUsersNotNull applies the NotNull predicate on the "max_users" field. -func MaxUsersNotNull() predicate.Group { +// MaxUsersNotNil applies the NotNil predicate on the "max_users" field. +func MaxUsersNotNil() predicate.Group { return predicate.GroupPerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldMaxUsers))) diff --git a/entc/integration/ent/migrate/schema.go b/entc/integration/ent/migrate/schema.go index dc86dac8f..e5cd75d22 100644 --- a/entc/integration/ent/migrate/schema.go +++ b/entc/integration/ent/migrate/schema.go @@ -49,16 +49,16 @@ var ( {Name: "int16", Type: field.TypeInt16}, {Name: "int32", Type: field.TypeInt32}, {Name: "int64", Type: field.TypeInt64}, - {Name: "optional_int", Type: field.TypeInt}, - {Name: "optional_int8", Type: field.TypeInt8}, - {Name: "optional_int16", Type: field.TypeInt16}, - {Name: "optional_int32", Type: field.TypeInt32}, - {Name: "optional_int64", Type: field.TypeInt64}, - {Name: "nullable_int", Type: field.TypeInt}, - {Name: "nullable_int8", Type: field.TypeInt8}, - {Name: "nullable_int16", Type: field.TypeInt16}, - {Name: "nullable_int32", Type: field.TypeInt32}, - {Name: "nullable_int64", Type: field.TypeInt64}, + {Name: "optional_int", Type: field.TypeInt, Nullable: &nullable}, + {Name: "optional_int8", Type: field.TypeInt8, Nullable: &nullable}, + {Name: "optional_int16", Type: field.TypeInt16, Nullable: &nullable}, + {Name: "optional_int32", Type: field.TypeInt32, Nullable: &nullable}, + {Name: "optional_int64", Type: field.TypeInt64, Nullable: &nullable}, + {Name: "nillable_int", Type: field.TypeInt, Nullable: &nullable}, + {Name: "nillable_int8", Type: field.TypeInt8, Nullable: &nullable}, + {Name: "nillable_int16", Type: field.TypeInt16, Nullable: &nullable}, + {Name: "nillable_int32", Type: field.TypeInt32, Nullable: &nullable}, + {Name: "nillable_int64", Type: field.TypeInt64, Nullable: &nullable}, } // FieldTypesTable holds the schema information for the "field_types" table. FieldTypesTable = &schema.Table{ @@ -72,8 +72,8 @@ var ( {Name: "id", Type: field.TypeInt, Increment: true}, {Name: "size", Type: field.TypeInt}, {Name: "name", Type: field.TypeString}, - {Name: "user", Type: field.TypeString}, - {Name: "group", Type: field.TypeString}, + {Name: "user", Type: field.TypeString, Nullable: &nullable}, + {Name: "group", Type: field.TypeString, Nullable: &nullable}, {Name: "group_file_id", Type: field.TypeInt, Nullable: &nullable}, {Name: "user_file_id", Type: field.TypeInt, Nullable: &nullable}, } @@ -104,8 +104,8 @@ var ( {Name: "id", Type: field.TypeInt, Increment: true}, {Name: "active", Type: field.TypeBool}, {Name: "expire", Type: field.TypeTime}, - {Name: "type", Type: field.TypeString}, - {Name: "max_users", Type: field.TypeInt}, + {Name: "type", Type: field.TypeString, Nullable: &nullable}, + {Name: "max_users", Type: field.TypeInt, Nullable: &nullable}, {Name: "name", Type: field.TypeString}, {Name: "info_id", Type: field.TypeInt, Nullable: &nullable}, } @@ -140,7 +140,7 @@ var ( // NodesColumns holds the columns for the "nodes" table. NodesColumns = []*schema.Column{ {Name: "id", Type: field.TypeInt, Increment: true}, - {Name: "value", Type: field.TypeInt}, + {Name: "value", Type: field.TypeInt, Nullable: &nullable}, {Name: "prev_id", Type: field.TypeInt, Unique: true, Nullable: &nullable}, } // NodesTable holds the schema information for the "nodes" table. @@ -193,8 +193,8 @@ var ( {Name: "age", Type: field.TypeInt}, {Name: "name", Type: field.TypeString}, {Name: "last", Type: field.TypeString}, - {Name: "nickname", Type: field.TypeString, Unique: true}, - {Name: "phone", Type: field.TypeString, Unique: true}, + {Name: "nickname", Type: field.TypeString, Unique: true, Nullable: &nullable}, + {Name: "phone", Type: field.TypeString, Unique: true, Nullable: &nullable}, {Name: "group_blocked_id", Type: field.TypeInt, Nullable: &nullable}, {Name: "user_spouse_id", Type: field.TypeInt, Unique: true, Nullable: &nullable}, {Name: "parent_id", Type: field.TypeInt, Nullable: &nullable}, diff --git a/entc/integration/ent/node/where.go b/entc/integration/ent/node/where.go index 801606966..35c88b4cf 100644 --- a/entc/integration/ent/node/where.go +++ b/entc/integration/ent/node/where.go @@ -284,8 +284,8 @@ func ValueNotIn(vs ...int) predicate.Node { ) } -// ValueIsNull applies the IsNull predicate on the "value" field. -func ValueIsNull() predicate.Node { +// ValueIsNil applies the IsNil predicate on the "value" field. +func ValueIsNil() predicate.Node { return predicate.NodePerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldValue))) @@ -296,8 +296,8 @@ func ValueIsNull() predicate.Node { ) } -// ValueNotNull applies the NotNull predicate on the "value" field. -func ValueNotNull() predicate.Node { +// ValueNotNil applies the NotNil predicate on the "value" field. +func ValueNotNil() predicate.Node { return predicate.NodePerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldValue))) diff --git a/entc/integration/ent/schema/fieldtype.go b/entc/integration/ent/schema/fieldtype.go index 885039229..0e65aa9cb 100644 --- a/entc/integration/ent/schema/fieldtype.go +++ b/entc/integration/ent/schema/fieldtype.go @@ -24,10 +24,10 @@ func (FieldType) Fields() []ent.Field { field.Int16("optional_int16").Optional(), field.Int32("optional_int32").Optional(), field.Int64("optional_int64").Optional(), - field.Int("nullable_int").Optional().Nullable(), - field.Int8("nullable_int8").Optional().Nullable(), - field.Int16("nullable_int16").Optional().Nullable(), - field.Int32("nullable_int32").Optional().Nullable(), - field.Int64("nullable_int64").Optional().Nullable(), + field.Int("nillable_int").Optional().Nillable(), + field.Int8("nillable_int8").Optional().Nillable(), + field.Int16("nillable_int16").Optional().Nillable(), + field.Int32("nillable_int32").Optional().Nillable(), + field.Int64("nillable_int64").Optional().Nillable(), } } diff --git a/entc/integration/ent/schema/file.go b/entc/integration/ent/schema/file.go index 4f3c2231c..406ebb444 100644 --- a/entc/integration/ent/schema/file.go +++ b/entc/integration/ent/schema/file.go @@ -21,7 +21,7 @@ func (File) Fields() []ent.Field { field.String("name"), field.String("user"). Optional(). - Nullable(), + Nillable(), field.String("group"). Optional(), } diff --git a/entc/integration/ent/schema/group.go b/entc/integration/ent/schema/group.go index 461117966..9e6fdd248 100644 --- a/entc/integration/ent/schema/group.go +++ b/entc/integration/ent/schema/group.go @@ -23,7 +23,7 @@ func (Group) Fields() []ent.Field { field.Time("expire"), field.String("type"). Optional(). - Nullable(). + Nillable(). MinLen(3), field.Int("max_users"). Optional(). diff --git a/entc/integration/ent/user/where.go b/entc/integration/ent/user/where.go index 225c1e50e..1e32d3df4 100644 --- a/entc/integration/ent/user/where.go +++ b/entc/integration/ent/user/where.go @@ -788,8 +788,8 @@ func NicknameHasSuffix(v string) predicate.User { ) } -// NicknameIsNull applies the IsNull predicate on the "nickname" field. -func NicknameIsNull() predicate.User { +// NicknameIsNil applies the IsNil predicate on the "nickname" field. +func NicknameIsNil() predicate.User { return predicate.UserPerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldNickname))) @@ -800,8 +800,8 @@ func NicknameIsNull() predicate.User { ) } -// NicknameNotNull applies the NotNull predicate on the "nickname" field. -func NicknameNotNull() predicate.User { +// NicknameNotNil applies the NotNil predicate on the "nickname" field. +func NicknameNotNil() predicate.User { return predicate.UserPerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldNickname))) @@ -964,8 +964,8 @@ func PhoneHasSuffix(v string) predicate.User { ) } -// PhoneIsNull applies the IsNull predicate on the "phone" field. -func PhoneIsNull() predicate.User { +// PhoneIsNil applies the IsNil predicate on the "phone" field. +func PhoneIsNil() predicate.User { return predicate.UserPerDialect( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldPhone))) @@ -976,8 +976,8 @@ func PhoneIsNull() predicate.User { ) } -// PhoneNotNull applies the NotNull predicate on the "phone" field. -func PhoneNotNull() predicate.User { +// PhoneNotNil applies the NotNil predicate on the "phone" field. +func PhoneNotNil() predicate.User { return predicate.UserPerDialect( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldPhone))) diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go index c6b433910..974357b71 100644 --- a/entc/integration/integration_test.go +++ b/entc/integration/integration_test.go @@ -274,34 +274,34 @@ func Predicate(t *testing.T, client *ent.Client) { require.Equal(f3.Name, files[0].Name) require.Equal(f4.Name, files[1].Name) - require.Zero(client.File.Query().Where(file.UserNotNull()).CountX(ctx)) - require.Equal(4, client.File.Query().Where(file.UserIsNull()).CountX(ctx)) - require.Zero(client.File.Query().Where(file.GroupNotNull()).CountX(ctx)) - require.Equal(4, client.File.Query().Where(file.GroupIsNull()).CountX(ctx)) + require.Zero(client.File.Query().Where(file.UserNotNil()).CountX(ctx)) + require.Equal(4, client.File.Query().Where(file.UserIsNil()).CountX(ctx)) + require.Zero(client.File.Query().Where(file.GroupNotNil()).CountX(ctx)) + require.Equal(4, client.File.Query().Where(file.GroupIsNil()).CountX(ctx)) f1 = f1.Update().SetUser("a8m").SaveX(ctx) require.NotNil(f1.User) require.Equal("a8m", *f1.User) - require.Equal(3, client.File.Query().Where(file.UserIsNull()).CountX(ctx)) - require.Equal(f1.Name, client.File.Query().Where(file.UserNotNull()).OnlyX(ctx).Name) + require.Equal(3, client.File.Query().Where(file.UserIsNil()).CountX(ctx)) + require.Equal(f1.Name, client.File.Query().Where(file.UserNotNil()).OnlyX(ctx).Name) f5 := client.File.Create().SetName("5").SetSize(40).SetUser("mashraki").SaveX(ctx) require.NotNil(f5.User) require.Equal("mashraki", *f5.User) - require.Equal(3, client.File.Query().Where(file.UserIsNull()).CountX(ctx)) - require.Equal(2, client.File.Query().Where(file.UserNotNull()).CountX(ctx)) + require.Equal(3, client.File.Query().Where(file.UserIsNil()).CountX(ctx)) + require.Equal(2, client.File.Query().Where(file.UserNotNil()).CountX(ctx)) - require.Equal(5, client.File.Query().Where(file.GroupIsNull()).CountX(ctx)) + require.Equal(5, client.File.Query().Where(file.GroupIsNil()).CountX(ctx)) f4 = f4.Update().SetGroup("fbc").SaveX(ctx) - require.Equal(1, client.File.Query().Where(file.GroupNotNull()).CountX(ctx)) - require.Equal(4, client.File.Query().Where(file.GroupIsNull()).CountX(ctx)) + require.Equal(1, client.File.Query().Where(file.GroupNotNil()).CountX(ctx)) + require.Equal(4, client.File.Query().Where(file.GroupIsNil()).CountX(ctx)) require.Equal( 5, client.File.Query(). Where( file.Or( - file.GroupIsNull(), + file.GroupIsNil(), file.And( - file.GroupNotNull(), + file.GroupNotNil(), file.Name(f4.Name), ), ), diff --git a/entc/integration/migrate/entv1/migrate/schema.go b/entc/integration/migrate/entv1/migrate/schema.go index c90750398..fb8a02a11 100644 --- a/entc/integration/migrate/entv1/migrate/schema.go +++ b/entc/integration/migrate/entv1/migrate/schema.go @@ -14,7 +14,7 @@ var ( {Name: "id", Type: field.TypeInt, Increment: true}, {Name: "age", Type: field.TypeInt32}, {Name: "name", Type: field.TypeString, Size: 10}, - {Name: "address", Type: field.TypeString}, + {Name: "address", Type: field.TypeString, Nullable: &nullable}, } // UsersTable holds the schema information for the "users" table. UsersTable = &schema.Table{ diff --git a/entc/integration/migrate/entv1/user/where.go b/entc/integration/migrate/entv1/user/where.go index e11a08e53..fa7fe638b 100644 --- a/entc/integration/migrate/entv1/user/where.go +++ b/entc/integration/migrate/entv1/user/where.go @@ -466,8 +466,8 @@ func AddressHasSuffix(v string) predicate.User { ) } -// AddressIsNull applies the IsNull predicate on the "address" field. -func AddressIsNull() predicate.User { +// AddressIsNil applies the IsNil predicate on the "address" field. +func AddressIsNil() predicate.User { return predicate.User( func(s *sql.Selector) { s.Where(sql.IsNull(s.C(FieldAddress))) @@ -475,8 +475,8 @@ func AddressIsNull() predicate.User { ) } -// AddressNotNull applies the NotNull predicate on the "address" field. -func AddressNotNull() predicate.User { +// AddressNotNil applies the NotNil predicate on the "address" field. +func AddressNotNil() predicate.User { return predicate.User( func(s *sql.Selector) { s.Where(sql.NotNull(s.C(FieldAddress))) diff --git a/entc/integration/type_test.go b/entc/integration/type_test.go index 18820963f..a8098ac7f 100644 --- a/entc/integration/type_test.go +++ b/entc/integration/type_test.go @@ -38,20 +38,20 @@ func Types(t *testing.T, client *ent.Client) { SetOptionalInt16(math.MaxInt16). SetOptionalInt32(math.MaxInt32). SetOptionalInt64(math.MaxInt64). - SetNullableInt8(math.MaxInt8). - SetNullableInt16(math.MaxInt16). - SetNullableInt32(math.MaxInt32). - SetNullableInt64(math.MaxInt64). + SetNillableInt8(math.MaxInt8). + SetNillableInt16(math.MaxInt16). + SetNillableInt32(math.MaxInt32). + SetNillableInt64(math.MaxInt64). SaveX(ctx) require.Equal(int8(math.MaxInt8), ft.OptionalInt8) require.Equal(int16(math.MaxInt16), ft.OptionalInt16) require.Equal(int32(math.MaxInt32), ft.OptionalInt32) require.Equal(int64(math.MaxInt64), ft.OptionalInt64) - require.Equal(int8(math.MaxInt8), *ft.NullableInt8) - require.Equal(int16(math.MaxInt16), *ft.NullableInt16) - require.Equal(int32(math.MaxInt32), *ft.NullableInt32) - require.Equal(int64(math.MaxInt64), *ft.NullableInt64) + require.Equal(int8(math.MaxInt8), *ft.NillableInt8) + require.Equal(int16(math.MaxInt16), *ft.NillableInt16) + require.Equal(int32(math.MaxInt32), *ft.NillableInt32) + require.Equal(int64(math.MaxInt64), *ft.NillableInt64) ft = client.FieldType.UpdateOne(ft). SetInt(1). @@ -63,18 +63,18 @@ func Types(t *testing.T, client *ent.Client) { SetOptionalInt16(math.MaxInt16). SetOptionalInt32(math.MaxInt32). SetOptionalInt64(math.MaxInt64). - SetNullableInt8(math.MaxInt8). - SetNullableInt16(math.MaxInt16). - SetNullableInt32(math.MaxInt32). - SetNullableInt64(math.MaxInt64). + SetNillableInt8(math.MaxInt8). + SetNillableInt16(math.MaxInt16). + SetNillableInt32(math.MaxInt32). + SetNillableInt64(math.MaxInt64). SaveX(ctx) require.Equal(int8(math.MaxInt8), ft.OptionalInt8) require.Equal(int16(math.MaxInt16), ft.OptionalInt16) require.Equal(int32(math.MaxInt32), ft.OptionalInt32) require.Equal(int64(math.MaxInt64), ft.OptionalInt64) - require.Equal(int8(math.MaxInt8), *ft.NullableInt8) - require.Equal(int16(math.MaxInt16), *ft.NullableInt16) - require.Equal(int32(math.MaxInt32), *ft.NullableInt32) - require.Equal(int64(math.MaxInt64), *ft.NullableInt64) + require.Equal(int8(math.MaxInt8), *ft.NillableInt8) + require.Equal(int16(math.MaxInt16), *ft.NillableInt16) + require.Equal(int32(math.MaxInt32), *ft.NillableInt32) + require.Equal(int64(math.MaxInt64), *ft.NillableInt64) } diff --git a/entc/load/bindata.go b/entc/load/bindata.go index 44f05651f..2c45e01af 100644 --- a/entc/load/bindata.go +++ b/entc/load/bindata.go @@ -87,7 +87,7 @@ func templateMainTmpl() (*asset, error) { return a, nil } -var _schemaGo = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x56\x51\x6f\xdb\x36\x10\x7e\x16\x7f\xc5\xcd\x0f\x81\x14\x18\xca\xbb\x0a\x3f\x0c\x5b\x87\x75\xc3\x92\xa1\xd9\xf6\x52\x14\x2d\x2d\x1d\x1d\xb6\x32\xe5\x92\x54\x8b\x34\xf0\x7f\x1f\xee\x78\xb4\x25\xdb\x4d\x81\xe6\x25\xe4\x7d\xdf\xdd\xf1\xee\x3e\x91\xde\xe9\xf6\xa3\xde\x20\xf4\x83\xee\x94\xb2\xdb\xdd\xe0\x23\x94\xaa\x58\xa0\x6b\x87\xce\xba\xcd\xcd\x87\x30\xb8\x85\x2a\x16\x1e\x4d\x8f\x6d\x5c\x28\x55\x2c\xcc\xba\xbd\x41\x17\x17\xc7\xe5\x8d\xb1\xd8\x77\x0b\x55\x29\x75\x73\x03\xf7\xed\x03\x6e\x35\x78\xdc\x79\x0c\xe8\x62\x00\xed\x00\x5d\xac\x05\x88\x0f\x3a\xc2\x17\x1d\x38\x2d\x76\x60\xfc\xb0\x05\x0d\xed\xb0\xdd\xf5\x16\x3b\x18\x03\x7a\x90\xa3\xd5\x2a\x3e\xee\x30\x87\x0c\xd1\x8f\x6d\x84\x27\x55\xdc\xea\x2d\x02\x90\xc1\xba\x0d\x00\xbc\xa7\x83\x36\x0b\xa7\xb7\xb8\x1c\xb6\x36\xe2\x76\x17\x1f\x17\xef\x55\xf1\xb2\xdb\x60\x00\x78\xf3\xf6\x9a\x56\x07\x22\x92\x79\xce\xfc\x8d\x6a\x08\xc4\xe4\x55\x66\x72\x69\x73\xea\x9e\xcb\x4c\xac\xf3\x2a\x93\xfd\x07\x8a\x4c\x8e\x67\x35\xc2\xb4\xce\x67\x2a\xfd\x87\x62\xa4\x3f\x3e\x73\xcd\x06\xa1\x53\x82\x13\xba\xde\xc0\x37\xa3\x47\xbd\x99\xb3\xef\xed\xd7\x1c\xfc\xda\xba\x28\x4b\x61\x07\xfb\xf5\x24\xf8\x2f\x0f\xda\x07\x64\xda\xf5\x31\xba\xd0\xdb\x04\xce\x3d\xfe\x75\xf6\xd3\x98\x52\xac\x87\xa1\x9f\x27\x18\x19\x9c\x3b\xdc\x8e\x7d\xaf\xd7\x3d\x5e\x74\x70\x02\xce\x5d\xee\x76\xd1\x0e\x4e\xf7\x17\x5d\x06\x01\xe7\x2e\xbf\xa2\xd1\x63\x1f\x2f\x1f\xab\x4b\xe0\xdc\xe3\x3f\xdd\xdb\x4e\xc7\xc1\x07\x38\x36\x2a\x7b\x7c\x3e\x80\x17\x04\xc5\x02\x3d\xd7\x13\x9b\x7f\x40\x4e\xec\x77\x41\x4d\x32\x8f\xef\xeb\x68\x4e\x7c\x46\x41\x27\xc4\x53\xed\xbc\x46\x93\x92\xcf\x79\x1e\xcd\xbb\xf3\xec\xaf\xd1\x88\xcc\x66\xdf\xab\x47\xf3\x0d\xbd\xc8\x58\x9e\x51\xca\x2b\xf7\x19\x7d\xc0\x53\xaa\x4d\xe6\xd3\xf4\x9f\x46\xeb\xb1\x3b\xe1\x7a\x31\x5f\x98\xda\x2d\x7e\xe1\x93\xb6\x1e\x75\x44\x9e\x9a\xcc\x88\xee\x98\x34\xa8\x90\xae\x2f\xeb\x22\x7a\xa3\x5b\xac\x95\x19\x5d\x9b\x5d\x4b\x3c\xcc\xb9\x92\xb2\x9f\x54\xe1\x10\x9a\x15\x5c\xd1\xf6\x49\x15\x3c\xbe\x86\x1b\x83\x35\xad\xcb\x6a\xa9\x0a\x9e\x55\xb6\xd2\x5a\xac\x7a\x93\x8c\x64\xd5\x9b\x64\x94\x29\x34\x64\x94\x75\x02\x52\x27\x1b\x66\xbf\x0a\x69\x97\x10\x69\x5c\x93\x10\xd9\xe5\x68\xa9\x21\x0d\x43\x79\xc7\xd8\x5e\x15\xd6\x00\x9f\x1e\xeb\x9f\x43\x18\xda\xb2\x7a\x01\x08\x3f\xad\xc0\xd9\x9e\x4a\x2b\x1c\x1f\x01\x56\xc7\x0e\x54\xec\xe7\x31\x8e\xde\x81\x43\xe9\xed\x5f\xda\x87\x07\xdd\xcb\xed\xcf\x8f\x12\x7d\x0a\x38\x7d\x4d\x0e\x4d\xa5\xd5\x00\x1a\xfe\xb8\xbf\xbb\x25\x67\xfe\x64\x5a\xed\x60\x8d\xd0\x21\xb9\x76\x89\x42\x01\xc4\x79\x58\x7f\xc0\x36\xca\x3f\x99\xca\x2c\x69\x19\x72\xee\x9c\xb0\x82\xf2\xcd\xdb\xf5\x63\xc4\x25\xa0\xf7\x83\xaf\xa8\xa2\xc0\xb3\x4a\x84\xa7\xd4\x66\xeb\x3a\xeb\xb1\x8d\xa5\x3c\x9d\x3c\x9f\x3b\x23\x01\xab\x4a\xa6\xb8\x57\x85\x19\x3c\xbc\x5b\x82\xa1\x18\x5e\x3b\xfa\x6a\x99\x93\x5e\x92\x50\x72\x86\x22\x30\x7e\xc5\x36\xda\x4f\x14\x01\x60\x26\x9a\x98\x88\x82\x80\xa3\x2c\x26\xba\x60\x20\x2b\x63\xa2\x00\xb2\xcf\x35\x70\xb8\x67\x1b\x01\xf3\x5e\xe0\x7c\xa7\x66\x38\xef\x05\x96\xfb\xb3\x49\xa1\x7f\xd7\x41\x0c\x02\x1f\x2f\xcb\x06\x7a\x74\xa5\xa9\x8f\x96\xb2\x62\xce\x5e\x15\xa4\xa7\xb0\x84\xe1\x23\x75\xc0\xd4\x65\x7a\xde\xe8\x49\xf2\xd5\x0b\x32\x73\x3f\xe8\x15\x22\x42\x60\xa4\xac\xd8\x66\x78\x03\x2b\xb8\x22\xf8\x18\xae\x3d\x0b\x27\x4f\xd6\x2c\xa4\xbc\x54\xc4\x6b\x33\xe1\x10\x38\xbf\x71\x2b\xb8\x12\x9e\x84\x0f\x32\x38\x58\x81\xde\xed\xd0\x75\x65\xb6\x2c\x21\x98\xa4\x74\x99\x39\x9e\xcd\x9c\x7f\xaf\xe4\x91\xa7\xdd\x34\x0e\x1b\x96\x93\xef\x66\xf6\xe1\xd0\x65\x55\x8b\x7e\xcb\x50\xd1\x57\xc4\x92\x3e\x68\x31\xc2\x54\x8d\xd5\x6c\x47\x29\xe9\x58\xb1\xfe\xd3\xba\xae\xac\x60\xb5\x3a\xe0\x7f\x47\xcf\x27\xa2\x6a\x63\xfd\xb2\xc7\x6d\x39\x4b\x1c\xd5\x5e\xfd\x1f\x00\x00\xff\xff\x3e\x7d\x4d\xef\x4d\x0a\x00\x00") +var _schemaGo = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x56\x51\x6f\xdb\x36\x10\x7e\x16\x7f\xc5\xcd\x0f\x81\x14\x18\xca\xbb\x0a\x3f\x0c\x5b\x87\x75\xc3\x92\xa1\xd9\xf6\x52\x14\x2d\x2d\x1d\x1d\xb6\x32\xa5\x92\x74\x8b\x34\xf0\x7f\x1f\xee\x78\xb4\x25\xdb\x4d\x81\xe6\x25\xe4\x7d\xdf\xdd\xf1\xee\x3e\x91\x1e\x75\xfb\x51\x6f\x10\xfa\x41\x77\x4a\xd9\xed\x38\xf8\x08\xa5\x2a\x16\xe8\xda\xa1\xb3\x6e\x73\xf3\x21\x0c\x6e\xa1\x8a\x85\x47\xd3\x63\x1b\x17\x4a\x15\x0b\xb3\x6e\x6f\xd0\xc5\xc5\x71\x79\x63\x2c\xf6\xdd\x42\x55\x4a\xdd\xdc\xc0\x7d\xfb\x80\x5b\x0d\x1e\x47\x8f\x01\x5d\x0c\xa0\x1d\xa0\x8b\xb5\x00\xf1\x41\x47\xf8\xa2\x03\xa7\xc5\x0e\x8c\x1f\xb6\xa0\xa1\x1d\xb6\x63\x6f\xb1\x83\x5d\x40\x0f\x72\xb4\x5a\xc5\xc7\x11\x73\xc8\x10\xfd\xae\x8d\xf0\xa4\x8a\x5b\xbd\x45\x00\x32\x58\xb7\x01\x80\xf7\x74\xd0\x66\xe1\xf4\x16\x97\xc3\xd6\x46\xdc\x8e\xf1\x71\xf1\x5e\x15\x2f\xbb\x0d\x06\x80\x37\x6f\xaf\x69\x75\x20\x22\x99\xe7\xcc\xdf\xa8\x86\x40\x4c\x5e\x65\x26\x97\x36\xa7\xee\xb9\xcc\xc4\x3a\xaf\x32\xd9\x7f\xa0\xc8\xe4\x78\x56\x23\x4c\xeb\x7c\xa6\xd2\x7f\x28\x46\xfa\xe3\x33\xd7\x6c\x10\x3a\x25\x38\xa1\xeb\x0d\x7c\x33\x7a\xd4\x9b\x39\xfb\xde\x7e\xcd\xc1\xaf\xad\x8b\xb2\x14\x76\xb0\x5f\x4f\x82\xff\xf2\xa0\x7d\x40\xa6\x5d\x1f\xa3\x0b\xbd\x4d\xe0\xdc\xe3\x5f\x67\x3f\xed\x52\x8a\xf5\x30\xf4\xf3\x04\x3b\x06\xe7\x0e\xb7\xb6\xef\xf5\xba\xc7\x8b\x0e\x4e\xc0\xb9\xcb\xdd\x18\xed\xe0\x74\x7f\xd1\x65\x10\x70\xee\xf2\x2b\x1a\xbd\xeb\xe3\xe5\x63\x75\x09\x9c\x7b\xfc\xa7\x7b\xdb\xe9\x38\xf8\x00\xc7\x46\x65\x8f\xcf\x07\xf0\x82\xa0\x58\xa0\xe7\x7a\x62\xf3\x0f\xc8\x89\xfd\x2e\xa8\x49\xe6\xf1\x7d\x1d\xcd\x89\xcf\x28\xe8\x84\x78\xaa\x9d\xd7\x68\x52\xf2\x39\xcf\xa3\x79\x77\x9e\xfd\x35\x1a\x91\xd9\xec\x7b\xf5\x68\xbe\xa1\x17\x19\xcb\x33\x4a\x79\xe5\x3e\xa3\x0f\x78\x4a\xb5\xc9\x7c\x9a\xfe\xd3\xce\x7a\xec\x4e\xb8\x5e\xcc\x17\xa6\x76\x8b\x5f\xf8\xa4\xad\x47\x1d\x91\xa7\x26\x33\xa2\x3b\x26\x0d\x2a\xa4\xeb\xcb\xba\x88\xde\xe8\x16\x6b\x65\x76\xae\xcd\xae\x25\x1e\xe6\x5c\x49\xd9\x4f\xaa\x70\x08\xcd\x0a\xae\x68\xfb\xa4\x0a\x1e\x5f\xc3\x8d\xc1\x9a\xd6\x65\xb5\x54\x05\xcf\x2a\x5b\x69\x2d\x56\xbd\x49\x46\xb2\xea\x4d\x32\xca\x14\x1a\x32\xca\x3a\x01\xa9\x93\x0d\xb3\x5f\x85\xb4\x4b\x88\x34\xae\x49\x88\xec\x72\xb4\xd4\x90\x86\xa1\xbc\x63\x6c\xaf\x0a\x6b\x80\x4f\x8f\xf5\xcf\x21\x0c\x6d\x59\xbd\x00\x84\x9f\x56\xe0\x6c\x4f\xa5\x15\x8e\x8f\x00\xab\x63\x07\x2a\xf6\xf3\x18\x77\xde\x81\x43\xe9\xed\x5f\xda\x87\x07\xdd\xcb\xed\xcf\x8f\x12\x7d\x0a\x38\x7d\x4d\x0e\x4d\xa5\xd5\x00\x1a\xfe\xb8\xbf\xbb\x25\x67\xfe\x64\x5a\xed\x60\x8d\xd0\x21\xb9\x76\x89\x42\x01\xc4\x79\x58\x7f\xc0\x36\xca\x3f\x99\xca\x2c\x69\x19\x72\xee\x9c\xb0\x82\xf2\xcd\xdb\xf5\x63\xc4\x25\xa0\xf7\x83\xaf\xa8\xa2\xc0\xb3\x4a\x84\xa7\xd4\x66\xeb\x3a\xeb\xb1\x8d\xa5\x3c\x9d\x3c\x9f\x3b\x23\x01\xab\x4a\xa6\xb8\x57\x85\x19\x3c\xbc\x5b\x82\xa1\x18\x5e\x3b\xfa\x6a\x99\x93\x5e\x92\x50\x72\x86\x22\x30\x7e\xc5\x36\xda\x4f\x14\x01\x60\x26\x9a\x98\x88\x82\x80\xa3\x2c\x26\xba\x60\x20\x2b\x63\xa2\x00\xb2\xcf\x35\x70\xb8\x67\x1b\x01\xf3\x5e\xe0\x7c\xa7\x66\x38\xef\x05\x96\xfb\xb3\x49\xa1\x7f\xd7\x41\x0c\x02\x1f\x2f\xcb\x06\x7a\x74\xa5\xa9\x8f\x96\xb2\x62\xce\x5e\x15\xa4\xa7\xb0\x84\xe1\x23\x75\xc0\xd4\x65\x7a\xde\xe8\x49\xf2\xd5\x0b\x32\x73\x3f\xe8\x15\x22\x42\x60\xa4\xac\xd8\x66\x78\x03\x2b\xb8\x22\xf8\x18\xae\x3d\x0b\x27\x4f\xd6\x2c\xa4\xbc\x54\xc4\x6b\x33\xe1\x10\x38\xbf\x71\x2b\xb8\x12\x9e\x84\x0f\x32\x38\x58\x81\x1e\x47\x74\x5d\x99\x2d\x4b\x08\x26\x29\x5d\x66\x8e\x67\x33\xe7\xdf\x2b\x79\xe4\x69\x37\x8d\xc3\x86\xe5\xe4\xbb\x99\x7d\x38\x74\x59\xd5\xa2\xdf\x32\x54\xf4\x15\xb1\xa4\x0f\x5a\x8c\x30\x55\x63\x35\xdb\x51\x4a\x3a\x56\xac\xff\xb4\xae\x2b\x2b\x58\xad\x0e\xf8\xdf\xd1\xf3\x89\xa8\xda\x58\xbf\xec\x71\x5b\xce\x12\x47\xb5\x57\xff\x07\x00\x00\xff\xff\x1a\xb4\x3e\xeb\x4d\x0a\x00\x00") func schemaGoBytes() ([]byte, error) { return bindataRead( @@ -102,7 +102,7 @@ func schemaGo() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "schema.go", size: 2637, mode: os.FileMode(420), modTime: time.Unix(1564657397, 0)} + info := bindataFileInfo{name: "schema.go", size: 2637, mode: os.FileMode(420), modTime: time.Unix(1565179921, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/load/schema.go b/entc/load/schema.go index f069df7bd..41fd3eb69 100644 --- a/entc/load/schema.go +++ b/entc/load/schema.go @@ -23,7 +23,7 @@ type Field struct { Size *int `json:"size,omitempty"` Charset *string `json:"charset,omitempty"` Unique bool `json:"unique,omitempty"` - Nullable bool `json:"nullable,omitempty"` + Nillable bool `json:"nillable,omitempty"` Optional bool `json:"optional,omitempty"` Default bool `json:"default,omitempty"` Validators int `json:"validators,omitempty"` @@ -68,7 +68,7 @@ func MarshalSchema(schema ent.Schema) ([]byte, error) { Type: f.Type(), Tag: f.Tag(), Unique: f.IsUnique(), - Nullable: f.IsNullable(), + Nillable: f.IsNillable(), Optional: f.IsOptional(), Default: f.HasDefault(), Validators: len(f.Validators()), diff --git a/entc/load/schema_test.go b/entc/load/schema_test.go index 341b4d3c8..bcf804beb 100644 --- a/entc/load/schema_test.go +++ b/entc/load/schema_test.go @@ -19,8 +19,8 @@ func (User) Fields() []ent.Field { return []ent.Field{ field.Int("age"), field.String("name"), - field.String("nullable"). - Nullable(), + field.String("nillable"). + Nillable(), field.String("optional"). Optional(), } @@ -62,14 +62,14 @@ func TestMarshalSchema(t *testing.T) { require.Equal(t, "name", schema.Fields[1].Name) require.Equal(t, field.TypeString, schema.Fields[1].Type) - require.Equal(t, "nullable", schema.Fields[2].Name) + require.Equal(t, "nillable", schema.Fields[2].Name) require.Equal(t, field.TypeString, schema.Fields[2].Type) - require.True(t, schema.Fields[2].Nullable) + require.True(t, schema.Fields[2].Nillable) require.False(t, schema.Fields[2].Optional) require.Equal(t, "optional", schema.Fields[3].Name) require.Equal(t, field.TypeString, schema.Fields[3].Type) - require.False(t, schema.Fields[3].Nullable) + require.False(t, schema.Fields[3].Nillable) require.True(t, schema.Fields[3].Optional) require.Len(t, schema.Edges, 2) diff --git a/field/field.go b/field/field.go index 678a6944a..9b3b27b33 100644 --- a/field/field.go +++ b/field/field.go @@ -89,7 +89,7 @@ type Field struct { name string charset string unique bool - nullable bool + nillable bool optional bool value interface{} validators []interface{} @@ -144,8 +144,8 @@ func (f Field) HasDefault() bool { return f.value != nil } // Value returns the default value of the field. func (f Field) Value() interface{} { return f.value } -// IsNullable returns if this field is an nullable field. Basically, wraps the value with pointer. -func (f Field) IsNullable() bool { return f.nullable } +// IsNillable returns if this field is an nillable field. Basically, wraps the value with pointer. +func (f Field) IsNillable() bool { return f.nillable } // IsOptional returns is this field is an optional field. func (f Field) IsOptional() bool { return f.optional } @@ -213,10 +213,10 @@ func (b *intBuilder) Default(i int) *intBuilder { return b } -// Nullable indicates that this field is nullable. -// Unlike "Optional", nullable fields are pointers in the generated field. -func (b *intBuilder) Nullable() *intBuilder { - b.nullable = true +// Nillable indicates that this field is a nillable. +// Unlike "Optional" only fields, "Nillable" fields are pointers in the generated field. +func (b *intBuilder) Nillable() *intBuilder { + b.nillable = true return b } @@ -298,10 +298,10 @@ func (b *floatBuilder) Default(i float64) *floatBuilder { return b } -// Nullable indicates that this field is nullable. -// Unlike "Optional", nullable fields are pointers in the generated field. -func (b *floatBuilder) Nullable() *floatBuilder { - b.nullable = true +// Nillable indicates that this field is a nillable. +// Unlike "Optional" only fields, "Nillable" fields are pointers in the generated field. +func (b *floatBuilder) Nillable() *floatBuilder { + b.nillable = true return b } @@ -388,10 +388,10 @@ func (b *stringBuilder) Default(s string) *stringBuilder { return b } -// Nullable indicates that this field is nullable. -// Unlike "Optional", nullable fields are pointers in the generated field. -func (b *stringBuilder) Nullable() *stringBuilder { - b.nullable = true +// Nillable indicates that this field is a nillable. +// Unlike "Optional" only fields, "Nillable" fields are pointers in the generated field. +func (b *stringBuilder) Nillable() *stringBuilder { + b.nillable = true return b } @@ -432,10 +432,10 @@ type timeBuilder struct { Field } -// Nullable indicates that this field is nullable. -// Unlike "Optional", nullable fields are pointers in the generated field. -func (b *timeBuilder) Nullable() *timeBuilder { - b.nullable = true +// Nillable indicates that this field is a nillable. +// Unlike "Optional" only fields, "Nillable" fields are pointers in the generated field. +func (b *timeBuilder) Nillable() *timeBuilder { + b.nillable = true return b } @@ -468,10 +468,10 @@ func (b *boolBuilder) Default(v bool) *boolBuilder { return b } -// Nullable indicates that this field is nullable. -// Unlike "Optional", nullable fields are pointers in the generated field. -func (b *boolBuilder) Nullable() *boolBuilder { - b.nullable = true +// Nillable indicates that this field is a nillable. +// Unlike "Optional" only fields, "Nillable" fields are pointers in the generated field. +func (b *boolBuilder) Nillable() *boolBuilder { + b.nillable = true return b } @@ -504,10 +504,10 @@ func (b *bytesBuilder) Default(v []byte) *bytesBuilder { return b } -// Nullable indicates that this field is nullable. -// Unlike "Optional", nullable fields are pointers in the generated field. -func (b *bytesBuilder) Nullable() *bytesBuilder { - b.nullable = true +// Nillable indicates that this field is a nillable. +// Unlike "Optional" only fields, "Nillable" fields are pointers in the generated field. +func (b *bytesBuilder) Nillable() *bytesBuilder { + b.nillable = true return b } diff --git a/field/field_test.go b/field/field_test.go index a3a0c3710..f827d2d85 100644 --- a/field/field_test.go +++ b/field/field_test.go @@ -21,9 +21,9 @@ func TestInt(t *testing.T) { assert.Equal(t, 10, f.Value()) assert.Len(t, f.Validators(), 2) - f = field.Int("age").Range(20, 40).Nullable() + f = field.Int("age").Range(20, 40).Nillable() assert.False(t, f.HasDefault()) - assert.True(t, f.IsNullable()) + assert.True(t, f.IsNillable()) assert.Len(t, f.Validators(), 1) assert.Equal(t, field.TypeInt8, field.Int8("age").Type())