Skip to content

SchemaReader: return the correct column definition for a composite primary key #1217

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
merged 1 commit into from
Jun 9, 2023
Merged

SchemaReader: return the correct column definition for a composite primary key #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/SQLite/Schema/SchemaReader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class SchemaReader {
.map { (row: Row) -> ColumnDefinition in
ColumnDefinition(
name: row[TableInfoTable.nameColumn],
primaryKey: row[TableInfoTable.primaryKeyColumn] == 1 ?
primaryKey: (row[TableInfoTable.primaryKeyColumn] ?? 0) > 0 ?
try parsePrimaryKey(column: row[TableInfoTable.nameColumn]) : nil,
type: ColumnDefinition.Affinity(row[TableInfoTable.typeColumn]),
nullable: row[TableInfoTable.notNullColumn] == 0,
Expand Down
37 changes: 37 additions & 0 deletions Tests/SQLiteTests/Schema/SchemaReaderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,43 @@ class SchemaReaderTests: SQLiteTestCase {
)
}

func test_columnDefinitions_composite_primary_keys() throws {
try db.run("""
CREATE TABLE t (
col1 INTEGER,
col2 INTEGER,
col3 INTEGER,
PRIMARY KEY (col1, col2)
);
""")

XCTAssertEqual(
try schemaReader.columnDefinitions(table: "t"), [
ColumnDefinition(
name: "col1",
primaryKey: .init(autoIncrement: false),
type: .INTEGER,
nullable: true,
defaultValue: .NULL,
references: nil),
ColumnDefinition(
name: "col2",
primaryKey: .init(autoIncrement: false),
type: .INTEGER,
nullable: true,
defaultValue: .NULL,
references: nil),
ColumnDefinition(
name: "col3",
primaryKey: nil,
type: .INTEGER,
nullable: true,
defaultValue: .NULL,
references: nil)
]
)
}

func test_indexDefinitions_no_index() throws {
let indexes = try schemaReader.indexDefinitions(table: "users")
XCTAssertTrue(indexes.isEmpty)
Expand Down