Merge pull request #14 from tamimattafi/bug/nullable_entities_#11

fix: nullable and non-nullable compounds conflict with each other Close #11
tamimattafi · Apr 18, 2024 · 7cb1891 · 7cb1891
2 parents f651e85 + b80b7aa
commit 7cb1891
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 8 deletions.
diff --git a/...piler/src/jvmMain/kotlin/com/attafitamim/kabin/compiler/sql/generator/dao/DaoGenerator.kt b/...piler/src/jvmMain/kotlin/com/attafitamim/kabin/compiler/sql/generator/dao/DaoGenerator.kt
@@ -677,15 +677,16 @@ class DaoGenerator(
                 directEntityColumn.declaration.type.toTypeName()
             )
 
-            val functionName = compoundSpec.declaration
-                .getQueryByColumnsName(entityColumnAccess.toSortedSet())
 
             actualFunctionName = if (relationSpec.property.dataTypeSpec.dataType is DataTypeSpec.DataType.Collection) {
+                val functionName = compoundSpec.declaration
+                    .getQueryByColumnsName(entityColumnAccess.toSortedSet())
+
                 buildString {
                     append(functionName, "Collection")
                 }
             } else {
-                functionName
+                compoundReturnType.getQueryByColumnsName(entityColumnAccess.toSortedSet())
             }
         }
 

diff --git a/...compiler/src/jvmMain/kotlin/com/attafitamim/kabin/compiler/sql/utils/spec/DaoSpecUtils.kt b/...compiler/src/jvmMain/kotlin/com/attafitamim/kabin/compiler/sql/utils/spec/DaoSpecUtils.kt
@@ -127,6 +127,20 @@ fun KSClassDeclaration.getQueryByColumnsName(columns: Set<ColumnSpec>): String =
         }
     }
 
+fun DataTypeSpec.getQueryByColumnsName(columns: Set<ColumnSpec>): String =
+    if (columns.isEmpty()) {
+        declaration.getQueryByNoParametersName(isNullable)
+    } else declaration.buildQueryFunctionName(isNullable) {
+        columns.forEach { columnSpec ->
+            if (columnSpec.typeSpec.isNullable) {
+                append("Optional")
+            }
+
+            append(columnSpec.declaration.simpleNameString.toPascalCase())
+        }
+    }
+
+
 fun KSClassDeclaration.getQueryByParametersName(parameters: Set<DaoParameterSpec>): String =
     if (parameters.isEmpty()) {
         getQueryByNoParametersName()
@@ -140,14 +154,23 @@ fun KSClassDeclaration.getQueryByParametersName(parameters: Set<DaoParameterSpec
         }
     }
 
-fun KSClassDeclaration.getQueryByNoParametersName(): String =
-    buildQueryFunctionName {
-        append("NoParameters")
-    }
+fun KSClassDeclaration.getQueryByNoParametersName(
+    isNullable: Boolean = false
+): String = buildQueryFunctionName(isNullable) {
+    append("NoParameters")
+}
 
-fun KSClassDeclaration.buildQueryFunctionName(builder: StringBuilder.() -> Unit): String =
+fun KSClassDeclaration.buildQueryFunctionName(
+    isNullable: Boolean = false,
+    builder: StringBuilder.() -> Unit
+): String =
     buildString {
         append("query")
+
+        if (isNullable) {
+            append("Optional")
+        }
+
         append(simpleNameString.toPascalCase())
         append("By")
 

diff --git a/...hared/src/commonMain/kotlin/com/attafitamim/kabin/local/entities/school/SchoolCompound.kt b/...hared/src/commonMain/kotlin/com/attafitamim/kabin/local/entities/school/SchoolCompound.kt
@@ -8,6 +8,20 @@ data class SchoolCompound(
     @Embedded
     val entity: SchoolEntity,
 
+    @Relation(
+        entity = StudentEntity::class,
+        parentColumn = "name",
+        entityColumn = "fullName"
+    )
+    val luckyStudent: StudentCompound?,
+
+    @Relation(
+        entity = StudentEntity::class,
+        parentColumn = "address",
+        entityColumn = "id"
+    )
+    val otherLuckyStudent: StudentCompound,
+
     @Relation(
         entity = StudentEntity::class,
         parentColumn = "identity",