Merge branch 'pr-375': support sqlite3

ouqiang#375

Author: zqhong

go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/klauspost/compress v1.5.0 // indirect
 	github.com/klauspost/cpuid v1.2.1 // indirect
 	github.com/lib/pq v1.1.1
+	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/ouqiang/goutil v1.1.1
 	github.com/rakyll/statik v0.1.7
 	github.com/sirupsen/logrus v1.4.2

go.sum

@@ -75,6 +75,8 @@ github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
+github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/ouqiang/goutil v1.1.1 h1:r5EKn1jw6vBnj0sLrk3XWeQGxG5ftjGQ3ftuiiO2DYE=
 github.com/ouqiang/goutil v1.1.1/go.mod h1:QrB1Ky4uGqcixxOx55MXweI3IA6nDZ0NtLMXbMfkur4=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=

internal/models/model.go

@@ -125,6 +125,8 @@ func getDbEngineDSN(setting *setting.Setting) string {
 			setting.Db.Host,
 			setting.Db.Port,
 			setting.Db.Database)
+	case "sqlite3":
+		dsn = setting.Db.Database
 	}
 
 	return dsn

internal/models/model_test.go

@@ -0,0 +1,84 @@
+package models
+
+import (
+	"os"
+	"testing"
+
+	_ "github.com/mattn/go-sqlite3"
+	"github.com/ouqiang/gocron/internal/modules/app"
+	"github.com/ouqiang/gocron/internal/modules/logger"
+	"github.com/ouqiang/gocron/internal/modules/setting"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDSN(t *testing.T) {
+	cfg := &setting.Setting{
+		Db: struct {
+			Engine       string
+			Host         string
+			Port         int
+			User         string
+			Password     string
+			Database     string
+			Prefix       string
+			Charset      string
+			MaxIdleConns int
+			MaxOpenConns int
+		}{Engine: "sqlite3", Database: "./test.db"},
+		AllowIps:         "",
+		AppName:          "",
+		ApiKey:           "",
+		ApiSecret:        "",
+		ApiSignEnable:    false,
+		EnableTLS:        false,
+		CAFile:           "",
+		CertFile:         "",
+		KeyFile:          "",
+		ConcurrencyQueue: 0,
+		AuthSecret:       "",
+	}
+	dsn := getDbEngineDSN(cfg)
+	t.Log("dsn: ", dsn)
+	assert.NotEmpty(t, dsn)
+}
+
+func TestCreateDb(t *testing.T) {
+	logger.InitLogger()
+	cfg := &setting.Setting{
+		Db: struct {
+			Engine       string
+			Host         string
+			Port         int
+			User         string
+			Password     string
+			Database     string
+			Prefix       string
+			Charset      string
+			MaxIdleConns int
+			MaxOpenConns int
+		}{Engine: "sqlite3", Database: "./test.db"},
+		AllowIps:         "",
+		AppName:          "",
+		ApiKey:           "",
+		ApiSecret:        "",
+		ApiSignEnable:    false,
+		EnableTLS:        false,
+		CAFile:           "",
+		CertFile:         "",
+		KeyFile:          "",
+		ConcurrencyQueue: 0,
+		AuthSecret:       "",
+	}
+	app.Setting = cfg
+
+	os.Remove(cfg.Db.Database)
+	defer os.Remove(cfg.Db.Database)
+
+	// 创建数据库并初始化
+	Db = CreateDb()
+	assert.NotNil(t, Db)
+
+	migrate := new(Migration)
+	err := migrate.Install("hello")
+	assert.Nil(t, err)
+}

internal/routers/install/install.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
+	_ "github.com/mattn/go-sqlite3"
 	macaron "gopkg.in/macaron.v1"
 
 	"github.com/go-macaron/binding"
@@ -20,7 +21,7 @@ import (
 // 系统安装
 
 type InstallForm struct {
-	DbType               string `binding:"In(mysql,postgres)"`
+	DbType               string `binding:"In(mysql,postgres,sqlite3)"`
 	DbHost               string `binding:"Required;MaxSize(50)"`
 	DbPort               int    `binding:"Required;Range(1,65535)"`
 	DbUsername           string `binding:"Required;MaxSize(50)"`

web/vue/src/pages/install/index.vue

@@ -12,6 +12,7 @@
               :value="item.value">
             </el-option>
           </el-select>
+          <label title="使用sqlite3时需要在数据库名称中配置文件路径，主机名/端口/用户名/密码随意">❓</label>
         </el-form-item>
         <el-row>
           <el-col :span="12">
@@ -143,11 +144,16 @@ export default {
         {
           value: 'postgres',
           label: 'PostgreSql'
+        },
+        {
+          value: 'sqlite3',
+          label: 'sqlite3'
         }
       ],
       default_ports: {
         'mysql': 3306,
-        'postgres': 5432
+        'postgres': 5432,
+        'sqlite3': 1
       }
     }
   },