Skip to content
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.

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

fix(jdbc): generated columns with stored in SQLite are not marked as generated #1133

Merged
merged 3 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
5 changes: 4 additions & 1 deletion src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,10 @@ public ResultSet getColumns(String c, String s, String tblNamePattern, String co
colType = colType.substring(0, iStartOfDimension).trim();
}

int colGenerated = "2".equals(colHidden) ? 1 : 0;
int colGenerated =
Arrays.binarySearch(new String[] {"2", "3"}, colHidden) >= 0
sualeh marked this conversation as resolved.
Show resolved Hide resolved
? 1
: 0;

sql.append("select ")
.append(i + 1)
Expand Down
24 changes: 24 additions & 0 deletions src/test/java/org/sqlite/DBMetaDataTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Properties;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledInNativeImage;
Expand Down Expand Up @@ -490,6 +491,29 @@ public void getColumnsIncludingGenerated() throws SQLException {
assertThat(rs.next()).isFalse();
}

@Test
@DisplayName(
"Issue #1132 - Generated columns with stored in SQLite are not marked as generated")
public void getColumnsIncludingGeneratedStored() throws SQLException {
stat.executeUpdate(
"create table foo("
+ "\n"
+ " id integer primary key,"
+ "\n"
+ " bar int not null generated always as (id + 1) stored"
+ "\n"
+ ");");

ResultSet rs = meta.getColumns(null, null, "foo", "%");
assertThat(rs.next()).isTrue();
assertThat(rs.getString(4)).as("first column is named 'id'").isEqualTo("id");
assertThat(rs.getString(24)).as("first column is generated").isEqualTo("NO");
assertThat(rs.next()).isTrue();
assertThat(rs.getString(4)).as("second column is named 'bar'").isEqualTo("bar");
assertThat(rs.getString(24)).as("second column is generated").isEqualTo("YES");
assertThat(rs.next()).isFalse();
}

@Test
public void getColumnsWithEscape() throws SQLException {
stat.executeUpdate("create table wildcard(col1 integer, co_1 integer, 'co%1' integer)");
Expand Down
Loading