Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ and missing syntax gets added on demand — [open an issue](https://github.com/J
| **ClickHouse column selection** | `COLUMNS('regexp')` select items with chained `APPLY`, `EXCEPT`, and `REPLACE` transformers |
| **DML** | `INSERT` · `UPDATE` · `UPSERT` · `MERGE` · `DELETE` · `TRUNCATE TABLE` |
| **DDL** | `CREATE …` · `ALTER …` · `DROP …` |
| **Oracle vector types** | `VECTOR(*, *)` · `VECTOR(*, FLOAT32)` · `VECTOR(3, *)`, including dense and sparse storage formats |
| **PostgreSQL ownership** | `DROP OWNED` · `REASSIGN OWNED` |
| **MySQL table maintenance** | `ANALYZE` · `CHECK` · `OPTIMIZE` · `REPAIR TABLE` |
| **MySQL account management** | `CREATE`/`ALTER`/`RENAME USER` · `CREATE ROLE` · `SET ROLE` · `SET DEFAULT ROLE` · `SET PASSWORD` |
Expand Down
3 changes: 3 additions & 0 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -18745,6 +18745,9 @@ ColDataType ColDataType():
tk=<DATA_TYPE>
|
tk=<K_CHAR>
|
tk="*" { requireDdlSyntax("VECTOR".equalsIgnoreCase(colDataType.getDataType()),
"Wildcard type arguments are only supported for VECTOR"); }
)
)
{
Expand Down
75 changes: 75 additions & 0 deletions src/test/java/net/sf/jsqlparser/parser/OracleVectorTypeTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2026 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.parser;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.Arrays;
import java.util.List;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.parser.AbstractJSqlParser.Dialect;
import net.sf.jsqlparser.statement.Statement;
import net.sf.jsqlparser.statement.create.table.ColDataType;
import net.sf.jsqlparser.statement.create.table.CreateTable;
import net.sf.jsqlparser.test.TestUtils;
import net.sf.jsqlparser.util.deparser.StatementDeParser;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

class OracleVectorTypeTest {
@ParameterizedTest
@ValueSource(strings = {"*, *", "*, FLOAT32", "3, *", "*, *, DENSE", "*, *, SPARSE",
"*, FLOAT32, SPARSE", "3, *, SPARSE", "3, FLOAT32, *", "*, *, *", "3, FLOAT32",
"3", "1024, FLOAT32, SPARSE"})
void preservesVectorArguments(String arguments) throws JSQLParserException {
List<String> expected = Arrays.asList(arguments.split(", "));
for (String name : List.of("VECTOR", "vector")) {
String typeSql = name + "(" + arguments + ")";
for (ColDataType type : List.of(CCJSqlParserUtil.parseColDataType(typeSql),
CCJSqlParserUtil.parseColDataType(typeSql,
p -> p.withDialect(Dialect.ORACLE)))) {
assertEquals(name, type.getDataType());
assertEquals(expected, type.getArgumentsStringList());
assertEquals(name + " (" + arguments + ")", type.toString());
}
}
}

@ParameterizedTest
@ValueSource(strings = {"VECTOR(*, *)", "VECTOR(*, FLOAT32)", "VECTOR(3, *)",
"VECTOR(*, *, SPARSE)", "VECTOR(3, FLOAT32, *)"})
void roundTripsVectorColumnsBeforeOtherColumns(String typeSql) throws JSQLParserException {
String sql = "CREATE TABLE items (embedding " + typeSql + ", label VARCHAR2(20))";
for (Statement statement : List.of(TestUtils.assertSqlCanBeParsedAndDeparsed(sql),
CCJSqlParserUtil.parse(sql, p -> p.withDialect(Dialect.ORACLE)))) {
CreateTable table = (CreateTable) statement;
assertEquals(2, table.getColumnDefinitions().size());
assertEquals("label", table.getColumnDefinitions().get(1).getColumnName());
StringBuilder buffer = new StringBuilder();
statement.accept(new StatementDeParser(buffer), null);
assertEquals(statement.toString(), buffer.toString());
CreateTable reparsed = (CreateTable) CCJSqlParserUtil.parse(buffer.toString());
assertEquals(
table.getColumnDefinitions().get(0).getColDataType().getArgumentsStringList(),
reparsed.getColumnDefinitions().get(0).getColDataType()
.getArgumentsStringList());
}
}

@ParameterizedTest
@ValueSource(strings = {"VARCHAR(*)", "NUMERIC(3, *)", "custom_type(*)",
"\"VECTOR\"(*, *)", "VECTOR(*,", "VECTOR(, *)", "VECTOR(*, *) NOT NULL"})
void rejectsWildcardsOutsideVectorAndIncompleteTypes(String typeSql) {
assertThrows(JSQLParserException.class, () -> CCJSqlParserUtil.parseColDataType(typeSql));
assertThrows(JSQLParserException.class,
() -> CCJSqlParserUtil.parseColDataType(typeSql,
p -> p.withDialect(Dialect.ORACLE)));
}
}
Loading