Skip to content

feat: Capture expression name part delimiters #2001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manticore-projects merged 5 commits into from
May 3, 2024
Merged

feat: Capture expression name part delimiters #2001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d57096
feat: Capture expression name part delimiters
mountaincrab May 2, 2024
82992ff
feat: Checkstyle
mountaincrab May 2, 2024
4df076a
feat: Test for empty name parts
mountaincrab May 3, 2024
12fe46e
feat: Move ObjectNames class to parser. Tidy imports.
mountaincrab May 3, 2024
90bd42e
feat: Spotless
mountaincrab May 3, 2024
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
Prev Previous commit
feat: Spotless
  • Loading branch information
@mountaincrab
mountaincrab committed May 3, 2024
commit 90bd42e783dc19302561ad1cd4d5125597768231
9 changes: 5 additions & 4 deletions src/main/java/net/sf/jsqlparser/schema/Column.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,15 @@ public Column(Table table, String columnName) {
}

public Column(List<String> nameParts) {
this(nameParts, nameParts.size() > 1 ? Collections.nCopies(nameParts.size() - 1, ".") : new ArrayList<>());
this(nameParts, nameParts.size() > 1 ? Collections.nCopies(nameParts.size() - 1, ".")
: new ArrayList<>());
}

public Column(List<String> nameParts, List<String> delimiters) {
this(
nameParts.size() > 1 ? new Table(nameParts.subList(0, nameParts.size() - 1), delimiters.subList(0, delimiters.size() - 1)) : null,
nameParts.get(nameParts.size() - 1)
);
nameParts.size() > 1 ? new Table(nameParts.subList(0, nameParts.size() - 1),
delimiters.subList(0, delimiters.size() - 1)) : null,
nameParts.get(nameParts.size() - 1));
setTableDelimiter(delimiters.isEmpty() ? "." : delimiters.get(delimiters.size() - 1));
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/sf/jsqlparser/schema/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public Table(List<String> partItems) {

public Table(List<String> partItems, List<String> partDelimiters) {
if (partDelimiters.size() != partItems.size() - 1) {
throw new IllegalArgumentException("the length of the delimiters list must be 1 less than nameParts");
throw new IllegalArgumentException(
"the length of the delimiters list must be 1 less than nameParts");
}
this.partItems = new ArrayList<>(partItems);
this.partDelimiters = new ArrayList<>(partDelimiters);
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/net/sf/jsqlparser/schema/TableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ public void testTableRemoveNameParts() {

@Test
public void testConstructorDelimitersInappropriateSize() {
assertThatThrownBy(() -> new Table(List.of("a", "b", "c"), List.of("too", "many", "delimiters")))
assertThatThrownBy(
() -> new Table(List.of("a", "b", "c"), List.of("too", "many", "delimiters")))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("the length of the delimiters list must be 1 less than nameParts");
.hasMessageContaining(
"the length of the delimiters list must be 1 less than nameParts");
}
}