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.

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

Don't use optional rules #624

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Don't use optional rules #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
213c5f2
Don't use optional rules
hfhbd Apr 15, 2024
9988879
Fix zip with empty constraint list
hfhbd Apr 15, 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
56 changes: 28 additions & 28 deletions core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/JoinClauseMixin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,39 +53,39 @@ internal abstract class JoinClauseMixin(

private val queryExposed = ModifiableFileLazy {
var queryAvailable = tableOrSubqueryList[0].queryExposed()
tableOrSubqueryList.drop(1)
.zip(joinConstraintList)
.zip(joinOperatorList) zip2@{ (subquery, constraint), operator ->
queryAvailable += subquery.queryExposed().let { query ->
when {
query.isEmpty() -> return@zip2
else -> {
var columns = query.flatMap { it.columns }
var synthesizedColumns = query.flatMap { it.synthesizedColumns }
for ((index, subquery) in tableOrSubqueryList.drop(1).withIndex()) {
val constraint: SqlJoinConstraint? = if (index in joinConstraintList.indices) joinConstraintList[index] else null
val operator: SqlJoinOperator = joinOperatorList[index]
val query = subquery.queryExposed()

if (supportsJoinOperator(operator)) {
columns = columns.map { it.copy(nullable = true) }
synthesizedColumns = synthesizedColumns.map { it.copy(nullable = true) }
}
if (constraint.node?.findChildByType(
SqlTypes.USING,
) != null
) {
val columnNames = constraint.columnNameList.map { it.name }
columns = columns.map {
it.copy(hiddenByUsing = it.element is PsiNamedElement && it.element.name in columnNames)
}
}
QueryResult(
table = query.first().table,
columns = columns,
synthesizedColumns = synthesizedColumns,
joinConstraint = constraint,
)
queryAvailable += when {
query.isEmpty() -> continue
else -> {
var columns = query.flatMap { it.columns }
var synthesizedColumns = query.flatMap { it.synthesizedColumns }

if (supportsJoinOperator(operator)) {
columns = columns.map { it.copy(nullable = true) }
synthesizedColumns = synthesizedColumns.map { it.copy(nullable = true) }
}
if (constraint != null && constraint.node?.findChildByType(
SqlTypes.USING,
) != null
) {
val columnNames = constraint.columnNameList.map { it.name }
columns = columns.map {
it.copy(hiddenByUsing = it.element is PsiNamedElement && it.element.name in columnNames)
}
}
QueryResult(
table = query.first().table,
columns = columns,
synthesizedColumns = synthesizedColumns,
joinConstraint = constraint,
)
}
}
}
return@ModifiableFileLazy queryAvailable
}

Expand Down
10 changes: 5 additions & 5 deletions core/src/main/kotlin/com/alecstrong/sql/psi/core/sql.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@ column_def ::= [ javadoc ] column_name column_type ( column_constraint ) * {
}
column_type ::= type_name
type_name ::= identifier [ LP signed_number RP | LP signed_number COMMA signed_number RP ]
column_constraint ::= [ CONSTRAINT identifier ] ( PRIMARY KEY [ ASC | DESC ] conflict_clause [ AUTOINCREMENT ] | NOT NULL conflict_clause | UNIQUE conflict_clause | check_constraint | default_constraint | COLLATE collation_name | foreign_key_clause | generated_clause )
column_constraint ::= [ CONSTRAINT identifier ] ( PRIMARY KEY [ ASC | DESC ] [ conflict_clause ] [ AUTOINCREMENT ] | NOT NULL [ conflict_clause ] | UNIQUE [ conflict_clause ] | check_constraint | default_constraint | COLLATE collation_name | foreign_key_clause | generated_clause )
generated_clause ::= [ GENERATED ] ALWAYS AS LP expr RP
check_constraint ::= CHECK LP expr RP
default_constraint ::= DEFAULT ( signed_number | literal_value | LP expr RP )
signed_number ::= [ PLUS | MINUS ] numeric_literal
table_constraint ::= [ CONSTRAINT identifier ] ( ( PRIMARY KEY | UNIQUE ) LP indexed_column ( COMMA indexed_column ) * RP conflict_clause | CHECK LP expr RP | FOREIGN KEY LP column_name ( COMMA column_name ) * RP foreign_key_clause )
table_constraint ::= [ CONSTRAINT identifier ] ( ( PRIMARY KEY | UNIQUE ) LP indexed_column ( COMMA indexed_column ) * RP [ conflict_clause ] | CHECK LP expr RP | FOREIGN KEY LP column_name ( COMMA column_name ) * RP foreign_key_clause )
foreign_key_clause ::= REFERENCES foreign_table [ LP column_name ( COMMA column_name ) * RP ] [ ( ON ( DELETE | UPDATE ) ( SET NULL | SET DEFAULT | CASCADE | RESTRICT | NO ACTION ) | MATCH identifier ) * ] [ [ NOT ] DEFERRABLE [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] ] {
mixin = "com.alecstrong.sql.psi.core.psi.mixins.ForeignKeyClauseMixin"
}
conflict_clause ::= [ ON CONFLICT ( ROLLBACK | ABORT | FAIL | IGNORE | REPLACE ) ]
conflict_clause ::= ON CONFLICT ( ROLLBACK | ABORT | FAIL | IGNORE | REPLACE )
create_trigger_stmt ::= CREATE [ TEMP | TEMPORARY ] TRIGGER [ IF NOT EXISTS ] [ database_name DOT ] trigger_name [ BEFORE | AFTER | INSTEAD OF ] ( DELETE | INSERT | UPDATE [ OF column_name ( COMMA column_name ) * ] ) ON table_name [ FOR EACH ROW ] [ WHEN expr ] BEGIN ( (update_stmt | insert_stmt | delete_stmt | compound_select_stmt ) SEMI ) + END {
mixin = "com.alecstrong.sql.psi.core.psi.mixins.CreateTriggerMixin"
implements = "com.alecstrong.sql.psi.core.psi.SchemaContributor"
Expand Down Expand Up @@ -358,7 +358,7 @@ group_by ::= GROUP BY expr ( COMMA expr ) * {
}

values_expression ::= LP expr ( COMMA expr ) * RP
join_clause ::= table_or_subquery ( join_operator table_or_subquery join_constraint ) * {
join_clause ::= table_or_subquery ( join_operator table_or_subquery [join_constraint] ) * {
mixin = "com.alecstrong.sql.psi.core.psi.mixins.JoinClauseMixin"
implements = [
"com.alecstrong.sql.psi.core.psi.QueryElement";
Expand Down Expand Up @@ -390,7 +390,7 @@ full_join_operator ::= FULL

join_operator ::= ( COMMA
| [ NATURAL ] [ left_join_operator [ OUTER ] | INNER | CROSS ] JOIN )
join_constraint ::= [ ON expr | USING LP column_name ( COMMA column_name ) * RP ]
join_constraint ::= ON expr | USING LP column_name ( COMMA column_name ) * RP
ordering_term ::= expr [ COLLATE collation_name ] [ ASC | DESC ] {
mixin = "com.alecstrong.sql.psi.core.psi.mixins.OrderByMixin"
}
Expand Down