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
18 changes: 9 additions & 9 deletions core/src/commonMain/kotlin/com/powersync/db/schema/Table.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public data class Table constructor(
/**
* Override the name for the view
*/
private val _viewNameOverride: String? = null
private val viewNameOverride: String? = null
) {

init {
Expand Down Expand Up @@ -67,7 +67,7 @@ public data class Table constructor(
indexes,
localOnly = true,
insertOnly = false,
_viewNameOverride = viewName
viewNameOverride = viewName
)
}

Expand All @@ -85,7 +85,7 @@ public data class Table constructor(
indexes = listOf(),
localOnly = false,
insertOnly = true,
_viewNameOverride = viewName
viewNameOverride = viewName
)
}
}
Expand All @@ -107,8 +107,8 @@ public data class Table constructor(
*/
val validName: Boolean
get() = !invalidSqliteCharacters.containsMatchIn(name) &&
(_viewNameOverride == null || !invalidSqliteCharacters.containsMatchIn(
_viewNameOverride
(viewNameOverride == null || !invalidSqliteCharacters.containsMatchIn(
viewNameOverride
))


Expand All @@ -124,11 +124,11 @@ public data class Table constructor(
throw AssertionError("Invalid characters in table name: $name")
}

if (_viewNameOverride != null && invalidSqliteCharacters.containsMatchIn(
_viewNameOverride
if (viewNameOverride != null && invalidSqliteCharacters.containsMatchIn(
viewNameOverride
)
) {
throw AssertionError("Invalid characters in view name: $_viewNameOverride")
throw AssertionError("Invalid characters in view name: $viewNameOverride")
}

val columnNames = mutableSetOf("id")
Expand Down Expand Up @@ -178,5 +178,5 @@ public data class Table constructor(
* Defaults to the synced table name.
*/
public val viewName: String
get() = _viewNameOverride ?: name
get() = viewNameOverride ?: name
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ class TableTest {
assertTrue(table.validName)
}

@Test
fun testViewNameOverride() {
val columns = listOf(Column("name", ColumnType.TEXT))
val table = Table("valid_table_name", columns, viewNameOverride = "new_view_name")

assertEquals(table.viewName,"new_view_name")
}

@Test
fun testInvalidTableName() {
val columns = listOf(Column("name", ColumnType.TEXT))
Expand Down