omedusyo/minisql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into empty-select

Browse source 
# Conflicts:
#	server/src/proto_wrapper.rs
This commit is contained in:
Jindřich Moravec 2024-01-28 20:50:55 +01:00
commit 36bc15ecc5
10 changed files with 64 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/src/proto_wrapper.rs
View file

@ -4,7 +4,7 @@ use rand_pcg::Pcg64;
use rand_seeder::Seeder;
use minisql::operation::ColumnSelection;
use minisql::restricted_row::RestrictedRow;
use minisql::schema::TableSchema;
use minisql::schema::{Column, TableSchema};
use proto::message::backend::{BackendMessage, ColumnDescription, CommandCompleteData, DataRowData, ErrorResponseData, ReadyForQueryData, RowDescriptionData};
use proto::message::primitive::pglist::PgList;
use proto::writer::backend::BackendProtoWriter;
@ -91,7 +91,7 @@ impl<W> ServerProto for W where W: BackendProtoWriter + Send {
}
}
fn column_to_description(schema: &TableSchema, column: usize) -> anyhow::Result<ColumnDescription> {
fn column_to_description(schema: &TableSchema, column: Column) -> anyhow::Result<ColumnDescription> {
let table_name = schema.table_name();
let table_oid = table_name_to_oid(table_name);