添加 jsp shell 样本,修正custom模式数据库部分逻辑

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## 2016/03
 
+### /26
+  1. 调整 Custom 方式数据库部分代码
+  2. 添加 Shells 目录, 用于存放 shell 样本代码
+  3. 添加 `custom.jsp` 服务端样本代码
+
 ### /24
   1. 文件管理双击文件进行编辑 //size < 100kb
 

source/core/custom/template/database/default.jsx

-// 
+//
 // 默认代码模板
-// 
+//
 // @params
 // :encode  SHELL编码
 // :conn    数据库连接字符串
 // :sql     执行SQL语句
-// 
+// :db      数据库名
+// :table   表名
 
 module.exports = {
   show_databases: {
@@ -16,12 +17,15 @@ module.exports = {
   show_tables: {
     _: 'O',
     'z0': '#{encode}',
-    'z1': '#{conn}'
+    'z1': '#{conn}',
+    'z2': '#{db}'
   },
   show_columns: {
     _: 'P',
     'z0': '#{encode}',
-    'z1': '#{conn}'
+    'z1': '#{conn}',
+    'z2': '#{db}',
+    'z3': '#{table}'
   },
   query: {
     _: 'Q',
@@ -29,4 +33,4 @@ module.exports = {
     'z1': '#{conn}',
     'z2': '#{sql}'
   }
-}
\ No newline at end of file
+}

source/modules/database/custom/index.jsx

-// 
+//
 // 数据库驱动::ASP
 // 支持数据库:access,sqlserver,mysql
-// 
+//
 
 class ASP {
 
@@ -9,9 +9,9 @@ class ASP {
     this.opt = opt;
     this.core = this.opt.core;
     this.manager = this.opt.super;
-    // 
+    //
     // * 数据库驱动列表
-    // 
+    //
     this.conns = {
       'mysql': 'com.mysql.jdbc.Driver\r\njdbc:mysql://localhost/test?user=root&password=123456',
       'sqlserver': 'com.microsoft.sqlserver.jdbc.SQLServerDriver\r\njdbc:sqlserver://127.0.0.1:1433;databaseName=test;user=sa;password=123456',
@@ -71,10 +71,11 @@ class ASP {
         // 生成查询SQL语句
         case 'column':
           let _co = arr[1].split(':');
+          const db = new Buffer(_co[1], 'base64').toString();
           const table = new Buffer(_co[2], 'base64').toString();
           const column = new Buffer(_co[3], 'base64').toString();
 
-          const sql = `SELECT TOP 20 [${column}] FROM [${table}] ORDER BY 1 DESC;`;
+          const sql = `SELECT ${column} FROM ${db}.${table} ORDER BY 1 DESC;`;
           this.manager.query.editor.session.setValue(sql);
           break;
       }
@@ -253,7 +254,7 @@ class ASP {
     {
       conn: conf['conn'],
       encode: this.manager.opt.encode,
-      dbname: ['access', 'microsoft_jet_oledb_4_0'].indexOf(conf['type']) > -1 ? conf['conn'].match(/[\w]+.mdb$/) : 'database'
+      db: ['access', 'microsoft_jet_oledb_4_0'].indexOf(conf['type']) > -1 ? conf['conn'].match(/[\w]+.mdb$/) : 'database'
     }, (ret) => {
       const arr = ret.split('\t');
       if (arr.length === 1 && ret === '') {
@@ -293,7 +294,7 @@ class ASP {
     {
       conn: conf['conn'],
       encode: this.manager.opt.encode,
-      dbname: db
+      db: db
     }, (ret) => {
       const arr = ret.split('\t');
       const _db = new Buffer(db).toString('base64');
@@ -329,7 +330,8 @@ class ASP {
     {
       conn: conf['conn'],
       encode: this.manager.opt.encode,
-      table: conf['type'] === 'oracle' ? `SELECT * FROM (SELECT A.*,ROWNUM N FROM ${table} A) WHERE N=1` : `SELECT TOP 1 * FROM ${table}`
+      db: db,
+      table: table
     }, (ret) => {
       const arr = ret.split('\t');
       const _db = new Buffer(db).toString('base64');
@@ -352,8 +354,8 @@ class ASP {
       // 更新编辑器SQL语句
       this.manager.query.editor.session.setValue(
         conf['type'] === 'oracle'
-        ? `SELECT * FROM (SELECT A.*,ROWNUM N FROM ${table} A ORDER BY 1 DESC) WHERE N>0 AND N<=20`
-        : `SELECT TOP 20 * FROM ${table} ORDER BY 1 DESC;`);
+        ? `SELECT * FROM (SELECT A.*,ROWNUM N FROM ${db}.${table} A ORDER BY 1 DESC) WHERE N>0 AND N<=20`
+        : `SELECT * FROM ${db}.${table} ORDER BY 1 DESC LIMIT 0,20;`);
       this.manager.list.layout.progressOff();
     });
   }
@@ -454,4 +456,4 @@ class ASP {
 
 }
 
-module.exports = ASP;
\ No newline at end of file
+module.exports = ASP;