Unverified Commit 1699f427 authored by Kevin Lyda's avatar Kevin Lyda
Browse files

Used perl to make a bunch of standard queries

parent 1d0d31c2

Makefile

+1 −0
Original line number Diff line number Diff line 
.PHONY: all

all:

	go generate ./...

	go install ./...





# vim:ft=make

folders/messages.go

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ func ReadMessage(login, folder string, msgid int64) (*storage.Message, error) { 
}



// ListMessages lists messages.

func ListMessages(folder string) ([]storage.ListMessagesRow, error) {

func ListMessages(folder string) ([]storage.Message, error) {

	ctx := context.TODO()

	// TODO: options aren't implemented - need to set them?

	rows, err := this.Q.ListMessages(ctx, folder)

repl/messages.go

+5 −2
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ import ( 
// messages in the current folder.

func ActionDirectory(cmd *dclish.Command) error {

	// TODO: flag parsing.

	showExpiration := false

	if cmd.Flags["/EXPIRATION"].Value == "true" {

		showExpiration = true

	}

	if len(cmd.Args) == 1 {

		folder, err := folders.ValidFolder(cmd.Args[0])

		if err != nil {
@@ -36,8 +40,7 @@ func ActionDirectory(cmd *dclish.Command) error { 
	}

	fmt.Printf("%4s %-43s %-12s %-10s\n", "#", "Subject", "From", "Date")

	for _, msg := range msgs {

		fmt.Printf("%4d %-43s %-12s %-10s\n", msg.ID, msg.Subject, msg.Author,

			msg.CreateAt.Format("2006-05-04 15:02:01"))

		fmt.Printf("%s\n", msg.OneLine(showExpiration))

	}



	return nil

storage/display.go

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ func (m *Message) String() string { 
	return buf.String()

}



// String renders a message row.

func (m *ListMessagesRow) String(expire bool) string {

// OneLine renders a message in a line.

func (m *Message) OneLine(expire bool) string {

	var t time.Time

	if expire {

		t = m.Expiration

storage/folders.sql.go

+0 −9
Original line number Diff line number Diff line
@@ -61,15 +61,6 @@ func (q *Queries) CreateFolder(ctx context.Context, arg CreateFolderParams) erro 
	return err

}



const deleteFolder = `-- name: DeleteFolder :exec

DELETE FROM folders WHERE name=?

`



func (q *Queries) DeleteFolder(ctx context.Context, name string) error {

	_, err := q.db.ExecContext(ctx, deleteFolder, name)

	return err

}



const findFolderExact = `-- name: FindFolderExact :one

SELECT name FROM folders where name = ?

`