Skip to content

Commit cd5ba95

Browse files
authored
Merge pull request #2 from rest-go/feature/view
feat: support sqlite view
2 parents 34ee97a + 74382fb commit cd5ba95

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

pkg/log/log.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ var (
2929
func init() { //nolint:gochecknoinits
3030
level := os.Getenv("REST_LOG_LEVEL")
3131
switch strings.ToLower(level) {
32+
case "trace":
33+
logLevel = TraceLevel
3234
case "error":
3335
logLevel = ErrorLevel
3436
case "warn":

pkg/server/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@ func (s *Server) get(r *http.Request, tableName string, urlQuery *sql.URLQuery,
433433
Msg: fmt.Sprintf("expect singular data, but got %d rows", len(objects)),
434434
}
435435
}
436-
return objects[0] // return single map[string]any
436+
return objects[0]
437437
}
438-
return objects // return []map[string]any
438+
return objects
439439
}
440440

441441
func (s *Server) count(r *http.Request, tableName string, urlQuery *sql.URLQuery) any {

pkg/sql/helper_my.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ func (h MyHelper) GetTablesSQL() string {
88
return `
99
SELECT TABLE_NAME as name
1010
FROM information_schema.TABLES
11-
WHERE TABLE_TYPE LIKE 'BASE_TABLE' AND TABLE_SCHEMA=DATABASE();
11+
WHERE (TABLE_TYPE = 'BASE_TABLE' OR TABLE_TYPE = 'view') AND TABLE_SCHEMA=DATABASE();
1212
`
1313
}
1414

pkg/sql/helper_sqlite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func (h SQLiteHelper) GetTablesSQL() string {
1111
FROM
1212
sqlite_schema
1313
WHERE
14-
type ='table' AND
14+
(type ='table' OR type = 'view') AND
1515
name NOT LIKE 'sqlite_%';
1616
`
1717
}

pkg/sql/urlquery.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var (
1919
// date functions
2020
"date", "date_format", "date_part", "date_trunc", "extract", "hour",
2121
"minute", "month", "second", "utctimestamp", "weekofday", "year",
22+
"time", "datetime", "julianday", "unixepoch", "strftime",
2223
// string functions
2324
"bit_length", "chr", "char_length", "left", "length", "ord", "trim",
2425
}

0 commit comments

Comments
 (0)