feat: Support DELETE

.CHANGELOG.md

@@ -12,4 +12,5 @@
 - [Support Aggregate Functions](https://github.com/gotomicro/eql/pull/37)
 - [Updater implementation, excluding WHERE clause](https://github.com/gotomicro/eql/pull/36)
 - [Force test and lint in pre-push](https://github.com/gotomicro/eql/pull/35)
-- [Insert implementation ](https://github.com/gotomicro/eql/pull/38)
+- [Insert implementation ](https://github.com/gotomicro/eql/pull/38)
+- [Delete implementation ](https://github.com/gotomicro/eql/pull/43)

.deepsource.toml

@@ -28,4 +28,5 @@ enabled = true
 
 [[analyzers]]
 name = "sql"
-enabled = true
+enabled = true
+

.github/workflows/go.yml

@@ -21,12 +21,10 @@ on:
     branches: [ main ]
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
@@ -36,4 +34,10 @@ jobs:
         run: go build -v ./...
 
       - name: Test
-        run: go test -v ./...
+        run: go test -coverprofile=cover.out -v ./...
+#      - name: Deepsource Cli
+#        run: curl https://deepsource.io/cli | sh
+#      - name: Report Code Coverage
+#        run: ./bin/deepsource report --analyzer test-coverage --key go --value-file ./cover.out
+#        env:
+#          DEEPSOURCE_DSN: ${{ secrets.DEEPSOURCE_DSN }}

db.go

@@ -52,8 +52,10 @@ func (db *DB) Select(columns ...Selectable) *Selector {
 }
 
 // Delete starts a "delete" query.
-func (*DB) Delete() *Deleter {
-	panic("implement me")
+func (db *DB) Delete() *Deleter {
+	return &Deleter{
+		builder: db.builder(),
+	}
 }
 
 func (db *DB) Update(table interface{}) *Updater {

delete.go

@@ -16,30 +16,45 @@ package eql
 
 // Deleter builds DELETE query
 type Deleter struct {
-
+	builder
+	table interface{}
+	where []Predicate
 }
 
 // Build returns DELETE query
 func (d *Deleter) Build() (*Query, error) {
-	panic("implement me")
+	_, err := d.buffer.WriteString("DELETE FROM ")
+	if err != nil {
+		return nil, err
+	}
+	d.meta, err = d.registry.Get(d.table)
+	if err != nil {
+		return nil, err
+	}
+
+	d.quote(d.meta.tableName)
+	if len(d.where) > 0 {
+		_, err = d.buffer.WriteString(" WHERE ")
+		if err != nil {
+			return nil, err
+		}
+		err = d.buildPredicates(d.where)
+		if err != nil {
+			return nil, err
+		}
+	}
+	d.end()
+	return &Query{SQL: d.buffer.String(), Args: d.args}, nil
 }
 
 // From accepts model definition
 func (d *Deleter) From(table interface{}) *Deleter {
-	panic("implement me")
+	d.table = table
+	return d
 }
 
 // Where accepts predicates
 func (d *Deleter) Where(predicates...Predicate) *Deleter {
-	panic("implement me")
-}
-
-// OrderBy means "ORDER BY"
-func (d *Deleter) OrderBy(orderBy... OrderBy) *Deleter {
-	panic("implement me")
-}
-
-// Limit limits the number of deleted rows
-func (d *Deleter) Limit(limit int) *Deleter {
-	panic("implement me")
+	d.where = predicates
+	return d
 }

delete_test.go

@@ -32,27 +32,6 @@ func TestDeleter_Build(t *testing.T) {
 			wantSql: "DELETE FROM `test_model` WHERE `id`=?;",
 			wantArgs: []interface{}{16},
 		},
-		{
-			name: "order",
-			builder: New().Delete().From(&TestModel{}).Where(C("Id").EQ(14)).
-				OrderBy(ASC("Id"), DESC("Name")),
-			wantSql: "DELETE FROM `test_model` WHERE `id`=? ORDER BY `id` ASC, `name` DESC;",
-			wantArgs: []interface{}{14},
-		},
-		{
-			name: "order and limit",
-			builder: New().Delete().From(&TestModel{}).Where(C("Id").EQ(14)).
-				OrderBy(ASC("Id"), DESC("Name")).Limit(3),
-			wantSql: "DELETE FROM `test_model` WHERE `id`=? ORDER BY `id` ASC, `name` DESC LIMIT ?;",
-			wantArgs: []interface{}{14, 3},
-		},
-
-		{
-			name: "limit",
-			builder: New().Delete().From(&TestModel{}).Where(C("Id").EQ(14)).Limit(3),
-			wantSql: "DELETE FROM `test_model` WHERE `id`=? LIMIT ?;",
-			wantArgs: []interface{}{14, 3},
-		},
 	}
 
 	for _, tc := range testCases {

model_test.go

@@ -36,11 +36,11 @@ func TestTagMetaRegistry(t *testing.T) {
 	assert.Equal(t, "id", idMeta.columnName)
 	assert.Equal(t, "Id", idMeta.fieldName)
 	assert.Equal(t, reflect.TypeOf(int64(0)), idMeta.typ)
-	assert.False(t, idMeta.isAutoIncrement)
-	assert.False(t, idMeta.isPrimaryKey)
+	assert.True(t, idMeta.isAutoIncrement)
+	assert.True(t, idMeta.isPrimaryKey)
 
 	idMetaFistName := meta.fieldMap["FirstName"]
-	assert.Equal(t, "fist_name", idMetaFistName.columnName)
+	assert.Equal(t, "first_name", idMetaFistName.columnName)
 	assert.Equal(t, "FirstName", idMetaFistName.fieldName)
 	assert.Equal(t, reflect.TypeOf(string("")), idMetaFistName.typ)