aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-09 10:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix column affinity detection

Browse Source 
As it turns out, column affinity is tricky in SQLite...

https://www.sqlite.org/datatype3.html#determination_of_column_affinity
This commit is contained in:
Pekka Enberg
2023-09-04 21:19:12 +03:00
parent b113fa2d10
commit 0cdf54a8c7
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/schema.rs
View File

@@ -47,13 +47,28 @@ impl Table {
for column in columns {
let name = column.col_name.0.to_string();
let ty = match column.col_type {
Some(data_type) => match data_type.name.as_str() {
"INT" => Type::Integer,
"REAL" => Type::Real,
"TEXT" => Type::Text,
"BLOB" => Type::Blob,
_ => unreachable!("Unknown type: {:?}", data_type.name),
},
Some(data_type) => {
let type_name = data_type.name.as_str();
if type_name.contains("INT") {
Type::Integer
} else if type_name.contains("CHAR")
|| type_name.contains("CLOB")
|| type_name.contains("TEXT")
{
Type::Text
} else if type_name.contains("BLOB")
|| type_name.is_empty()
{
Type::Blob
} else if type_name.contains("REAL")
|| type_name.contains("FLOA")
|| type_name.contains("DOUB")
{
Type::Real
} else {
Type::Numeric
}
}
None => Type::Null,
};
cols.push(Column { name, ty });
@@ -104,9 +119,10 @@ pub struct Column {
pub enum Type {
Null,
Text,
Numeric,
Integer,
Real,
Text,
Blob,
}
@@ -114,9 +130,10 @@ impl fmt::Display for Type {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let s = match self {
Type::Null => "NULL",
Type::Text => "TEXT",
Type::Numeric => "NUMERIC",
Type::Integer => "INTEGER",
Type::Real => "REAL",
Type::Text => "TEXT",
Type::Blob => "BLOB",
};
write!(f, "{}", s)

2
core/sqlite3_ondisk.rs
View File

@@ -321,4 +321,4 @@ fn read_varint(buf: &[u8]) -> (u64, usize) {
}
v = (v << 8) + buf[8] as u64;
(v, 9)
}
}