Merge pull request #454 from visuddhinanda/master

修改表结构 为pg方式

documents/zh/api/channel.md

@@ -2,22 +2,22 @@
 
 ```table
 CREATE TABLE channal (
-    id           int PRIMARY KEY,
-    uuid           CHAR (36),
+    id SERIAL PRIMARY KEY,
+    uuid         VARCHAR (36),
     owner_id     INTEGER NOT NULL,
     owner        VARCHAR (36) NOT NULL,
     name         VARCHAR (32),
     summary      VARCHAR (255),
     status       INTEGER,
-    lang         CHAR (8),
-    create_at  BIGINT,
-    update_at  BIGINT,
-    delete_at BIGINT
+    lang         VARCHAR (8),
+	version     INTEGER NOT NULL DEFAULT (1),
+    deleted_at  TIMESTAMP,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 ```
 
-`owner`        VARCHAR (36) NOT NULL
+`owner` VARCHAR (36) NOT NULL
 
 最初的创建者。
-旧表中的用户id uuid。新表中改用owner_id(int)。
-
+旧表中的用户 id uuid。新表中改用 owner_id(int)。

documents/zh/api/course.md

@@ -1,52 +1,50 @@
-# Course课程
+# Course 课程
 
 ## Table
 
 ```
-CREATE TABLE course 
-( 
-    id SERIAL PRIMARY KEY, 
-    cover BYTEA, 
-    title VARCHAR(32) NOT NULL, 
+CREATE TABLE courses
+(
+    id SERIAL PRIMARY KEY,
+    cover VARCHAR(255),
+    title VARCHAR(32) NOT NULL,
     subtitle VARCHAR(32),
     summary VARCHAR(255),
-    teacher UUID NOT NULL, 
-    tag VARCHAR(255), 
-    lang VARCHAR (8), 
-    speech_lang VARCHAR (8), 
-    status INTEGER, 
-    lesson_num INTEGER, 
-    creator UUID NOT NULL, 
-    create_time INTEGER, 
-    update_time INTEGER, 
-    delete_time INTEGER , 
-    content TEXT
+    teacher INTEGER NOT NULL,
+    lang VARCHAR (8),
+    speech_lang VARCHAR (8),
+    status INTEGER NOT NULL DEFAULT(0),
+    lesson_num INTEGER NOT NULL DEFAULT(0),
+    content TEXT ,
+    creator INTEGER NOT NULL,
+    version INTEGER,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 ```
 
 ```
-CREATE TABLE 'lesson' 
-( 
-    id SERIAL PRIMARY KEY, 
-    course_id INTEGER,
-    title VARCHAR(32) NOT NULL, 
-    subtitle VARCHAR(32), 
-    creator CHAR (36), 
-    tag VARCHAR(255), 
-    summary VARCHAR(255), 
-    status INTEGER, 
-    cover BYTEA, 
-    teacher UUID NOT NULL, 
-    lang VARCHAR (8), 
-    speech_lang VARCHAR (8), 
-    create_time INTEGER, 
-    modify_time INTEGER, 
-    receive_time INTEGER , 
-    'date' INTEGER, 
-    'duration' INTEGER, 
-    'content' TEXT
+CREATE TABLE lessons
+(
+    id SERIAL PRIMARY KEY,
+    course_id INTEGER NOT NULL,
+    course_uuid VARCHAR(36),
+    title VARCHAR(32) NOT NULL,
+    subtitle VARCHAR(32),
+    summary VARCHAR(255),
+    status INTEGER  NOT NULL DEFAULT(0),
+    cover VARCHAR(255),
+    teacher INTEGER,
+    lang VARCHAR(8),
+    speech_lang VARCHAR(8),
+    start_date TIMESTAMP,
+    duration INTEGER,
+    content TEXT,
+    creator INTEGER  NOT NULL,
+    version INTEGER,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
-
 ```
 
 ## API
@@ -60,4 +58,4 @@ GET /api/lesson/:lid
 GET /api/lessons/:cid
 PUT /api/lesson/?data=data
 POST /api/lesson/:lid/?data=data
-DELETE /api/lesson/:lid
+DELETE /api/lesson/:lid

documents/zh/api/translation.md

@@ -1,18 +1,18 @@
 # 译文
 
-## 句子块sent_block
+## 句子块 sent_block
 
 ```table
 CREATE TABLE sent_block (
-    id           int PRIMARY KEY,
-    uuid         CHAR (36),
-    parent_id    CHAR (36),
+    id SERIAL PRIMARY KEY,
+    uuid         VARCHAR (36),
+    parent_id    VARCHAR (36),
     book         INTEGER,
     paragraph    INTEGER,
     owner_id     INTEGER NOT NULL,
-    owner        CHAR (36) NOT NULL,
-    lang         CHAR (8),
-    author       CHAR (50),
+    owner        VARCHAR (36) NOT NULL,
+    lang         VARCHAR (8),
+    author       VARCHAR (50),
     editor_id    INTEGER,
     editor       TEXT,
     status       INTEGER,
@@ -26,9 +26,10 @@ CREATE TABLE sent_block (
 
 `paragraph` 书号
 
-`author` 
+`author`
 
 编辑者列表。还没设计好。 可能是这样
+
 ```
 [
     {"creater":"bhikkhu bodhi"},
@@ -41,6 +42,7 @@ CREATE TABLE sent_block (
 `owner` 记录的创建者
 
 ## sentence
+
 ```table
 CREATE TABLE sentence (
     id           int PRIMARY KEY,
@@ -59,25 +61,25 @@ CREATE TABLE sentence (
     version      INTEGER,
     status       INTEGER,
     strlen       INTEGER,
-    create_at    BIGINT  NOT NULL, 
+    create_at    BIGINT  NOT NULL,
     update_at    BIGINT   NOT NULL,
     delete_at    BIGINT,
 
 );
 ```
-`uuid` 原表的主键 新表中用int代替
 
-`channel_id` 外键 原表 channal uuid 导入后应改为int
+`uuid` 原表的主键 新表中用 int 代替
+
+`channel_id` 外键 原表 channal uuid 导入后应改为 int
 
 `editor_id` 记录的上传者 外键 原表用 uuid 现在改用 int
 
-`text` 句子文本 
+`text` 句子文本
 
 `version` 用于乐观锁 每次更新+1
 
 `strlen` 句子字符数
 
-
 ```table
 CREATE TABLE sent_pr (
     id           INTEGER      PRIMARY KEY AUTOINCREMENT,
@@ -92,7 +94,7 @@ CREATE TABLE sent_pr (
     language     VARCHAR (8),
     status       INTEGER,
     strlen       INTEGER,
-    create_at    BIGINT  NOT NULL, 
+    create_at    BIGINT  NOT NULL,
     update_at    BIGINT   NOT NULL,
     delete_at    BIGINT,
 );
@@ -111,10 +113,10 @@ CREATE TABLE sent_historay (
 );
 ```
 
-`sent_id` 外键 导入后改为int
+`sent_id` 外键 导入后改为 int
 
-`user_id` 外键 导入后改为int
+`user_id` 外键 导入后改为 int
 
 `text` 句子文本
 
-`landmark` 里程碑标记
+`landmark` 里程碑标记