Repository: kylin
Updated Branches:
  refs/heads/master 7a6dd1ca3 -> 6d11dd1d2


KYLIN-1875 Kylin support SnowFlake schema (alias name rule)

Signed-off-by: zhongjian <jiat...@163.com>


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8581f1d2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8581f1d2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8581f1d2

Branch: refs/heads/master
Commit: 8581f1d203cee9fe3d834d6beb9f6bf7717f921a
Parents: 7a6dd1c
Author: luguosheng <550175...@qq.com>
Authored: Tue Feb 7 16:24:23 2017 +0800
Committer: zhongjian <jiat...@163.com>
Committed: Tue Feb 7 17:08:24 2017 +0800

----------------------------------------------------------------------
 webapp/app/partials/modelDesigner/data_model.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/8581f1d2/webapp/app/partials/modelDesigner/data_model.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/data_model.html 
b/webapp/app/partials/modelDesigner/data_model.html
index 4d72266..167c088 100644
--- a/webapp/app/partials/modelDesigner/data_model.html
+++ b/webapp/app/partials/modelDesigner/data_model.html
@@ -157,8 +157,8 @@
                             <label class="col-sm-3 control-label 
font-color-default"><b>Alias</b></label>
                             <div class="col-sm-6">
                               <input type="text" class="form-control " 
name="joinTable_alias" placeholder="Input Table Alias" ng-required="true"
-                                     ng-model="newLookup.alias"  
ng-pattern="/^\w+$/">
-                              <small class="help-block red" 
ng-show="!lookup_form.joinTable_alias.$error.required&&lookup_form.joinTable_alias.$invalid
 && (lookup_form.joinTable_alias.$dirty||lookup_form.$submitted)"><i class="fa 
fa-exclamation-triangle"></i>&nbsp;&nbsp; Alias is invalid.</small>
+                                     ng-model="newLookup.alias"  
ng-pattern="/^[A-Z_\d]+$/">
+                              <small class="help-block red" 
ng-show="!lookup_form.joinTable_alias.$error.required&&lookup_form.joinTable_alias.$invalid
 && (lookup_form.joinTable_alias.$dirty||lookup_form.$submitted)"><i class="fa 
fa-exclamation-triangle"></i>&nbsp;&nbsp; Table alias is invalid(A Combination 
of numbers, uppercase letters or underscores).</small>
                             </div>
                         </div>
                     </div>

Reply via email to