You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2018/08/29 04:22:28 UTC

[4/4] calcite-avatica-go git commit: [CALCITE-2500] Regenerate and update protobufs to Avatica 1.12.0

[CALCITE-2500] Regenerate and update protobufs to Avatica 1.12.0


Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/commit/5d398eec
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/tree/5d398eec
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/diff/5d398eec

Branch: refs/heads/master
Commit: 5d398eec9cf761957114b162d5bbba535a125666
Parents: 49fd3a4
Author: Francis Chuang <fr...@apache.org>
Authored: Wed Aug 29 14:16:33 2018 +1000
Committer: Francis Chuang <fr...@apache.org>
Committed: Wed Aug 29 14:16:33 2018 +1000

----------------------------------------------------------------------
 gen-protobuf.sh         |   2 +-
 message/common.pb.go    | 720 +++++++++++++++++++++++++++------------
 message/requests.pb.go  | 789 +++++++++++++++++++++++++++++++++++--------
 message/responses.pb.go | 610 ++++++++++++++++++++++++++-------
 4 files changed, 1635 insertions(+), 486 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/5d398eec/gen-protobuf.sh
----------------------------------------------------------------------
diff --git a/gen-protobuf.sh b/gen-protobuf.sh
index 55b236f..4029672 100644
--- a/gen-protobuf.sh
+++ b/gen-protobuf.sh
@@ -18,7 +18,7 @@ set -e
 
 rm -rf message avatica-tmp
 
-export AVATICA_VER="rel/avatica-1.11.0"
+export AVATICA_VER="rel/avatica-1.12.0"s
 
 mkdir -p avatica-tmp
 pushd avatica-tmp &> /dev/null

http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/5d398eec/message/common.pb.go
----------------------------------------------------------------------
diff --git a/message/common.pb.go b/message/common.pb.go
index dfc3514..6e93358 100644
--- a/message/common.pb.go
+++ b/message/common.pb.go
@@ -1,70 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: common.proto
 
-/*
-Package message is a generated protocol buffer package.
-
-It is generated from these files:
-	common.proto
-	requests.proto
-	responses.proto
-
-It has these top-level messages:
-	ConnectionProperties
-	StatementHandle
-	Signature
-	ColumnMetaData
-	AvaticaType
-	AvaticaParameter
-	CursorFactory
-	Frame
-	Row
-	DatabaseProperty
-	WireMessage
-	ColumnValue
-	TypedValue
-	MetaDataOperationArgument
-	QueryState
-	CatalogsRequest
-	DatabasePropertyRequest
-	SchemasRequest
-	TablesRequest
-	TableTypesRequest
-	ColumnsRequest
-	TypeInfoRequest
-	PrepareAndExecuteRequest
-	PrepareRequest
-	FetchRequest
-	CreateStatementRequest
-	CloseStatementRequest
-	OpenConnectionRequest
-	CloseConnectionRequest
-	ConnectionSyncRequest
-	ExecuteRequest
-	SyncResultsRequest
-	CommitRequest
-	RollbackRequest
-	PrepareAndExecuteBatchRequest
-	UpdateBatch
-	ExecuteBatchRequest
-	ResultSetResponse
-	ExecuteResponse
-	PrepareResponse
-	FetchResponse
-	CreateStatementResponse
-	CloseStatementResponse
-	OpenConnectionResponse
-	CloseConnectionResponse
-	ConnectionSyncResponse
-	DatabasePropertyElement
-	DatabasePropertyResponse
-	ErrorResponse
-	SyncResultsResponse
-	RpcMetadata
-	CommitResponse
-	RollbackResponse
-	ExecuteBatchResponse
-*/
 package message
 
 import proto "github.com/golang/protobuf/proto"
