Added tags

Author: djthorpe

pkg/indexer/schema.go

@@ -31,11 +31,18 @@ type File struct {
 }
 
 type Doc struct {
-	Name        string `sqlite:"name,primary,foreign,join:name"` // Index name, primary key
-	Path        string `sqlite:"path,primary,foreign,join:path"` // Relative path, primary key
-	Title       string `sqlite:"title,notnull"`                  // Title of the document, text
-	Description string `sqlite:"description"`                    // Description of the document, text
-	Shortform   string `sqlite:"shortform"`                      // Shortform of the document, html
+	Name        string   `sqlite:"name,primary,foreign,join:name"` // Index name, primary key
+	Path        string   `sqlite:"path,primary,foreign,join:path"` // Relative path, primary key
+	Title       string   `sqlite:"title,notnull"`                  // Title of the document, text
+	Description string   `sqlite:"description"`                    // Description of the document, text
+	Shortform   string   `sqlite:"shortform"`                      // Shortform of the document, html
+	Tags        []string `sqlite:"-"`                              // Tags added via DocTag table
+}
+
+type DocTag struct {
+	Name string `sqlite:"name,primary,foreign"` // Index name, primary key
+	Path string `sqlite:"path,primary,foreign"` // Relative path, primary key
+	Tag  string `sqlite:"tag,notnull"`          // Document tag
 }
 
 // View is used as the content source for the search virtual table
@@ -66,6 +73,7 @@ const (
 	fileTableName           = "file"
 	searchTableName         = "search"
 	docTableName            = "doc"
+	tagTableName            = "tag"
 	viewTableName           = "view"
 	searchTriggerInsertName = "search_insert"
 	searchTriggerDeleteName = "search_delete"
@@ -92,6 +100,7 @@ var (
 var (
 	fileTable   = sqobj.MustRegisterClass(N(fileTableName), File{})
 	docTable    = sqobj.MustRegisterClass(N(docTableName), Doc{}).ForeignKey(fileTable)
+	tagTable    = sqobj.MustRegisterClass(N(tagTableName), DocTag{}).ForeignKey(docTable)
 	viewTable   = sqobj.MustRegisterView(N(viewTableName), View{}, true, fileTable, docTable)
 	searchTable = sqobj.MustRegisterVirtual(N(searchTableName), "fts5", Search{}, "content="+Quote(viewTableName))
 )
@@ -113,6 +122,9 @@ func CreateSchema(ctx context.Context, conn SQConnection, schema string, tokeniz
 		if err := docTable.Create(txn, schema); err != nil {
 			return err
 		}
+		if err := tagTable.Create(txn, schema); err != nil {
+			return err
+		}
 		if err := viewTable.Create(txn, schema); err != nil {
 			return err
 		}
@@ -196,11 +208,22 @@ func GetFile(schema string, rowid int64) (SQStatement, []interface{}, []reflect.
 }
 
 func UpsertDoc(txn SQTransaction, doc *Doc) (int64, error) {
-	if n, err := docTable.UpsertKeys(txn, doc); err != nil {
+	n, err := docTable.UpsertKeys(txn, doc)
+	if err != nil {
 		return 0, err
-	} else {
-		return n[0], nil
 	}
+	// Add any tags
+	for _, tag := range doc.Tags {
+		if _, err := tagTable.UpsertKeys(txn, &DocTag{
+			Name: doc.Name,
+			Path: doc.Path,
+			Tag:  tag,
+		}); err != nil {
+			return 0, err
+		}
+	}
+	// Return rowid for the document
+	return n[0], nil
 }
 
 func Query(schema string, snippet bool) SQSelect {

pkg/indexer/store.go

@@ -292,6 +292,7 @@ func (s *Store) insert(ctx context.Context, txn SQTransaction, name, path string
 		Title:       doc.Title(),
 		Description: doc.Description(),
 		Shortform:   string(doc.Shortform()), // TODO: html2text
+		Tags:        doc.Tags(),
 	}); err != nil {
 		return err
 	} else {

pkg/lang/join.go

@@ -48,15 +48,15 @@ func (j *join) String() string {
 // PUBLIC METHODS
 
 func (j *join) Join(expr ...SQExpr) SQJoin {
-	return &join{j.l, j.r, "JOIN", expr, nil}
+	return &join{j.l, j.r, "JOIN", expr, j.cols}
 }
 
 func (j *join) LeftJoin(expr ...SQExpr) SQJoin {
-	return &join{j.l, j.r, "LEFT JOIN", expr, nil}
+	return &join{j.l, j.r, "LEFT JOIN", expr, j.cols}
 }
 
 func (j *join) LeftInnerJoin(expr ...SQExpr) SQJoin {
-	return &join{j.l, j.r, "LEFT INNER JOIN", expr, nil}
+	return &join{j.l, j.r, "LEFT INNER JOIN", expr, j.cols}
 }
 
 func (j *join) Using(cols ...string) SQJoin {

pkg/sqobj/sqreflect.go

@@ -96,6 +96,10 @@ func NewReflect(proto interface{}) (*SQReflect, error) {
 	// Set columns
 	var result error
 	for _, field := range fields {
+		if field == nil {
+			// Ignored fields
+			continue
+		}
 		// Check for duplicate column name
 		if _, exists := r.colmap[field.Name]; exists {
 			result = multierror.Append(result, ErrDuplicateEntry.With(field.Name))
@@ -112,6 +116,10 @@ func NewReflect(proto interface{}) (*SQReflect, error) {
 
 	// Set indexes
 	for _, field := range fields {
+		if field == nil {
+			// Ignored fields
+			continue
+		}
 		for _, tag := range field.Tags {
 			name, unique := parseTagIndexValue(tag)
 			if name != "" {
@@ -129,6 +137,10 @@ func NewReflect(proto interface{}) (*SQReflect, error) {
 	// Set joins. The join names are aliases so when joining two tables, the aliases
 	// are used to match up the columns
 	for _, field := range fields {
+		if field == nil {
+			// Ignored fields
+			continue
+		}
 		for _, tag := range field.Tags {
 			name := parseTagJoinValue(tag)
 			if name == "" {

pkg/sqobj/sqview.go

@@ -155,7 +155,7 @@ func (this *View) join(l, r *Class, leftjoin bool) SQJoin {
 	// or if the column names are the same,
 	//   this [LEFT} JOIN other USING (alias,alias)
 	join := J(l.SQSource, r.SQSource)
-	expr := make([]SQExpr, len(aliases))
+	expr := make([]SQExpr, 0, len(aliases))
 	using := make([]string, 0, len(aliases))
 	for _, alias := range aliases {
 		lcol := l.joinmap[alias]
@@ -174,6 +174,8 @@ func (this *View) join(l, r *Class, leftjoin bool) SQJoin {
 	} else {
 		join = join.Join(expr...)
 	}
+
+	// Return success
 	return join
 }