Repository: kylin Updated Branches: refs/heads/master 14c680c94 -> 71f373507
Partition-Date-Column-Add-Type-Integer-Kylin Signed-off-by: Jason <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/71f37350 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/71f37350 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/71f37350 Branch: refs/heads/master Commit: 71f3735073d3e29c0620c1e680d41dd495ff5ec0 Parents: 14c680c Author: chenzhx <346839...@qq.com> Authored: Sun Oct 9 11:32:54 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Sun Oct 9 19:36:34 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/modelEdit.js | 4 ++-- webapp/app/partials/modelDesigner/conditions_settings.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/71f37350/webapp/app/js/controllers/modelEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index 65e17fa..b843829 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -35,7 +35,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati $scope.getPartitonColumns = function(tableName){ var columns = _.filter($scope.getColumnsByTable(tableName),function(column){ - return column.datatype==="date"||column.datatype==="timestamp"||column.datatype==="string"||column.datatype.startsWith("varchar")||column.datatype==="bigint"||column.datatype==="int"; + return column.datatype==="date"||column.datatype==="timestamp"||column.datatype==="string"||column.datatype.startsWith("varchar")||column.datatype==="bigint"||column.datatype==="int"||column.datatype==="integer"; }); return columns; }; @@ -79,7 +79,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati if(dateColumn==columnName) return _column; }); - if(column[0].datatype==="bigint"||column[0].datatype==="int"){ + if(column[0].datatype==="bigint"||column[0].datatype==="int"||column[0].datatype==="integer"){ $scope.isBigInt=true; $scope.modelsManager.selectedModel.partition_desc.partition_date_format=null;; $scope.partitionColumn.hasSeparateTimeColumn=false; http://git-wip-us.apache.org/repos/asf/kylin/blob/71f37350/webapp/app/partials/modelDesigner/conditions_settings.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html index f0390e5..1de93b4 100644 --- a/webapp/app/partials/modelDesigner/conditions_settings.html +++ b/webapp/app/partials/modelDesigner/conditions_settings.html @@ -164,7 +164,7 @@ <script type="text/ng-template" id="partitionTip.html"> <ol> <li>Partition date column not required,leave as default if cube always need full build</Li> - <li>Column should contain date value (type can be Date, Timestamp, String, VARCHAR, Int, BigInt, etc.)</li> + <li>Column should contain date value (type can be Date, Timestamp, String, VARCHAR, Int, Integer, BigInt, etc.)</li> </ol> </script>
