Remove 255 literal from ServerVar

MaterializeInc · Aug 5, 2023 · ab268d4 · ab268d4
1 parent ba4dcfc
commit ab268d4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/sql-lexer/src/lexer.rs b/src/sql-lexer/src/lexer.rs
@@ -59,7 +59,7 @@ static ALLOCATOR: LockedAllocator<FreeListAllocator> =
 const LEX_TS_DEF: &'static str = r#"export function lex(query: string): PosToken[];"#;
 
 // Maximum allowed identifier length in bytes.
-const MAX_IDENTIFIER_LENGTH: usize = 255;
+pub const MAX_IDENTIFIER_LENGTH: usize = 255;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct LexerError {

diff --git a/src/sql/Cargo.toml b/src/sql/Cargo.toml
@@ -36,6 +36,7 @@ mz-repr = { path = "../repr", features = ["tracing_"] }
 mz-rocksdb-types = { path = "../rocksdb-types" }
 mz-secrets = { path = "../secrets" }
 mz-sql-parser = { path = "../sql-parser" }
+mz-sql-lexer = { path = "../sql-lexer" }
 mz-stash = { path = "../stash" }
 mz-storage-client = { path = "../storage-client" }
 mz-tracing = { path = "../tracing" }

diff --git a/src/sql/src/session/vars.rs b/src/sql/src/session/vars.rs
@@ -515,10 +515,10 @@ pub const MAX_QUERY_RESULT_SIZE: ServerVar<u32> = ServerVar {
     internal: false,
 };
 
-pub const MAX_IDENTIFIER_LENGTH: ServerVar<u32> = ServerVar {
+pub const MAX_IDENTIFIER_LENGTH: ServerVar<usize> = ServerVar {
     name: UncasedStr::new("max_identifier_length"),
     // 1 GiB
-    value: &255,
+    value: &mz_sql_lexer::lexer::MAX_IDENTIFIER_LENGTH,
     description: "The maximum length of object identifiers in bytes (PostgreSQL).",
     internal: false,
 };

diff --git a/test/sqllogictest/id_length.slt b/test/sqllogictest/id_length.slt
@@ -14,6 +14,11 @@ mode cockroach
 # Requires stable ids
 reset-server
 
+statement ok
+SELECT 1 AS justriiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiight
+
+statement ok
+SELECT 1 AS "justriiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiight"
 
 statement error db error: ERROR: identifier length exceeds 255 bytes
 SELECT 1 AS tooloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong