improved generated code

Author: inforithmics

nuget/Sqlite_net.SourceGenerator/SQLiteFastColumnSetterGenerator.cs

@@ -133,7 +133,7 @@ static bool HasBaseClass (ClassDeclarationSyntax classDecl)
 				    // Include property if not ignored
 				    if (!ignore) {
 					    var columnName = GetColumnName (member);
-					    properties.Add (new PropertyInfo (member.Name, member.Type.ToDisplayString (), columnName, GetEnumInfo(member)));
+					    properties.Add (new PropertyInfo (member.Name, member.Type.ToDisplayString (), columnName,  GetEnumInfo(member)));
 				    }
 			    }
 		    }
@@ -377,16 +377,9 @@ static void Execute(
                 sb.AppendLine($"                \"{property.ColumnName}\",");
                 sb.AppendLine($"                (obj, stmt, index) => ");
                 sb.AppendLine($"                {{");
-                sb.AppendLine($"                    if (SQLite3.ColumnType(stmt, index) != SQLite3.ColType.Null)");
-                sb.AppendLine($"                    {{");
-                
-                // Generate appropriate setter based on property type
-                GeneratePropertySetter($"(({fullTypeName})obj)",sb, property);
-                
-                sb.AppendLine($"                    }}");
-                sb.AppendLine($"                }});");
-                sb.AppendLine();
-            }
+	            GeneratePropertySetter ($"(({fullTypeName})obj)", sb, property);
+	            sb.AppendLine($"                }});");
+			}
         }
 
         sb.AppendLine("        }");
@@ -416,6 +409,11 @@ static void GeneratePropertySetter(string typedObject, StringBuilder sb, Propert
         if (isNullable)
             propertyType = propertyType.Replace("?", "");
 
+        if (isNullable) {
+	        sb.AppendLine($"                    if (SQLite3.ColumnType(stmt, index) != SQLite3.ColType.Null)");
+	        sb.AppendLine($"                    {{");
+        }
+
         switch (propertyType)
         {
             case "string":
@@ -511,6 +509,10 @@ static void GeneratePropertySetter(string typedObject, StringBuilder sb, Propert
 
 	            break;
         }
+
+        if (isNullable) {
+	        sb.AppendLine($"                    }}");
+        }
     }
 
     record ClassInfo(string ClassName, string Namespace, List<PropertyInfo> Properties);