@@ -132,7 +68,9 @@ var StatementType_value = map[string]int32{
 func (x StatementType) String() string {
 	return proto.EnumName(StatementType_name, int32(x))
 }
-func (StatementType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (StatementType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{0}
+}
 
 type Rep int32
 
@@ -237,7 +175,9 @@ var Rep_value = map[string]int32{
 func (x Rep) String() string {
 	return proto.EnumName(Rep_name, int32(x))
 }
-func (Rep) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (Rep) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{1}
+}
 
 // The severity of some unexpected outcome to an operation.
 // Protobuf enum values must be unique across all other enums
@@ -266,7 +206,9 @@ var Severity_value = map[string]int32{
 func (x Severity) String() string {
 	return proto.EnumName(Severity_name, int32(x))
 }
-func (Severity) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+func (Severity) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{2}
+}
 
 // Enumeration corresponding to DatabaseMetaData operations
 type MetaDataOperation int32
@@ -360,7 +302,9 @@ var MetaDataOperation_value = map[string]int32{
 func (x MetaDataOperation) String() string {
 	return proto.EnumName(MetaDataOperation_name, int32(x))
 }
-func (MetaDataOperation) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+func (MetaDataOperation) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{3}
+}
 
 type StateType int32
 
@@ -381,7 +325,9 @@ var StateType_value = map[string]int32{
 func (x StateType) String() string {
 	return proto.EnumName(StateType_name, int32(x))
 }
-func (StateType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (StateType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{4}
+}
 
 type CursorFactory_Style int32
 
@@ -414,7 +360,9 @@ var CursorFactory_Style_value = map[string]int32{
 func (x CursorFactory_Style) String() string {
 	return proto.EnumName(CursorFactory_Style_name, int32(x))
 }
-func (CursorFactory_Style) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{6, 0} }
+func (CursorFactory_Style) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{6, 0}
+}
 
 type MetaDataOperationArgument_ArgumentType int32
 
@@ -448,25 +396,47 @@ func (x MetaDataOperationArgument_ArgumentType) String() string {
 	return proto.EnumName(MetaDataOperationArgument_ArgumentType_name, int32(x))
 }
 func (MetaDataOperationArgument_ArgumentType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{13, 0}
+	return fileDescriptor_common_84e383fbabed0a31, []int{13, 0}
 }
 
 // Details about a connection
 type ConnectionProperties struct {
-	IsDirty              bool   `protobuf:"varint,1,opt,name=is_dirty,json=isDirty" json:"is_dirty,omitempty"`
-	AutoCommit           bool   `protobuf:"varint,2,opt,name=auto_commit,json=autoCommit" json:"auto_commit,omitempty"`
-	HasAutoCommit        bool   `protobuf:"varint,7,opt,name=has_auto_commit,json=hasAutoCommit" json:"has_auto_commit,omitempty"`
-	ReadOnly             bool   `protobuf:"varint,3,opt,name=read_only,json=readOnly" json:"read_only,omitempty"`
-	HasReadOnly          bool   `protobuf:"varint,8,opt,name=has_read_only,json=hasReadOnly" json:"has_read_only,omitempty"`
-	TransactionIsolation uint32 `protobuf:"varint,4,opt,name=transaction_isolation,json=transactionIsolation" json:"transaction_isolation,omitempty"`
-	Catalog              string `protobuf:"bytes,5,opt,name=catalog" json:"catalog,omitempty"`
-	Schema               string `protobuf:"bytes,6,opt,name=schema" json:"schema,omitempty"`
+	IsDirty              bool     `protobuf:"varint,1,opt,name=is_dirty,json=isDirty,proto3" json:"is_dirty,omitempty"`
+	AutoCommit           bool     `protobuf:"varint,2,opt,name=auto_commit,json=autoCommit,proto3" json:"auto_commit,omitempty"`
+	HasAutoCommit        bool     `protobuf:"varint,7,opt,name=has_auto_commit,json=hasAutoCommit,proto3" json:"has_auto_commit,omitempty"`
+	ReadOnly             bool     `protobuf:"varint,3,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"`
+	HasReadOnly          bool     `protobuf:"varint,8,opt,name=has_read_only,json=hasReadOnly,proto3" json:"has_read_only,omitempty"`
+	TransactionIsolation uint32   `protobuf:"varint,4,opt,name=transaction_isolation,json=transactionIsolation,proto3" json:"transaction_isolation,omitempty"`
+	Catalog              string   `protobuf:"bytes,5,opt,name=catalog,proto3" json:"catalog,omitempty"`
+	Schema               string   `protobuf:"bytes,6,opt,name=schema,proto3" json:"schema,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ConnectionProperties) Reset()         { *m = ConnectionProperties{} }
+func (m *ConnectionProperties) String() string { return proto.CompactTextString(m) }
+func (*ConnectionProperties) ProtoMessage()    {}
+func (*ConnectionProperties) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{0}
+}
+func (m *ConnectionProperties) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ConnectionProperties.Unmarshal(m, b)
+}
+func (m *ConnectionProperties) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ConnectionProperties.Marshal(b, m, deterministic)
+}
+func (dst *ConnectionProperties) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConnectionProperties.Merge(dst, src)
+}
+func (m *ConnectionProperties) XXX_Size() int {
+	return xxx_messageInfo_ConnectionProperties.Size(m)
+}
+func (m *ConnectionProperties) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConnectionProperties.DiscardUnknown(m)
 }
 
-func (m *ConnectionProperties) Reset()                    { *m = ConnectionProperties{} }
-func (m *ConnectionProperties) String() string            { return proto.CompactTextString(m) }
-func (*ConnectionProperties) ProtoMessage()               {}
-func (*ConnectionProperties) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+var xxx_messageInfo_ConnectionProperties proto.InternalMessageInfo
 
 func (m *ConnectionProperties) GetIsDirty() bool {
 	if m != nil {
@@ -526,15 +496,37 @@ func (m *ConnectionProperties) GetSchema() string {
 
 // Statement handle
 type StatementHandle struct {
-	ConnectionId string     `protobuf:"bytes,1,opt,name=connection_id,json=connectionId" json:"connection_id,omitempty"`
-	Id           uint32     `protobuf:"varint,2,opt,name=id" json:"id,omitempty"`
-	Signature    *Signature `protobuf:"bytes,3,opt,name=signature" json:"signature,omitempty"`
+	ConnectionId         string     `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
+	Id                   uint32     `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
+	Signature            *Signature `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
-func (m *StatementHandle) Reset()                    { *m = StatementHandle{} }
-func (m *StatementHandle) String() string            { return proto.CompactTextString(m) }
-func (*StatementHandle) ProtoMessage()               {}
-func (*StatementHandle) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (m *StatementHandle) Reset()         { *m = StatementHandle{} }
+func (m *StatementHandle) String() string { return proto.CompactTextString(m) }
+func (*StatementHandle) ProtoMessage()    {}
+func (*StatementHandle) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{1}
+}
+func (m *StatementHandle) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_StatementHandle.Unmarshal(m, b)
+}
+func (m *StatementHandle) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_StatementHandle.Marshal(b, m, deterministic)
+}
+func (dst *StatementHandle) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_StatementHandle.Merge(dst, src)
+}
+func (m *StatementHandle) XXX_Size() int {
+	return xxx_messageInfo_StatementHandle.Size(m)
+}
+func (m *StatementHandle) XXX_DiscardUnknown() {
+	xxx_messageInfo_StatementHandle.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_StatementHandle proto.InternalMessageInfo
 
 func (m *StatementHandle) GetConnectionId() string {
 	if m != nil {
@@ -559,17 +551,39 @@ func (m *StatementHandle) GetSignature() *Signature {
 
 // Results of preparing a statement
 type Signature struct {
-	Columns       []*ColumnMetaData   `protobuf:"bytes,1,rep,name=columns" json:"columns,omitempty"`
-	Sql           string              `protobuf:"bytes,2,opt,name=sql" json:"sql,omitempty"`
-	Parameters    []*AvaticaParameter `protobuf:"bytes,3,rep,name=parameters" json:"parameters,omitempty"`
-	CursorFactory *CursorFactory      `protobuf:"bytes,4,opt,name=cursor_factory,json=cursorFactory" json:"cursor_factory,omitempty"`
-	StatementType StatementType       `protobuf:"varint,5,opt,name=statementType,enum=StatementType" json:"statementType,omitempty"`
+	Columns              []*ColumnMetaData   `protobuf:"bytes,1,rep,name=columns,proto3" json:"columns,omitempty"`
+	Sql                  string              `protobuf:"bytes,2,opt,name=sql,proto3" json:"sql,omitempty"`
+	Parameters           []*AvaticaParameter `protobuf:"bytes,3,rep,name=parameters,proto3" json:"parameters,omitempty"`
+	CursorFactory        *CursorFactory      `protobuf:"bytes,4,opt,name=cursor_factory,json=cursorFactory,proto3" json:"cursor_factory,omitempty"`
+	StatementType        StatementType       `protobuf:"varint,5,opt,name=statementType,proto3,enum=StatementType" json:"statementType,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *Signature) Reset()         { *m = Signature{} }
+func (m *Signature) String() string { return proto.CompactTextString(m) }
+func (*Signature) ProtoMessage()    {}
+func (*Signature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{2}
+}
+func (m *Signature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Signature.Unmarshal(m, b)
+}
+func (m *Signature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Signature.Marshal(b, m, deterministic)
+}
+func (dst *Signature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Signature.Merge(dst, src)
+}
+func (m *Signature) XXX_Size() int {
+	return xxx_messageInfo_Signature.Size(m)
+}
+func (m *Signature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Signature.DiscardUnknown(m)
 }
 
-func (m *Signature) Reset()                    { *m = Signature{} }
-func (m *Signature) String() string            { return proto.CompactTextString(m) }
-func (*Signature) ProtoMessage()               {}
-func (*Signature) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+var xxx_messageInfo_Signature proto.InternalMessageInfo
 
 func (m *Signature) GetColumns() []*ColumnMetaData {
 	if m != nil {
@@ -607,32 +621,54 @@ func (m *Signature) GetStatementType() StatementType {
 }
 
 type ColumnMetaData struct {
-	Ordinal            uint32       `protobuf:"varint,1,opt,name=ordinal" json:"ordinal,omitempty"`
-	AutoIncrement      bool         `protobuf:"varint,2,opt,name=auto_increment,json=autoIncrement" json:"auto_increment,omitempty"`
-	CaseSensitive      bool         `protobuf:"varint,3,opt,name=case_sensitive,json=caseSensitive" json:"case_sensitive,omitempty"`
-	Searchable         bool         `protobuf:"varint,4,opt,name=searchable" json:"searchable,omitempty"`
-	Currency           bool         `protobuf:"varint,5,opt,name=currency" json:"currency,omitempty"`
-	Nullable           uint32       `protobuf:"varint,6,opt,name=nullable" json:"nullable,omitempty"`
-	Signed             bool         `protobuf:"varint,7,opt,name=signed" json:"signed,omitempty"`
-	DisplaySize        uint32       `protobuf:"varint,8,opt,name=display_size,json=displaySize" json:"display_size,omitempty"`
-	Label              string       `protobuf:"bytes,9,opt,name=label" json:"label,omitempty"`
-	ColumnName         string       `protobuf:"bytes,10,opt,name=column_name,json=columnName" json:"column_name,omitempty"`
-	SchemaName         string       `protobuf:"bytes,11,opt,name=schema_name,json=schemaName" json:"schema_name,omitempty"`
-	Precision          uint32       `protobuf:"varint,12,opt,name=precision" json:"precision,omitempty"`
-	Scale              uint32       `protobuf:"varint,13,opt,name=scale" json:"scale,omitempty"`
-	TableName          string       `protobuf:"bytes,14,opt,name=table_name,json=tableName" json:"table_name,omitempty"`
-	CatalogName        string       `protobuf:"bytes,15,opt,name=catalog_name,json=catalogName" json:"catalog_name,omitempty"`
-	ReadOnly           bool         `protobuf:"varint,16,opt,name=read_only,json=readOnly" json:"read_only,omitempty"`
-	Writable           bool         `protobuf:"varint,17,opt,name=writable" json:"writable,omitempty"`
-	DefinitelyWritable bool         `protobuf:"varint,18,opt,name=definitely_writable,json=definitelyWritable" json:"definitely_writable,omitempty"`
-	ColumnClassName    string       `protobuf:"bytes,19,opt,name=column_class_name,json=columnClassName" json:"column_class_name,omitempty"`
-	Type               *AvaticaType `protobuf:"bytes,20,opt,name=type" json:"type,omitempty"`
-}
-
-func (m *ColumnMetaData) Reset()                    { *m = ColumnMetaData{} }
-func (m *ColumnMetaData) String() string            { return proto.CompactTextString(m) }
-func (*ColumnMetaData) ProtoMessage()               {}
-func (*ColumnMetaData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+	Ordinal              uint32       `protobuf:"varint,1,opt,name=ordinal,proto3" json:"ordinal,omitempty"`
+	AutoIncrement        bool         `protobuf:"varint,2,opt,name=auto_increment,json=autoIncrement,proto3" json:"auto_increment,omitempty"`
+	CaseSensitive        bool         `protobuf:"varint,3,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"`
+	Searchable           bool         `protobuf:"varint,4,opt,name=searchable,proto3" json:"searchable,omitempty"`
+	Currency             bool         `protobuf:"varint,5,opt,name=currency,proto3" json:"currency,omitempty"`
+	Nullable             uint32       `protobuf:"varint,6,opt,name=nullable,proto3" json:"nullable,omitempty"`
+	Signed               bool         `protobuf:"varint,7,opt,name=signed,proto3" json:"signed,omitempty"`
+	DisplaySize          uint32       `protobuf:"varint,8,opt,name=display_size,json=displaySize,proto3" json:"display_size,omitempty"`
+	Label                string       `protobuf:"bytes,9,opt,name=label,proto3" json:"label,omitempty"`
+	ColumnName           string       `protobuf:"bytes,10,opt,name=column_name,json=columnName,proto3" json:"column_name,omitempty"`
+	SchemaName           string       `protobuf:"bytes,11,opt,name=schema_name,json=schemaName,proto3" json:"schema_name,omitempty"`
+	Precision            uint32       `protobuf:"varint,12,opt,name=precision,proto3" json:"precision,omitempty"`
+	Scale                uint32       `protobuf:"varint,13,opt,name=scale,proto3" json:"scale,omitempty"`
+	TableName            string       `protobuf:"bytes,14,opt,name=table_name,json=tableName,proto3" json:"table_name,omitempty"`
+	CatalogName          string       `protobuf:"bytes,15,opt,name=catalog_name,json=catalogName,proto3" json:"catalog_name,omitempty"`
+	ReadOnly             bool         `protobuf:"varint,16,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"`
+	Writable             bool         `protobuf:"varint,17,opt,name=writable,proto3" json:"writable,omitempty"`
+	DefinitelyWritable   bool         `protobuf:"varint,18,opt,name=definitely_writable,json=definitelyWritable,proto3" json:"definitely_writable,omitempty"`
+	ColumnClassName      string       `protobuf:"bytes,19,opt,name=column_class_name,json=columnClassName,proto3" json:"column_class_name,omitempty"`
+	Type                 *AvaticaType `protobuf:"bytes,20,opt,name=type,proto3" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *ColumnMetaData) Reset()         { *m = ColumnMetaData{} }
+func (m *ColumnMetaData) String() string { return proto.CompactTextString(m) }
+func (*ColumnMetaData) ProtoMessage()    {}
+func (*ColumnMetaData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{3}
+}
+func (m *ColumnMetaData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColumnMetaData.Unmarshal(m, b)
+}
+func (m *ColumnMetaData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColumnMetaData.Marshal(b, m, deterministic)
+}
+func (dst *ColumnMetaData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnMetaData.Merge(dst, src)
+}
+func (m *ColumnMetaData) XXX_Size() int {
+	return xxx_messageInfo_ColumnMetaData.Size(m)
+}
+func (m *ColumnMetaData) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColumnMetaData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ColumnMetaData proto.InternalMessageInfo
 
 func (m *ColumnMetaData) GetOrdinal() uint32 {
 	if m != nil {
@@ -776,17 +812,39 @@ func (m *ColumnMetaData) GetType() *AvaticaType {
 
 // Base class for a column type
 type AvaticaType struct {
-	Id        uint32            `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
-	Name      string            `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Rep       Rep               `protobuf:"varint,3,opt,name=rep,enum=Rep" json:"rep,omitempty"`
-	Columns   []*ColumnMetaData `protobuf:"bytes,4,rep,name=columns" json:"columns,omitempty"`
-	Component *AvaticaType      `protobuf:"bytes,5,opt,name=component" json:"component,omitempty"`
+	Id                   uint32            `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Name                 string            `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Rep                  Rep               `protobuf:"varint,3,opt,name=rep,proto3,enum=Rep" json:"rep,omitempty"`
+	Columns              []*ColumnMetaData `protobuf:"bytes,4,rep,name=columns,proto3" json:"columns,omitempty"`
+	Component            *AvaticaType      `protobuf:"bytes,5,opt,name=component,proto3" json:"component,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
 }
 
-func (m *AvaticaType) Reset()                    { *m = AvaticaType{} }
-func (m *AvaticaType) String() string            { return proto.CompactTextString(m) }
-func (*AvaticaType) ProtoMessage()               {}
-func (*AvaticaType) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (m *AvaticaType) Reset()         { *m = AvaticaType{} }
+func (m *AvaticaType) String() string { return proto.CompactTextString(m) }
+func (*AvaticaType) ProtoMessage()    {}
+func (*AvaticaType) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{4}
+}
+func (m *AvaticaType) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AvaticaType.Unmarshal(m, b)
+}
+func (m *AvaticaType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AvaticaType.Marshal(b, m, deterministic)
+}
+func (dst *AvaticaType) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AvaticaType.Merge(dst, src)
+}
+func (m *AvaticaType) XXX_Size() int {
+	return xxx_messageInfo_AvaticaType.Size(m)
+}
+func (m *AvaticaType) XXX_DiscardUnknown() {
+	xxx_messageInfo_AvaticaType.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AvaticaType proto.InternalMessageInfo
 
 func (m *AvaticaType) GetId() uint32 {
 	if m != nil {
@@ -825,19 +883,41 @@ func (m *AvaticaType) GetComponent() *AvaticaType {
 
 // Metadata for a parameter
 type AvaticaParameter struct {
-	Signed        bool   `protobuf:"varint,1,opt,name=signed" json:"signed,omitempty"`
-	Precision     uint32 `protobuf:"varint,2,opt,name=precision" json:"precision,omitempty"`
-	Scale         uint32 `protobuf:"varint,3,opt,name=scale" json:"scale,omitempty"`
-	ParameterType uint32 `protobuf:"varint,4,opt,name=parameter_type,json=parameterType" json:"parameter_type,omitempty"`
-	TypeName      string `protobuf:"bytes,5,opt,name=type_name,json=typeName" json:"type_name,omitempty"`
-	ClassName     string `protobuf:"bytes,6,opt,name=class_name,json=className" json:"class_name,omitempty"`
-	Name          string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
+	Signed               bool     `protobuf:"varint,1,opt,name=signed,proto3" json:"signed,omitempty"`
+	Precision            uint32   `protobuf:"varint,2,opt,name=precision,proto3" json:"precision,omitempty"`
+	Scale                uint32   `protobuf:"varint,3,opt,name=scale,proto3" json:"scale,omitempty"`
+	ParameterType        uint32   `protobuf:"varint,4,opt,name=parameter_type,json=parameterType,proto3" json:"parameter_type,omitempty"`
+	TypeName             string   `protobuf:"bytes,5,opt,name=type_name,json=typeName,proto3" json:"type_name,omitempty"`
+	ClassName            string   `protobuf:"bytes,6,opt,name=class_name,json=className,proto3" json:"class_name,omitempty"`
+	Name                 string   `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *AvaticaParameter) Reset()         { *m = AvaticaParameter{} }
+func (m *AvaticaParameter) String() string { return proto.CompactTextString(m) }
+func (*AvaticaParameter) ProtoMessage()    {}
+func (*AvaticaParameter) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{5}
+}
+func (m *AvaticaParameter) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_AvaticaParameter.Unmarshal(m, b)
+}
+func (m *AvaticaParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_AvaticaParameter.Marshal(b, m, deterministic)
+}
+func (dst *AvaticaParameter) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_AvaticaParameter.Merge(dst, src)
+}
+func (m *AvaticaParameter) XXX_Size() int {
+	return xxx_messageInfo_AvaticaParameter.Size(m)
+}
+func (m *AvaticaParameter) XXX_DiscardUnknown() {
+	xxx_messageInfo_AvaticaParameter.DiscardUnknown(m)
 }
 
-func (m *AvaticaParameter) Reset()                    { *m = AvaticaParameter{} }
-func (m *AvaticaParameter) String() string            { return proto.CompactTextString(m) }
-func (*AvaticaParameter) ProtoMessage()               {}
-func (*AvaticaParameter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+var xxx_messageInfo_AvaticaParameter proto.InternalMessageInfo
 
 func (m *AvaticaParameter) GetSigned() bool {
 	if m != nil {
@@ -890,15 +970,37 @@ func (m *AvaticaParameter) GetName() string {
 
 // Information necessary to convert an Iterable into a Calcite Cursor
 type CursorFactory struct {
-	Style      CursorFactory_Style `protobuf:"varint,1,opt,name=style,enum=CursorFactory_Style" json:"style,omitempty"`
-	ClassName  string              `protobuf:"bytes,2,opt,name=class_name,json=className" json:"class_name,omitempty"`
-	FieldNames []string            `protobuf:"bytes,3,rep,name=field_names,json=fieldNames" json:"field_names,omitempty"`
+	Style                CursorFactory_Style `protobuf:"varint,1,opt,name=style,proto3,enum=CursorFactory_Style" json:"style,omitempty"`
+	ClassName            string              `protobuf:"bytes,2,opt,name=class_name,json=className,proto3" json:"class_name,omitempty"`
+	FieldNames           []string            `protobuf:"bytes,3,rep,name=field_names,json=fieldNames,proto3" json:"field_names,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
 }
 
-func (m *CursorFactory) Reset()                    { *m = CursorFactory{} }
-func (m *CursorFactory) String() string            { return proto.CompactTextString(m) }
-func (*CursorFactory) ProtoMessage()               {}
-func (*CursorFactory) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+func (m *CursorFactory) Reset()         { *m = CursorFactory{} }
+func (m *CursorFactory) String() string { return proto.CompactTextString(m) }
+func (*CursorFactory) ProtoMessage()    {}
+func (*CursorFactory) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{6}
+}
+func (m *CursorFactory) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CursorFactory.Unmarshal(m, b)
+}
+func (m *CursorFactory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CursorFactory.Marshal(b, m, deterministic)
+}
+func (dst *CursorFactory) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CursorFactory.Merge(dst, src)
+}
+func (m *CursorFactory) XXX_Size() int {
+	return xxx_messageInfo_CursorFactory.Size(m)
+}
+func (m *CursorFactory) XXX_DiscardUnknown() {
+	xxx_messageInfo_CursorFactory.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CursorFactory proto.InternalMessageInfo
 
 func (m *CursorFactory) GetStyle() CursorFactory_Style {
 	if m != nil {
@@ -923,15 +1025,37 @@ func (m *CursorFactory) GetFieldNames() []string {
 
 // A collection of rows
 type Frame struct {
-	Offset uint64 `protobuf:"varint,1,opt,name=offset" json:"offset,omitempty"`
-	Done   bool   `protobuf:"varint,2,opt,name=done" json:"done,omitempty"`
-	Rows   []*Row `protobuf:"bytes,3,rep,name=rows" json:"rows,omitempty"`
+	Offset               uint64   `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"`
+	Done                 bool     `protobuf:"varint,2,opt,name=done,proto3" json:"done,omitempty"`
+	Rows                 []*Row   `protobuf:"bytes,3,rep,name=rows,proto3" json:"rows,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Frame) Reset()         { *m = Frame{} }
+func (m *Frame) String() string { return proto.CompactTextString(m) }
+func (*Frame) ProtoMessage()    {}
+func (*Frame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{7}
+}
+func (m *Frame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Frame.Unmarshal(m, b)
+}
+func (m *Frame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Frame.Marshal(b, m, deterministic)
+}
+func (dst *Frame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Frame.Merge(dst, src)
+}
+func (m *Frame) XXX_Size() int {
+	return xxx_messageInfo_Frame.Size(m)
+}
+func (m *Frame) XXX_DiscardUnknown() {
+	xxx_messageInfo_Frame.DiscardUnknown(m)
 }
 
-func (m *Frame) Reset()                    { *m = Frame{} }
-func (m *Frame) String() string            { return proto.CompactTextString(m) }
-func (*Frame) ProtoMessage()               {}
-func (*Frame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+var xxx_messageInfo_Frame proto.InternalMessageInfo
 
 func (m *Frame) GetOffset() uint64 {
 	if m != nil {
@@ -956,13 +1080,35 @@ func (m *Frame) GetRows() []*Row {
 
 // A row is a collection of values
 type Row struct {
-	Value []*ColumnValue `protobuf:"bytes,1,rep,name=value" json:"value,omitempty"`
+	Value                []*ColumnValue `protobuf:"bytes,1,rep,name=value,proto3" json:"value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
 }
 
-func (m *Row) Reset()                    { *m = Row{} }
-func (m *Row) String() string            { return proto.CompactTextString(m) }
-func (*Row) ProtoMessage()               {}
-func (*Row) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+func (m *Row) Reset()         { *m = Row{} }
+func (m *Row) String() string { return proto.CompactTextString(m) }
+func (*Row) ProtoMessage()    {}
+func (*Row) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{8}
+}
+func (m *Row) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Row.Unmarshal(m, b)
+}
+func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Row.Marshal(b, m, deterministic)
+}
+func (dst *Row) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Row.Merge(dst, src)
+}
+func (m *Row) XXX_Size() int {
+	return xxx_messageInfo_Row.Size(m)
+}
+func (m *Row) XXX_DiscardUnknown() {
+	xxx_messageInfo_Row.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Row proto.InternalMessageInfo
 
 func (m *Row) GetValue() []*ColumnValue {
 	if m != nil {
@@ -973,14 +1119,36 @@ func (m *Row) GetValue() []*ColumnValue {
 
 // Database property, list of functions the database provides for a certain operation
 type DatabaseProperty struct {
-	Name      string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Functions []string `protobuf:"bytes,2,rep,name=functions" json:"functions,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Functions            []string `protobuf:"bytes,2,rep,name=functions,proto3" json:"functions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *DatabaseProperty) Reset()         { *m = DatabaseProperty{} }
+func (m *DatabaseProperty) String() string { return proto.CompactTextString(m) }
+func (*DatabaseProperty) ProtoMessage()    {}
+func (*DatabaseProperty) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{9}
+}
+func (m *DatabaseProperty) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DatabaseProperty.Unmarshal(m, b)
+}
+func (m *DatabaseProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DatabaseProperty.Marshal(b, m, deterministic)
+}
+func (dst *DatabaseProperty) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DatabaseProperty.Merge(dst, src)
+}
+func (m *DatabaseProperty) XXX_Size() int {
+	return xxx_messageInfo_DatabaseProperty.Size(m)
+}
+func (m *DatabaseProperty) XXX_DiscardUnknown() {
+	xxx_messageInfo_DatabaseProperty.DiscardUnknown(m)
 }
 
-func (m *DatabaseProperty) Reset()                    { *m = DatabaseProperty{} }
-func (m *DatabaseProperty) String() string            { return proto.CompactTextString(m) }
-func (*DatabaseProperty) ProtoMessage()               {}
-func (*DatabaseProperty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+var xxx_messageInfo_DatabaseProperty proto.InternalMessageInfo
 
 func (m *DatabaseProperty) GetName() string {
 	if m != nil {
@@ -998,14 +1166,36 @@ func (m *DatabaseProperty) GetFunctions() []string {
 
 // Message which encapsulates another message to support a single RPC endpoint
 type WireMessage struct {
-	Name           string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	WrappedMessage []byte `protobuf:"bytes,2,opt,name=wrapped_message,json=wrappedMessage,proto3" json:"wrapped_message,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	WrappedMessage       []byte   `protobuf:"bytes,2,opt,name=wrapped_message,json=wrappedMessage,proto3" json:"wrapped_message,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *WireMessage) Reset()                    { *m = WireMessage{} }
-func (m *WireMessage) String() string            { return proto.CompactTextString(m) }
-func (*WireMessage) ProtoMessage()               {}
-func (*WireMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+func (m *WireMessage) Reset()         { *m = WireMessage{} }
+func (m *WireMessage) String() string { return proto.CompactTextString(m) }
+func (*WireMessage) ProtoMessage()    {}
+func (*WireMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{10}
+}
+func (m *WireMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WireMessage.Unmarshal(m, b)
+}
+func (m *WireMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WireMessage.Marshal(b, m, deterministic)
+}
+func (dst *WireMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WireMessage.Merge(dst, src)
+}
+func (m *WireMessage) XXX_Size() int {
+	return xxx_messageInfo_WireMessage.Size(m)
+}
+func (m *WireMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_WireMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WireMessage proto.InternalMessageInfo
 
 func (m *WireMessage) GetName() string {
 	if m != nil {
@@ -1023,16 +1213,38 @@ func (m *WireMessage) GetWrappedMessage() []byte {
 
 // A value might be a TypedValue or an Array of TypedValue's
 type ColumnValue struct {
-	Value         []*TypedValue `protobuf:"bytes,1,rep,name=value" json:"value,omitempty"`
-	ArrayValue    []*TypedValue `protobuf:"bytes,2,rep,name=array_value,json=arrayValue" json:"array_value,omitempty"`
-	HasArrayValue bool          `protobuf:"varint,3,opt,name=has_array_value,json=hasArrayValue" json:"has_array_value,omitempty"`
-	ScalarValue   *TypedValue   `protobuf:"bytes,4,opt,name=scalar_value,json=scalarValue" json:"scalar_value,omitempty"`
+	Value                []*TypedValue `protobuf:"bytes,1,rep,name=value,proto3" json:"value,omitempty"`
+	ArrayValue           []*TypedValue `protobuf:"bytes,2,rep,name=array_value,json=arrayValue,proto3" json:"array_value,omitempty"`
+	HasArrayValue        bool          `protobuf:"varint,3,opt,name=has_array_value,json=hasArrayValue,proto3" json:"has_array_value,omitempty"`
+	ScalarValue          *TypedValue   `protobuf:"bytes,4,opt,name=scalar_value,json=scalarValue,proto3" json:"scalar_value,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ColumnValue) Reset()         { *m = ColumnValue{} }
+func (m *ColumnValue) String() string { return proto.CompactTextString(m) }
+func (*ColumnValue) ProtoMessage()    {}
+func (*ColumnValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{11}
+}
+func (m *ColumnValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ColumnValue.Unmarshal(m, b)
+}
+func (m *ColumnValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ColumnValue.Marshal(b, m, deterministic)
+}
+func (dst *ColumnValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ColumnValue.Merge(dst, src)
+}
+func (m *ColumnValue) XXX_Size() int {
+	return xxx_messageInfo_ColumnValue.Size(m)
+}
+func (m *ColumnValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_ColumnValue.DiscardUnknown(m)
 }
 
-func (m *ColumnValue) Reset()                    { *m = ColumnValue{} }
-func (m *ColumnValue) String() string            { return proto.CompactTextString(m) }
-func (*ColumnValue) ProtoMessage()               {}
-func (*ColumnValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
+var xxx_messageInfo_ColumnValue proto.InternalMessageInfo
 
 func (m *ColumnValue) GetValue() []*TypedValue {
 	if m != nil {
@@ -1064,23 +1276,45 @@ func (m *ColumnValue) GetScalarValue() *TypedValue {
 
 // Generic wrapper to support any SQL type. Struct-like to work around no polymorphism construct.
 type TypedValue struct {
-	Type        Rep    `protobuf:"varint,1,opt,name=type,enum=Rep" json:"type,omitempty"`
-	BoolValue   bool   `protobuf:"varint,2,opt,name=bool_value,json=boolValue" json:"bool_value,omitempty"`
-	StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
-	NumberValue int64  `protobuf:"zigzag64,4,opt,name=number_value,json=numberValue" json:"number_value,omitempty"`
+	Type        Rep    `protobuf:"varint,1,opt,name=type,proto3,enum=Rep" json:"type,omitempty"`
+	BoolValue   bool   `protobuf:"varint,2,opt,name=bool_value,json=boolValue,proto3" json:"bool_value,omitempty"`
+	StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,proto3" json:"string_value,omitempty"`
+	NumberValue int64  `protobuf:"zigzag64,4,opt,name=number_value,json=numberValue,proto3" json:"number_value,omitempty"`
 	// includes numeric types and date/time types.
-	BytesValue     []byte        `protobuf:"bytes,5,opt,name=bytes_value,json=bytesValue,proto3" json:"bytes_value,omitempty"`
-	DoubleValue    float64       `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"`
-	Null           bool          `protobuf:"varint,7,opt,name=null" json:"null,omitempty"`
-	ArrayValue     []*TypedValue `protobuf:"bytes,8,rep,name=array_value,json=arrayValue" json:"array_value,omitempty"`
-	ComponentType  Rep           `protobuf:"varint,9,opt,name=component_type,json=componentType,enum=Rep" json:"component_type,omitempty"`
-	ImplicitlyNull bool          `protobuf:"varint,10,opt,name=implicitly_null,json=implicitlyNull" json:"implicitly_null,omitempty"`
+	BytesValue           []byte        `protobuf:"bytes,5,opt,name=bytes_value,json=bytesValue,proto3" json:"bytes_value,omitempty"`
+	DoubleValue          float64       `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue,proto3" json:"double_value,omitempty"`
+	Null                 bool          `protobuf:"varint,7,opt,name=null,proto3" json:"null,omitempty"`
+	ArrayValue           []*TypedValue `protobuf:"bytes,8,rep,name=array_value,json=arrayValue,proto3" json:"array_value,omitempty"`
+	ComponentType        Rep           `protobuf:"varint,9,opt,name=component_type,json=componentType,proto3,enum=Rep" json:"component_type,omitempty"`
+	ImplicitlyNull       bool          `protobuf:"varint,10,opt,name=implicitly_null,json=implicitlyNull,proto3" json:"implicitly_null,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
-func (m *TypedValue) Reset()                    { *m = TypedValue{} }
-func (m *TypedValue) String() string            { return proto.CompactTextString(m) }
-func (*TypedValue) ProtoMessage()               {}
-func (*TypedValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
+func (m *TypedValue) Reset()         { *m = TypedValue{} }
+func (m *TypedValue) String() string { return proto.CompactTextString(m) }
+func (*TypedValue) ProtoMessage()    {}
+func (*TypedValue) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{12}
+}
+func (m *TypedValue) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TypedValue.Unmarshal(m, b)
+}
+func (m *TypedValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TypedValue.Marshal(b, m, deterministic)
+}
+func (dst *TypedValue) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TypedValue.Merge(dst, src)
+}
+func (m *TypedValue) XXX_Size() int {
+	return xxx_messageInfo_TypedValue.Size(m)
+}
+func (m *TypedValue) XXX_DiscardUnknown() {
+	xxx_messageInfo_TypedValue.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TypedValue proto.InternalMessageInfo
 
 func (m *TypedValue) GetType() Rep {
 	if m != nil {
@@ -1154,18 +1388,40 @@ func (m *TypedValue) GetImplicitlyNull() bool {
 
 // Represents the breadth of arguments to DatabaseMetaData functions
 type MetaDataOperationArgument struct {
-	StringValue       string                                 `protobuf:"bytes,1,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
-	BoolValue         bool                                   `protobuf:"varint,2,opt,name=bool_value,json=boolValue" json:"bool_value,omitempty"`
-	IntValue          int32                                  `protobuf:"zigzag32,3,opt,name=int_value,json=intValue" json:"int_value,omitempty"`
-	StringArrayValues []string                               `protobuf:"bytes,4,rep,name=string_array_values,json=stringArrayValues" json:"string_array_values,omitempty"`
-	IntArrayValues    []int32                                `protobuf:"zigzag32,5,rep,packed,name=int_array_values,json=intArrayValues" json:"int_array_values,omitempty"`
-	Type              MetaDataOperationArgument_ArgumentType `protobuf:"varint,6,opt,name=type,enum=MetaDataOperationArgument_ArgumentType" json:"type,omitempty"`
+	StringValue          string                                 `protobuf:"bytes,1,opt,name=string_value,json=stringValue,proto3" json:"string_value,omitempty"`
+	BoolValue            bool                                   `protobuf:"varint,2,opt,name=bool_value,json=boolValue,proto3" json:"bool_value,omitempty"`
+	IntValue             int32                                  `protobuf:"zigzag32,3,opt,name=int_value,json=intValue,proto3" json:"int_value,omitempty"`
+	StringArrayValues    []string                               `protobuf:"bytes,4,rep,name=string_array_values,json=stringArrayValues,proto3" json:"string_array_values,omitempty"`
+	IntArrayValues       []int32                                `protobuf:"zigzag32,5,rep,packed,name=int_array_values,json=intArrayValues,proto3" json:"int_array_values,omitempty"`
+	Type                 MetaDataOperationArgument_ArgumentType `protobuf:"varint,6,opt,name=type,proto3,enum=MetaDataOperationArgument_ArgumentType" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                               `json:"-"`
+	XXX_unrecognized     []byte                                 `json:"-"`
+	XXX_sizecache        int32                                  `json:"-"`
+}
+
+func (m *MetaDataOperationArgument) Reset()         { *m = MetaDataOperationArgument{} }
+func (m *MetaDataOperationArgument) String() string { return proto.CompactTextString(m) }
+func (*MetaDataOperationArgument) ProtoMessage()    {}
+func (*MetaDataOperationArgument) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{13}
+}
+func (m *MetaDataOperationArgument) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MetaDataOperationArgument.Unmarshal(m, b)
+}
+func (m *MetaDataOperationArgument) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MetaDataOperationArgument.Marshal(b, m, deterministic)
+}
+func (dst *MetaDataOperationArgument) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetaDataOperationArgument.Merge(dst, src)
+}
+func (m *MetaDataOperationArgument) XXX_Size() int {
+	return xxx_messageInfo_MetaDataOperationArgument.Size(m)
+}
+func (m *MetaDataOperationArgument) XXX_DiscardUnknown() {
+	xxx_messageInfo_MetaDataOperationArgument.DiscardUnknown(m)
 }
 
-func (m *MetaDataOperationArgument) Reset()                    { *m = MetaDataOperationArgument{} }
-func (m *MetaDataOperationArgument) String() string            { return proto.CompactTextString(m) }
-func (*MetaDataOperationArgument) ProtoMessage()               {}
-func (*MetaDataOperationArgument) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
+var xxx_messageInfo_MetaDataOperationArgument proto.InternalMessageInfo
 
 func (m *MetaDataOperationArgument) GetStringValue() string {
 	if m != nil {
@@ -1210,19 +1466,41 @@ func (m *MetaDataOperationArgument) GetType() MetaDataOperationArgument_Argument
 }
 
 type QueryState struct {
-	Type    StateType                    `protobuf:"varint,1,opt,name=type,enum=StateType" json:"type,omitempty"`
-	Sql     string                       `protobuf:"bytes,2,opt,name=sql" json:"sql,omitempty"`
-	Op      MetaDataOperation            `protobuf:"varint,3,opt,name=op,enum=MetaDataOperation" json:"op,omitempty"`
-	Args    []*MetaDataOperationArgument `protobuf:"bytes,4,rep,name=args" json:"args,omitempty"`
-	HasArgs bool                         `protobuf:"varint,5,opt,name=has_args,json=hasArgs" json:"has_args,omitempty"`
-	HasSql  bool                         `protobuf:"varint,6,opt,name=has_sql,json=hasSql" json:"has_sql,omitempty"`
-	HasOp   bool                         `protobuf:"varint,7,opt,name=has_op,json=hasOp" json:"has_op,omitempty"`
+	Type                 StateType                    `protobuf:"varint,1,opt,name=type,proto3,enum=StateType" json:"type,omitempty"`
+	Sql                  string                       `protobuf:"bytes,2,opt,name=sql,proto3" json:"sql,omitempty"`
+	Op                   MetaDataOperation            `protobuf:"varint,3,opt,name=op,proto3,enum=MetaDataOperation" json:"op,omitempty"`
+	Args                 []*MetaDataOperationArgument `protobuf:"bytes,4,rep,name=args,proto3" json:"args,omitempty"`
+	HasArgs              bool                         `protobuf:"varint,5,opt,name=has_args,json=hasArgs,proto3" json:"has_args,omitempty"`
+	HasSql               bool                         `protobuf:"varint,6,opt,name=has_sql,json=hasSql,proto3" json:"has_sql,omitempty"`
+	HasOp                bool                         `protobuf:"varint,7,opt,name=has_op,json=hasOp,proto3" json:"has_op,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *QueryState) Reset()         { *m = QueryState{} }
+func (m *QueryState) String() string { return proto.CompactTextString(m) }
+func (*QueryState) ProtoMessage()    {}
+func (*QueryState) Descriptor() ([]byte, []int) {
+	return fileDescriptor_common_84e383fbabed0a31, []int{14}
+}
+func (m *QueryState) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_QueryState.Unmarshal(m, b)
+}
+func (m *QueryState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_QueryState.Marshal(b, m, deterministic)
+}
+func (dst *QueryState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_QueryState.Merge(dst, src)
+}
+func (m *QueryState) XXX_Size() int {
+	return xxx_messageInfo_QueryState.Size(m)
+}
+func (m *QueryState) XXX_DiscardUnknown() {
+	xxx_messageInfo_QueryState.DiscardUnknown(m)
 }
 
-func (m *QueryState) Reset()                    { *m = QueryState{} }
-func (m *QueryState) String() string            { return proto.CompactTextString(m) }
-func (*QueryState) ProtoMessage()               {}
-func (*QueryState) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
+var xxx_messageInfo_QueryState proto.InternalMessageInfo
 
 func (m *QueryState) GetType() StateType {
 	if m != nil {
@@ -1298,9 +1576,9 @@ func init() {
 	proto.RegisterEnum("MetaDataOperationArgument_ArgumentType", MetaDataOperationArgument_ArgumentType_name, MetaDataOperationArgument_ArgumentType_value)
 }
 
-func init() { proto.RegisterFile("common.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("common.proto", fileDescriptor_common_84e383fbabed0a31) }
 
-var fileDescriptor0 = []byte{
+var fileDescriptor_common_84e383fbabed0a31 = []byte{
 	// 2227 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x58, 0xcb, 0x72, 0xe3, 0xc6,
 	0x15, 0x1d, 0xf0, 0x21, 0x11, 0x17, 0x24, 0xd5, 0x6a, 0x49, 0x33, 0x9c, 0x19, 0x3f, 0x64, 0xa6,