minor

desc/create_table_query.go

@@ -15,7 +15,7 @@ func BuildCreateTableQuery(td *Table) string {
 	query.WriteString(fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s (", td.Name))
 
 	// Loop over the columns and append their definitions to the query
-	for i, col := range td.Columns {
+	for i, col := range td.ListColumnsWithoutPresenter() {
 		if col.Presenter {
 			continue // skip presenter columns.
 		}
@@ -46,14 +46,9 @@ func BuildCreateTableQuery(td *Table) string {
 			query.WriteString(fmt.Sprintf(" CHECK (%s)", col.CheckConstraint))
 		}
 
-		// Add a comma separator if this is not the last column
+		// Add a comma separator if this is not the last column.
 		if i < len(td.Columns)-1 {
-			nextIsPresenter := false
-			nextIndex := i + 1
-			nextIsPresenter = len(td.Columns)-1 >= nextIndex && td.Columns[nextIndex].Presenter
-			if !nextIsPresenter {
-				query.WriteString(", ")
-			}
+			query.WriteString(", ")
 		}
 	}
 

desc/table.go

@@ -140,6 +140,20 @@ func (td *Table) listColumnsForSelectWithoutGenerated() []*Column {
 	return columns
 }
 
+// ListColumnsWithoutPresenter returns the columns of the table definition except the presenter ones.
+func (td *Table) ListColumnsWithoutPresenter() []*Column {
+	columns := make([]*Column, 0, len(td.Columns))
+	for _, c := range td.Columns {
+		if c.Presenter {
+			continue
+		}
+
+		columns = append(columns, c)
+	}
+
+	return columns
+}
+
 // ListColumnNames returns the column names of the table definition.
 func (td *Table) ListColumnNames() []string {
 	names := make([]string, 0, len(td.Columns))