diff --git a/public/app/plugins/panel/alertlist/module.ts b/public/app/plugins/panel/alertlist/module.ts
index 35fbaead3b1..55869ce626d 100644
--- a/public/app/plugins/panel/alertlist/module.ts
+++ b/public/app/plugins/panel/alertlist/module.ts
@@ -21,6 +21,7 @@ class AlertListPanel extends PanelCtrl {
currentAlerts: any = [];
alertHistory: any = [];
noAlertsMessage: string;
+
// Set and populate defaults
panelDefaults = {
show: 'current',
@@ -28,6 +29,9 @@ class AlertListPanel extends PanelCtrl {
stateFilter: [],
onlyAlertsOnDashboard: false,
sortOrder: 1,
+ dashboardFilter: '',
+ nameFilter: '',
+ folderId: null,
};
/** @ngInject */
@@ -89,6 +93,11 @@ class AlertListPanel extends PanelCtrl {
});
}
+ onFolderChange(folder: any) {
+ this.panel.folderId = folder.id;
+ this.refresh();
+ }
+
getStateChanges() {
var params: any = {
limit: this.panel.limit,
@@ -110,6 +119,7 @@ class AlertListPanel extends PanelCtrl {
al.info = alertDef.getAlertAnnotationInfo(al);
return al;
});
+
this.noAlertsMessage = this.alertHistory.length === 0 ? 'No alerts in current time range' : '';
return this.alertHistory;
@@ -121,10 +131,26 @@ class AlertListPanel extends PanelCtrl {
state: this.panel.stateFilter,
};
+ if (this.panel.nameFilter) {
+ params.query = this.panel.nameFilter;
+ }
+
+ if (this.panel.folderId >= 0) {
+ params.folderId = this.panel.folderId;
+ }
+
+ if (this.panel.dashboardFilter) {
+ params.dashboardQuery = this.panel.dashboardFilter;
+ }
+
if (this.panel.onlyAlertsOnDashboard) {
params.dashboardId = this.dashboard.id;
}
+ if (this.panel.dashboardTags) {
+ params.dashboardTag = this.panel.dashboardTags;
+ }
+
return this.backendSrv.get(`/api/alerts`, params).then(res => {
this.currentAlerts = this.sortResult(
_.map(res, al => {
@@ -135,6 +161,9 @@ class AlertListPanel extends PanelCtrl {
return al;
})
);
+ if (this.currentAlerts.length > this.panel.limit) {
+ this.currentAlerts = this.currentAlerts.slice(0, this.panel.limit);
+ }
this.noAlertsMessage = this.currentAlerts.length === 0 ? 'No alerts' : '';
return this.currentAlerts;
diff --git a/public/app/plugins/panel/singlestat/editor.html b/public/app/plugins/panel/singlestat/editor.html
index f444cd0170c..15f4e6a9efa 100644
--- a/public/app/plugins/panel/singlestat/editor.html
+++ b/public/app/plugins/panel/singlestat/editor.html
@@ -61,7 +61,7 @@
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index b1996d8ffc9..20c4dcfeb70 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -580,6 +580,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
lines: {
show: true,
fill: 1,
+ zero: false,
lineWidth: 1,
fillColor: panel.sparkline.fillColor,
},
@@ -713,11 +714,13 @@ function getColorForValue(data, value) {
if (!_.isFinite(value)) {
return null;
}
+
for (var i = data.thresholds.length; i > 0; i--) {
if (value >= data.thresholds[i - 1]) {
return data.colorMap[i];
}
}
+
return _.first(data.colorMap);
}
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 6a61315f956..b10084d1941 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -3,7 +3,6 @@ import './ReactContainer';
import ServerStats from 'app/containers/ServerStats/ServerStats';
import AlertRuleList from 'app/containers/AlertRuleList/AlertRuleList';
-// import Explore from 'app/containers/Explore/Explore';
import FolderSettings from 'app/containers/ManageDashboards/FolderSettings';
import FolderPermissions from 'app/containers/ManageDashboards/FolderPermissions';
@@ -114,7 +113,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
.when('/explore/:initial?', {
template: '
',
resolve: {
- component: () => import(/* webpackChunkName: "explore" */ 'app/containers/Explore/Explore'),
+ component: () => import(/* webpackChunkName: "explore" */ 'app/containers/Explore/Wrapper'),
},
})
.when('/org', {
diff --git a/public/img/resize-handle-white.svg b/public/img/resize-handle-white.svg
deleted file mode 100644
index 110ff8edfbb..00000000000
--- a/public/img/resize-handle-white.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 6e86aa1872e..4907540815d 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -45,6 +45,10 @@ $brand-warning: $brand-primary;
$brand-danger: $red;
$query-blue: $blue;
+$query-red: $red;
+$query-green: $green;
+$query-purple: $purple;
+$query-orange: $orange;
// Status colors
// -------------------------
@@ -176,6 +180,9 @@ $btn-inverse-bg-hl: lighten($dark-3, 4%);
$btn-inverse-text-color: $link-color;
$btn-inverse-text-shadow: 0px 1px 0 rgba(0, 0, 0, 0.1);
+$btn-active-bg: $gray-4;
+$btn-active-text-color: $blue-dark;
+
$btn-link-color: $gray-3;
$iconContainerBackground: $black;
@@ -204,6 +211,11 @@ $input-invalid-border-color: lighten($red, 5%);
$search-shadow: 0 0 30px 0 $black;
$search-filter-box-bg: $gray-blue;
+// Typeahead
+$typeahead-shadow: 0 5px 10px 0 $black;
+$typeahead-selected-bg: $dark-4;
+$typeahead-selected-color: $blue;
+
// Dropdowns
// -------------------------
$dropdownBackground: $dark-3;
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index bb8f93dbe69..14716f6dfef 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -46,6 +46,10 @@ $brand-warning: $orange;
$brand-danger: $red;
$query-blue: $blue-dark;
+$query-red: $red;
+$query-green: $green;
+$query-purple: $purple;
+$query-orange: $orange;
// Status colors
// -------------------------
@@ -173,6 +177,9 @@ $btn-inverse-bg-hl: darken($gray-6, 5%);
$btn-inverse-text-color: $gray-1;
$btn-inverse-text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+$btn-active-bg: $white;
+$btn-active-text-color: $blue-dark;
+
$btn-link-color: $gray-1;
$btn-divider-left: $gray-4;
@@ -226,6 +233,11 @@ $tab-border-color: $gray-5;
$search-shadow: 0 5px 30px 0 $gray-4;
$search-filter-box-bg: $gray-7;
+// Typeahead
+$typeahead-shadow: 0 5px 10px 0 $gray-5;
+$typeahead-selected-bg: lighten($blue, 25%);
+$typeahead-selected-color: $blue-dark;
+
// Dropdowns
// -------------------------
$dropdownBackground: $white;
diff --git a/public/sass/components/_dashboard_grid.scss b/public/sass/components/_dashboard_grid.scss
index aec08d72258..f1908ca8786 100644
--- a/public/sass/components/_dashboard_grid.scss
+++ b/public/sass/components/_dashboard_grid.scss
@@ -1,4 +1,4 @@
-@import '~react-grid-layout-grafana/css/styles.css';
+@import '~react-grid-layout/css/styles.css';
@import '~react-resizable/css/styles.css';
.panel-in-fullscreen {
@@ -18,6 +18,20 @@
height: 100% !important;
transform: translate(0px, 0px) !important;
}
+
+ // Disable grid interaction indicators in fullscreen panels
+
+ .panel-header:hover {
+ background-color: inherit;
+ }
+
+ .panel-title-container {
+ cursor: pointer;
+ }
+
+ .react-resizable-handle {
+ display: none;
+ }
}
@include media-breakpoint-down(sm) {
@@ -44,11 +58,6 @@
border-right: 2px solid $gray-1;
border-bottom: 2px solid $gray-1;
}
- // temp fix since we use old commit of grid component
- // this can be removed when we revert to non fork grid component
- .react-grid-item > .react-resizable-handle {
- background-image: url('../img/resize-handle-white.svg');
- }
}
.theme-light {
diff --git a/public/sass/components/_panel_singlestat.scss b/public/sass/components/_panel_singlestat.scss
index 33a956a0244..af11de3b835 100644
--- a/public/sass/components/_panel_singlestat.scss
+++ b/public/sass/components/_panel_singlestat.scss
@@ -7,13 +7,14 @@
.singlestat-panel-value-container {
line-height: 1;
- display: table-cell;
- vertical-align: middle;
- text-align: center;
- position: relative;
+ position: absolute;
z-index: 1;
font-size: 3em;
font-weight: bold;
+ margin: 0;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
}
.singlestat-panel-prefix {
diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss
index b1fa47d0c0a..c14590b4ec9 100644
--- a/public/sass/components/_view_states.scss
+++ b/public/sass/components/_view_states.scss
@@ -10,7 +10,8 @@
.playlist-active,
.user-activity-low {
- .react-resizable-handle .add-row-panel-hint,
+ .react-resizable-handle,
+ .add-row-panel-hint,
.dash-row-menu-container,
.navbar-button--refresh,
.navbar-buttons--zoom,
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index 855d11cb859..7dacccf6a87 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -1,11 +1,89 @@
.explore {
+ width: 100%;
+
+ &-container {
+ padding: 2rem;
+ }
+
+ &-wrapper {
+ display: flex;
+
+ > .explore-split {
+ width: 50%;
+ }
+ }
+
+ // Push split button a bit
+ .explore-first-button {
+ margin-left: 15px;
+ }
+
+ // Graph panel needs a bit extra padding at top
+ .panel-container {
+ padding: $panel-padding;
+ padding-top: 10px;
+ }
+
+ // Make sure wrap buttons around on small screens
+ .navbar {
+ flex-wrap: wrap;
+ height: auto;
+ }
+
+ .navbar-page-btn {
+ margin-right: 1rem;
+
+ // Explore icon in header
+ .fa {
+ font-size: 100%;
+ opacity: 0.75;
+ margin-right: 0.5em;
+ }
+ }
+
+ // Toggle mode
+ .navbar-button.active {
+ color: $btn-active-text-color;
+ background-color: $btn-active-bg;
+ }
+
+ .elapsed-time {
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 3.5rem;
+ text-align: center;
+ font-size: 0.8rem;
+ }
+
.graph-legend {
flex-wrap: wrap;
}
+
+ .timepicker {
+ display: flex;
+
+ &-rangestring {
+ margin-left: 0.5em;
+ }
+ }
+
+ .run-icon {
+ margin-left: 0.5em;
+ transform: rotate(90deg);
+ }
+
+ .relative {
+ position: relative;
+ }
+}
+
+.explore + .explore {
+ border-left: 1px dotted $table-border;
}
.query-row {
- position: relative;
+ display: flex;
& + & {
margin-top: 0.5rem;
@@ -13,17 +91,12 @@
}
.query-row-tools {
- position: absolute;
- left: -4rem;
- top: 0.33rem;
- > * {
- margin-right: 0.25rem;
- }
+ width: 4rem;
}
.query-field {
- font-size: 14px;
- font-family: Consolas, Menlo, Courier, monospace;
+ font-size: $font-size-root;
+ font-family: $font-family-monospace;
height: auto;
}
@@ -33,54 +106,52 @@
padding: 6px 7px 4px;
width: 100%;
cursor: text;
- line-height: 1.5;
- color: rgba(0, 0, 0, 0.65);
- background-color: #fff;
+ line-height: $line-height-base;
+ color: $text-color-weak;
+ background-color: $panel-bg;
background-image: none;
- border: 1px solid lightgray;
- border-radius: 3px;
+ border: $panel-border;
+ border-radius: $border-radius;
transition: all 0.3s;
}
-.explore {
+.explore-typeahead {
.typeahead {
position: absolute;
z-index: auto;
top: -10000px;
left: -10000px;
opacity: 0;
- border-radius: 4px;
+ border-radius: $border-radius;
transition: opacity 0.75s;
- border: 1px solid #e4e4e4;
+ border: $panel-border;
max-height: calc(66vh);
overflow-y: scroll;
max-width: calc(66%);
overflow-x: hidden;
outline: none;
list-style: none;
- background: #fff;
- color: rgba(0, 0, 0, 0.65);
+ background: $panel-bg;
+ color: $text-color;
transition: opacity 0.4s ease-out;
+ box-shadow: $typeahead-shadow;
}
.typeahead-group__title {
- color: rgba(0, 0, 0, 0.43);
- font-size: 12px;
- line-height: 1.5;
- padding: 8px 16px;
+ color: $text-color-weak;
+ font-size: $font-size-sm;
+ line-height: $line-height-base;
+ padding: $input-padding-y $input-padding-x;
}
.typeahead-item {
- line-height: 200%;
height: auto;
- font-family: Consolas, Menlo, Courier, monospace;
- padding: 0 16px 0 28px;
- font-size: 12px;
+ font-family: $font-family-monospace;
+ padding: $input-padding-y $input-padding-x;
+ padding-left: $input-padding-x-lg;
+ font-size: $font-size-sm;
text-overflow: ellipsis;
overflow: hidden;
- margin-left: -1px;
- left: 1px;
- position: relative;
z-index: 1;
display: block;
white-space: nowrap;
@@ -90,234 +161,82 @@
}
.typeahead-item__selected {
- background-color: #ecf6fd;
- color: #108ee9;
+ background-color: $typeahead-selected-bg;
+ color: $typeahead-selected-color;
}
}
/* SYNTAX */
-/**
- * prism.js Coy theme for JavaScript, CoffeeScript, CSS and HTML
- * Based on https://github.com/tshedor/workshop-wp-theme (Example: http://workshop.kansan.com/category/sessions/basics or http://workshop.timshedor.com/category/sessions/basics);
- * @author Tim Shedor
- */
+.explore {
+ .token.comment,
+ .token.block-comment,
+ .token.prolog,
+ .token.doctype,
+ .token.cdata {
+ color: $text-color-weak;
+ }
-code[class*='language-'],
-pre[class*='language-'] {
- color: black;
- background: none;
- font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
- text-align: left;
- white-space: pre;
- word-spacing: normal;
- word-break: normal;
- word-wrap: normal;
- line-height: 1.5;
+ .token.punctuation {
+ color: $text-color-weak;
+ }
- -moz-tab-size: 4;
- -o-tab-size: 4;
- tab-size: 4;
+ .token.property,
+ .token.tag,
+ .token.boolean,
+ .token.number,
+ .token.function-name,
+ .token.constant,
+ .token.symbol,
+ .token.deleted {
+ color: $query-red;
+ }
- -webkit-hyphens: none;
- -moz-hyphens: none;
- -ms-hyphens: none;
- hyphens: none;
-}
+ .token.selector,
+ .token.attr-name,
+ .token.string,
+ .token.char,
+ .token.function,
+ .token.builtin,
+ .token.inserted {
+ color: $query-green;
+ }
-/* Code blocks */
-pre[class*='language-'] {
- position: relative;
- margin: 0.5em 0;
- overflow: visible;
- padding: 0;
-}
-pre[class*='language-'] > code {
- position: relative;
- border-left: 10px solid #358ccb;
- box-shadow: -1px 0px 0px 0px #358ccb, 0px 0px 0px 1px #dfdfdf;
- background-color: #fdfdfd;
- background-image: linear-gradient(transparent 50%, rgba(69, 142, 209, 0.04) 50%);
- background-size: 3em 3em;
- background-origin: content-box;
- background-attachment: local;
-}
+ .token.operator,
+ .token.entity,
+ .token.url,
+ .token.variable {
+ color: $query-purple;
+ }
-code[class*='language'] {
- max-height: inherit;
- height: inherit;
- padding: 0 1em;
- display: block;
- overflow: auto;
-}
+ .token.atrule,
+ .token.attr-value,
+ .token.keyword,
+ .token.class-name {
+ color: $query-blue;
+ }
-/* Margin bottom to accomodate shadow */
-:not(pre) > code[class*='language-'],
-pre[class*='language-'] {
- background-color: #fdfdfd;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- margin-bottom: 1em;
-}
+ .token.regex,
+ .token.important {
+ color: $query-orange;
+ }
-/* Inline code */
-:not(pre) > code[class*='language-'] {
- position: relative;
- padding: 0.2em;
- border-radius: 0.3em;
- color: #c92c2c;
- border: 1px solid rgba(0, 0, 0, 0.1);
- display: inline;
- white-space: normal;
-}
+ .token.important {
+ font-weight: normal;
+ }
-pre[class*='language-']:before,
-pre[class*='language-']:after {
- content: '';
- z-index: -2;
- display: block;
- position: absolute;
- bottom: 0.75em;
- left: 0.18em;
- width: 40%;
- height: 20%;
- max-height: 13em;
- box-shadow: 0px 13px 8px #979797;
- -webkit-transform: rotate(-2deg);
- -moz-transform: rotate(-2deg);
- -ms-transform: rotate(-2deg);
- -o-transform: rotate(-2deg);
- transform: rotate(-2deg);
-}
+ .token.bold {
+ font-weight: bold;
+ }
+ .token.italic {
+ font-style: italic;
+ }
-:not(pre) > code[class*='language-']:after,
-pre[class*='language-']:after {
- right: 0.75em;
- left: auto;
- -webkit-transform: rotate(2deg);
- -moz-transform: rotate(2deg);
- -ms-transform: rotate(2deg);
- -o-transform: rotate(2deg);
- transform: rotate(2deg);
-}
+ .token.entity {
+ cursor: help;
+ }
-.token.comment,
-.token.block-comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
- color: #7d8b99;
-}
-
-.token.punctuation {
- color: #5f6364;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.function-name,
-.token.constant,
-.token.symbol,
-.token.deleted {
- color: #c92c2c;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.function,
-.token.builtin,
-.token.inserted {
- color: #2f9c0a;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.token.variable {
- color: #a67f59;
- background: rgba(255, 255, 255, 0.5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword,
-.token.class-name {
- color: #1990b8;
-}
-
-.token.regex,
-.token.important {
- color: #e90;
-}
-
-.language-css .token.string,
-.style .token.string {
- color: #a67f59;
- background: rgba(255, 255, 255, 0.5);
-}
-
-.token.important {
- font-weight: normal;
-}
-
-.token.bold {
- font-weight: bold;
-}
-.token.italic {
- font-style: italic;
-}
-
-.token.entity {
- cursor: help;
-}
-
-.namespace {
- opacity: 0.7;
-}
-
-@media screen and (max-width: 767px) {
- pre[class*='language-']:before,
- pre[class*='language-']:after {
- bottom: 14px;
- box-shadow: none;
+ .namespace {
+ opacity: 0.7;
}
}
-
-/* Plugin styles */
-.token.tab:not(:empty):before,
-.token.cr:before,
-.token.lf:before {
- color: #e0d7d1;
-}
-
-/* Plugin styles: Line Numbers */
-pre[class*='language-'].line-numbers {
- padding-left: 0;
-}
-
-pre[class*='language-'].line-numbers code {
- padding-left: 3.8em;
-}
-
-pre[class*='language-'].line-numbers .line-numbers-rows {
- left: 0;
-}
-
-/* Plugin styles: Line Highlight */
-pre[class*='language-'][data-line] {
- padding-top: 0;
- padding-bottom: 0;
- padding-left: 0;
-}
-pre[data-line] code {
- position: relative;
- padding-left: 4em;
-}
-pre .line-highlight {
- margin-top: 0;
-}
diff --git a/public/vendor/plugin-css/css.js b/public/vendor/plugin-css/css.js
index 44839808385..09f28d23b3a 100644
--- a/public/vendor/plugin-css/css.js
+++ b/public/vendor/plugin-css/css.js
@@ -1,6 +1,7 @@
"use strict";
if (typeof window !== 'undefined') {
+ var bust = '?_cache=' + Date.now();
var waitSeconds = 100;
var head = document.getElementsByTagName('head')[0];
@@ -13,8 +14,8 @@ if (typeof window !== 'undefined') {
}
var isWebkit = !!window.navigator.userAgent.match(/AppleWebKit\/([^ ;]*)/);
- var webkitLoadCheck = function(link, callback) {
- setTimeout(function() {
+ var webkitLoadCheck = function (link, callback) {
+ setTimeout(function () {
for (var i = 0; i < document.styleSheets.length; i++) {
var sheet = document.styleSheets[i];
if (sheet.href === link.href) {
@@ -25,17 +26,17 @@ if (typeof window !== 'undefined') {
}, 10);
};
- var noop = function() {};
+ var noop = function () { };
- var loadCSS = function(url) {
- return new Promise(function(resolve, reject) {
- var timeout = setTimeout(function() {
+ var loadCSS = function (url) {
+ return new Promise(function (resolve, reject) {
+ var timeout = setTimeout(function () {
reject('Unable to load CSS');
}, waitSeconds * 1000);
- var _callback = function(error) {
+ var _callback = function (error) {
clearTimeout(timeout);
link.onload = link.onerror = noop;
- setTimeout(function() {
+ setTimeout(function () {
if (error) {
reject(error);
}
@@ -47,22 +48,22 @@ if (typeof window !== 'undefined') {
var link = document.createElement('link');
link.type = 'text/css';
link.rel = 'stylesheet';
- link.href = url;
+ link.href = url + bust;
if (!isWebkit) {
- link.onload = function() {
+ link.onload = function () {
_callback();
}
} else {
webkitLoadCheck(link, _callback);
}
- link.onerror = function(event) {
+ link.onerror = function (event) {
_callback(event.error || new Error('Error loading CSS file.'));
};
head.appendChild(link);
});
};
- exports.fetch = function(load) {
+ exports.fetch = function (load) {
// dont reload styles loaded in the head
for (var i = 0; i < linkHrefs.length; i++)
if (load.address == linkHrefs[i])
diff --git a/scripts/webpack/webpack.dev.js b/scripts/webpack/webpack.dev.js
index 625f921a388..7e43e8179ac 100644
--- a/scripts/webpack/webpack.dev.js
+++ b/scripts/webpack/webpack.dev.js
@@ -5,61 +5,29 @@ const common = require('./webpack.common.js');
const path = require('path');
const webpack = require('webpack');
const HtmlWebpackPlugin = require("html-webpack-plugin");
-const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin');
const ExtractTextPlugin = require("extract-text-webpack-plugin");
const CleanWebpackPlugin = require('clean-webpack-plugin');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-const TARGET = process.env.npm_lifecycle_event;
-const HOT = TARGET === 'start';
-
const extractSass = new ExtractTextPlugin({
- filename: "grafana.[name].css",
- disable: HOT
+ filename: "grafana.[name].css"
});
-const entries = HOT ? {
- app: [
- 'webpack-dev-server/client?http://localhost:3333',
- './public/app/dev.ts',
- ],
- vendor: require('./dependencies'),
-} : {
- app: './public/app/index.ts',
- dark: './public/sass/grafana.dark.scss',
- light: './public/sass/grafana.light.scss',
- vendor: require('./dependencies'),
- };
-
-const output = HOT ? {
- path: path.resolve(__dirname, '../../public/build'),
- filename: '[name].[hash].js',
- publicPath: "/public/build/",
-} : {
- path: path.resolve(__dirname, '../../public/build'),
- filename: '[name].[hash].js',
- // Keep publicPath relative for host.com/grafana/ deployments
- publicPath: "public/build/",
- };
-
module.exports = merge(common, {
devtool: "cheap-module-source-map",
- entry: entries,
-
- output: output,
-
- resolve: {
- extensions: ['.scss', '.ts', '.tsx', '.es6', '.js', '.json', '.svg', '.woff2', '.png'],
+ entry: {
+ app: './public/app/index.ts',
+ dark: './public/sass/grafana.dark.scss',
+ light: './public/sass/grafana.light.scss',
+ vendor: require('./dependencies'),
},
- devServer: {
- publicPath: '/public/build/',
- hot: HOT,
- port: 3333,
- proxy: {
- '!/public/build': 'http://localhost:3000'
- }
+ output: {
+ path: path.resolve(__dirname, '../../public/build'),
+ filename: '[name].[hash].js',
+ // Keep publicPath relative for host.com/grafana/ deployments
+ publicPath: "public/build/",
},
module: {
@@ -83,33 +51,16 @@ module.exports = merge(common, {
loader: 'awesome-typescript-loader',
options: {
useCache: true,
- useBabel: HOT,
- babelOptions: {
- babelrc: false,
- plugins: [
- 'syntax-dynamic-import',
- 'react-hot-loader/babel'
- ]
- }
},
}
},
require('./sass.rule.js')({
- sourceMap: true, minimize: false, preserveUrl: HOT
+ sourceMap: true, minimize: false, preserveUrl: false
}, extractSass),
{
- test: /\.(ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/,
+ test: /\.(png|jpg|gif|ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/,
loader: 'file-loader'
},
- {
- test: /\.(png|jpg|gif)$/,
- use: [
- {
- loader: 'file-loader',
- options: {}
- }
- ]
- },
]
},
@@ -121,13 +72,10 @@ module.exports = merge(common, {
template: path.resolve(__dirname, '../../public/views/index.template.html'),
inject: 'body',
chunks: ['manifest', 'vendor', 'app'],
- alwaysWriteToDisk: HOT
}),
- new HtmlWebpackHarddiskPlugin(),
new webpack.NamedModulesPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.DefinePlugin({
- 'GRAFANA_THEME': JSON.stringify(process.env.GRAFANA_THEME || 'dark'),
'process.env': {
'NODE_ENV': JSON.stringify('development')
}
diff --git a/scripts/webpack/webpack.hot.js b/scripts/webpack/webpack.hot.js
new file mode 100644
index 00000000000..9a2845372ea
--- /dev/null
+++ b/scripts/webpack/webpack.hot.js
@@ -0,0 +1,93 @@
+'use strict';
+
+const merge = require('webpack-merge');
+const common = require('./webpack.common.js');
+const path = require('path');
+const webpack = require('webpack');
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin');
+const CleanWebpackPlugin = require('clean-webpack-plugin');
+
+module.exports = merge(common, {
+ entry: {
+ app: [
+ 'webpack-dev-server/client?http://localhost:3333',
+ './public/app/dev.ts',
+ ],
+ },
+
+ output: {
+ path: path.resolve(__dirname, '../../public/build'),
+ filename: '[name].[hash].js',
+ publicPath: "/public/build/",
+ },
+
+ resolve: {
+ extensions: ['.scss', '.ts', '.tsx', '.es6', '.js', '.json', '.svg', '.woff2', '.png'],
+ },
+
+ devtool: 'eval-source-map',
+
+ devServer: {
+ publicPath: '/public/build/',
+ hot: true,
+ port: 3333,
+ proxy: {
+ '!/public/build': 'http://localhost:3000'
+ }
+ },
+
+ module: {
+ rules: [
+ {
+ test: /\.tsx?$/,
+ exclude: /node_modules/,
+ use: {
+ loader: 'awesome-typescript-loader',
+ options: {
+ useCache: true,
+ useBabel: true,
+ babelOptions: {
+ babelrc: false,
+ plugins: [
+ 'syntax-dynamic-import',
+ 'react-hot-loader/babel'
+ ]
+ }
+ },
+ }
+ },
+ {
+ test: /\.scss$/,
+ use: [
+ "style-loader", // creates style nodes from JS strings
+ "css-loader", // translates CSS into CommonJS
+ "sass-loader" // compiles Sass to CSS
+ ]
+ },
+ {
+ test: /\.(png|jpg|gif|ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/,
+ loader: 'file-loader'
+ },
+ ]
+ },
+
+ plugins: [
+ new CleanWebpackPlugin('../public/build', { allowExternal: true }),
+ new HtmlWebpackPlugin({
+ filename: path.resolve(__dirname, '../../public/views/index.html'),
+ template: path.resolve(__dirname, '../../public/views/index.template.html'),
+ inject: 'body',
+ alwaysWriteToDisk: true
+ }),
+ new HtmlWebpackHarddiskPlugin(),
+ new webpack.NamedModulesPlugin(),
+ new webpack.HotModuleReplacementPlugin(),
+ new webpack.DefinePlugin({
+ 'GRAFANA_THEME': JSON.stringify(process.env.GRAFANA_THEME || 'dark'),
+ 'process.env': {
+ 'NODE_ENV': JSON.stringify('development')
+ }
+ }),
+ ]
+});
diff --git a/vendor/github.com/go-xorm/core/cache.go b/vendor/github.com/go-xorm/core/cache.go
index 8f9531da940..bf81bd52ba4 100644
--- a/vendor/github.com/go-xorm/core/cache.go
+++ b/vendor/github.com/go-xorm/core/cache.go
@@ -1,12 +1,11 @@
package core
import (
- "bytes"
- "encoding/gob"
"errors"
"fmt"
- "strings"
"time"
+ "bytes"
+ "encoding/gob"
)
const (
@@ -56,10 +55,11 @@ func encodeIds(ids []PK) (string, error) {
return buf.String(), err
}
+
func decodeIds(s string) ([]PK, error) {
pks := make([]PK, 0)
- dec := gob.NewDecoder(strings.NewReader(s))
+ dec := gob.NewDecoder(bytes.NewBufferString(s))
err := dec.Decode(&pks)
return pks, err
diff --git a/vendor/github.com/go-xorm/core/column.go b/vendor/github.com/go-xorm/core/column.go
index 65370bb5ba1..d9362e98578 100644
--- a/vendor/github.com/go-xorm/core/column.go
+++ b/vendor/github.com/go-xorm/core/column.go
@@ -79,10 +79,6 @@ func (col *Column) String(d Dialect) string {
}
}
- if col.Default != "" {
- sql += "DEFAULT " + col.Default + " "
- }
-
if d.ShowCreateNull() {
if col.Nullable {
sql += "NULL "
@@ -91,6 +87,10 @@ func (col *Column) String(d Dialect) string {
}
}
+ if col.Default != "" {
+ sql += "DEFAULT " + col.Default + " "
+ }
+
return sql
}
@@ -99,10 +99,6 @@ func (col *Column) StringNoPk(d Dialect) string {
sql += d.SqlType(col) + " "
- if col.Default != "" {
- sql += "DEFAULT " + col.Default + " "
- }
-
if d.ShowCreateNull() {
if col.Nullable {
sql += "NULL "
@@ -111,6 +107,10 @@ func (col *Column) StringNoPk(d Dialect) string {
}
}
+ if col.Default != "" {
+ sql += "DEFAULT " + col.Default + " "
+ }
+
return sql
}
diff --git a/vendor/github.com/go-xorm/core/db.go b/vendor/github.com/go-xorm/core/db.go
index 9969fa43134..6111c4b332f 100644
--- a/vendor/github.com/go-xorm/core/db.go
+++ b/vendor/github.com/go-xorm/core/db.go
@@ -7,11 +7,6 @@ import (
"fmt"
"reflect"
"regexp"
- "sync"
-)
-
-var (
- DefaultCacheSize = 200
)
func MapToSlice(query string, mp interface{}) (string, []interface{}, error) {
@@ -63,16 +58,9 @@ func StructToSlice(query string, st interface{}) (string, []interface{}, error)
return query, args, nil
}
-type cacheStruct struct {
- value reflect.Value
- idx int
-}
-
type DB struct {
*sql.DB
- Mapper IMapper
- reflectCache map[reflect.Type]*cacheStruct
- reflectCacheMutex sync.RWMutex
+ Mapper IMapper
}
func Open(driverName, dataSourceName string) (*DB, error) {
@@ -80,32 +68,11 @@ func Open(driverName, dataSourceName string) (*DB, error) {
if err != nil {
return nil, err
}
- return &DB{
- DB: db,
- Mapper: NewCacheMapper(&SnakeMapper{}),
- reflectCache: make(map[reflect.Type]*cacheStruct),
- }, nil
+ return &DB{db, NewCacheMapper(&SnakeMapper{})}, nil
}
func FromDB(db *sql.DB) *DB {
- return &DB{
- DB: db,
- Mapper: NewCacheMapper(&SnakeMapper{}),
- reflectCache: make(map[reflect.Type]*cacheStruct),
- }
-}
-
-func (db *DB) reflectNew(typ reflect.Type) reflect.Value {
- db.reflectCacheMutex.Lock()
- defer db.reflectCacheMutex.Unlock()
- cs, ok := db.reflectCache[typ]
- if !ok || cs.idx+1 > DefaultCacheSize-1 {
- cs = &cacheStruct{reflect.MakeSlice(reflect.SliceOf(typ), DefaultCacheSize, DefaultCacheSize), 0}
- db.reflectCache[typ] = cs
- } else {
- cs.idx = cs.idx + 1
- }
- return cs.value.Index(cs.idx).Addr()
+ return &DB{db, NewCacheMapper(&SnakeMapper{})}
}
func (db *DB) Query(query string, args ...interface{}) (*Rows, error) {
@@ -116,7 +83,7 @@ func (db *DB) Query(query string, args ...interface{}) (*Rows, error) {
}
return nil, err
}
- return &Rows{rows, db}, nil
+ return &Rows{rows, db.Mapper}, nil
}
func (db *DB) QueryMap(query string, mp interface{}) (*Rows, error) {
@@ -161,8 +128,8 @@ func (db *DB) QueryRowStruct(query string, st interface{}) *Row {
type Stmt struct {
*sql.Stmt
- db *DB
- names map[string]int
+ Mapper IMapper
+ names map[string]int
}
func (db *DB) Prepare(query string) (*Stmt, error) {
@@ -178,7 +145,7 @@ func (db *DB) Prepare(query string) (*Stmt, error) {
if err != nil {
return nil, err
}
- return &Stmt{stmt, db, names}, nil
+ return &Stmt{stmt, db.Mapper, names}, nil
}
func (s *Stmt) ExecMap(mp interface{}) (sql.Result, error) {
@@ -212,7 +179,7 @@ func (s *Stmt) Query(args ...interface{}) (*Rows, error) {
if err != nil {
return nil, err
}
- return &Rows{rows, s.db}, nil
+ return &Rows{rows, s.Mapper}, nil
}
func (s *Stmt) QueryMap(mp interface{}) (*Rows, error) {
@@ -307,7 +274,7 @@ func (EmptyScanner) Scan(src interface{}) error {
type Tx struct {
*sql.Tx
- db *DB
+ Mapper IMapper
}
func (db *DB) Begin() (*Tx, error) {
@@ -315,7 +282,7 @@ func (db *DB) Begin() (*Tx, error) {
if err != nil {
return nil, err
}
- return &Tx{tx, db}, nil
+ return &Tx{tx, db.Mapper}, nil
}
func (tx *Tx) Prepare(query string) (*Stmt, error) {
@@ -331,7 +298,7 @@ func (tx *Tx) Prepare(query string) (*Stmt, error) {
if err != nil {
return nil, err
}
- return &Stmt{stmt, tx.db, names}, nil
+ return &Stmt{stmt, tx.Mapper, names}, nil
}
func (tx *Tx) Stmt(stmt *Stmt) *Stmt {
@@ -360,7 +327,7 @@ func (tx *Tx) Query(query string, args ...interface{}) (*Rows, error) {
if err != nil {
return nil, err
}
- return &Rows{rows, tx.db}, nil
+ return &Rows{rows, tx.Mapper}, nil
}
func (tx *Tx) QueryMap(query string, mp interface{}) (*Rows, error) {
diff --git a/vendor/github.com/go-xorm/core/dialect.go b/vendor/github.com/go-xorm/core/dialect.go
index c288a084783..6f2e81d017b 100644
--- a/vendor/github.com/go-xorm/core/dialect.go
+++ b/vendor/github.com/go-xorm/core/dialect.go
@@ -74,7 +74,6 @@ type Dialect interface {
GetIndexes(tableName string) (map[string]*Index, error)
Filters() []Filter
- SetParams(params map[string]string)
}
func OpenDialect(dialect Dialect) (*DB, error) {
@@ -149,8 +148,7 @@ func (db *Base) SupportDropIfExists() bool {
}
func (db *Base) DropTableSql(tableName string) string {
- quote := db.dialect.Quote
- return fmt.Sprintf("DROP TABLE IF EXISTS %s", quote(tableName))
+ return fmt.Sprintf("DROP TABLE IF EXISTS `%s`", tableName)
}
func (db *Base) HasRecords(query string, args ...interface{}) (bool, error) {
@@ -291,9 +289,6 @@ func (b *Base) LogSQL(sql string, args []interface{}) {
}
}
-func (b *Base) SetParams(params map[string]string) {
-}
-
var (
dialects = map[string]func() Dialect{}
)
diff --git a/vendor/github.com/go-xorm/core/filter.go b/vendor/github.com/go-xorm/core/filter.go
index 35b0ece6764..60caaf29026 100644
--- a/vendor/github.com/go-xorm/core/filter.go
+++ b/vendor/github.com/go-xorm/core/filter.go
@@ -37,9 +37,9 @@ func (q *Quoter) Quote(content string) string {
func (i *IdFilter) Do(sql string, dialect Dialect, table *Table) string {
quoter := NewQuoter(dialect)
if table != nil && len(table.PrimaryKeys) == 1 {
- sql = strings.Replace(sql, " `(id)` ", " "+quoter.Quote(table.PrimaryKeys[0])+" ", -1)
- sql = strings.Replace(sql, " "+quoter.Quote("(id)")+" ", " "+quoter.Quote(table.PrimaryKeys[0])+" ", -1)
- return strings.Replace(sql, " (id) ", " "+quoter.Quote(table.PrimaryKeys[0])+" ", -1)
+ sql = strings.Replace(sql, "`(id)`", quoter.Quote(table.PrimaryKeys[0]), -1)
+ sql = strings.Replace(sql, quoter.Quote("(id)"), quoter.Quote(table.PrimaryKeys[0]), -1)
+ return strings.Replace(sql, "(id)", quoter.Quote(table.PrimaryKeys[0]), -1)
}
return sql
}
diff --git a/vendor/github.com/go-xorm/core/index.go b/vendor/github.com/go-xorm/core/index.go
index 9aa1b7ac99b..73b95175adc 100644
--- a/vendor/github.com/go-xorm/core/index.go
+++ b/vendor/github.com/go-xorm/core/index.go
@@ -22,8 +22,6 @@ type Index struct {
func (index *Index) XName(tableName string) string {
if !strings.HasPrefix(index.Name, "UQE_") &&
!strings.HasPrefix(index.Name, "IDX_") {
- tableName = strings.Replace(tableName, `"`, "", -1)
- tableName = strings.Replace(tableName, `.`, "_", -1)
if index.Type == UniqueType {
return fmt.Sprintf("UQE_%v_%v", tableName, index.Name)
}
diff --git a/vendor/github.com/go-xorm/core/rows.go b/vendor/github.com/go-xorm/core/rows.go
index 580de4f9c66..4a4acaa4c26 100644
--- a/vendor/github.com/go-xorm/core/rows.go
+++ b/vendor/github.com/go-xorm/core/rows.go
@@ -9,7 +9,7 @@ import (
type Rows struct {
*sql.Rows
- db *DB
+ Mapper IMapper
}
func (rs *Rows) ToMapString() ([]map[string]string, error) {
@@ -105,7 +105,7 @@ func (rs *Rows) ScanStructByName(dest interface{}) error {
newDest := make([]interface{}, len(cols))
var v EmptyScanner
for j, name := range cols {
- f := fieldByName(vv.Elem(), rs.db.Mapper.Table2Obj(name))
+ f := fieldByName(vv.Elem(), rs.Mapper.Table2Obj(name))
if f.IsValid() {
newDest[j] = f.Addr().Interface()
} else {
@@ -116,6 +116,36 @@ func (rs *Rows) ScanStructByName(dest interface{}) error {
return rs.Rows.Scan(newDest...)
}
+type cacheStruct struct {
+ value reflect.Value
+ idx int
+}
+
+var (
+ reflectCache = make(map[reflect.Type]*cacheStruct)
+ reflectCacheMutex sync.RWMutex
+)
+
+func ReflectNew(typ reflect.Type) reflect.Value {
+ reflectCacheMutex.RLock()
+ cs, ok := reflectCache[typ]
+ reflectCacheMutex.RUnlock()
+
+ const newSize = 200
+
+ if !ok || cs.idx+1 > newSize-1 {
+ cs = &cacheStruct{reflect.MakeSlice(reflect.SliceOf(typ), newSize, newSize), 0}
+ reflectCacheMutex.Lock()
+ reflectCache[typ] = cs
+ reflectCacheMutex.Unlock()
+ } else {
+ reflectCacheMutex.Lock()
+ cs.idx = cs.idx + 1
+ reflectCacheMutex.Unlock()
+ }
+ return cs.value.Index(cs.idx).Addr()
+}
+
// scan data to a slice's pointer, slice's length should equal to columns' number
func (rs *Rows) ScanSlice(dest interface{}) error {
vv := reflect.ValueOf(dest)
@@ -167,7 +197,9 @@ func (rs *Rows) ScanMap(dest interface{}) error {
vvv := vv.Elem()
for i, _ := range cols {
- newDest[i] = rs.db.reflectNew(vvv.Type().Elem()).Interface()
+ newDest[i] = ReflectNew(vvv.Type().Elem()).Interface()
+ //v := reflect.New(vvv.Type().Elem())
+ //newDest[i] = v.Interface()
}
err = rs.Rows.Scan(newDest...)
@@ -183,6 +215,32 @@ func (rs *Rows) ScanMap(dest interface{}) error {
return nil
}
+/*func (rs *Rows) ScanMap(dest interface{}) error {
+ vv := reflect.ValueOf(dest)
+ if vv.Kind() != reflect.Ptr || vv.Elem().Kind() != reflect.Map {
+ return errors.New("dest should be a map's pointer")
+ }
+
+ cols, err := rs.Columns()
+ if err != nil {
+ return err
+ }
+
+ newDest := make([]interface{}, len(cols))
+ err = rs.ScanSlice(newDest)
+ if err != nil {
+ return err
+ }
+
+ vvv := vv.Elem()
+
+ for i, name := range cols {
+ vname := reflect.ValueOf(name)
+ vvv.SetMapIndex(vname, reflect.ValueOf(newDest[i]).Elem())
+ }
+
+ return nil
+}*/
type Row struct {
rows *Rows
// One of these two will be non-nil:
diff --git a/vendor/github.com/go-xorm/core/scan.go b/vendor/github.com/go-xorm/core/scan.go
index b7c159b2740..7da338d8645 100644
--- a/vendor/github.com/go-xorm/core/scan.go
+++ b/vendor/github.com/go-xorm/core/scan.go
@@ -44,9 +44,6 @@ func convertTime(dest *NullTime, src interface{}) error {
}
*dest = NullTime(t)
return nil
- case time.Time:
- *dest = NullTime(s)
- return nil
case nil:
default:
return fmt.Errorf("unsupported driver -> Scan pair: %T -> %T", src, dest)
diff --git a/vendor/github.com/go-xorm/core/type.go b/vendor/github.com/go-xorm/core/type.go
index 9171ce2d711..8010a2220fc 100644
--- a/vendor/github.com/go-xorm/core/type.go
+++ b/vendor/github.com/go-xorm/core/type.go
@@ -69,17 +69,15 @@ var (
Enum = "ENUM"
Set = "SET"
- Char = "CHAR"
- Varchar = "VARCHAR"
- NVarchar = "NVARCHAR"
- TinyText = "TINYTEXT"
- Text = "TEXT"
- Clob = "CLOB"
- MediumText = "MEDIUMTEXT"
- LongText = "LONGTEXT"
- Uuid = "UUID"
- UniqueIdentifier = "UNIQUEIDENTIFIER"
- SysName = "SYSNAME"
+ Char = "CHAR"
+ Varchar = "VARCHAR"
+ NVarchar = "NVARCHAR"
+ TinyText = "TINYTEXT"
+ Text = "TEXT"
+ Clob = "CLOB"
+ MediumText = "MEDIUMTEXT"
+ LongText = "LONGTEXT"
+ Uuid = "UUID"
Date = "DATE"
DateTime = "DATETIME"
@@ -134,7 +132,6 @@ var (
LongText: TEXT_TYPE,
Uuid: TEXT_TYPE,
Clob: TEXT_TYPE,
- SysName: TEXT_TYPE,
Date: TIME_TYPE,
DateTime: TIME_TYPE,
@@ -151,12 +148,11 @@ var (
Binary: BLOB_TYPE,
VarBinary: BLOB_TYPE,
- TinyBlob: BLOB_TYPE,
- Blob: BLOB_TYPE,
- MediumBlob: BLOB_TYPE,
- LongBlob: BLOB_TYPE,
- Bytea: BLOB_TYPE,
- UniqueIdentifier: BLOB_TYPE,
+ TinyBlob: BLOB_TYPE,
+ Blob: BLOB_TYPE,
+ MediumBlob: BLOB_TYPE,
+ LongBlob: BLOB_TYPE,
+ Bytea: BLOB_TYPE,
Bool: NUMERIC_TYPE,
@@ -293,9 +289,9 @@ func SQLType2Type(st SQLType) reflect.Type {
return reflect.TypeOf(float32(1))
case Double:
return reflect.TypeOf(float64(1))
- case Char, Varchar, NVarchar, TinyText, Text, MediumText, LongText, Enum, Set, Uuid, Clob, SysName:
+ case Char, Varchar, NVarchar, TinyText, Text, MediumText, LongText, Enum, Set, Uuid, Clob:
return reflect.TypeOf("")
- case TinyBlob, Blob, LongBlob, Bytea, Binary, MediumBlob, VarBinary, UniqueIdentifier:
+ case TinyBlob, Blob, LongBlob, Bytea, Binary, MediumBlob, VarBinary:
return reflect.TypeOf([]byte{})
case Bool:
return reflect.TypeOf(true)
diff --git a/vendor/github.com/go-xorm/xorm/dialect_mysql.go b/vendor/github.com/go-xorm/xorm/dialect_mysql.go
index f2b4ff7a786..99100b23251 100644
--- a/vendor/github.com/go-xorm/xorm/dialect_mysql.go
+++ b/vendor/github.com/go-xorm/xorm/dialect_mysql.go
@@ -172,33 +172,12 @@ type mysql struct {
allowAllFiles bool
allowOldPasswords bool
clientFoundRows bool
- rowFormat string
}
func (db *mysql) Init(d *core.DB, uri *core.Uri, drivername, dataSourceName string) error {
return db.Base.Init(d, db, uri, drivername, dataSourceName)
}
-func (db *mysql) SetParams(params map[string]string) {
- rowFormat, ok := params["rowFormat"]
- if ok {
- var t = strings.ToUpper(rowFormat)
- switch t {
- case "COMPACT":
- fallthrough
- case "REDUNDANT":
- fallthrough
- case "DYNAMIC":
- fallthrough
- case "COMPRESSED":
- db.rowFormat = t
- break
- default:
- break
- }
- }
-}
-
func (db *mysql) SqlType(c *core.Column) string {
var res string
switch t := c.SQLType.Name; t {
@@ -508,59 +487,6 @@ func (db *mysql) GetIndexes(tableName string) (map[string]*core.Index, error) {
return indexes, nil
}
-func (db *mysql) CreateTableSql(table *core.Table, tableName, storeEngine, charset string) string {
- var sql string
- sql = "CREATE TABLE IF NOT EXISTS "
- if tableName == "" {
- tableName = table.Name
- }
-
- sql += db.Quote(tableName)
- sql += " ("
-
- if len(table.ColumnsSeq()) > 0 {
- pkList := table.PrimaryKeys
-
- for _, colName := range table.ColumnsSeq() {
- col := table.GetColumn(colName)
- if col.IsPrimaryKey && len(pkList) == 1 {
- sql += col.String(db)
- } else {
- sql += col.StringNoPk(db)
- }
- sql = strings.TrimSpace(sql)
- if len(col.Comment) > 0 {
- sql += " COMMENT '" + col.Comment + "'"
- }
- sql += ", "
- }
-
- if len(pkList) > 1 {
- sql += "PRIMARY KEY ( "
- sql += db.Quote(strings.Join(pkList, db.Quote(",")))
- sql += " ), "
- }
-
- sql = sql[:len(sql)-2]
- }
- sql += ")"
-
- if storeEngine != "" {
- sql += " ENGINE=" + storeEngine
- }
-
- if len(charset) == 0 {
- charset = db.URI().Charset
- } else if len(charset) > 0 {
- sql += " DEFAULT CHARSET " + charset
- }
-
- if db.rowFormat != "" {
- sql += " ROW_FORMAT=" + db.rowFormat
- }
- return sql
-}
-
func (db *mysql) Filters() []core.Filter {
return []core.Filter{&core.IdFilter{}}
}
diff --git a/vendor/github.com/go-xorm/xorm/dialect_postgres.go b/vendor/github.com/go-xorm/xorm/dialect_postgres.go
index d907c68c05d..83e9a1015c4 100644
--- a/vendor/github.com/go-xorm/xorm/dialect_postgres.go
+++ b/vendor/github.com/go-xorm/xorm/dialect_postgres.go
@@ -764,26 +764,14 @@ var (
"YES": true,
"ZONE": true,
}
-
- // DefaultPostgresSchema default postgres schema
- DefaultPostgresSchema = "public"
)
-const postgresPublicSchema = "public"
-
type postgres struct {
core.Base
}
func (db *postgres) Init(d *core.DB, uri *core.Uri, drivername, dataSourceName string) error {
- err := db.Base.Init(d, db, uri, drivername, dataSourceName)
- if err != nil {
- return err
- }
- if db.Schema == "" {
- db.Schema = DefaultPostgresSchema
- }
- return nil
+ return db.Base.Init(d, db, uri, drivername, dataSourceName)
}
func (db *postgres) SqlType(c *core.Column) string {
@@ -880,42 +868,32 @@ func (db *postgres) IndexOnTable() bool {
}
func (db *postgres) IndexCheckSql(tableName, idxName string) (string, []interface{}) {
- if len(db.Schema) == 0 {
- args := []interface{}{tableName, idxName}
- return `SELECT indexname FROM pg_indexes WHERE tablename = ? AND indexname = ?`, args
- }
-
- args := []interface{}{db.Schema, tableName, idxName}
+ args := []interface{}{tableName, idxName}
return `SELECT indexname FROM pg_indexes ` +
- `WHERE schemaname = ? AND tablename = ? AND indexname = ?`, args
+ `WHERE tablename = ? AND indexname = ?`, args
}
func (db *postgres) TableCheckSql(tableName string) (string, []interface{}) {
- if len(db.Schema) == 0 {
- args := []interface{}{tableName}
- return `SELECT tablename FROM pg_tables WHERE tablename = ?`, args
- }
-
- args := []interface{}{db.Schema, tableName}
- return `SELECT tablename FROM pg_tables WHERE schemaname = ? AND tablename = ?`, args
+ args := []interface{}{tableName}
+ return `SELECT tablename FROM pg_tables WHERE tablename = ?`, args
}
+/*func (db *postgres) ColumnCheckSql(tableName, colName string) (string, []interface{}) {
+ args := []interface{}{tableName, colName}
+ return "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = ?" +
+ " AND column_name = ?", args
+}*/
+
func (db *postgres) ModifyColumnSql(tableName string, col *core.Column) string {
- if len(db.Schema) == 0 {
- return fmt.Sprintf("alter table %s ALTER COLUMN %s TYPE %s",
- tableName, col.Name, db.SqlType(col))
- }
- return fmt.Sprintf("alter table %s.%s ALTER COLUMN %s TYPE %s",
- db.Schema, tableName, col.Name, db.SqlType(col))
+ return fmt.Sprintf("alter table %s ALTER COLUMN %s TYPE %s",
+ tableName, col.Name, db.SqlType(col))
}
func (db *postgres) DropIndexSql(tableName string, index *core.Index) string {
+ //var unique string
quote := db.Quote
idxName := index.Name
- tableName = strings.Replace(tableName, `"`, "", -1)
- tableName = strings.Replace(tableName, `.`, "_", -1)
-
if !strings.HasPrefix(idxName, "UQE_") &&
!strings.HasPrefix(idxName, "IDX_") {
if index.Type == core.UniqueType {
@@ -924,21 +902,13 @@ func (db *postgres) DropIndexSql(tableName string, index *core.Index) string {
idxName = fmt.Sprintf("IDX_%v_%v", tableName, index.Name)
}
}
- if db.Uri.Schema != "" {
- idxName = db.Uri.Schema + "." + idxName
- }
return fmt.Sprintf("DROP INDEX %v", quote(idxName))
}
func (db *postgres) IsColumnExist(tableName, colName string) (bool, error) {
- args := []interface{}{db.Schema, tableName, colName}
- query := "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = $1 AND table_name = $2" +
- " AND column_name = $3"
- if len(db.Schema) == 0 {
- args = []interface{}{tableName, colName}
- query = "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = $1" +
- " AND column_name = $2"
- }
+ args := []interface{}{tableName, colName}
+ query := "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = $1" +
+ " AND column_name = $2"
db.LogSQL(query, args)
rows, err := db.DB().Query(query, args...)
@@ -951,7 +921,8 @@ func (db *postgres) IsColumnExist(tableName, colName string) (bool, error) {
}
func (db *postgres) GetColumns(tableName string) ([]string, map[string]*core.Column, error) {
- args := []interface{}{tableName}
+ // FIXME: the schema should be replaced by user custom's
+ args := []interface{}{tableName, "public"}
s := `SELECT column_name, column_default, is_nullable, data_type, character_maximum_length, numeric_precision, numeric_precision_radix ,
CASE WHEN p.contype = 'p' THEN true ELSE false END AS primarykey,
CASE WHEN p.contype = 'u' THEN true ELSE false END AS uniquekey
@@ -962,15 +933,7 @@ FROM pg_attribute f
LEFT JOIN pg_constraint p ON p.conrelid = c.oid AND f.attnum = ANY (p.conkey)
LEFT JOIN pg_class AS g ON p.confrelid = g.oid
LEFT JOIN INFORMATION_SCHEMA.COLUMNS s ON s.column_name=f.attname AND c.relname=s.table_name
-WHERE c.relkind = 'r'::char AND c.relname = $1%s AND f.attnum > 0 ORDER BY f.attnum;`
-
- var f string
- if len(db.Schema) != 0 {
- args = append(args, db.Schema)
- f = " AND s.table_schema = $2"
- }
- s = fmt.Sprintf(s, f)
-
+WHERE c.relkind = 'r'::char AND c.relname = $1 AND s.table_schema = $2 AND f.attnum > 0 ORDER BY f.attnum;`
db.LogSQL(s, args)
rows, err := db.DB().Query(s, args...)
@@ -1060,13 +1023,9 @@ WHERE c.relkind = 'r'::char AND c.relname = $1%s AND f.attnum > 0 ORDER BY f.att
}
func (db *postgres) GetTables() ([]*core.Table, error) {
- args := []interface{}{}
- s := "SELECT tablename FROM pg_tables"
- if len(db.Schema) != 0 {
- args = append(args, db.Schema)
- s = s + " WHERE schemaname = $1"
- }
-
+ // FIXME: replace public to user customrize schema
+ args := []interface{}{"public"}
+ s := fmt.Sprintf("SELECT tablename FROM pg_tables WHERE schemaname = $1")
db.LogSQL(s, args)
rows, err := db.DB().Query(s, args...)
@@ -1090,12 +1049,9 @@ func (db *postgres) GetTables() ([]*core.Table, error) {
}
func (db *postgres) GetIndexes(tableName string) (map[string]*core.Index, error) {
- args := []interface{}{tableName}
- s := fmt.Sprintf("SELECT indexname, indexdef FROM pg_indexes WHERE tablename=$1")
- if len(db.Schema) != 0 {
- args = append(args, db.Schema)
- s = s + " AND schemaname=$2"
- }
+ // FIXME: replace the public schema to user specify schema
+ args := []interface{}{"public", tableName}
+ s := fmt.Sprintf("SELECT indexname, indexdef FROM pg_indexes WHERE schemaname=$1 AND tablename=$2")
db.LogSQL(s, args)
rows, err := db.DB().Query(s, args...)
diff --git a/vendor/github.com/go-xorm/xorm/engine.go b/vendor/github.com/go-xorm/xorm/engine.go
index 4984d37463b..444611afb16 100644
--- a/vendor/github.com/go-xorm/xorm/engine.go
+++ b/vendor/github.com/go-xorm/xorm/engine.go
@@ -49,35 +49,6 @@ type Engine struct {
tagHandlers map[string]tagHandler
engineGroup *EngineGroup
-
- cachers map[string]core.Cacher
- cacherLock sync.RWMutex
-}
-
-func (engine *Engine) setCacher(tableName string, cacher core.Cacher) {
- engine.cacherLock.Lock()
- engine.cachers[tableName] = cacher
- engine.cacherLock.Unlock()
-}
-
-func (engine *Engine) SetCacher(tableName string, cacher core.Cacher) {
- engine.setCacher(tableName, cacher)
-}
-
-func (engine *Engine) getCacher(tableName string) core.Cacher {
- var cacher core.Cacher
- var ok bool
- engine.cacherLock.RLock()
- cacher, ok = engine.cachers[tableName]
- engine.cacherLock.RUnlock()
- if !ok && !engine.disableGlobalCache {
- cacher = engine.Cacher
- }
- return cacher
-}
-
-func (engine *Engine) GetCacher(tableName string) core.Cacher {
- return engine.getCacher(tableName)
}
// BufferSize sets buffer size for iterate
@@ -274,7 +245,13 @@ func (engine *Engine) NoCascade() *Session {
// MapCacher Set a table use a special cacher
func (engine *Engine) MapCacher(bean interface{}, cacher core.Cacher) error {
- engine.setCacher(engine.TableName(bean, true), cacher)
+ v := rValue(bean)
+ tb, err := engine.autoMapType(v)
+ if err != nil {
+ return err
+ }
+
+ tb.Cacher = cacher
return nil
}
@@ -559,6 +536,33 @@ func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.D
return nil
}
+func (engine *Engine) tableName(beanOrTableName interface{}) (string, error) {
+ v := rValue(beanOrTableName)
+ if v.Type().Kind() == reflect.String {
+ return beanOrTableName.(string), nil
+ } else if v.Type().Kind() == reflect.Struct {
+ return engine.tbName(v), nil
+ }
+ return "", errors.New("bean should be a struct or struct's point")
+}
+
+func (engine *Engine) tbName(v reflect.Value) string {
+ if tb, ok := v.Interface().(TableName); ok {
+ return tb.TableName()
+ }
+
+ if v.Type().Kind() == reflect.Ptr {
+ if tb, ok := reflect.Indirect(v).Interface().(TableName); ok {
+ return tb.TableName()
+ }
+ } else if v.CanAddr() {
+ if tb, ok := v.Addr().Interface().(TableName); ok {
+ return tb.TableName()
+ }
+ }
+ return engine.TableMapper.Obj2Table(reflect.Indirect(v).Type().Name())
+}
+
// Cascade use cascade or not
func (engine *Engine) Cascade(trueOrFalse ...bool) *Session {
session := engine.NewSession()
@@ -842,7 +846,7 @@ func (engine *Engine) TableInfo(bean interface{}) *Table {
if err != nil {
engine.logger.Error(err)
}
- return &Table{tb, engine.TableName(bean)}
+ return &Table{tb, engine.tbName(v)}
}
func addIndex(indexName string, table *core.Table, col *core.Column, indexType int) {
@@ -857,6 +861,15 @@ func addIndex(indexName string, table *core.Table, col *core.Column, indexType i
}
}
+func (engine *Engine) newTable() *core.Table {
+ table := core.NewEmptyTable()
+
+ if !engine.disableGlobalCache {
+ table.Cacher = engine.Cacher
+ }
+ return table
+}
+
// TableName table name interface to define customerize table name
type TableName interface {
TableName() string
@@ -868,9 +881,21 @@ var (
func (engine *Engine) mapType(v reflect.Value) (*core.Table, error) {
t := v.Type()
- table := core.NewEmptyTable()
+ table := engine.newTable()
+ if tb, ok := v.Interface().(TableName); ok {
+ table.Name = tb.TableName()
+ } else {
+ if v.CanAddr() {
+ if tb, ok = v.Addr().Interface().(TableName); ok {
+ table.Name = tb.TableName()
+ }
+ }
+ if table.Name == "" {
+ table.Name = engine.TableMapper.Obj2Table(t.Name())
+ }
+ }
+
table.Type = t
- table.Name = engine.tbNameForMap(v)
var idFieldColName string
var hasCacheTag, hasNoCacheTag bool
@@ -1024,15 +1049,15 @@ func (engine *Engine) mapType(v reflect.Value) (*core.Table, error) {
if hasCacheTag {
if engine.Cacher != nil { // !nash! use engine's cacher if provided
engine.logger.Info("enable cache on table:", table.Name)
- engine.setCacher(table.Name, engine.Cacher)
+ table.Cacher = engine.Cacher
} else {
engine.logger.Info("enable LRU cache on table:", table.Name)
- engine.setCacher(table.Name, NewLRUCacher2(NewMemoryStore(), time.Hour, 10000))
+ table.Cacher = NewLRUCacher2(NewMemoryStore(), time.Hour, 10000) // !nashtsai! HACK use LRU cacher for now
}
}
if hasNoCacheTag {
- engine.logger.Info("disable cache on table:", table.Name)
- engine.setCacher(table.Name, nil)
+ engine.logger.Info("no cache on table:", table.Name)
+ table.Cacher = nil
}
return table, nil
@@ -1137,10 +1162,26 @@ func (engine *Engine) CreateUniques(bean interface{}) error {
return session.CreateUniques(bean)
}
+func (engine *Engine) getCacher2(table *core.Table) core.Cacher {
+ return table.Cacher
+}
+
// ClearCacheBean if enabled cache, clear the cache bean
func (engine *Engine) ClearCacheBean(bean interface{}, id string) error {
- tableName := engine.TableName(bean)
- cacher := engine.getCacher(tableName)
+ v := rValue(bean)
+ t := v.Type()
+ if t.Kind() != reflect.Struct {
+ return errors.New("error params")
+ }
+ tableName := engine.tbName(v)
+ table, err := engine.autoMapType(v)
+ if err != nil {
+ return err
+ }
+ cacher := table.Cacher
+ if cacher == nil {
+ cacher = engine.Cacher
+ }
if cacher != nil {
cacher.ClearIds(tableName)
cacher.DelBean(tableName, id)
@@ -1151,8 +1192,21 @@ func (engine *Engine) ClearCacheBean(bean interface{}, id string) error {
// ClearCache if enabled cache, clear some tables' cache
func (engine *Engine) ClearCache(beans ...interface{}) error {
for _, bean := range beans {
- tableName := engine.TableName(bean)
- cacher := engine.getCacher(tableName)
+ v := rValue(bean)
+ t := v.Type()
+ if t.Kind() != reflect.Struct {
+ return errors.New("error params")
+ }
+ tableName := engine.tbName(v)
+ table, err := engine.autoMapType(v)
+ if err != nil {
+ return err
+ }
+
+ cacher := table.Cacher
+ if cacher == nil {
+ cacher = engine.Cacher
+ }
if cacher != nil {
cacher.ClearIds(tableName)
cacher.ClearBeans(tableName)
@@ -1170,13 +1224,13 @@ func (engine *Engine) Sync(beans ...interface{}) error {
for _, bean := range beans {
v := rValue(bean)
- tableNameNoSchema := engine.tbNameNoSchema(v.Interface())
+ tableName := engine.tbName(v)
table, err := engine.autoMapType(v)
if err != nil {
return err
}
- isExist, err := session.Table(bean).isTableExist(tableNameNoSchema)
+ isExist, err := session.Table(bean).isTableExist(tableName)
if err != nil {
return err
}
@@ -1202,12 +1256,12 @@ func (engine *Engine) Sync(beans ...interface{}) error {
}
} else {
for _, col := range table.Columns() {
- isExist, err := engine.dialect.IsColumnExist(tableNameNoSchema, col.Name)
+ isExist, err := engine.dialect.IsColumnExist(tableName, col.Name)
if err != nil {
return err
}
if !isExist {
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
err = session.addColumn(col.Name)
@@ -1218,35 +1272,35 @@ func (engine *Engine) Sync(beans ...interface{}) error {
}
for name, index := range table.Indexes {
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
if index.Type == core.UniqueType {
- isExist, err := session.isIndexExist2(tableNameNoSchema, index.Cols, true)
+ isExist, err := session.isIndexExist2(tableName, index.Cols, true)
if err != nil {
return err
}
if !isExist {
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
- err = session.addUnique(tableNameNoSchema, name)
+ err = session.addUnique(tableName, name)
if err != nil {
return err
}
}
} else if index.Type == core.IndexType {
- isExist, err := session.isIndexExist2(tableNameNoSchema, index.Cols, false)
+ isExist, err := session.isIndexExist2(tableName, index.Cols, false)
if err != nil {
return err
}
if !isExist {
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
- err = session.addIndex(tableNameNoSchema, name)
+ err = session.addIndex(tableName, name)
if err != nil {
return err
}
@@ -1399,13 +1453,6 @@ func (engine *Engine) Find(beans interface{}, condiBeans ...interface{}) error {
return session.Find(beans, condiBeans...)
}
-// FindAndCount find the results and also return the counts
-func (engine *Engine) FindAndCount(rowsSlicePtr interface{}, condiBean ...interface{}) (int64, error) {
- session := engine.NewSession()
- defer session.Close()
- return session.FindAndCount(rowsSlicePtr, condiBean...)
-}
-
// Iterate record by record handle records from table, bean's non-empty fields
// are conditions.
func (engine *Engine) Iterate(bean interface{}, fun IterFunc) error {
@@ -1582,11 +1629,6 @@ func (engine *Engine) SetTZDatabase(tz *time.Location) {
engine.DatabaseTZ = tz
}
-// SetSchema sets the schema of database
-func (engine *Engine) SetSchema(schema string) {
- engine.dialect.URI().Schema = schema
-}
-
// Unscoped always disable struct tag "deleted"
func (engine *Engine) Unscoped() *Session {
session := engine.NewSession()
diff --git a/vendor/github.com/go-xorm/xorm/engine_cond.go b/vendor/github.com/go-xorm/xorm/engine_cond.go
index 4dde8662e13..6c8e3879cee 100644
--- a/vendor/github.com/go-xorm/xorm/engine_cond.go
+++ b/vendor/github.com/go-xorm/xorm/engine_cond.go
@@ -9,7 +9,6 @@ import (
"encoding/json"
"fmt"
"reflect"
- "strings"
"time"
"github.com/go-xorm/builder"
@@ -52,9 +51,7 @@ func (engine *Engine) buildConds(table *core.Table, bean interface{},
fieldValuePtr, err := col.ValueOf(bean)
if err != nil {
- if !strings.Contains(err.Error(), "is not valid") {
- engine.logger.Warn(err)
- }
+ engine.logger.Error(err)
continue
}
diff --git a/vendor/github.com/go-xorm/xorm/engine_table.go b/vendor/github.com/go-xorm/xorm/engine_table.go
deleted file mode 100644
index 94871a4bce5..00000000000
--- a/vendor/github.com/go-xorm/xorm/engine_table.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2018 The Xorm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xorm
-
-import (
- "fmt"
- "reflect"
- "strings"
-
- "github.com/go-xorm/core"
-)
-
-// TableNameWithSchema will automatically add schema prefix on table name
-func (engine *Engine) tbNameWithSchema(v string) string {
- // Add schema name as prefix of table name.
- // Only for postgres database.
- if engine.dialect.DBType() == core.POSTGRES &&
- engine.dialect.URI().Schema != "" &&
- engine.dialect.URI().Schema != postgresPublicSchema &&
- strings.Index(v, ".") == -1 {
- return engine.dialect.URI().Schema + "." + v
- }
- return v
-}
-
-// TableName returns table name with schema prefix if has
-func (engine *Engine) TableName(bean interface{}, includeSchema ...bool) string {
- tbName := engine.tbNameNoSchema(bean)
- if len(includeSchema) > 0 && includeSchema[0] {
- tbName = engine.tbNameWithSchema(tbName)
- }
-
- return tbName
-}
-
-// tbName get some table's table name
-func (session *Session) tbNameNoSchema(table *core.Table) string {
- if len(session.statement.AltTableName) > 0 {
- return session.statement.AltTableName
- }
-
- return table.Name
-}
-
-func (engine *Engine) tbNameForMap(v reflect.Value) string {
- if v.Type().Implements(tpTableName) {
- return v.Interface().(TableName).TableName()
- }
- if v.Kind() == reflect.Ptr {
- v = v.Elem()
- if v.Type().Implements(tpTableName) {
- return v.Interface().(TableName).TableName()
- }
- }
-
- return engine.TableMapper.Obj2Table(v.Type().Name())
-}
-
-func (engine *Engine) tbNameNoSchema(tablename interface{}) string {
- switch tablename.(type) {
- case []string:
- t := tablename.([]string)
- if len(t) > 1 {
- return fmt.Sprintf("%v AS %v", engine.Quote(t[0]), engine.Quote(t[1]))
- } else if len(t) == 1 {
- return engine.Quote(t[0])
- }
- case []interface{}:
- t := tablename.([]interface{})
- l := len(t)
- var table string
- if l > 0 {
- f := t[0]
- switch f.(type) {
- case string:
- table = f.(string)
- case TableName:
- table = f.(TableName).TableName()
- default:
- v := rValue(f)
- t := v.Type()
- if t.Kind() == reflect.Struct {
- table = engine.tbNameForMap(v)
- } else {
- table = engine.Quote(fmt.Sprintf("%v", f))
- }
- }
- }
- if l > 1 {
- return fmt.Sprintf("%v AS %v", engine.Quote(table),
- engine.Quote(fmt.Sprintf("%v", t[1])))
- } else if l == 1 {
- return engine.Quote(table)
- }
- case TableName:
- return tablename.(TableName).TableName()
- case string:
- return tablename.(string)
- case reflect.Value:
- v := tablename.(reflect.Value)
- return engine.tbNameForMap(v)
- default:
- v := rValue(tablename)
- t := v.Type()
- if t.Kind() == reflect.Struct {
- return engine.tbNameForMap(v)
- }
- return engine.Quote(fmt.Sprintf("%v", tablename))
- }
- return ""
-}
diff --git a/vendor/github.com/go-xorm/xorm/error.go b/vendor/github.com/go-xorm/xorm/error.go
index 1694683cf31..cfeefc31e8e 100644
--- a/vendor/github.com/go-xorm/xorm/error.go
+++ b/vendor/github.com/go-xorm/xorm/error.go
@@ -6,7 +6,6 @@ package xorm
import (
"errors"
- "fmt"
)
var (
@@ -26,16 +25,4 @@ var (
ErrNotImplemented = errors.New("Not implemented")
// ErrConditionType condition type unsupported
ErrConditionType = errors.New("Unsupported conditon type")
- // ErrColumnIsNotExist columns is not exist
- ErrFieldIsNotExist = errors.New("Field is not exist")
)
-
-// ErrFieldIsNotValid is not valid
-type ErrFieldIsNotValid struct {
- FieldName string
- TableName string
-}
-
-func (e ErrFieldIsNotValid) Error() string {
- return fmt.Sprintf("field %s is not valid on table %s", e.FieldName, e.TableName)
-}
diff --git a/vendor/github.com/go-xorm/xorm/helpers.go b/vendor/github.com/go-xorm/xorm/helpers.go
index f1705782e3d..f39ed472560 100644
--- a/vendor/github.com/go-xorm/xorm/helpers.go
+++ b/vendor/github.com/go-xorm/xorm/helpers.go
@@ -11,6 +11,7 @@ import (
"sort"
"strconv"
"strings"
+ "time"
"github.com/go-xorm/core"
)
@@ -292,6 +293,19 @@ func structName(v reflect.Type) string {
return v.Name()
}
+func col2NewCols(columns ...string) []string {
+ newColumns := make([]string, 0, len(columns))
+ for _, col := range columns {
+ col = strings.Replace(col, "`", "", -1)
+ col = strings.Replace(col, `"`, "", -1)
+ ccols := strings.Split(col, ",")
+ for _, c := range ccols {
+ newColumns = append(newColumns, strings.TrimSpace(c))
+ }
+ }
+ return newColumns
+}
+
func sliceEq(left, right []string) bool {
if len(left) != len(right) {
return false
@@ -306,6 +320,154 @@ func sliceEq(left, right []string) bool {
return true
}
+func setColumnInt(bean interface{}, col *core.Column, t int64) {
+ v, err := col.ValueOf(bean)
+ if err != nil {
+ return
+ }
+ if v.CanSet() {
+ switch v.Type().Kind() {
+ case reflect.Int, reflect.Int64, reflect.Int32:
+ v.SetInt(t)
+ case reflect.Uint, reflect.Uint64, reflect.Uint32:
+ v.SetUint(uint64(t))
+ }
+ }
+}
+
+func setColumnTime(bean interface{}, col *core.Column, t time.Time) {
+ v, err := col.ValueOf(bean)
+ if err != nil {
+ return
+ }
+ if v.CanSet() {
+ switch v.Type().Kind() {
+ case reflect.Struct:
+ v.Set(reflect.ValueOf(t).Convert(v.Type()))
+ case reflect.Int, reflect.Int64, reflect.Int32:
+ v.SetInt(t.Unix())
+ case reflect.Uint, reflect.Uint64, reflect.Uint32:
+ v.SetUint(uint64(t.Unix()))
+ }
+ }
+}
+
+func genCols(table *core.Table, session *Session, bean interface{}, useCol bool, includeQuote bool) ([]string, []interface{}, error) {
+ colNames := make([]string, 0, len(table.ColumnsSeq()))
+ args := make([]interface{}, 0, len(table.ColumnsSeq()))
+
+ for _, col := range table.Columns() {
+ if useCol && !col.IsVersion && !col.IsCreated && !col.IsUpdated {
+ if _, ok := getFlagForColumn(session.statement.columnMap, col); !ok {
+ continue
+ }
+ }
+ if col.MapType == core.ONLYFROMDB {
+ continue
+ }
+
+ fieldValuePtr, err := col.ValueOf(bean)
+ if err != nil {
+ return nil, nil, err
+ }
+ fieldValue := *fieldValuePtr
+
+ if col.IsAutoIncrement {
+ switch fieldValue.Type().Kind() {
+ case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int, reflect.Int64:
+ if fieldValue.Int() == 0 {
+ continue
+ }
+ case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint, reflect.Uint64:
+ if fieldValue.Uint() == 0 {
+ continue
+ }
+ case reflect.String:
+ if len(fieldValue.String()) == 0 {
+ continue
+ }
+ case reflect.Ptr:
+ if fieldValue.Pointer() == 0 {
+ continue
+ }
+ }
+ }
+
+ if col.IsDeleted {
+ continue
+ }
+
+ if session.statement.ColumnStr != "" {
+ if _, ok := getFlagForColumn(session.statement.columnMap, col); !ok {
+ continue
+ } else if _, ok := session.statement.incrColumns[col.Name]; ok {
+ continue
+ } else if _, ok := session.statement.decrColumns[col.Name]; ok {
+ continue
+ }
+ }
+ if session.statement.OmitStr != "" {
+ if _, ok := getFlagForColumn(session.statement.columnMap, col); ok {
+ continue
+ }
+ }
+
+ // !evalphobia! set fieldValue as nil when column is nullable and zero-value
+ if _, ok := getFlagForColumn(session.statement.nullableMap, col); ok {
+ if col.Nullable && isZero(fieldValue.Interface()) {
+ var nilValue *int
+ fieldValue = reflect.ValueOf(nilValue)
+ }
+ }
+
+ if (col.IsCreated || col.IsUpdated) && session.statement.UseAutoTime /*&& isZero(fieldValue.Interface())*/ {
+ // if time is non-empty, then set to auto time
+ val, t := session.engine.nowTime(col)
+ args = append(args, val)
+
+ var colName = col.Name
+ session.afterClosures = append(session.afterClosures, func(bean interface{}) {
+ col := table.GetColumn(colName)
+ setColumnTime(bean, col, t)
+ })
+ } else if col.IsVersion && session.statement.checkVersion {
+ args = append(args, 1)
+ } else {
+ arg, err := session.value2Interface(col, fieldValue)
+ if err != nil {
+ return colNames, args, err
+ }
+ args = append(args, arg)
+ }
+
+ if includeQuote {
+ colNames = append(colNames, session.engine.Quote(col.Name)+" = ?")
+ } else {
+ colNames = append(colNames, col.Name)
+ }
+ }
+ return colNames, args, nil
+}
+
func indexName(tableName, idxName string) string {
return fmt.Sprintf("IDX_%v_%v", tableName, idxName)
}
+
+func getFlagForColumn(m map[string]bool, col *core.Column) (val bool, has bool) {
+ if len(m) == 0 {
+ return false, false
+ }
+
+ n := len(col.Name)
+
+ for mk := range m {
+ if len(mk) != n {
+ continue
+ }
+ if strings.EqualFold(mk, col.Name) {
+ return m[mk], true
+ }
+ }
+
+ return false, false
+}
diff --git a/vendor/github.com/go-xorm/xorm/interface.go b/vendor/github.com/go-xorm/xorm/interface.go
index 0bc12ba0066..9a3b6da0b2b 100644
--- a/vendor/github.com/go-xorm/xorm/interface.go
+++ b/vendor/github.com/go-xorm/xorm/interface.go
@@ -30,7 +30,6 @@ type Interface interface {
Exec(string, ...interface{}) (sql.Result, error)
Exist(bean ...interface{}) (bool, error)
Find(interface{}, ...interface{}) error
- FindAndCount(interface{}, ...interface{}) (int64, error)
Get(interface{}) (bool, error)
GroupBy(keys string) *Session
ID(interface{}) *Session
@@ -42,7 +41,6 @@ type Interface interface {
IsTableExist(beanOrTableName interface{}) (bool, error)
Iterate(interface{}, IterFunc) error
Limit(int, ...int) *Session
- MustCols(columns ...string) *Session
NoAutoCondition(...bool) *Session
NotIn(string, ...interface{}) *Session
Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *Session
@@ -77,7 +75,6 @@ type EngineInterface interface {
Dialect() core.Dialect
DropTables(...interface{}) error
DumpAllToFile(fp string, tp ...core.DbType) error
- GetCacher(string) core.Cacher
GetColumnMapper() core.IMapper
GetDefaultCacher() core.Cacher
GetTableMapper() core.IMapper
@@ -86,11 +83,9 @@ type EngineInterface interface {
NewSession() *Session
NoAutoTime() *Session
Quote(string) string
- SetCacher(string, core.Cacher)
SetDefaultCacher(core.Cacher)
SetLogLevel(core.LogLevel)
SetMapper(core.IMapper)
- SetSchema(string)
SetTZDatabase(tz *time.Location)
SetTZLocation(tz *time.Location)
ShowSQL(show ...bool)
@@ -98,7 +93,6 @@ type EngineInterface interface {
Sync2(...interface{}) error
StoreEngine(storeEngine string) *Session
TableInfo(bean interface{}) *Table
- TableName(interface{}, ...bool) string
UnMapType(reflect.Type)
}
diff --git a/vendor/github.com/go-xorm/xorm/rows.go b/vendor/github.com/go-xorm/xorm/rows.go
index 54ec7f37a28..31e29ae26f6 100644
--- a/vendor/github.com/go-xorm/xorm/rows.go
+++ b/vendor/github.com/go-xorm/xorm/rows.go
@@ -32,7 +32,7 @@ func newRows(session *Session, bean interface{}) (*Rows, error) {
var args []interface{}
var err error
- if err = rows.session.statement.setRefBean(bean); err != nil {
+ if err = rows.session.statement.setRefValue(rValue(bean)); err != nil {
return nil, err
}
@@ -94,7 +94,8 @@ func (rows *Rows) Scan(bean interface{}) error {
return fmt.Errorf("scan arg is incompatible type to [%v]", rows.beanType)
}
- if err := rows.session.statement.setRefBean(bean); err != nil {
+ dataStruct := rValue(bean)
+ if err := rows.session.statement.setRefValue(dataStruct); err != nil {
return err
}
@@ -103,7 +104,6 @@ func (rows *Rows) Scan(bean interface{}) error {
return err
}
- dataStruct := rValue(bean)
_, err = rows.session.slice2Bean(scanResults, rows.fields, bean, &dataStruct, rows.session.statement.RefTable)
if err != nil {
return err
diff --git a/vendor/github.com/go-xorm/xorm/session.go b/vendor/github.com/go-xorm/xorm/session.go
index 48baf768eb5..5c6cb5f9def 100644
--- a/vendor/github.com/go-xorm/xorm/session.go
+++ b/vendor/github.com/go-xorm/xorm/session.go
@@ -278,22 +278,24 @@ func (session *Session) doPrepare(db *core.DB, sqlStr string) (stmt *core.Stmt,
return
}
-func (session *Session) getField(dataStruct *reflect.Value, key string, table *core.Table, idx int) (*reflect.Value, error) {
+func (session *Session) getField(dataStruct *reflect.Value, key string, table *core.Table, idx int) *reflect.Value {
var col *core.Column
if col = table.GetColumnIdx(key, idx); col == nil {
- return nil, ErrFieldIsNotExist
+ //session.engine.logger.Warnf("table %v has no column %v. %v", table.Name, key, table.ColumnsSeq())
+ return nil
}
fieldValue, err := col.ValueOfV(dataStruct)
if err != nil {
- return nil, err
+ session.engine.logger.Error(err)
+ return nil
}
if !fieldValue.IsValid() || !fieldValue.CanSet() {
- return nil, ErrFieldIsNotValid{key, table.Name}
+ session.engine.logger.Warnf("table %v's column %v is not valid or cannot set", table.Name, key)
+ return nil
}
-
- return fieldValue, nil
+ return fieldValue
}
// Cell cell is a result of one column field
@@ -405,417 +407,409 @@ func (session *Session) slice2Bean(scanResults []interface{}, fields []string, b
}
tempMap[lKey] = idx
- fieldValue, err := session.getField(dataStruct, key, table, idx)
- if err != nil {
- if !strings.Contains(err.Error(), "is not valid") {
- session.engine.logger.Warn(err)
+ if fieldValue := session.getField(dataStruct, key, table, idx); fieldValue != nil {
+ rawValue := reflect.Indirect(reflect.ValueOf(scanResults[ii]))
+
+ // if row is null then ignore
+ if rawValue.Interface() == nil {
+ continue
}
- continue
- }
- if fieldValue == nil {
- continue
- }
- rawValue := reflect.Indirect(reflect.ValueOf(scanResults[ii]))
- // if row is null then ignore
- if rawValue.Interface() == nil {
- continue
- }
-
- if fieldValue.CanAddr() {
- if structConvert, ok := fieldValue.Addr().Interface().(core.Conversion); ok {
- if data, err := value2Bytes(&rawValue); err == nil {
- if err := structConvert.FromDB(data); err != nil {
+ if fieldValue.CanAddr() {
+ if structConvert, ok := fieldValue.Addr().Interface().(core.Conversion); ok {
+ if data, err := value2Bytes(&rawValue); err == nil {
+ if err := structConvert.FromDB(data); err != nil {
+ return nil, err
+ }
+ } else {
return nil, err
}
+ continue
+ }
+ }
+
+ if _, ok := fieldValue.Interface().(core.Conversion); ok {
+ if data, err := value2Bytes(&rawValue); err == nil {
+ if fieldValue.Kind() == reflect.Ptr && fieldValue.IsNil() {
+ fieldValue.Set(reflect.New(fieldValue.Type().Elem()))
+ }
+ fieldValue.Interface().(core.Conversion).FromDB(data)
} else {
return nil, err
}
continue
}
- }
- if _, ok := fieldValue.Interface().(core.Conversion); ok {
- if data, err := value2Bytes(&rawValue); err == nil {
- if fieldValue.Kind() == reflect.Ptr && fieldValue.IsNil() {
- fieldValue.Set(reflect.New(fieldValue.Type().Elem()))
- }
- fieldValue.Interface().(core.Conversion).FromDB(data)
- } else {
- return nil, err
+ rawValueType := reflect.TypeOf(rawValue.Interface())
+ vv := reflect.ValueOf(rawValue.Interface())
+ col := table.GetColumnIdx(key, idx)
+ if col.IsPrimaryKey {
+ pk = append(pk, rawValue.Interface())
}
- continue
- }
+ fieldType := fieldValue.Type()
+ hasAssigned := false
- rawValueType := reflect.TypeOf(rawValue.Interface())
- vv := reflect.ValueOf(rawValue.Interface())
- col := table.GetColumnIdx(key, idx)
- if col.IsPrimaryKey {
- pk = append(pk, rawValue.Interface())
- }
- fieldType := fieldValue.Type()
- hasAssigned := false
-
- if col.SQLType.IsJson() {
- var bs []byte
- if rawValueType.Kind() == reflect.String {
- bs = []byte(vv.String())
- } else if rawValueType.ConvertibleTo(core.BytesType) {
- bs = vv.Bytes()
- } else {
- return nil, fmt.Errorf("unsupported database data type: %s %v", key, rawValueType.Kind())
- }
-
- hasAssigned = true
-
- if len(bs) > 0 {
- if fieldType.Kind() == reflect.String {
- fieldValue.SetString(string(bs))
- continue
- }
- if fieldValue.CanAddr() {
- err := json.Unmarshal(bs, fieldValue.Addr().Interface())
- if err != nil {
- return nil, err
- }
+ if col.SQLType.IsJson() {
+ var bs []byte
+ if rawValueType.Kind() == reflect.String {
+ bs = []byte(vv.String())
+ } else if rawValueType.ConvertibleTo(core.BytesType) {
+ bs = vv.Bytes()
} else {
- x := reflect.New(fieldType)
- err := json.Unmarshal(bs, x.Interface())
- if err != nil {
- return nil, err
- }
- fieldValue.Set(x.Elem())
+ return nil, fmt.Errorf("unsupported database data type: %s %v", key, rawValueType.Kind())
}
- }
- continue
- }
+ hasAssigned = true
- switch fieldType.Kind() {
- case reflect.Complex64, reflect.Complex128:
- // TODO: reimplement this
- var bs []byte
- if rawValueType.Kind() == reflect.String {
- bs = []byte(vv.String())
- } else if rawValueType.ConvertibleTo(core.BytesType) {
- bs = vv.Bytes()
- }
-
- hasAssigned = true
- if len(bs) > 0 {
- if fieldValue.CanAddr() {
- err := json.Unmarshal(bs, fieldValue.Addr().Interface())
- if err != nil {
- return nil, err
+ if len(bs) > 0 {
+ if fieldType.Kind() == reflect.String {
+ fieldValue.SetString(string(bs))
+ continue
}
- } else {
- x := reflect.New(fieldType)
- err := json.Unmarshal(bs, x.Interface())
- if err != nil {
- return nil, err
+ if fieldValue.CanAddr() {
+ err := json.Unmarshal(bs, fieldValue.Addr().Interface())
+ if err != nil {
+ return nil, err
+ }
+ } else {
+ x := reflect.New(fieldType)
+ err := json.Unmarshal(bs, x.Interface())
+ if err != nil {
+ return nil, err
+ }
+ fieldValue.Set(x.Elem())
}
- fieldValue.Set(x.Elem())
}
+
+ continue
}
- case reflect.Slice, reflect.Array:
- switch rawValueType.Kind() {
+
+ switch fieldType.Kind() {
+ case reflect.Complex64, reflect.Complex128:
+ // TODO: reimplement this
+ var bs []byte
+ if rawValueType.Kind() == reflect.String {
+ bs = []byte(vv.String())
+ } else if rawValueType.ConvertibleTo(core.BytesType) {
+ bs = vv.Bytes()
+ }
+
+ hasAssigned = true
+ if len(bs) > 0 {
+ if fieldValue.CanAddr() {
+ err := json.Unmarshal(bs, fieldValue.Addr().Interface())
+ if err != nil {
+ return nil, err
+ }
+ } else {
+ x := reflect.New(fieldType)
+ err := json.Unmarshal(bs, x.Interface())
+ if err != nil {
+ return nil, err
+ }
+ fieldValue.Set(x.Elem())
+ }
+ }
case reflect.Slice, reflect.Array:
- switch rawValueType.Elem().Kind() {
- case reflect.Uint8:
- if fieldType.Elem().Kind() == reflect.Uint8 {
+ switch rawValueType.Kind() {
+ case reflect.Slice, reflect.Array:
+ switch rawValueType.Elem().Kind() {
+ case reflect.Uint8:
+ if fieldType.Elem().Kind() == reflect.Uint8 {
+ hasAssigned = true
+ if col.SQLType.IsText() {
+ x := reflect.New(fieldType)
+ err := json.Unmarshal(vv.Bytes(), x.Interface())
+ if err != nil {
+ return nil, err
+ }
+ fieldValue.Set(x.Elem())
+ } else {
+ if fieldValue.Len() > 0 {
+ for i := 0; i < fieldValue.Len(); i++ {
+ if i < vv.Len() {
+ fieldValue.Index(i).Set(vv.Index(i))
+ }
+ }
+ } else {
+ for i := 0; i < vv.Len(); i++ {
+ fieldValue.Set(reflect.Append(*fieldValue, vv.Index(i)))
+ }
+ }
+ }
+ }
+ }
+ }
+ case reflect.String:
+ if rawValueType.Kind() == reflect.String {
+ hasAssigned = true
+ fieldValue.SetString(vv.String())
+ }
+ case reflect.Bool:
+ if rawValueType.Kind() == reflect.Bool {
+ hasAssigned = true
+ fieldValue.SetBool(vv.Bool())
+ }
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+ switch rawValueType.Kind() {
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+ hasAssigned = true
+ fieldValue.SetInt(vv.Int())
+ }
+ case reflect.Float32, reflect.Float64:
+ switch rawValueType.Kind() {
+ case reflect.Float32, reflect.Float64:
+ hasAssigned = true
+ fieldValue.SetFloat(vv.Float())
+ }
+ case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
+ switch rawValueType.Kind() {
+ case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
+ hasAssigned = true
+ fieldValue.SetUint(vv.Uint())
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+ hasAssigned = true
+ fieldValue.SetUint(uint64(vv.Int()))
+ }
+ case reflect.Struct:
+ if fieldType.ConvertibleTo(core.TimeType) {
+ dbTZ := session.engine.DatabaseTZ
+ if col.TimeZone != nil {
+ dbTZ = col.TimeZone
+ }
+
+ if rawValueType == core.TimeType {
hasAssigned = true
- if col.SQLType.IsText() {
- x := reflect.New(fieldType)
+
+ t := vv.Convert(core.TimeType).Interface().(time.Time)
+
+ z, _ := t.Zone()
+ // set new location if database don't save timezone or give an incorrect timezone
+ if len(z) == 0 || t.Year() == 0 || t.Location().String() != dbTZ.String() { // !nashtsai! HACK tmp work around for lib/pq doesn't properly time with location
+ session.engine.logger.Debugf("empty zone key[%v] : %v | zone: %v | location: %+v\n", key, t, z, *t.Location())
+ t = time.Date(t.Year(), t.Month(), t.Day(), t.Hour(),
+ t.Minute(), t.Second(), t.Nanosecond(), dbTZ)
+ }
+
+ t = t.In(session.engine.TZLocation)
+ fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
+ } else if rawValueType == core.IntType || rawValueType == core.Int64Type ||
+ rawValueType == core.Int32Type {
+ hasAssigned = true
+
+ t := time.Unix(vv.Int(), 0).In(session.engine.TZLocation)
+ fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
+ } else {
+ if d, ok := vv.Interface().([]uint8); ok {
+ hasAssigned = true
+ t, err := session.byte2Time(col, d)
+ if err != nil {
+ session.engine.logger.Error("byte2Time error:", err.Error())
+ hasAssigned = false
+ } else {
+ fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
+ }
+ } else if d, ok := vv.Interface().(string); ok {
+ hasAssigned = true
+ t, err := session.str2Time(col, d)
+ if err != nil {
+ session.engine.logger.Error("byte2Time error:", err.Error())
+ hasAssigned = false
+ } else {
+ fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
+ }
+ } else {
+ return nil, fmt.Errorf("rawValueType is %v, value is %v", rawValueType, vv.Interface())
+ }
+ }
+ } else if nulVal, ok := fieldValue.Addr().Interface().(sql.Scanner); ok {
+ // !
! 增加支持sql.Scanner接口的结构，如sql.NullString
+ hasAssigned = true
+ if err := nulVal.Scan(vv.Interface()); err != nil {
+ session.engine.logger.Error("sql.Sanner error:", err.Error())
+ hasAssigned = false
+ }
+ } else if col.SQLType.IsJson() {
+ if rawValueType.Kind() == reflect.String {
+ hasAssigned = true
+ x := reflect.New(fieldType)
+ if len([]byte(vv.String())) > 0 {
+ err := json.Unmarshal([]byte(vv.String()), x.Interface())
+ if err != nil {
+ return nil, err
+ }
+ fieldValue.Set(x.Elem())
+ }
+ } else if rawValueType.Kind() == reflect.Slice {
+ hasAssigned = true
+ x := reflect.New(fieldType)
+ if len(vv.Bytes()) > 0 {
err := json.Unmarshal(vv.Bytes(), x.Interface())
if err != nil {
return nil, err
}
fieldValue.Set(x.Elem())
- } else {
- if fieldValue.Len() > 0 {
- for i := 0; i < fieldValue.Len(); i++ {
- if i < vv.Len() {
- fieldValue.Index(i).Set(vv.Index(i))
- }
- }
- } else {
- for i := 0; i < vv.Len(); i++ {
- fieldValue.Set(reflect.Append(*fieldValue, vv.Index(i)))
- }
- }
}
}
- }
- }
- case reflect.String:
- if rawValueType.Kind() == reflect.String {
- hasAssigned = true
- fieldValue.SetString(vv.String())
- }
- case reflect.Bool:
- if rawValueType.Kind() == reflect.Bool {
- hasAssigned = true
- fieldValue.SetBool(vv.Bool())
- }
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- switch rawValueType.Kind() {
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- hasAssigned = true
- fieldValue.SetInt(vv.Int())
- }
- case reflect.Float32, reflect.Float64:
- switch rawValueType.Kind() {
- case reflect.Float32, reflect.Float64:
- hasAssigned = true
- fieldValue.SetFloat(vv.Float())
- }
- case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
- switch rawValueType.Kind() {
- case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
- hasAssigned = true
- fieldValue.SetUint(vv.Uint())
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- hasAssigned = true
- fieldValue.SetUint(uint64(vv.Int()))
- }
- case reflect.Struct:
- if fieldType.ConvertibleTo(core.TimeType) {
- dbTZ := session.engine.DatabaseTZ
- if col.TimeZone != nil {
- dbTZ = col.TimeZone
- }
-
- if rawValueType == core.TimeType {
- hasAssigned = true
-
- t := vv.Convert(core.TimeType).Interface().(time.Time)
-
- z, _ := t.Zone()
- // set new location if database don't save timezone or give an incorrect timezone
- if len(z) == 0 || t.Year() == 0 || t.Location().String() != dbTZ.String() { // !nashtsai! HACK tmp work around for lib/pq doesn't properly time with location
- session.engine.logger.Debugf("empty zone key[%v] : %v | zone: %v | location: %+v\n", key, t, z, *t.Location())
- t = time.Date(t.Year(), t.Month(), t.Day(), t.Hour(),
- t.Minute(), t.Second(), t.Nanosecond(), dbTZ)
+ } else if session.statement.UseCascade {
+ table, err := session.engine.autoMapType(*fieldValue)
+ if err != nil {
+ return nil, err
}
- t = t.In(session.engine.TZLocation)
- fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
- } else if rawValueType == core.IntType || rawValueType == core.Int64Type ||
- rawValueType == core.Int32Type {
hasAssigned = true
+ if len(table.PrimaryKeys) != 1 {
+ return nil, errors.New("unsupported non or composited primary key cascade")
+ }
+ var pk = make(core.PK, len(table.PrimaryKeys))
+ pk[0], err = asKind(vv, rawValueType)
+ if err != nil {
+ return nil, err
+ }
- t := time.Unix(vv.Int(), 0).In(session.engine.TZLocation)
- fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
- } else {
- if d, ok := vv.Interface().([]uint8); ok {
- hasAssigned = true
- t, err := session.byte2Time(col, d)
+ if !isPKZero(pk) {
+ // !nashtsai! TODO for hasOne relationship, it's preferred to use join query for eager fetch
+ // however, also need to consider adding a 'lazy' attribute to xorm tag which allow hasOne
+ // property to be fetched lazily
+ structInter := reflect.New(fieldValue.Type())
+ has, err := session.ID(pk).NoCascade().get(structInter.Interface())
if err != nil {
- session.engine.logger.Error("byte2Time error:", err.Error())
- hasAssigned = false
- } else {
- fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
+ return nil, err
}
- } else if d, ok := vv.Interface().(string); ok {
- hasAssigned = true
- t, err := session.str2Time(col, d)
- if err != nil {
- session.engine.logger.Error("byte2Time error:", err.Error())
- hasAssigned = false
+ if has {
+ fieldValue.Set(structInter.Elem())
} else {
- fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
+ return nil, errors.New("cascade obj is not exist")
}
- } else {
- return nil, fmt.Errorf("rawValueType is %v, value is %v", rawValueType, vv.Interface())
}
}
- } else if nulVal, ok := fieldValue.Addr().Interface().(sql.Scanner); ok {
- // !! 增加支持sql.Scanner接口的结构，如sql.NullString
- hasAssigned = true
- if err := nulVal.Scan(vv.Interface()); err != nil {
- session.engine.logger.Error("sql.Sanner error:", err.Error())
- hasAssigned = false
- }
- } else if col.SQLType.IsJson() {
- if rawValueType.Kind() == reflect.String {
- hasAssigned = true
- x := reflect.New(fieldType)
+ case reflect.Ptr:
+ // !nashtsai! TODO merge duplicated codes above
+ switch fieldType {
+ // following types case matching ptr's native type, therefore assign ptr directly
+ case core.PtrStringType:
+ if rawValueType.Kind() == reflect.String {
+ x := vv.String()
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrBoolType:
+ if rawValueType.Kind() == reflect.Bool {
+ x := vv.Bool()
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrTimeType:
+ if rawValueType == core.PtrTimeType {
+ hasAssigned = true
+ var x = rawValue.Interface().(time.Time)
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrFloat64Type:
+ if rawValueType.Kind() == reflect.Float64 {
+ x := vv.Float()
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrUint64Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = uint64(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrInt64Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ x := vv.Int()
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrFloat32Type:
+ if rawValueType.Kind() == reflect.Float64 {
+ var x = float32(vv.Float())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrIntType:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = int(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrInt32Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = int32(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrInt8Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = int8(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrInt16Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = int16(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrUintType:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = uint(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.PtrUint32Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = uint32(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.Uint8Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = uint8(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.Uint16Type:
+ if rawValueType.Kind() == reflect.Int64 {
+ var x = uint16(vv.Int())
+ hasAssigned = true
+ fieldValue.Set(reflect.ValueOf(&x))
+ }
+ case core.Complex64Type:
+ var x complex64
if len([]byte(vv.String())) > 0 {
- err := json.Unmarshal([]byte(vv.String()), x.Interface())
+ err := json.Unmarshal([]byte(vv.String()), &x)
if err != nil {
return nil, err
}
- fieldValue.Set(x.Elem())
+ fieldValue.Set(reflect.ValueOf(&x))
}
- } else if rawValueType.Kind() == reflect.Slice {
hasAssigned = true
- x := reflect.New(fieldType)
- if len(vv.Bytes()) > 0 {
- err := json.Unmarshal(vv.Bytes(), x.Interface())
+ case core.Complex128Type:
+ var x complex128
+ if len([]byte(vv.String())) > 0 {
+ err := json.Unmarshal([]byte(vv.String()), &x)
if err != nil {
return nil, err
}
- fieldValue.Set(x.Elem())
+ fieldValue.Set(reflect.ValueOf(&x))
}
- }
- } else if session.statement.UseCascade {
- table, err := session.engine.autoMapType(*fieldValue)
+ hasAssigned = true
+ } // switch fieldType
+ } // switch fieldType.Kind()
+
+ // !nashtsai! for value can't be assigned directly fallback to convert to []byte then back to value
+ if !hasAssigned {
+ data, err := value2Bytes(&rawValue)
if err != nil {
return nil, err
}
- hasAssigned = true
- if len(table.PrimaryKeys) != 1 {
- return nil, errors.New("unsupported non or composited primary key cascade")
- }
- var pk = make(core.PK, len(table.PrimaryKeys))
- pk[0], err = asKind(vv, rawValueType)
- if err != nil {
+ if err = session.bytes2Value(col, fieldValue, data); err != nil {
return nil, err
}
-
- if !isPKZero(pk) {
- // !nashtsai! TODO for hasOne relationship, it's preferred to use join query for eager fetch
- // however, also need to consider adding a 'lazy' attribute to xorm tag which allow hasOne
- // property to be fetched lazily
- structInter := reflect.New(fieldValue.Type())
- has, err := session.ID(pk).NoCascade().get(structInter.Interface())
- if err != nil {
- return nil, err
- }
- if has {
- fieldValue.Set(structInter.Elem())
- } else {
- return nil, errors.New("cascade obj is not exist")
- }
- }
- }
- case reflect.Ptr:
- // !nashtsai! TODO merge duplicated codes above
- switch fieldType {
- // following types case matching ptr's native type, therefore assign ptr directly
- case core.PtrStringType:
- if rawValueType.Kind() == reflect.String {
- x := vv.String()
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrBoolType:
- if rawValueType.Kind() == reflect.Bool {
- x := vv.Bool()
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrTimeType:
- if rawValueType == core.PtrTimeType {
- hasAssigned = true
- var x = rawValue.Interface().(time.Time)
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrFloat64Type:
- if rawValueType.Kind() == reflect.Float64 {
- x := vv.Float()
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrUint64Type:
- if rawValueType.Kind() == reflect.Int64 {
- var x = uint64(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrInt64Type:
- if rawValueType.Kind() == reflect.Int64 {
- x := vv.Int()
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrFloat32Type:
- if rawValueType.Kind() == reflect.Float64 {
- var x = float32(vv.Float())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrIntType:
- if rawValueType.Kind() == reflect.Int64 {
- var x = int(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrInt32Type:
- if rawValueType.Kind() == reflect.Int64 {
- var x = int32(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrInt8Type:
- if rawValueType.Kind() == reflect.Int64 {
- var x = int8(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrInt16Type:
- if rawValueType.Kind() == reflect.Int64 {
- var x = int16(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrUintType:
- if rawValueType.Kind() == reflect.Int64 {
- var x = uint(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.PtrUint32Type:
- if rawValueType.Kind() == reflect.Int64 {
- var x = uint32(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.Uint8Type:
- if rawValueType.Kind() == reflect.Int64 {
- var x = uint8(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.Uint16Type:
- if rawValueType.Kind() == reflect.Int64 {
- var x = uint16(vv.Int())
- hasAssigned = true
- fieldValue.Set(reflect.ValueOf(&x))
- }
- case core.Complex64Type:
- var x complex64
- if len([]byte(vv.String())) > 0 {
- err := json.Unmarshal([]byte(vv.String()), &x)
- if err != nil {
- return nil, err
- }
- fieldValue.Set(reflect.ValueOf(&x))
- }
- hasAssigned = true
- case core.Complex128Type:
- var x complex128
- if len([]byte(vv.String())) > 0 {
- err := json.Unmarshal([]byte(vv.String()), &x)
- if err != nil {
- return nil, err
- }
- fieldValue.Set(reflect.ValueOf(&x))
- }
- hasAssigned = true
- } // switch fieldType
- } // switch fieldType.Kind()
-
- // !nashtsai! for value can't be assigned directly fallback to convert to []byte then back to value
- if !hasAssigned {
- data, err := value2Bytes(&rawValue)
- if err != nil {
- return nil, err
- }
-
- if err = session.bytes2Value(col, fieldValue, data); err != nil {
- return nil, err
}
}
}
@@ -834,6 +828,15 @@ func (session *Session) LastSQL() (string, []interface{}) {
return session.lastSQL, session.lastSQLArgs
}
+// tbName get some table's table name
+func (session *Session) tbNameNoSchema(table *core.Table) string {
+ if len(session.statement.AltTableName) > 0 {
+ return session.statement.AltTableName
+ }
+
+ return table.Name
+}
+
// Unscoped always disable struct tag "deleted"
func (session *Session) Unscoped() *Session {
session.statement.Unscoped()
diff --git a/vendor/github.com/go-xorm/xorm/session_cols.go b/vendor/github.com/go-xorm/xorm/session_cols.go
index 1c2b023d82a..9972cb0ae4b 100644
--- a/vendor/github.com/go-xorm/xorm/session_cols.go
+++ b/vendor/github.com/go-xorm/xorm/session_cols.go
@@ -4,113 +4,6 @@
package xorm
-import (
- "reflect"
- "strings"
- "time"
-
- "github.com/go-xorm/core"
-)
-
-type incrParam struct {
- colName string
- arg interface{}
-}
-
-type decrParam struct {
- colName string
- arg interface{}
-}
-
-type exprParam struct {
- colName string
- expr string
-}
-
-type columnMap []string
-
-func (m columnMap) contain(colName string) bool {
- if len(m) == 0 {
- return false
- }
-
- n := len(colName)
- for _, mk := range m {
- if len(mk) != n {
- continue
- }
- if strings.EqualFold(mk, colName) {
- return true
- }
- }
-
- return false
-}
-
-func setColumnInt(bean interface{}, col *core.Column, t int64) {
- v, err := col.ValueOf(bean)
- if err != nil {
- return
- }
- if v.CanSet() {
- switch v.Type().Kind() {
- case reflect.Int, reflect.Int64, reflect.Int32:
- v.SetInt(t)
- case reflect.Uint, reflect.Uint64, reflect.Uint32:
- v.SetUint(uint64(t))
- }
- }
-}
-
-func setColumnTime(bean interface{}, col *core.Column, t time.Time) {
- v, err := col.ValueOf(bean)
- if err != nil {
- return
- }
- if v.CanSet() {
- switch v.Type().Kind() {
- case reflect.Struct:
- v.Set(reflect.ValueOf(t).Convert(v.Type()))
- case reflect.Int, reflect.Int64, reflect.Int32:
- v.SetInt(t.Unix())
- case reflect.Uint, reflect.Uint64, reflect.Uint32:
- v.SetUint(uint64(t.Unix()))
- }
- }
-}
-
-func getFlagForColumn(m map[string]bool, col *core.Column) (val bool, has bool) {
- if len(m) == 0 {
- return false, false
- }
-
- n := len(col.Name)
-
- for mk := range m {
- if len(mk) != n {
- continue
- }
- if strings.EqualFold(mk, col.Name) {
- return m[mk], true
- }
- }
-
- return false, false
-}
-
-func col2NewCols(columns ...string) []string {
- newColumns := make([]string, 0, len(columns))
- for _, col := range columns {
- col = strings.Replace(col, "`", "", -1)
- col = strings.Replace(col, `"`, "", -1)
- ccols := strings.Split(col, ",")
- for _, c := range ccols {
- newColumns = append(newColumns, strings.TrimSpace(c))
- }
- }
- return newColumns
-}
-
// Incr provides a query string like "count = count + 1"
func (session *Session) Incr(column string, arg ...interface{}) *Session {
session.statement.Incr(column, arg...)
diff --git a/vendor/github.com/go-xorm/xorm/session_delete.go b/vendor/github.com/go-xorm/xorm/session_delete.go
index d9cf3ea9373..688b122ca6d 100644
--- a/vendor/github.com/go-xorm/xorm/session_delete.go
+++ b/vendor/github.com/go-xorm/xorm/session_delete.go
@@ -27,7 +27,7 @@ func (session *Session) cacheDelete(table *core.Table, tableName, sqlStr string,
return ErrCacheFailed
}
- cacher := session.engine.getCacher(tableName)
+ cacher := session.engine.getCacher2(table)
pkColumns := table.PKColumns()
ids, err := core.GetCacheSql(cacher, tableName, newsql, args)
if err != nil {
@@ -79,7 +79,7 @@ func (session *Session) Delete(bean interface{}) (int64, error) {
defer session.Close()
}
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(rValue(bean)); err != nil {
return 0, err
}
@@ -199,7 +199,7 @@ func (session *Session) Delete(bean interface{}) (int64, error) {
})
}
- if cacher := session.engine.getCacher(tableName); cacher != nil && session.statement.UseCache {
+ if cacher := session.engine.getCacher2(table); cacher != nil && session.statement.UseCache {
session.cacheDelete(table, tableNameNoQuote, deleteSQL, argsForCache...)
}
diff --git a/vendor/github.com/go-xorm/xorm/session_exist.go b/vendor/github.com/go-xorm/xorm/session_exist.go
index 74a660e852b..049c1ddff14 100644
--- a/vendor/github.com/go-xorm/xorm/session_exist.go
+++ b/vendor/github.com/go-xorm/xorm/session_exist.go
@@ -10,7 +10,6 @@ import (
"reflect"
"github.com/go-xorm/builder"
- "github.com/go-xorm/core"
)
// Exist returns true if the record exist otherwise return false
@@ -36,18 +35,10 @@ func (session *Session) Exist(bean ...interface{}) (bool, error) {
return false, err
}
- if session.engine.dialect.DBType() == core.MSSQL {
- sqlStr = fmt.Sprintf("SELECT top 1 * FROM %s WHERE %s", tableName, condSQL)
- } else {
- sqlStr = fmt.Sprintf("SELECT * FROM %s WHERE %s LIMIT 1", tableName, condSQL)
- }
+ sqlStr = fmt.Sprintf("SELECT * FROM %s WHERE %s LIMIT 1", tableName, condSQL)
args = condArgs
} else {
- if session.engine.dialect.DBType() == core.MSSQL {
- sqlStr = fmt.Sprintf("SELECT top 1 * FROM %s", tableName)
- } else {
- sqlStr = fmt.Sprintf("SELECT * FROM %s LIMIT 1", tableName)
- }
+ sqlStr = fmt.Sprintf("SELECT * FROM %s LIMIT 1", tableName)
args = []interface{}{}
}
} else {
@@ -57,7 +48,7 @@ func (session *Session) Exist(bean ...interface{}) (bool, error) {
}
if beanValue.Elem().Kind() == reflect.Struct {
- if err := session.statement.setRefBean(bean[0]); err != nil {
+ if err := session.statement.setRefValue(beanValue.Elem()); err != nil {
return false, err
}
}
diff --git a/vendor/github.com/go-xorm/xorm/session_find.go b/vendor/github.com/go-xorm/xorm/session_find.go
index 46bbf26c98d..f95dcfef2cb 100644
--- a/vendor/github.com/go-xorm/xorm/session_find.go
+++ b/vendor/github.com/go-xorm/xorm/session_find.go
@@ -29,39 +29,6 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{})
return session.find(rowsSlicePtr, condiBean...)
}
-// FindAndCount find the results and also return the counts
-func (session *Session) FindAndCount(rowsSlicePtr interface{}, condiBean ...interface{}) (int64, error) {
- if session.isAutoClose {
- defer session.Close()
- }
-
- session.autoResetStatement = false
- err := session.find(rowsSlicePtr, condiBean...)
- if err != nil {
- return 0, err
- }
-
- sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr))
- if sliceValue.Kind() != reflect.Slice && sliceValue.Kind() != reflect.Map {
- return 0, errors.New("needs a pointer to a slice or a map")
- }
-
- sliceElementType := sliceValue.Type().Elem()
- if sliceElementType.Kind() == reflect.Ptr {
- sliceElementType = sliceElementType.Elem()
- }
- session.autoResetStatement = true
-
- if session.statement.selectStr != "" {
- session.statement.selectStr = ""
- }
- if session.statement.OrderStr != "" {
- session.statement.OrderStr = ""
- }
-
- return session.Count(reflect.New(sliceElementType).Interface())
-}
-
func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{}) error {
sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr))
if sliceValue.Kind() != reflect.Slice && sliceValue.Kind() != reflect.Map {
@@ -75,7 +42,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
if sliceElementType.Kind() == reflect.Ptr {
if sliceElementType.Elem().Kind() == reflect.Struct {
pv := reflect.New(sliceElementType.Elem())
- if err := session.statement.setRefValue(pv); err != nil {
+ if err := session.statement.setRefValue(pv.Elem()); err != nil {
return err
}
} else {
@@ -83,7 +50,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
}
} else if sliceElementType.Kind() == reflect.Struct {
pv := reflect.New(sliceElementType)
- if err := session.statement.setRefValue(pv); err != nil {
+ if err := session.statement.setRefValue(pv.Elem()); err != nil {
return err
}
} else {
@@ -161,7 +128,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
}
args = append(session.statement.joinArgs, condArgs...)
- sqlStr, err = session.statement.genSelectSQL(columnStr, condSQL, true, true)
+ sqlStr, err = session.statement.genSelectSQL(columnStr, condSQL)
if err != nil {
return err
}
@@ -176,7 +143,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
}
if session.canCache() {
- if cacher := session.engine.getCacher(table.Name); cacher != nil &&
+ if cacher := session.engine.getCacher2(table); cacher != nil &&
!session.statement.IsDistinct &&
!session.statement.unscoped {
err = session.cacheFind(sliceElementType, sqlStr, rowsSlicePtr, args...)
@@ -321,12 +288,6 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
return ErrCacheFailed
}
- tableName := session.statement.TableName()
- cacher := session.engine.getCacher(tableName)
- if cacher == nil {
- return nil
- }
-
for _, filter := range session.engine.dialect.Filters() {
sqlStr = filter.Do(sqlStr, session.engine.dialect, session.statement.RefTable)
}
@@ -336,7 +297,9 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
return ErrCacheFailed
}
+ tableName := session.statement.TableName()
table := session.statement.RefTable
+ cacher := session.engine.getCacher2(table)
ids, err := core.GetCacheSql(cacher, tableName, newsql, args)
if err != nil {
rows, err := session.queryRows(newsql, args...)
diff --git a/vendor/github.com/go-xorm/xorm/session_get.go b/vendor/github.com/go-xorm/xorm/session_get.go
index 3b2c9493c26..8faf53c02c7 100644
--- a/vendor/github.com/go-xorm/xorm/session_get.go
+++ b/vendor/github.com/go-xorm/xorm/session_get.go
@@ -5,7 +5,6 @@
package xorm
import (
- "database/sql"
"errors"
"reflect"
"strconv"
@@ -31,7 +30,7 @@ func (session *Session) get(bean interface{}) (bool, error) {
}
if beanValue.Elem().Kind() == reflect.Struct {
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(beanValue.Elem()); err != nil {
return false, err
}
}
@@ -57,7 +56,7 @@ func (session *Session) get(bean interface{}) (bool, error) {
table := session.statement.RefTable
if session.canCache() && beanValue.Elem().Kind() == reflect.Struct {
- if cacher := session.engine.getCacher(table.Name); cacher != nil &&
+ if cacher := session.engine.getCacher2(table); cacher != nil &&
!session.statement.unscoped {
has, err := session.cacheGet(bean, sqlStr, args...)
if err != ErrCacheFailed {
@@ -80,13 +79,6 @@ func (session *Session) nocacheGet(beanKind reflect.Kind, table *core.Table, bea
return false, nil
}
- switch bean.(type) {
- case sql.NullInt64, sql.NullBool, sql.NullFloat64, sql.NullString:
- return true, rows.Scan(&bean)
- case *sql.NullInt64, *sql.NullBool, *sql.NullFloat64, *sql.NullString:
- return true, rows.Scan(bean)
- }
-
switch beanKind {
case reflect.Struct:
fields, err := rows.Columns()
@@ -134,9 +126,8 @@ func (session *Session) cacheGet(bean interface{}, sqlStr string, args ...interf
return false, ErrCacheFailed
}
+ cacher := session.engine.getCacher2(session.statement.RefTable)
tableName := session.statement.TableName()
- cacher := session.engine.getCacher(tableName)
-
session.engine.logger.Debug("[cacheGet] find sql:", newsql, args)
table := session.statement.RefTable
ids, err := core.GetCacheSql(cacher, tableName, newsql, args)
diff --git a/vendor/github.com/go-xorm/xorm/session_insert.go b/vendor/github.com/go-xorm/xorm/session_insert.go
index c1182fe64f8..129ee23098a 100644
--- a/vendor/github.com/go-xorm/xorm/session_insert.go
+++ b/vendor/github.com/go-xorm/xorm/session_insert.go
@@ -66,12 +66,11 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
return 0, errors.New("could not insert a empty slice")
}
- if err := session.statement.setRefBean(sliceValue.Index(0).Interface()); err != nil {
+ if err := session.statement.setRefValue(reflect.ValueOf(sliceValue.Index(0).Interface())); err != nil {
return 0, err
}
- tableName := session.statement.TableName()
- if len(tableName) <= 0 {
+ if len(session.statement.TableName()) <= 0 {
return 0, ErrTableNotFound
}
@@ -116,11 +115,15 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
if col.IsDeleted {
continue
}
- if session.statement.omitColumnMap.contain(col.Name) {
- continue
+ if session.statement.ColumnStr != "" {
+ if _, ok := getFlagForColumn(session.statement.columnMap, col); !ok {
+ continue
+ }
}
- if len(session.statement.columnMap) > 0 && !session.statement.columnMap.contain(col.Name) {
- continue
+ if session.statement.OmitStr != "" {
+ if _, ok := getFlagForColumn(session.statement.columnMap, col); ok {
+ continue
+ }
}
if (col.IsCreated || col.IsUpdated) && session.statement.UseAutoTime {
val, t := session.engine.nowTime(col)
@@ -167,11 +170,15 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
if col.IsDeleted {
continue
}
- if session.statement.omitColumnMap.contain(col.Name) {
- continue
+ if session.statement.ColumnStr != "" {
+ if _, ok := getFlagForColumn(session.statement.columnMap, col); !ok {
+ continue
+ }
}
- if len(session.statement.columnMap) > 0 && !session.statement.columnMap.contain(col.Name) {
- continue
+ if session.statement.OmitStr != "" {
+ if _, ok := getFlagForColumn(session.statement.columnMap, col); ok {
+ continue
+ }
}
if (col.IsCreated || col.IsUpdated) && session.statement.UseAutoTime {
val, t := session.engine.nowTime(col)
@@ -206,6 +213,7 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
var sql = "INSERT INTO %s (%v%v%v) VALUES (%v)"
var statement string
+ var tableName = session.statement.TableName()
if session.engine.dialect.DBType() == core.ORACLE {
sql = "INSERT ALL INTO %s (%v%v%v) VALUES (%v) SELECT 1 FROM DUAL"
temp := fmt.Sprintf(") INTO %s (%v%v%v) VALUES (",
@@ -232,7 +240,9 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
return 0, err
}
- session.cacheInsert(tableName)
+ if cacher := session.engine.getCacher2(table); cacher != nil && session.statement.UseCache {
+ session.cacheInsert(table, tableName)
+ }
lenAfterClosures := len(session.afterClosures)
for i := 0; i < size; i++ {
@@ -288,7 +298,7 @@ func (session *Session) InsertMulti(rowsSlicePtr interface{}) (int64, error) {
}
func (session *Session) innerInsert(bean interface{}) (int64, error) {
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(rValue(bean)); err != nil {
return 0, err
}
if len(session.statement.TableName()) <= 0 {
@@ -306,8 +316,8 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) {
if processor, ok := interface{}(bean).(BeforeInsertProcessor); ok {
processor.BeforeInsert()
}
-
- colNames, args, err := session.genInsertColumns(bean)
+ // --
+ colNames, args, err := genCols(session.statement.RefTable, session, bean, false, false)
if err != nil {
return 0, err
}
@@ -392,7 +402,9 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) {
defer handleAfterInsertProcessorFunc(bean)
- session.cacheInsert(tableName)
+ if cacher := session.engine.getCacher2(table); cacher != nil && session.statement.UseCache {
+ session.cacheInsert(table, tableName)
+ }
if table.Version != "" && session.statement.checkVersion {
verValue, err := table.VersionColumn().ValueOf(bean)
@@ -435,7 +447,9 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) {
}
defer handleAfterInsertProcessorFunc(bean)
- session.cacheInsert(tableName)
+ if cacher := session.engine.getCacher2(table); cacher != nil && session.statement.UseCache {
+ session.cacheInsert(table, tableName)
+ }
if table.Version != "" && session.statement.checkVersion {
verValue, err := table.VersionColumn().ValueOf(bean)
@@ -476,7 +490,9 @@ func (session *Session) innerInsert(bean interface{}) (int64, error) {
defer handleAfterInsertProcessorFunc(bean)
- session.cacheInsert(tableName)
+ if cacher := session.engine.getCacher2(table); cacher != nil && session.statement.UseCache {
+ session.cacheInsert(table, tableName)
+ }
if table.Version != "" && session.statement.checkVersion {
verValue, err := table.VersionColumn().ValueOf(bean)
@@ -523,104 +539,16 @@ func (session *Session) InsertOne(bean interface{}) (int64, error) {
return session.innerInsert(bean)
}
-func (session *Session) cacheInsert(table string) error {
- if !session.statement.UseCache {
- return nil
+func (session *Session) cacheInsert(table *core.Table, tables ...string) error {
+ if table == nil {
+ return ErrCacheFailed
}
- cacher := session.engine.getCacher(table)
- if cacher == nil {
- return nil
+
+ cacher := session.engine.getCacher2(table)
+ for _, t := range tables {
+ session.engine.logger.Debug("[cache] clear sql:", t)
+ cacher.ClearIds(t)
}
- session.engine.logger.Debug("[cache] clear sql:", table)
- cacher.ClearIds(table)
+
return nil
}
-
-// genInsertColumns generates insert needed columns
-func (session *Session) genInsertColumns(bean interface{}) ([]string, []interface{}, error) {
- table := session.statement.RefTable
- colNames := make([]string, 0, len(table.ColumnsSeq()))
- args := make([]interface{}, 0, len(table.ColumnsSeq()))
-
- for _, col := range table.Columns() {
- if col.MapType == core.ONLYFROMDB {
- continue
- }
-
- if col.IsDeleted {
- continue
- }
-
- if session.statement.omitColumnMap.contain(col.Name) {
- continue
- }
-
- if len(session.statement.columnMap) > 0 && !session.statement.columnMap.contain(col.Name) {
- continue
- }
-
- if _, ok := session.statement.incrColumns[col.Name]; ok {
- continue
- } else if _, ok := session.statement.decrColumns[col.Name]; ok {
- continue
- }
-
- fieldValuePtr, err := col.ValueOf(bean)
- if err != nil {
- return nil, nil, err
- }
- fieldValue := *fieldValuePtr
-
- if col.IsAutoIncrement {
- switch fieldValue.Type().Kind() {
- case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int, reflect.Int64:
- if fieldValue.Int() == 0 {
- continue
- }
- case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint, reflect.Uint64:
- if fieldValue.Uint() == 0 {
- continue
- }
- case reflect.String:
- if len(fieldValue.String()) == 0 {
- continue
- }
- case reflect.Ptr:
- if fieldValue.Pointer() == 0 {
- continue
- }
- }
- }
-
- // !evalphobia! set fieldValue as nil when column is nullable and zero-value
- if _, ok := getFlagForColumn(session.statement.nullableMap, col); ok {
- if col.Nullable && isZero(fieldValue.Interface()) {
- var nilValue *int
- fieldValue = reflect.ValueOf(nilValue)
- }
- }
-
- if (col.IsCreated || col.IsUpdated) && session.statement.UseAutoTime /*&& isZero(fieldValue.Interface())*/ {
- // if time is non-empty, then set to auto time
- val, t := session.engine.nowTime(col)
- args = append(args, val)
-
- var colName = col.Name
- session.afterClosures = append(session.afterClosures, func(bean interface{}) {
- col := table.GetColumn(colName)
- setColumnTime(bean, col, t)
- })
- } else if col.IsVersion && session.statement.checkVersion {
- args = append(args, 1)
- } else {
- arg, err := session.value2Interface(col, fieldValue)
- if err != nil {
- return colNames, args, err
- }
- args = append(args, arg)
- }
-
- colNames = append(colNames, col.Name)
- }
- return colNames, args, nil
-}
diff --git a/vendor/github.com/go-xorm/xorm/session_query.go b/vendor/github.com/go-xorm/xorm/session_query.go
index 5c9aeb3916c..5b4e0dc45d0 100644
--- a/vendor/github.com/go-xorm/xorm/session_query.go
+++ b/vendor/github.com/go-xorm/xorm/session_query.go
@@ -17,17 +17,7 @@ import (
func (session *Session) genQuerySQL(sqlorArgs ...interface{}) (string, []interface{}, error) {
if len(sqlorArgs) > 0 {
- switch sqlorArgs[0].(type) {
- case string:
- return sqlorArgs[0].(string), sqlorArgs[1:], nil
- case *builder.Builder:
- return sqlorArgs[0].(*builder.Builder).ToSQL()
- case builder.Builder:
- bd := sqlorArgs[0].(builder.Builder)
- return bd.ToSQL()
- default:
- return "", nil, ErrUnSupportedType
- }
+ return sqlorArgs[0].(string), sqlorArgs[1:], nil
}
if session.statement.RawSQL != "" {
@@ -64,17 +54,13 @@ func (session *Session) genQuerySQL(sqlorArgs ...interface{}) (string, []interfa
}
}
- if err := session.statement.processIDParam(); err != nil {
- return "", nil, err
- }
-
condSQL, condArgs, err := builder.ToSQL(session.statement.cond)
if err != nil {
return "", nil, err
}
args := append(session.statement.joinArgs, condArgs...)
- sqlStr, err := session.statement.genSelectSQL(columnStr, condSQL, true, true)
+ sqlStr, err := session.statement.genSelectSQL(columnStr, condSQL)
if err != nil {
return "", nil, err
}
diff --git a/vendor/github.com/go-xorm/xorm/session_schema.go b/vendor/github.com/go-xorm/xorm/session_schema.go
index f06286614e3..a2708b736c0 100644
--- a/vendor/github.com/go-xorm/xorm/session_schema.go
+++ b/vendor/github.com/go-xorm/xorm/session_schema.go
@@ -6,7 +6,9 @@ package xorm
import (
"database/sql"
+ "errors"
"fmt"
+ "reflect"
"strings"
"github.com/go-xorm/core"
@@ -32,7 +34,8 @@ func (session *Session) CreateTable(bean interface{}) error {
}
func (session *Session) createTable(bean interface{}) error {
- if err := session.statement.setRefBean(bean); err != nil {
+ v := rValue(bean)
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
@@ -51,7 +54,8 @@ func (session *Session) CreateIndexes(bean interface{}) error {
}
func (session *Session) createIndexes(bean interface{}) error {
- if err := session.statement.setRefBean(bean); err != nil {
+ v := rValue(bean)
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
@@ -74,7 +78,8 @@ func (session *Session) CreateUniques(bean interface{}) error {
}
func (session *Session) createUniques(bean interface{}) error {
- if err := session.statement.setRefBean(bean); err != nil {
+ v := rValue(bean)
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
@@ -98,7 +103,8 @@ func (session *Session) DropIndexes(bean interface{}) error {
}
func (session *Session) dropIndexes(bean interface{}) error {
- if err := session.statement.setRefBean(bean); err != nil {
+ v := rValue(bean)
+ if err := session.statement.setRefValue(v); err != nil {
return err
}
@@ -122,7 +128,11 @@ func (session *Session) DropTable(beanOrTableName interface{}) error {
}
func (session *Session) dropTable(beanOrTableName interface{}) error {
- tableName := session.engine.tbNameNoSchema(beanOrTableName)
+ tableName, err := session.engine.tableName(beanOrTableName)
+ if err != nil {
+ return err
+ }
+
var needDrop = true
if !session.engine.dialect.SupportDropIfExists() {
sqlStr, args := session.engine.dialect.TableCheckSql(tableName)
@@ -134,8 +144,8 @@ func (session *Session) dropTable(beanOrTableName interface{}) error {
}
if needDrop {
- sqlStr := session.engine.Dialect().DropTableSql(session.engine.TableName(tableName, true))
- _, err := session.exec(sqlStr)
+ sqlStr := session.engine.Dialect().DropTableSql(tableName)
+ _, err = session.exec(sqlStr)
return err
}
return nil
@@ -147,7 +157,10 @@ func (session *Session) IsTableExist(beanOrTableName interface{}) (bool, error)
defer session.Close()
}
- tableName := session.engine.tbNameNoSchema(beanOrTableName)
+ tableName, err := session.engine.tableName(beanOrTableName)
+ if err != nil {
+ return false, err
+ }
return session.isTableExist(tableName)
}
@@ -160,15 +173,24 @@ func (session *Session) isTableExist(tableName string) (bool, error) {
// IsTableEmpty if table have any records
func (session *Session) IsTableEmpty(bean interface{}) (bool, error) {
- if session.isAutoClose {
- defer session.Close()
+ v := rValue(bean)
+ t := v.Type()
+
+ if t.Kind() == reflect.String {
+ if session.isAutoClose {
+ defer session.Close()
+ }
+ return session.isTableEmpty(bean.(string))
+ } else if t.Kind() == reflect.Struct {
+ rows, err := session.Count(bean)
+ return rows == 0, err
}
- return session.isTableEmpty(session.engine.tbNameNoSchema(bean))
+ return false, errors.New("bean should be a struct or struct's point")
}
func (session *Session) isTableEmpty(tableName string) (bool, error) {
var total int64
- sqlStr := fmt.Sprintf("select count(*) from %s", session.engine.Quote(session.engine.TableName(tableName, true)))
+ sqlStr := fmt.Sprintf("select count(*) from %s", session.engine.Quote(tableName))
err := session.queryRow(sqlStr).Scan(&total)
if err != nil {
if err == sql.ErrNoRows {
@@ -233,12 +255,6 @@ func (session *Session) Sync2(beans ...interface{}) error {
return err
}
- session.autoResetStatement = false
- defer func() {
- session.autoResetStatement = true
- session.resetStatement()
- }()
-
var structTables []*core.Table
for _, bean := range beans {
@@ -248,8 +264,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
return err
}
structTables = append(structTables, table)
- tbName := session.tbNameNoSchema(table)
- tbNameWithSchema := engine.TableName(tbName, true)
+ var tbName = session.tbNameNoSchema(table)
var oriTable *core.Table
for _, tb := range tables {
@@ -294,32 +309,32 @@ func (session *Session) Sync2(beans ...interface{}) error {
if engine.dialect.DBType() == core.MYSQL ||
engine.dialect.DBType() == core.POSTGRES {
engine.logger.Infof("Table %s column %s change type from %s to %s\n",
- tbNameWithSchema, col.Name, curType, expectedType)
- _, err = session.exec(engine.dialect.ModifyColumnSql(tbNameWithSchema, col))
+ tbName, col.Name, curType, expectedType)
+ _, err = session.exec(engine.dialect.ModifyColumnSql(table.Name, col))
} else {
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s\n",
- tbNameWithSchema, col.Name, curType, expectedType)
+ tbName, col.Name, curType, expectedType)
}
} else if strings.HasPrefix(curType, core.Varchar) && strings.HasPrefix(expectedType, core.Varchar) {
if engine.dialect.DBType() == core.MYSQL {
if oriCol.Length < col.Length {
engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
- tbNameWithSchema, col.Name, oriCol.Length, col.Length)
- _, err = session.exec(engine.dialect.ModifyColumnSql(tbNameWithSchema, col))
+ tbName, col.Name, oriCol.Length, col.Length)
+ _, err = session.exec(engine.dialect.ModifyColumnSql(table.Name, col))
}
}
} else {
if !(strings.HasPrefix(curType, expectedType) && curType[len(expectedType)] == '(') {
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s",
- tbNameWithSchema, col.Name, curType, expectedType)
+ tbName, col.Name, curType, expectedType)
}
}
} else if expectedType == core.Varchar {
if engine.dialect.DBType() == core.MYSQL {
if oriCol.Length < col.Length {
engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
- tbNameWithSchema, col.Name, oriCol.Length, col.Length)
- _, err = session.exec(engine.dialect.ModifyColumnSql(tbNameWithSchema, col))
+ tbName, col.Name, oriCol.Length, col.Length)
+ _, err = session.exec(engine.dialect.ModifyColumnSql(table.Name, col))
}
}
}
@@ -333,7 +348,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
}
} else {
session.statement.RefTable = table
- session.statement.tableName = tbNameWithSchema
+ session.statement.tableName = tbName
err = session.addColumn(col.Name)
}
if err != nil {
@@ -356,7 +371,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
if oriIndex != nil {
if oriIndex.Type != index.Type {
- sql := engine.dialect.DropIndexSql(tbNameWithSchema, oriIndex)
+ sql := engine.dialect.DropIndexSql(tbName, oriIndex)
_, err = session.exec(sql)
if err != nil {
return err
@@ -372,7 +387,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
for name2, index2 := range oriTable.Indexes {
if _, ok := foundIndexNames[name2]; !ok {
- sql := engine.dialect.DropIndexSql(tbNameWithSchema, index2)
+ sql := engine.dialect.DropIndexSql(tbName, index2)
_, err = session.exec(sql)
if err != nil {
return err
@@ -383,12 +398,12 @@ func (session *Session) Sync2(beans ...interface{}) error {
for name, index := range addedNames {
if index.Type == core.UniqueType {
session.statement.RefTable = table
- session.statement.tableName = tbNameWithSchema
- err = session.addUnique(tbNameWithSchema, name)
+ session.statement.tableName = tbName
+ err = session.addUnique(tbName, name)
} else if index.Type == core.IndexType {
session.statement.RefTable = table
- session.statement.tableName = tbNameWithSchema
- err = session.addIndex(tbNameWithSchema, name)
+ session.statement.tableName = tbName
+ err = session.addIndex(tbName, name)
}
if err != nil {
return err
@@ -413,7 +428,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
for _, colName := range table.ColumnsSeq() {
if oriTable.GetColumn(colName) == nil {
- engine.logger.Warnf("Table %s has column %s but struct has not related field", engine.TableName(table.Name, true), colName)
+ engine.logger.Warnf("Table %s has column %s but struct has not related field", table.Name, colName)
}
}
}
diff --git a/vendor/github.com/go-xorm/xorm/session_update.go b/vendor/github.com/go-xorm/xorm/session_update.go
index 84c7e7fecff..f558745667f 100644
--- a/vendor/github.com/go-xorm/xorm/session_update.go
+++ b/vendor/github.com/go-xorm/xorm/session_update.go
@@ -40,7 +40,7 @@ func (session *Session) cacheUpdate(table *core.Table, tableName, sqlStr string,
}
}
- cacher := session.engine.getCacher(tableName)
+ cacher := session.engine.getCacher2(table)
session.engine.logger.Debug("[cacheUpdate] get cache sql", newsql, args[nStart:])
ids, err := core.GetCacheSql(cacher, tableName, newsql, args[nStart:])
if err != nil {
@@ -167,7 +167,7 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
var isMap = t.Kind() == reflect.Map
var isStruct = t.Kind() == reflect.Struct
if isStruct {
- if err := session.statement.setRefBean(bean); err != nil {
+ if err := session.statement.setRefValue(v); err != nil {
return 0, err
}
@@ -176,10 +176,12 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
}
if session.statement.ColumnStr == "" {
- colNames, args = session.statement.buildUpdates(bean, false, false,
- false, false, true)
+ colNames, args = buildUpdates(session.engine, session.statement.RefTable, bean, false, false,
+ false, false, session.statement.allUseBool, session.statement.useAllCols,
+ session.statement.mustColumnMap, session.statement.nullableMap,
+ session.statement.columnMap, true, session.statement.unscoped)
} else {
- colNames, args, err = session.genUpdateColumns(bean)
+ colNames, args, err = genCols(session.statement.RefTable, session, bean, true, true)
if err != nil {
return 0, err
}
@@ -200,8 +202,7 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
table := session.statement.RefTable
if session.statement.UseAutoTime && table != nil && table.Updated != "" {
- if !session.statement.columnMap.contain(table.Updated) &&
- !session.statement.omitColumnMap.contain(table.Updated) {
+ if _, ok := session.statement.columnMap[strings.ToLower(table.Updated)]; !ok {
colNames = append(colNames, session.engine.Quote(table.Updated)+" = ?")
col := table.UpdatedColumn()
val, t := session.engine.nowTime(col)
@@ -361,11 +362,12 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
}
}
- if cacher := session.engine.getCacher(tableName); cacher != nil && session.statement.UseCache {
- //session.cacheUpdate(table, tableName, sqlStr, args...)
- session.engine.logger.Debug("[cacheUpdate] clear table ", tableName)
- cacher.ClearIds(tableName)
- cacher.ClearBeans(tableName)
+ if table != nil {
+ if cacher := session.engine.getCacher2(table); cacher != nil && session.statement.UseCache {
+ //session.cacheUpdate(table, tableName, sqlStr, args...)
+ cacher.ClearIds(tableName)
+ cacher.ClearBeans(tableName)
+ }
}
// handle after update processors
@@ -400,92 +402,3 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
return res.RowsAffected()
}
-
-func (session *Session) genUpdateColumns(bean interface{}) ([]string, []interface{}, error) {
- table := session.statement.RefTable
- colNames := make([]string, 0, len(table.ColumnsSeq()))
- args := make([]interface{}, 0, len(table.ColumnsSeq()))
-
- for _, col := range table.Columns() {
- if !col.IsVersion && !col.IsCreated && !col.IsUpdated {
- if session.statement.omitColumnMap.contain(col.Name) {
- continue
- }
- }
- if col.MapType == core.ONLYFROMDB {
- continue
- }
-
- fieldValuePtr, err := col.ValueOf(bean)
- if err != nil {
- return nil, nil, err
- }
- fieldValue := *fieldValuePtr
-
- if col.IsAutoIncrement {
- switch fieldValue.Type().Kind() {
- case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int, reflect.Int64:
- if fieldValue.Int() == 0 {
- continue
- }
- case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint, reflect.Uint64:
- if fieldValue.Uint() == 0 {
- continue
- }
- case reflect.String:
- if len(fieldValue.String()) == 0 {
- continue
- }
- case reflect.Ptr:
- if fieldValue.Pointer() == 0 {
- continue
- }
- }
- }
-
- if col.IsDeleted || col.IsCreated {
- continue
- }
-
- if len(session.statement.columnMap) > 0 {
- if !session.statement.columnMap.contain(col.Name) {
- continue
- } else if _, ok := session.statement.incrColumns[col.Name]; ok {
- continue
- } else if _, ok := session.statement.decrColumns[col.Name]; ok {
- continue
- }
- }
-
- // !evalphobia! set fieldValue as nil when column is nullable and zero-value
- if _, ok := getFlagForColumn(session.statement.nullableMap, col); ok {
- if col.Nullable && isZero(fieldValue.Interface()) {
- var nilValue *int
- fieldValue = reflect.ValueOf(nilValue)
- }
- }
-
- if col.IsUpdated && session.statement.UseAutoTime /*&& isZero(fieldValue.Interface())*/ {
- // if time is non-empty, then set to auto time
- val, t := session.engine.nowTime(col)
- args = append(args, val)
-
- var colName = col.Name
- session.afterClosures = append(session.afterClosures, func(bean interface{}) {
- col := table.GetColumn(colName)
- setColumnTime(bean, col, t)
- })
- } else if col.IsVersion && session.statement.checkVersion {
- args = append(args, 1)
- } else {
- arg, err := session.value2Interface(col, fieldValue)
- if err != nil {
- return colNames, args, err
- }
- args = append(args, arg)
- }
-
- colNames = append(colNames, session.engine.Quote(col.Name)+" = ?")
- }
- return colNames, args, nil
-}
diff --git a/vendor/github.com/go-xorm/xorm/statement.go b/vendor/github.com/go-xorm/xorm/statement.go
index 38fa26d2e92..6400425b20e 100644
--- a/vendor/github.com/go-xorm/xorm/statement.go
+++ b/vendor/github.com/go-xorm/xorm/statement.go
@@ -18,6 +18,21 @@ import (
"github.com/go-xorm/core"
)
+type incrParam struct {
+ colName string
+ arg interface{}
+}
+
+type decrParam struct {
+ colName string
+ arg interface{}
+}
+
+type exprParam struct {
+ colName string
+ expr string
+}
+
// Statement save all the sql info for executing SQL
type Statement struct {
RefTable *core.Table
@@ -32,6 +47,7 @@ type Statement struct {
HavingStr string
ColumnStr string
selectStr string
+ columnMap map[string]bool
useAllCols bool
OmitStr string
AltTableName string
@@ -51,8 +67,6 @@ type Statement struct {
allUseBool bool
checkVersion bool
unscoped bool
- columnMap columnMap
- omitColumnMap columnMap
mustColumnMap map[string]bool
nullableMap map[string]bool
incrColumns map[string]incrParam
@@ -75,8 +89,7 @@ func (statement *Statement) Init() {
statement.HavingStr = ""
statement.ColumnStr = ""
statement.OmitStr = ""
- statement.columnMap = columnMap{}
- statement.omitColumnMap = columnMap{}
+ statement.columnMap = make(map[string]bool)
statement.AltTableName = ""
statement.tableName = ""
statement.idParam = nil
@@ -208,33 +221,34 @@ func (statement *Statement) setRefValue(v reflect.Value) error {
if err != nil {
return err
}
- statement.tableName = statement.Engine.TableName(v, true)
+ statement.tableName = statement.Engine.tbName(v)
return nil
}
-func (statement *Statement) setRefBean(bean interface{}) error {
- var err error
- statement.RefTable, err = statement.Engine.autoMapType(rValue(bean))
- if err != nil {
- return err
+// Table tempororily set table name, the parameter could be a string or a pointer of struct
+func (statement *Statement) Table(tableNameOrBean interface{}) *Statement {
+ v := rValue(tableNameOrBean)
+ t := v.Type()
+ if t.Kind() == reflect.String {
+ statement.AltTableName = tableNameOrBean.(string)
+ } else if t.Kind() == reflect.Struct {
+ var err error
+ statement.RefTable, err = statement.Engine.autoMapType(v)
+ if err != nil {
+ statement.Engine.logger.Error(err)
+ return statement
+ }
+ statement.AltTableName = statement.Engine.tbName(v)
}
- statement.tableName = statement.Engine.TableName(bean, true)
- return nil
+ return statement
}
// Auto generating update columnes and values according a struct
-func (statement *Statement) buildUpdates(bean interface{},
- includeVersion, includeUpdated, includeNil,
- includeAutoIncr, update bool) ([]string, []interface{}) {
- engine := statement.Engine
- table := statement.RefTable
- allUseBool := statement.allUseBool
- useAllCols := statement.useAllCols
- mustColumnMap := statement.mustColumnMap
- nullableMap := statement.nullableMap
- columnMap := statement.columnMap
- omitColumnMap := statement.omitColumnMap
- unscoped := statement.unscoped
+func buildUpdates(engine *Engine, table *core.Table, bean interface{},
+ includeVersion bool, includeUpdated bool, includeNil bool,
+ includeAutoIncr bool, allUseBool bool, useAllCols bool,
+ mustColumnMap map[string]bool, nullableMap map[string]bool,
+ columnMap map[string]bool, update, unscoped bool) ([]string, []interface{}) {
var colNames = make([]string, 0)
var args = make([]interface{}, 0)
@@ -254,10 +268,7 @@ func (statement *Statement) buildUpdates(bean interface{},
if col.IsDeleted && !unscoped {
continue
}
- if omitColumnMap.contain(col.Name) {
- continue
- }
- if len(columnMap) > 0 && !columnMap.contain(col.Name) {
+ if use, ok := columnMap[strings.ToLower(col.Name)]; ok && !use {
continue
}
@@ -593,10 +604,17 @@ func (statement *Statement) col2NewColsWithQuote(columns ...string) []string {
}
func (statement *Statement) colmap2NewColsWithQuote() []string {
- newColumns := make([]string, len(statement.columnMap), len(statement.columnMap))
- copy(newColumns, statement.columnMap)
- for i := 0; i < len(statement.columnMap); i++ {
- newColumns[i] = statement.Engine.Quote(newColumns[i])
+ newColumns := make([]string, 0, len(statement.columnMap))
+ for col := range statement.columnMap {
+ fields := strings.Split(strings.TrimSpace(col), ".")
+ if len(fields) == 1 {
+ newColumns = append(newColumns, statement.Engine.quote(fields[0]))
+ } else if len(fields) == 2 {
+ newColumns = append(newColumns, statement.Engine.quote(fields[0])+"."+
+ statement.Engine.quote(fields[1]))
+ } else {
+ panic(errors.New("unwanted colnames"))
+ }
}
return newColumns
}
@@ -624,11 +642,10 @@ func (statement *Statement) Select(str string) *Statement {
func (statement *Statement) Cols(columns ...string) *Statement {
cols := col2NewCols(columns...)
for _, nc := range cols {
- statement.columnMap = append(statement.columnMap, nc)
+ statement.columnMap[strings.ToLower(nc)] = true
}
newColumns := statement.colmap2NewColsWithQuote()
-
statement.ColumnStr = strings.Join(newColumns, ", ")
statement.ColumnStr = strings.Replace(statement.ColumnStr, statement.Engine.quote("*"), "*", -1)
return statement
@@ -663,7 +680,7 @@ func (statement *Statement) UseBool(columns ...string) *Statement {
func (statement *Statement) Omit(columns ...string) {
newColumns := col2NewCols(columns...)
for _, nc := range newColumns {
- statement.omitColumnMap = append(statement.omitColumnMap, nc)
+ statement.columnMap[strings.ToLower(nc)] = false
}
statement.OmitStr = statement.Engine.Quote(strings.Join(newColumns, statement.Engine.Quote(", ")))
}
@@ -726,23 +743,6 @@ func (statement *Statement) Asc(colNames ...string) *Statement {
return statement
}
-// Table tempororily set table name, the parameter could be a string or a pointer of struct
-func (statement *Statement) Table(tableNameOrBean interface{}) *Statement {
- v := rValue(tableNameOrBean)
- t := v.Type()
- if t.Kind() == reflect.Struct {
- var err error
- statement.RefTable, err = statement.Engine.autoMapType(v)
- if err != nil {
- statement.Engine.logger.Error(err)
- return statement
- }
- }
-
- statement.AltTableName = statement.Engine.TableName(tableNameOrBean, true)
- return statement
-}
-
// Join The joinOP should be one of INNER, LEFT OUTER, CROSS etc - this will be prepended to JOIN
func (statement *Statement) Join(joinOP string, tablename interface{}, condition string, args ...interface{}) *Statement {
var buf bytes.Buffer
@@ -752,9 +752,39 @@ func (statement *Statement) Join(joinOP string, tablename interface{}, condition
fmt.Fprintf(&buf, "%v JOIN ", joinOP)
}
- tbName := statement.Engine.TableName(tablename, true)
+ switch tablename.(type) {
+ case []string:
+ t := tablename.([]string)
+ if len(t) > 1 {
+ fmt.Fprintf(&buf, "%v AS %v", statement.Engine.Quote(t[0]), statement.Engine.Quote(t[1]))
+ } else if len(t) == 1 {
+ fmt.Fprintf(&buf, statement.Engine.Quote(t[0]))
+ }
+ case []interface{}:
+ t := tablename.([]interface{})
+ l := len(t)
+ var table string
+ if l > 0 {
+ f := t[0]
+ v := rValue(f)
+ t := v.Type()
+ if t.Kind() == reflect.String {
+ table = f.(string)
+ } else if t.Kind() == reflect.Struct {
+ table = statement.Engine.tbName(v)
+ }
+ }
+ if l > 1 {
+ fmt.Fprintf(&buf, "%v AS %v", statement.Engine.Quote(table),
+ statement.Engine.Quote(fmt.Sprintf("%v", t[1])))
+ } else if l == 1 {
+ fmt.Fprintf(&buf, statement.Engine.Quote(table))
+ }
+ default:
+ fmt.Fprintf(&buf, statement.Engine.Quote(fmt.Sprintf("%v", tablename)))
+ }
- fmt.Fprintf(&buf, "%s ON %v", tbName, condition)
+ fmt.Fprintf(&buf, " ON %v", condition)
statement.JoinStr = buf.String()
statement.joinArgs = append(statement.joinArgs, args...)
return statement
@@ -787,12 +817,10 @@ func (statement *Statement) genColumnStr() string {
columns := statement.RefTable.Columns()
for _, col := range columns {
- if statement.omitColumnMap.contain(col.Name) {
- continue
- }
-
- if len(statement.columnMap) > 0 && !statement.columnMap.contain(col.Name) {
- continue
+ if statement.OmitStr != "" {
+ if _, ok := getFlagForColumn(statement.columnMap, col); ok {
+ continue
+ }
}
if col.MapType == core.ONLYTODB {
@@ -803,6 +831,10 @@ func (statement *Statement) genColumnStr() string {
buf.WriteString(", ")
}
+ if col.IsPrimaryKey && statement.Engine.Dialect().DBType() == "ql" {
+ buf.WriteString("id() AS ")
+ }
+
if statement.JoinStr != "" {
if statement.TableAlias != "" {
buf.WriteString(statement.TableAlias)
@@ -827,13 +859,11 @@ func (statement *Statement) genCreateTableSQL() string {
func (statement *Statement) genIndexSQL() []string {
var sqls []string
tbName := statement.TableName()
- for _, index := range statement.RefTable.Indexes {
+ quote := statement.Engine.Quote
+ for idxName, index := range statement.RefTable.Indexes {
if index.Type == core.IndexType {
- sql := statement.Engine.dialect.CreateIndexSql(tbName, index)
- /*idxTBName := strings.Replace(tbName, ".", "_", -1)
- idxTBName = strings.Replace(idxTBName, `"`, "", -1)
- sql := fmt.Sprintf("CREATE INDEX %v ON %v (%v);", quote(indexName(idxTBName, idxName)),
- quote(tbName), quote(strings.Join(index.Cols, quote(","))))*/
+ sql := fmt.Sprintf("CREATE INDEX %v ON %v (%v);", quote(indexName(tbName, idxName)),
+ quote(tbName), quote(strings.Join(index.Cols, quote(","))))
sqls = append(sqls, sql)
}
}
@@ -859,18 +889,16 @@ func (statement *Statement) genUniqueSQL() []string {
func (statement *Statement) genDelIndexSQL() []string {
var sqls []string
tbName := statement.TableName()
- idxPrefixName := strings.Replace(tbName, `"`, "", -1)
- idxPrefixName = strings.Replace(idxPrefixName, `.`, "_", -1)
for idxName, index := range statement.RefTable.Indexes {
var rIdxName string
if index.Type == core.UniqueType {
- rIdxName = uniqueName(idxPrefixName, idxName)
+ rIdxName = uniqueName(tbName, idxName)
} else if index.Type == core.IndexType {
- rIdxName = indexName(idxPrefixName, idxName)
+ rIdxName = indexName(tbName, idxName)
}
- sql := fmt.Sprintf("DROP INDEX %v", statement.Engine.Quote(statement.Engine.TableName(rIdxName, true)))
+ sql := fmt.Sprintf("DROP INDEX %v", statement.Engine.Quote(rIdxName))
if statement.Engine.dialect.IndexOnTable() {
- sql += fmt.Sprintf(" ON %v", statement.Engine.Quote(tbName))
+ sql += fmt.Sprintf(" ON %v", statement.Engine.Quote(statement.TableName()))
}
sqls = append(sqls, sql)
}
@@ -921,7 +949,7 @@ func (statement *Statement) genGetSQL(bean interface{}) (string, []interface{},
v := rValue(bean)
isStruct := v.Kind() == reflect.Struct
if isStruct {
- statement.setRefBean(bean)
+ statement.setRefValue(v)
}
var columnStr = statement.ColumnStr
@@ -954,17 +982,13 @@ func (statement *Statement) genGetSQL(bean interface{}) (string, []interface{},
if err := statement.mergeConds(bean); err != nil {
return "", nil, err
}
- } else {
- if err := statement.processIDParam(); err != nil {
- return "", nil, err
- }
}
condSQL, condArgs, err := builder.ToSQL(statement.cond)
if err != nil {
return "", nil, err
}
- sqlStr, err := statement.genSelectSQL(columnStr, condSQL, true, true)
+ sqlStr, err := statement.genSelectSQL(columnStr, condSQL)
if err != nil {
return "", nil, err
}
@@ -977,7 +1001,7 @@ func (statement *Statement) genCountSQL(beans ...interface{}) (string, []interfa
var condArgs []interface{}
var err error
if len(beans) > 0 {
- statement.setRefBean(beans[0])
+ statement.setRefValue(rValue(beans[0]))
condSQL, condArgs, err = statement.genConds(beans[0])
} else {
condSQL, condArgs, err = builder.ToSQL(statement.cond)
@@ -994,7 +1018,7 @@ func (statement *Statement) genCountSQL(beans ...interface{}) (string, []interfa
selectSQL = "count(*)"
}
}
- sqlStr, err := statement.genSelectSQL(selectSQL, condSQL, false, false)
+ sqlStr, err := statement.genSelectSQL(selectSQL, condSQL)
if err != nil {
return "", nil, err
}
@@ -1003,7 +1027,7 @@ func (statement *Statement) genCountSQL(beans ...interface{}) (string, []interfa
}
func (statement *Statement) genSumSQL(bean interface{}, columns ...string) (string, []interface{}, error) {
- statement.setRefBean(bean)
+ statement.setRefValue(rValue(bean))
var sumStrs = make([]string, 0, len(columns))
for _, colName := range columns {
@@ -1019,7 +1043,7 @@ func (statement *Statement) genSumSQL(bean interface{}, columns ...string) (stri
return "", nil, err
}
- sqlStr, err := statement.genSelectSQL(sumSelect, condSQL, true, true)
+ sqlStr, err := statement.genSelectSQL(sumSelect, condSQL)
if err != nil {
return "", nil, err
}
@@ -1027,7 +1051,7 @@ func (statement *Statement) genSumSQL(bean interface{}, columns ...string) (stri
return sqlStr, append(statement.joinArgs, condArgs...), nil
}
-func (statement *Statement) genSelectSQL(columnStr, condSQL string, needLimit, needOrderBy bool) (a string, err error) {
+func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string, err error) {
var distinct string
if statement.IsDistinct && !strings.HasPrefix(columnStr, "count") {
distinct = "DISTINCT "
@@ -1038,6 +1062,10 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string, needLimit, n
var top string
var mssqlCondi string
+ if err := statement.processIDParam(); err != nil {
+ return "", err
+ }
+
var buf bytes.Buffer
if len(condSQL) > 0 {
fmt.Fprintf(&buf, " WHERE %v", condSQL)
@@ -1090,10 +1118,9 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string, needLimit, n
}
var orderStr string
- if needOrderBy && len(statement.OrderStr) > 0 {
+ if len(statement.OrderStr) > 0 {
orderStr = " ORDER BY " + statement.OrderStr
}
-
var groupStr string
if len(statement.GroupByStr) > 0 {
groupStr = " GROUP BY " + statement.GroupByStr
@@ -1119,20 +1146,18 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string, needLimit, n
if statement.HavingStr != "" {
a = fmt.Sprintf("%v %v", a, statement.HavingStr)
}
- if needOrderBy && statement.OrderStr != "" {
+ if statement.OrderStr != "" {
a = fmt.Sprintf("%v ORDER BY %v", a, statement.OrderStr)
}
- if needLimit {
- if dialect.DBType() != core.MSSQL && dialect.DBType() != core.ORACLE {
- if statement.Start > 0 {
- a = fmt.Sprintf("%v LIMIT %v OFFSET %v", a, statement.LimitN, statement.Start)
- } else if statement.LimitN > 0 {
- a = fmt.Sprintf("%v LIMIT %v", a, statement.LimitN)
- }
- } else if dialect.DBType() == core.ORACLE {
- if statement.Start != 0 || statement.LimitN != 0 {
- a = fmt.Sprintf("SELECT %v FROM (SELECT %v,ROWNUM RN FROM (%v) at WHERE ROWNUM <= %d) aat WHERE RN > %d", columnStr, columnStr, a, statement.Start+statement.LimitN, statement.Start)
- }
+ if dialect.DBType() != core.MSSQL && dialect.DBType() != core.ORACLE {
+ if statement.Start > 0 {
+ a = fmt.Sprintf("%v LIMIT %v OFFSET %v", a, statement.LimitN, statement.Start)
+ } else if statement.LimitN > 0 {
+ a = fmt.Sprintf("%v LIMIT %v", a, statement.LimitN)
+ }
+ } else if dialect.DBType() == core.ORACLE {
+ if statement.Start != 0 || statement.LimitN != 0 {
+ a = fmt.Sprintf("SELECT %v FROM (SELECT %v,ROWNUM RN FROM (%v) at WHERE ROWNUM <= %d) aat WHERE RN > %d", columnStr, columnStr, a, statement.Start+statement.LimitN, statement.Start)
}
}
if statement.IsForUpdate {
@@ -1143,7 +1168,7 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string, needLimit, n
}
func (statement *Statement) processIDParam() error {
- if statement.idParam == nil || statement.RefTable == nil {
+ if statement.idParam == nil {
return nil
}
diff --git a/vendor/github.com/go-xorm/xorm/xorm.go b/vendor/github.com/go-xorm/xorm/xorm.go
index b1032b52637..4fdadf2fade 100644
--- a/vendor/github.com/go-xorm/xorm/xorm.go
+++ b/vendor/github.com/go-xorm/xorm/xorm.go
@@ -17,7 +17,7 @@ import (
const (
// Version show the xorm's version
- Version string = "0.6.6.0413"
+ Version string = "0.6.4.0910"
)
func regDrvsNDialects() bool {
@@ -90,7 +90,6 @@ func NewEngine(driverName string, dataSourceName string) (*Engine, error) {
TagIdentifier: "xorm",
TZLocation: time.Local,
tagHandlers: defaultTagHandlers,
- cachers: make(map[string]core.Cacher),
}
if uri.DbType == core.SQLITE {
@@ -109,13 +108,6 @@ func NewEngine(driverName string, dataSourceName string) (*Engine, error) {
return engine, nil
}
-// NewEngineWithParams new a db manager with params. The params will be passed to dialect.
-func NewEngineWithParams(driverName string, dataSourceName string, params map[string]string) (*Engine, error) {
- engine, err := NewEngine(driverName, dataSourceName)
- engine.dialect.SetParams(params)
- return engine, err
-}
-
// Clone clone an engine
func (engine *Engine) Clone() (*Engine, error) {
return NewEngine(engine.DriverName(), engine.DataSourceName())
diff --git a/yarn.lock b/yarn.lock
index 8d742b34ba1..f58731040c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -405,17 +405,17 @@ angular-native-dragdrop@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/angular-native-dragdrop/-/angular-native-dragdrop-1.2.2.tgz#d646c6b75b131c48073c3f6e36a225b2726d8bae"
-angular-route@^1.6.6:
- version "1.6.10"
- resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.6.10.tgz#4247a32eab19495624623e96c1626dfba17ebf21"
+angular-route@1.6.6:
+ version "1.6.6"
+ resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.6.6.tgz#8c11748aa195c717b1b615a7e746442bfc7c61f4"
-angular-sanitize@^1.6.6:
- version "1.6.10"
- resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.10.tgz#635a362afb2dd040179f17d3a5455962b2c1918f"
+angular-sanitize@1.6.6:
+ version "1.6.6"
+ resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.6.tgz#0fd065a19931517fbece66596d325d72b6e06041"
-angular@^1.6.6:
- version "1.6.10"
- resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826"
+angular@1.6.6:
+ version "1.6.6"
+ resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.6.tgz#fd5a3cfb437ce382d854ee01120797978527cb64"
ansi-align@^2.0.0:
version "2.0.0"
@@ -728,9 +728,9 @@ autoprefixer@^6.3.1, autoprefixer@^6.4.0:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
-awesome-typescript-loader@^3.2.3:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.5.0.tgz#4d4d10cba7a04ed433dfa0334250846fb11a1a5a"
+awesome-typescript-loader@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-4.0.1.tgz#bddae8183f06eb65184390d596e4342ca2089281"
dependencies:
chalk "^2.3.1"
enhanced-resolve "3.3.0"
@@ -886,14 +886,6 @@ babel-jest@^22.4.3:
babel-plugin-istanbul "^4.1.5"
babel-preset-jest "^22.4.3"
-babel-loader@^7.1.2:
- version "7.1.4"
- resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015"
- dependencies:
- find-cache-dir "^1.0.0"
- loader-utils "^1.0.2"
- mkdirp "^0.5.1"
-
babel-messages@^6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -2069,10 +2061,6 @@ comment-parser@^0.3.1:
dependencies:
readable-stream "^2.0.4"
-commondir@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-
compare-versions@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
@@ -3270,7 +3258,7 @@ enhanced-resolve@3.3.0:
object-assign "^4.0.1"
tapable "^0.2.5"
-enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0:
+enhanced-resolve@^3.4.0:
version "3.4.1"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
dependencies:
@@ -3870,11 +3858,12 @@ file-entry-cache@^1.1.1:
flat-cache "^1.2.1"
object-assign "^4.0.1"
-file-loader@^0.11.2:
- version "0.11.2"
- resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
+file-loader@^1.1.11:
+ version "1.1.11"
+ resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
dependencies:
loader-utils "^1.0.2"
+ schema-utils "^0.4.5"
file-saver@^1.3.3:
version "1.3.8"
@@ -3942,14 +3931,6 @@ finalhandler@1.1.1:
statuses "~1.4.0"
unpipe "~1.0.0"
-find-cache-dir@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
- dependencies:
- commondir "^1.0.1"
- make-dir "^1.0.0"
- pkg-dir "^2.0.0"
-
find-index@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
@@ -6091,7 +6072,7 @@ jshint@~2.9.4:
shelljs "0.3.x"
strip-json-comments "1.0.x"
-json-loader@^0.5.4, json-loader@^0.5.7:
+json-loader@^0.5.4:
version "0.5.7"
resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
@@ -8917,22 +8898,22 @@ react-dom@^16.2.0:
object-assign "^4.1.1"
prop-types "^15.6.0"
-"react-draggable@^2.2.6 || ^3.0.3", react-draggable@^3.0.3:
+react-draggable@3.x, "react-draggable@^2.2.6 || ^3.0.3":
version "3.0.5"
resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.0.5.tgz#c031e0ed4313531f9409d6cd84c8ebcec0ddfe2d"
dependencies:
classnames "^2.2.5"
prop-types "^15.6.0"
-react-grid-layout-grafana@0.16.0:
- version "0.16.0"
- resolved "https://registry.yarnpkg.com/react-grid-layout-grafana/-/react-grid-layout-grafana-0.16.0.tgz#12242153fcd0bb80a26af8e41694bc2fde788b3a"
+react-grid-layout@0.16.6:
+ version "0.16.6"
+ resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-0.16.6.tgz#9b2407a2b946c2260ebaf66f13b556e1da4efeb2"
dependencies:
classnames "2.x"
lodash.isequal "^4.0.0"
prop-types "15.x"
- react-draggable "^3.0.3"
- react-resizable "^1.7.5"
+ react-draggable "3.x"
+ react-resizable "1.x"
react-highlight-words@^0.10.0:
version "0.10.0"
@@ -8941,15 +8922,15 @@ react-highlight-words@^0.10.0:
highlight-words-core "^1.1.0"
prop-types "^15.5.8"
-react-hot-loader@^4.0.1:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.1.2.tgz#5e8025f5bc5605506586b46eb2c6cc4006fd54d7"
+react-hot-loader@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.2.0.tgz#4a2ec79114f872e28ea786e04889d643ad3dfb7c"
dependencies:
fast-levenshtein "^2.0.6"
global "^4.3.0"
hoist-non-react-statics "^2.5.0"
prop-types "^15.6.1"
- react-lifecycles-compat "^3.0.2"
+ react-lifecycles-compat "^3.0.4"
shallowequal "^1.0.2"
react-immutable-proptypes@^2.1.0:
@@ -8966,9 +8947,9 @@ react-is@^16.3.2:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
-react-lifecycles-compat@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff"
+react-lifecycles-compat@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
react-popper@^0.7.5:
version "0.7.5"
@@ -8992,7 +8973,7 @@ react-reconciler@^0.7.0:
object-assign "^4.1.1"
prop-types "^15.6.0"
-react-resizable@^1.7.5:
+react-resizable@1.x:
version "1.7.5"
resolved "https://registry.yarnpkg.com/react-resizable/-/react-resizable-1.7.5.tgz#83eb75bb3684da6989bbbf4f826e1470f0af902e"
dependencies:
@@ -9668,9 +9649,9 @@ sass-lint@^1.10.2, sass-lint@^1.12.0:
path-is-absolute "^1.0.0"
util "^0.10.3"
-sass-loader@^6.0.6:
- version "6.0.7"
- resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.7.tgz#dd2fdb3e7eeff4a53f35ba6ac408715488353d00"
+sass-loader@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.0.1.tgz#fd937259ccba3a9cfe0d5f8a98746d48adfcc261"
dependencies:
clone-deep "^2.0.1"
loader-utils "^1.0.1"
@@ -9726,7 +9707,7 @@ semver-diff@^2.0.0:
dependencies:
semver "^5.0.3"
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
@@ -10470,9 +10451,9 @@ strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-style-loader@^0.20.3:
- version "0.20.3"
- resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4"
+style-loader@^0.21.0:
+ version "0.21.0"
+ resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
dependencies:
loader-utils "^1.1.0"
schema-utils "^0.4.5"
@@ -10799,16 +10780,6 @@ ts-jest@^22.0.0:
pkg-dir "^2.0.0"
yargs "^11.0.0"
-ts-loader@^3.2.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.5.0.tgz#151d004dcddb4cf8e381a3bf9d6b74c2d957a9c0"
- dependencies:
- chalk "^2.3.0"
- enhanced-resolve "^3.0.0"
- loader-utils "^1.0.2"
- micromatch "^3.1.4"
- semver "^5.0.1"
-
tslib@^1.8.0, tslib@^1.8.1:
version "1.9.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
-The new table panel is very flexible, supporting both multiple modes for time series as well as for
+The table panel is very flexible, supporting both multiple modes for time series as well as for
table, annotation and raw JSON data. It also provides date formatting and value formatting and coloring options.
To view table panels in action and test different configurations with sample data, check out the [Table Panel Showcase in the Grafana Playground](http://play.grafana.org/dashboard/db/table-panel-showcase).
+## Querying Data
+
+The table panel displays the results of a query specified in the **Metrics** tab.
+The result being displayed depends on the datasource and the query, but generally there is one row per datapoint, with extra columns for associated keys and values, as well as one column for the numeric value of the datapoint.
+You can change the behavior in the section **Data to Table** below.
+
+### Merge Multiple Queries per Table
+
+> Only available in Grafana v5.0+.
+
+Sometimes it is useful to display the results of multiple queries in the same table on corresponding rows, e.g., when comparing capacity and actual usage of resources.
+In this example usage and capacity are metrics that will have corresponding datapoints, while their associated keys and values can be used to match them.
+(This matching is only available with the **Table Transform** set to **Table**.)
+
+In its simplest case, both queries return time-series data with a numeric value and a timestamp.
+If the timestamps are the same, datapoints will be matched and rendered on the same row.
+Some datasources return keys and values (labels, tags) associated with the datapoint.
+These are being matched as well if they are present in both results and have the same value.
+The following datapoints will end up on the same row with one time column, two label columns ("host" and "job") and two value columns:
+
+```
+Datapoint for query A: {time: 1, host: "node-2", job: "job-8", value: 3}
+Datapoint for query B: {time: 1, host: "node-2", value: 4}
+```
+
+The following two results cannot be matched and will be rendered on separate rows:
+
+```
+Different time
+Datapoint for query A: {time: 1, host: "node-2", job: "job-8", value: 3}
+Datapoint for query B: {time: 2, host: "node-2", value: 4}
+
+Different label "host"
+Datapoint for query A: {time: 1, host: "node-2", job: "job-8", value: 3}
+Datapoint for query B: {time: 1, host: "node-9", value: 4}
+```
+
+You can still merge both of the above cases by changing the conflicting column's **Type** to **hidden** in the **Column Styles**.
+
+Note that if each datapoint of your query results have multiple value fields like max, min, mean, etc., they will likely have different values and therefore will not match and render on separate rows.
+If you intend for rows to be merged but see them rendered on separate rows, check the query results in the **Query Inspector** for field values being identical across datapoints that should be merged into a row.
+
## Options overview
The table panel has many ways to manipulate your data for optimal presentation.
diff --git a/docs/sources/http_api/alerting.md b/docs/sources/http_api/alerting.md
index 4d52105cf3c..e4fe0dad3ff 100644
--- a/docs/sources/http_api/alerting.md
+++ b/docs/sources/http_api/alerting.md
@@ -35,10 +35,15 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
`/api/alerts?dashboardId=1`
- - **dashboardId** – Return alerts for a specified dashboard.
- - **panelId** – Return alerts for a specified panel on a dashboard.
- - **limit** - Limit response to x number of alerts.
+ - **dashboardId** – Limit response to alerts in specified dashboard(s). You can specify multiple dashboards, e.g. dashboardId=23&dashboardId=35.
+ - **panelId** – Limit response to alert for a specified panel on a dashboard.
+ - **query** - Limit response to alerts having a name like this value.
- **state** - Return alerts with one or more of the following alert states: `ALL`,`no_data`, `paused`, `alerting`, `ok`, `pending`. To specify multiple states use the following format: `?state=paused&state=alerting`
+ - **limit** - Limit response to *X* number of alerts.
+ - **folderId** – Limit response to alerts of dashboards in specified folder(s). You can specify multiple folders, e.g. folderId=23&folderId=35.
+ - **dashboardQuery** - Limit response to alerts having a dashboard name like this value.
+ - **dashboardTag** - Limit response to alerts of dashboards with specified tags. To do an "AND" filtering with multiple tags, specify the tags parameter multiple times e.g. dashboardTag=tag1&dashboardTag=tag2.
+
**Example Response**:
diff --git a/package.json b/package.json
index 06883a6c7ec..df3da5812c1 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,9 @@
"@types/react-dom": "^16.0.3",
"angular-mocks": "^1.6.6",
"autoprefixer": "^6.4.0",
- "awesome-typescript-loader": "^3.2.3",
+ "awesome-typescript-loader": "^4.0.0",
"axios": "^0.17.1",
"babel-core": "^6.26.0",
- "babel-loader": "^7.1.2",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-preset-es2015": "^6.24.1",
"clean-webpack-plugin": "^0.1.19",
@@ -34,7 +33,7 @@
"expect.js": "~0.2.0",
"expose-loader": "^0.7.3",
"extract-text-webpack-plugin": "^3.0.0",
- "file-loader": "^0.11.2",
+ "file-loader": "^1.1.11",
"gaze": "^1.1.2",
"glob": "~7.0.0",
"grunt": "1.0.1",
@@ -61,7 +60,6 @@
"husky": "^0.14.3",
"jest": "^22.0.4",
"jshint-stylish": "~2.2.1",
- "json-loader": "^0.5.7",
"karma": "1.7.0",
"karma-chrome-launcher": "~2.2.0",
"karma-expect": "~1.1.3",
@@ -83,16 +81,15 @@
"postcss-loader": "^2.0.6",
"postcss-reporter": "^5.0.0",
"prettier": "1.9.2",
- "react-hot-loader": "^4.0.1",
+ "react-hot-loader": "^4.2.0",
"react-test-renderer": "^16.0.0",
"sass-lint": "^1.10.2",
- "sass-loader": "^6.0.6",
+ "sass-loader": "^7.0.1",
"sinon": "1.17.6",
- "style-loader": "^0.20.3",
+ "style-loader": "^0.21.0",
"systemjs": "0.20.19",
"systemjs-plugin-css": "^0.1.36",
"ts-jest": "^22.0.0",
- "ts-loader": "^3.2.0",
"tslint": "^5.8.0",
"tslint-loader": "^3.5.3",
"typescript": "^2.6.2",
@@ -105,7 +102,7 @@
},
"scripts": {
"dev": "webpack --progress --colors --config scripts/webpack/webpack.dev.js",
- "start": "webpack-dev-server --progress --colors --config scripts/webpack/webpack.dev.js",
+ "start": "webpack-dev-server --progress --colors --config scripts/webpack/webpack.hot.js",
"watch": "webpack --progress --colors --watch --config scripts/webpack/webpack.dev.js",
"build": "grunt build",
"test": "grunt test",
@@ -137,11 +134,11 @@
},
"license": "Apache-2.0",
"dependencies": {
- "angular": "^1.6.6",
+ "angular": "1.6.6",
"angular-bindonce": "^0.3.1",
"angular-native-dragdrop": "^1.2.2",
- "angular-route": "^1.6.6",
- "angular-sanitize": "^1.6.6",
+ "angular-route": "1.6.6",
+ "angular-sanitize": "1.6.6",
"babel-polyfill": "^6.26.0",
"baron": "^3.0.3",
"brace": "^0.10.0",
@@ -164,7 +161,7 @@
"prop-types": "^15.6.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
- "react-grid-layout-grafana": "0.16.0",
+ "react-grid-layout": "0.16.6",
"react-highlight-words": "^0.10.0",
"react-popper": "^0.7.5",
"react-select": "^1.1.0",
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index a9a3773ceb1..961fc11b2dc 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -2,12 +2,14 @@ package api
import (
"fmt"
+ "strconv"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/guardian"
+ "github.com/grafana/grafana/pkg/services/search"
)
func ValidateOrgAlert(c *m.ReqContext) {
@@ -46,12 +48,64 @@ func GetAlertStatesForDashboard(c *m.ReqContext) Response {
// GET /api/alerts
func GetAlerts(c *m.ReqContext) Response {
+ dashboardQuery := c.Query("dashboardQuery")
+ dashboardTags := c.QueryStrings("dashboardTag")
+ stringDashboardIDs := c.QueryStrings("dashboardId")
+ stringFolderIDs := c.QueryStrings("folderId")
+
+ dashboardIDs := make([]int64, 0)
+ for _, id := range stringDashboardIDs {
+ dashboardID, err := strconv.ParseInt(id, 10, 64)
+ if err == nil {
+ dashboardIDs = append(dashboardIDs, dashboardID)
+ }
+ }
+
+ if dashboardQuery != "" || len(dashboardTags) > 0 || len(stringFolderIDs) > 0 {
+ folderIDs := make([]int64, 0)
+ for _, id := range stringFolderIDs {
+ folderID, err := strconv.ParseInt(id, 10, 64)
+ if err == nil {
+ folderIDs = append(folderIDs, folderID)
+ }
+ }
+
+ searchQuery := search.Query{
+ Title: dashboardQuery,
+ Tags: dashboardTags,
+ SignedInUser: c.SignedInUser,
+ Limit: 1000,
+ OrgId: c.OrgId,
+ DashboardIds: dashboardIDs,
+ Type: string(search.DashHitDB),
+ FolderIds: folderIDs,
+ Permission: m.PERMISSION_EDIT,
+ }
+
+ err := bus.Dispatch(&searchQuery)
+ if err != nil {
+ return Error(500, "List alerts failed", err)
+ }
+
+ for _, d := range searchQuery.Result {
+ if d.Type == search.DashHitDB && d.Id > 0 {
+ dashboardIDs = append(dashboardIDs, d.Id)
+ }
+ }
+
+ // if we didn't find any dashboards, return empty result
+ if len(dashboardIDs) == 0 {
+ return JSON(200, []*m.AlertListItemDTO{})
+ }
+ }
+
query := m.GetAlertsQuery{
- OrgId: c.OrgId,
- DashboardId: c.QueryInt64("dashboardId"),
- PanelId: c.QueryInt64("panelId"),
- Limit: c.QueryInt64("limit"),
- User: c.SignedInUser,
+ OrgId: c.OrgId,
+ DashboardIDs: dashboardIDs,
+ PanelId: c.QueryInt64("panelId"),
+ Limit: c.QueryInt64("limit"),
+ User: c.SignedInUser,
+ Query: c.Query("query"),
}
states := c.QueryStrings("state")
diff --git a/pkg/api/alerting_test.go b/pkg/api/alerting_test.go
index 9302ef7beca..abfdfb66322 100644
--- a/pkg/api/alerting_test.go
+++ b/pkg/api/alerting_test.go
@@ -6,6 +6,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/search"
. "github.com/smartystreets/goconvey/convey"
)
@@ -64,6 +65,60 @@ func TestAlertingApiEndpoint(t *testing.T) {
})
})
})
+
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/alerts?dashboardId=1", "/api/alerts", m.ROLE_EDITOR, func(sc *scenarioContext) {
+ var searchQuery *search.Query
+ bus.AddHandler("test", func(query *search.Query) error {
+ searchQuery = query
+ return nil
+ })
+
+ var getAlertsQuery *m.GetAlertsQuery
+ bus.AddHandler("test", func(query *m.GetAlertsQuery) error {
+ getAlertsQuery = query
+ return nil
+ })
+
+ sc.handlerFunc = GetAlerts
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+ So(searchQuery, ShouldBeNil)
+ So(getAlertsQuery, ShouldNotBeNil)
+ })
+
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/alerts?dashboardId=1&dashboardId=2&folderId=3&dashboardTag=abc&dashboardQuery=dbQuery&limit=5&query=alertQuery", "/api/alerts", m.ROLE_EDITOR, func(sc *scenarioContext) {
+ var searchQuery *search.Query
+ bus.AddHandler("test", func(query *search.Query) error {
+ searchQuery = query
+ query.Result = search.HitList{
+ &search.Hit{Id: 1},
+ &search.Hit{Id: 2},
+ }
+ return nil
+ })
+
+ var getAlertsQuery *m.GetAlertsQuery
+ bus.AddHandler("test", func(query *m.GetAlertsQuery) error {
+ getAlertsQuery = query
+ return nil
+ })
+
+ sc.handlerFunc = GetAlerts
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+ So(searchQuery, ShouldNotBeNil)
+ So(searchQuery.DashboardIds[0], ShouldEqual, 1)
+ So(searchQuery.DashboardIds[1], ShouldEqual, 2)
+ So(searchQuery.FolderIds[0], ShouldEqual, 3)
+ So(searchQuery.Tags[0], ShouldEqual, "abc")
+ So(searchQuery.Title, ShouldEqual, "dbQuery")
+
+ So(getAlertsQuery, ShouldNotBeNil)
+ So(getAlertsQuery.DashboardIDs[0], ShouldEqual, 1)
+ So(getAlertsQuery.DashboardIDs[1], ShouldEqual, 2)
+ So(getAlertsQuery.Limit, ShouldEqual, 5)
+ So(getAlertsQuery.Query, ShouldEqual, "alertQuery")
+ })
})
}
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 2a905b474ce..f082f03b5f6 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -92,17 +92,22 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
data.Theme = "light"
}
- if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR {
+ if hasEditPermissionInFoldersQuery.Result {
+ children := []*dtos.NavLink{
+ {Text: "Dashboard", Icon: "gicon gicon-dashboard-new", Url: setting.AppSubUrl + "/dashboard/new"},
+ }
+
+ if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR {
+ children = append(children, &dtos.NavLink{Text: "Folder", SubTitle: "Create a new folder to organize your dashboards", Id: "folder", Icon: "gicon gicon-folder-new", Url: setting.AppSubUrl + "/dashboards/folder/new"})
+ children = append(children, &dtos.NavLink{Text: "Import", SubTitle: "Import dashboard from file or Grafana.com", Id: "import", Icon: "gicon gicon-dashboard-import", Url: setting.AppSubUrl + "/dashboard/import"})
+ }
+
data.NavTree = append(data.NavTree, &dtos.NavLink{
- Text: "Create",
- Id: "create",
- Icon: "fa fa-fw fa-plus",
- Url: setting.AppSubUrl + "/dashboard/new",
- Children: []*dtos.NavLink{
- {Text: "Dashboard", Icon: "gicon gicon-dashboard-new", Url: setting.AppSubUrl + "/dashboard/new"},
- {Text: "Folder", SubTitle: "Create a new folder to organize your dashboards", Id: "folder", Icon: "gicon gicon-folder-new", Url: setting.AppSubUrl + "/dashboards/folder/new"},
- {Text: "Import", SubTitle: "Import dashboard from file or Grafana.com", Id: "import", Icon: "gicon gicon-dashboard-import", Url: setting.AppSubUrl + "/dashboard/import"},
- },
+ Text: "Create",
+ Id: "create",
+ Icon: "fa fa-fw fa-plus",
+ Url: setting.AppSubUrl + "/dashboard/new",
+ Children: children,
})
}
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 9d0fa31946f..01fa71a6e44 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -155,5 +155,9 @@ func Logout(c *m.ReqContext) {
c.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl+"/")
c.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl+"/")
c.Session.Destory(c.Context)
- c.Redirect(setting.AppSubUrl + "/login")
+ if setting.SignoutRedirectUrl != "" {
+ c.Redirect(setting.SignoutRedirectUrl)
+ } else {
+ c.Redirect(setting.AppSubUrl + "/login")
+ }
}
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index c4a5f8fdacf..fe4fa93b621 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -78,6 +78,7 @@ func OAuthLogin(ctx *m.ReqContext) {
// handle call back
tr := &http.Transport{
+ Proxy: http.ProxyFromEnvironment,
TLSClientConfig: &tls.Config{
InsecureSkipVerify: setting.OAuthService.OAuthInfos[name].TlsSkipVerify,
},
diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go
index d6ab1c9d372..dfb2cf045ed 100644
--- a/pkg/api/org_invite.go
+++ b/pkg/api/org_invite.go
@@ -74,6 +74,9 @@ func AddOrgInvite(c *m.ReqContext, inviteDto dtos.AddInviteForm) Response {
}
if err := bus.Dispatch(&emailCmd); err != nil {
+ if err == m.ErrSmtpNotEnabled {
+ return Error(412, err.Error(), err)
+ }
return Error(500, "Failed to send email invite", err)
}
diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go
index c7ea6bb432b..976c027d749 100644
--- a/pkg/cmd/grafana-server/main.go
+++ b/pkg/cmd/grafana-server/main.go
@@ -22,6 +22,7 @@ import (
_ "github.com/grafana/grafana/pkg/services/alerting/conditions"
_ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
_ "github.com/grafana/grafana/pkg/tsdb/cloudwatch"
+ _ "github.com/grafana/grafana/pkg/tsdb/elasticsearch"
_ "github.com/grafana/grafana/pkg/tsdb/graphite"
_ "github.com/grafana/grafana/pkg/tsdb/influxdb"
_ "github.com/grafana/grafana/pkg/tsdb/mysql"
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index 83505826910..3d3cfc2e1b6 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -332,6 +332,8 @@ func updateTotalStats() {
M_StatTotal_Orgs.Set(float64(statsQuery.Result.Orgs))
}
+var usageStatsURL = "https://stats.grafana.org/grafana-usage-report"
+
func sendUsageStats() {
if !setting.ReportingEnabled {
return
@@ -366,6 +368,12 @@ func sendUsageStats() {
metrics["stats.active_users.count"] = statsQuery.Result.ActiveUsers
metrics["stats.datasources.count"] = statsQuery.Result.Datasources
metrics["stats.stars.count"] = statsQuery.Result.Stars
+ metrics["stats.folders.count"] = statsQuery.Result.Folders
+ metrics["stats.dashboard_permissions.count"] = statsQuery.Result.DashboardPermissions
+ metrics["stats.folder_permissions.count"] = statsQuery.Result.FolderPermissions
+ metrics["stats.provisioned_dashboards.count"] = statsQuery.Result.ProvisionedDashboards
+ metrics["stats.snapshots.count"] = statsQuery.Result.Snapshots
+ metrics["stats.teams.count"] = statsQuery.Result.Teams
dsStats := models.GetDataSourceStatsQuery{}
if err := bus.Dispatch(&dsStats); err != nil {
@@ -386,9 +394,38 @@ func sendUsageStats() {
}
metrics["stats.ds.other.count"] = dsOtherCount
+ dsAccessStats := models.GetDataSourceAccessStatsQuery{}
+ if err := bus.Dispatch(&dsAccessStats); err != nil {
+ metricsLogger.Error("Failed to get datasource access stats", "error", err)
+ return
+ }
+
+ // send access counters for each data source
+ // but ignore any custom data sources
+ // as sending that name could be sensitive information
+ dsAccessOtherCount := make(map[string]int64)
+ for _, dsAccessStat := range dsAccessStats.Result {
+ if dsAccessStat.Access == "" {
+ continue
+ }
+
+ access := strings.ToLower(dsAccessStat.Access)
+
+ if models.IsKnownDataSourcePlugin(dsAccessStat.Type) {
+ metrics["stats.ds_access."+dsAccessStat.Type+"."+access+".count"] = dsAccessStat.Count
+ } else {
+ old := dsAccessOtherCount[access]
+ dsAccessOtherCount[access] = old + dsAccessStat.Count
+ }
+ }
+
+ for access, count := range dsAccessOtherCount {
+ metrics["stats.ds_access.other."+access+".count"] = count
+ }
+
out, _ := json.MarshalIndent(report, "", " ")
data := bytes.NewBuffer(out)
client := http.Client{Timeout: 5 * time.Second}
- go client.Post("https://stats.grafana.org/grafana-usage-report", "application/json", data)
+ go client.Post(usageStatsURL, "application/json", data)
}
diff --git a/pkg/metrics/metrics_test.go b/pkg/metrics/metrics_test.go
new file mode 100644
index 00000000000..8d88e03d106
--- /dev/null
+++ b/pkg/metrics/metrics_test.go
@@ -0,0 +1,222 @@
+package metrics
+
+import (
+ "bytes"
+ "io/ioutil"
+ "runtime"
+ "sync"
+ "testing"
+ "time"
+
+ "net/http"
+ "net/http/httptest"
+
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/plugins"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestMetrics(t *testing.T) {
+ Convey("Test send usage stats", t, func() {
+ var getSystemStatsQuery *models.GetSystemStatsQuery
+ bus.AddHandler("test", func(query *models.GetSystemStatsQuery) error {
+ query.Result = &models.SystemStats{
+ Dashboards: 1,
+ Datasources: 2,
+ Users: 3,
+ ActiveUsers: 4,
+ Orgs: 5,
+ Playlists: 6,
+ Alerts: 7,
+ Stars: 8,
+ Folders: 9,
+ DashboardPermissions: 10,
+ FolderPermissions: 11,
+ ProvisionedDashboards: 12,
+ Snapshots: 13,
+ Teams: 14,
+ }
+ getSystemStatsQuery = query
+ return nil
+ })
+
+ var getDataSourceStatsQuery *models.GetDataSourceStatsQuery
+ bus.AddHandler("test", func(query *models.GetDataSourceStatsQuery) error {
+ query.Result = []*models.DataSourceStats{
+ {
+ Type: models.DS_ES,
+ Count: 9,
+ },
+ {
+ Type: models.DS_PROMETHEUS,
+ Count: 10,
+ },
+ {
+ Type: "unknown_ds",
+ Count: 11,
+ },
+ {
+ Type: "unknown_ds2",
+ Count: 12,
+ },
+ }
+ getDataSourceStatsQuery = query
+ return nil
+ })
+
+ var getDataSourceAccessStatsQuery *models.GetDataSourceAccessStatsQuery
+ bus.AddHandler("test", func(query *models.GetDataSourceAccessStatsQuery) error {
+ query.Result = []*models.DataSourceAccessStats{
+ {
+ Type: models.DS_ES,
+ Access: "direct",
+ Count: 1,
+ },
+ {
+ Type: models.DS_ES,
+ Access: "proxy",
+ Count: 2,
+ },
+ {
+ Type: models.DS_PROMETHEUS,
+ Access: "proxy",
+ Count: 3,
+ },
+ {
+ Type: "unknown_ds",
+ Access: "proxy",
+ Count: 4,
+ },
+ {
+ Type: "unknown_ds2",
+ Access: "",
+ Count: 5,
+ },
+ {
+ Type: "unknown_ds3",
+ Access: "direct",
+ Count: 6,
+ },
+ {
+ Type: "unknown_ds4",
+ Access: "direct",
+ Count: 7,
+ },
+ {
+ Type: "unknown_ds5",
+ Access: "proxy",
+ Count: 8,
+ },
+ }
+ getDataSourceAccessStatsQuery = query
+ return nil
+ })
+
+ var wg sync.WaitGroup
+ var responseBuffer *bytes.Buffer
+ var req *http.Request
+ ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+ req = r
+ buf, err := ioutil.ReadAll(r.Body)
+ if err != nil {
+ t.Fatalf("Failed to read response body, err=%v", err)
+ }
+ responseBuffer = bytes.NewBuffer(buf)
+ wg.Done()
+ }))
+ usageStatsURL = ts.URL
+
+ sendUsageStats()
+
+ Convey("Given reporting not enabled and sending usage stats", func() {
+ setting.ReportingEnabled = false
+ sendUsageStats()
+
+ Convey("Should not gather stats or call http endpoint", func() {
+ So(getSystemStatsQuery, ShouldBeNil)
+ So(getDataSourceStatsQuery, ShouldBeNil)
+ So(getDataSourceAccessStatsQuery, ShouldBeNil)
+ So(req, ShouldBeNil)
+ })
+ })
+
+ Convey("Given reporting enabled and sending usage stats", func() {
+ setting.ReportingEnabled = true
+ setting.BuildVersion = "5.0.0"
+ wg.Add(1)
+ sendUsageStats()
+
+ Convey("Should gather stats and call http endpoint", func() {
+ if waitTimeout(&wg, 2*time.Second) {
+ t.Fatalf("Timed out waiting for http request")
+ }
+
+ So(getSystemStatsQuery, ShouldNotBeNil)
+ So(getDataSourceStatsQuery, ShouldNotBeNil)
+ So(getDataSourceAccessStatsQuery, ShouldNotBeNil)
+ So(req, ShouldNotBeNil)
+ So(req.Method, ShouldEqual, http.MethodPost)
+ So(req.Header.Get("Content-Type"), ShouldEqual, "application/json")
+
+ So(responseBuffer, ShouldNotBeNil)
+
+ j, err := simplejson.NewFromReader(responseBuffer)
+ So(err, ShouldBeNil)
+
+ So(j.Get("version").MustString(), ShouldEqual, "5_0_0")
+ So(j.Get("os").MustString(), ShouldEqual, runtime.GOOS)
+ So(j.Get("arch").MustString(), ShouldEqual, runtime.GOARCH)
+
+ metrics := j.Get("metrics")
+ So(metrics.Get("stats.dashboards.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Dashboards)
+ So(metrics.Get("stats.users.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Users)
+ So(metrics.Get("stats.orgs.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Orgs)
+ So(metrics.Get("stats.playlist.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Playlists)
+ So(metrics.Get("stats.plugins.apps.count").MustInt(), ShouldEqual, len(plugins.Apps))
+ So(metrics.Get("stats.plugins.panels.count").MustInt(), ShouldEqual, len(plugins.Panels))
+ So(metrics.Get("stats.plugins.datasources.count").MustInt(), ShouldEqual, len(plugins.DataSources))
+ So(metrics.Get("stats.alerts.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Alerts)
+ So(metrics.Get("stats.active_users.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.ActiveUsers)
+ So(metrics.Get("stats.datasources.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Datasources)
+ So(metrics.Get("stats.stars.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Stars)
+ So(metrics.Get("stats.folders.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Folders)
+ So(metrics.Get("stats.dashboard_permissions.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.DashboardPermissions)
+ So(metrics.Get("stats.folder_permissions.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.FolderPermissions)
+ So(metrics.Get("stats.provisioned_dashboards.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.ProvisionedDashboards)
+ So(metrics.Get("stats.snapshots.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Snapshots)
+ So(metrics.Get("stats.teams.count").MustInt(), ShouldEqual, getSystemStatsQuery.Result.Teams)
+
+ So(metrics.Get("stats.ds."+models.DS_ES+".count").MustInt(), ShouldEqual, 9)
+ So(metrics.Get("stats.ds."+models.DS_PROMETHEUS+".count").MustInt(), ShouldEqual, 10)
+ So(metrics.Get("stats.ds.other.count").MustInt(), ShouldEqual, 11+12)
+
+ So(metrics.Get("stats.ds_access."+models.DS_ES+".direct.count").MustInt(), ShouldEqual, 1)
+ So(metrics.Get("stats.ds_access."+models.DS_ES+".proxy.count").MustInt(), ShouldEqual, 2)
+ So(metrics.Get("stats.ds_access."+models.DS_PROMETHEUS+".proxy.count").MustInt(), ShouldEqual, 3)
+ So(metrics.Get("stats.ds_access.other.direct.count").MustInt(), ShouldEqual, 6+7)
+ So(metrics.Get("stats.ds_access.other.proxy.count").MustInt(), ShouldEqual, 4+8)
+ })
+ })
+
+ Reset(func() {
+ ts.Close()
+ })
+ })
+}
+
+func waitTimeout(wg *sync.WaitGroup, timeout time.Duration) bool {
+ c := make(chan struct{})
+ go func() {
+ defer close(c)
+ wg.Wait()
+ }()
+ select {
+ case <-c:
+ return false // completed normally
+ case <-time.After(timeout):
+ return true // timed out
+ }
+}
diff --git a/pkg/models/alert.go b/pkg/models/alert.go
index b72d87e94b2..fba2aa63df9 100644
--- a/pkg/models/alert.go
+++ b/pkg/models/alert.go
@@ -161,12 +161,13 @@ type SetAlertStateCommand struct {
//Queries
type GetAlertsQuery struct {
- OrgId int64
- State []string
- DashboardId int64
- PanelId int64
- Limit int64
- User *SignedInUser
+ OrgId int64
+ State []string
+ DashboardIDs []int64
+ PanelId int64
+ Limit int64
+ Query string
+ User *SignedInUser
Result []*AlertListItemDTO
}
diff --git a/pkg/models/stats.go b/pkg/models/stats.go
index e132d88c030..4cd50d37463 100644
--- a/pkg/models/stats.go
+++ b/pkg/models/stats.go
@@ -1,14 +1,20 @@
package models
type SystemStats struct {
- Dashboards int64
- Datasources int64
- Users int64
- ActiveUsers int64
- Orgs int64
- Playlists int64
- Alerts int64
- Stars int64
+ Dashboards int64
+ Datasources int64
+ Users int64
+ ActiveUsers int64
+ Orgs int64
+ Playlists int64
+ Alerts int64
+ Stars int64
+ Snapshots int64
+ Teams int64
+ DashboardPermissions int64
+ FolderPermissions int64
+ Folders int64
+ ProvisionedDashboards int64
}
type DataSourceStats struct {
@@ -24,6 +30,16 @@ type GetDataSourceStatsQuery struct {
Result []*DataSourceStats
}
+type DataSourceAccessStats struct {
+ Type string
+ Access string
+ Count int64
+}
+
+type GetDataSourceAccessStatsQuery struct {
+ Result []*DataSourceAccessStats
+}
+
type AdminStats struct {
Users int `json:"users"`
Orgs int `json:"orgs"`
@@ -40,3 +56,11 @@ type AdminStats struct {
type GetAdminStatsQuery struct {
Result *AdminStats
}
+
+type SystemUserCountStats struct {
+ Count int64
+}
+
+type GetSystemUserCountStatsQuery struct {
+ Result *SystemUserCountStats
+}
diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go
index e5186e12f06..93846f5c474 100644
--- a/pkg/services/provisioning/dashboards/file_reader.go
+++ b/pkg/services/provisioning/dashboards/file_reader.go
@@ -47,9 +47,15 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
log.Error("Cannot read directory", "error", err)
}
+ absPath, err := filepath.Abs(path)
+ if err != nil {
+ log.Error("Could not create absolute path ", "path", path)
+ absPath = path //if .Abs return an error we fallback to path
+ }
+
return &fileReader{
Cfg: cfg,
- Path: path,
+ Path: absPath,
log: log,
dashboardService: dashboards.NewProvisioningService(),
}, nil
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
index 084fae1310a..87e9ec6d226 100644
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
@@ -3,6 +3,7 @@ package dashboards
import (
"os"
"path/filepath"
+ "runtime"
"testing"
"time"
@@ -15,14 +16,59 @@ import (
)
var (
- defaultDashboards = "./testdata/test-dashboards/folder-one"
- brokenDashboards = "./testdata/test-dashboards/broken-dashboards"
- oneDashboard = "./testdata/test-dashboards/one-dashboard"
- containingId = "./testdata/test-dashboards/containing-id"
+ defaultDashboards = "testdata/test-dashboards/folder-one"
+ brokenDashboards = "testdata/test-dashboards/broken-dashboards"
+ oneDashboard = "testdata/test-dashboards/one-dashboard"
+ containingId = "testdata/test-dashboards/containing-id"
fakeService *fakeDashboardProvisioningService
)
+func TestCreatingNewDashboardFileReader(t *testing.T) {
+ Convey("creating new dashboard file reader", t, func() {
+ cfg := &DashboardsAsConfig{
+ Name: "Default",
+ Type: "file",
+ OrgId: 1,
+ Folder: "",
+ Options: map[string]interface{}{},
+ }
+
+ Convey("using path parameter", func() {
+ cfg.Options["path"] = defaultDashboards
+ reader, err := NewDashboardFileReader(cfg, log.New("test-logger"))
+ So(err, ShouldBeNil)
+ So(reader.Path, ShouldNotEqual, "")
+ })
+
+ Convey("using folder as options", func() {
+ cfg.Options["folder"] = defaultDashboards
+ reader, err := NewDashboardFileReader(cfg, log.New("test-logger"))
+ So(err, ShouldBeNil)
+ So(reader.Path, ShouldNotEqual, "")
+ })
+
+ Convey("using full path", func() {
+ cfg.Options["folder"] = "/var/lib/grafana/dashboards"
+ reader, err := NewDashboardFileReader(cfg, log.New("test-logger"))
+ So(err, ShouldBeNil)
+
+ if runtime.GOOS != "windows" {
+ So(reader.Path, ShouldEqual, "/var/lib/grafana/dashboards")
+ }
+ So(filepath.IsAbs(reader.Path), ShouldBeTrue)
+ })
+
+ Convey("using relative path", func() {
+ cfg.Options["folder"] = defaultDashboards
+ reader, err := NewDashboardFileReader(cfg, log.New("test-logger"))
+ So(err, ShouldBeNil)
+
+ So(filepath.IsAbs(reader.Path), ShouldBeTrue)
+ })
+ })
+}
+
func TestDashboardFileReader(t *testing.T) {
Convey("Dashboard file reader", t, func() {
bus.ClearBusHandlers()
@@ -170,30 +216,6 @@ func TestDashboardFileReader(t *testing.T) {
})
})
- Convey("Can use bpth path and folder as dashboard path", func() {
- cfg := &DashboardsAsConfig{
- Name: "Default",
- Type: "file",
- OrgId: 1,
- Folder: "",
- Options: map[string]interface{}{},
- }
-
- Convey("using path parameter", func() {
- cfg.Options["path"] = defaultDashboards
- reader, err := NewDashboardFileReader(cfg, log.New("test-logger"))
- So(err, ShouldBeNil)
- So(reader.Path, ShouldEqual, defaultDashboards)
- })
-
- Convey("using folder as options", func() {
- cfg.Options["folder"] = defaultDashboards
- reader, err := NewDashboardFileReader(cfg, log.New("test-logger"))
- So(err, ShouldBeNil)
- So(reader.Path, ShouldEqual, defaultDashboards)
- })
- })
-
Reset(func() {
dashboards.NewProvisioningService = origNewDashboardProvisioningService
})
diff --git a/pkg/services/provisioning/datasources/config_reader_test.go b/pkg/services/provisioning/datasources/config_reader_test.go
index 89ecc5a0b68..2e407dbe4de 100644
--- a/pkg/services/provisioning/datasources/config_reader_test.go
+++ b/pkg/services/provisioning/datasources/config_reader_test.go
@@ -13,12 +13,12 @@ import (
var (
logger log.Logger = log.New("fake.log")
- twoDatasourcesConfig = "./test-configs/two-datasources"
- twoDatasourcesConfigPurgeOthers = "./test-configs/insert-two-delete-two"
- doubleDatasourcesConfig = "./test-configs/double-default"
- allProperties = "./test-configs/all-properties"
- versionZero = "./test-configs/version-0"
- brokenYaml = "./test-configs/broken-yaml"
+ twoDatasourcesConfig = "testdata/two-datasources"
+ twoDatasourcesConfigPurgeOthers = "testdata/insert-two-delete-two"
+ doubleDatasourcesConfig = "testdata/double-default"
+ allProperties = "testdata/all-properties"
+ versionZero = "testdata/version-0"
+ brokenYaml = "testdata/broken-yaml"
fakeRepo *fakeRepository
)
diff --git a/pkg/services/provisioning/datasources/test-configs/all-properties/all-properties.yaml b/pkg/services/provisioning/datasources/testdata/all-properties/all-properties.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/all-properties/all-properties.yaml
rename to pkg/services/provisioning/datasources/testdata/all-properties/all-properties.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/all-properties/not.yaml.txt b/pkg/services/provisioning/datasources/testdata/all-properties/not.yaml.txt
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/all-properties/not.yaml.txt
rename to pkg/services/provisioning/datasources/testdata/all-properties/not.yaml.txt
diff --git a/pkg/services/provisioning/datasources/test-configs/all-properties/sample.yaml b/pkg/services/provisioning/datasources/testdata/all-properties/sample.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/all-properties/sample.yaml
rename to pkg/services/provisioning/datasources/testdata/all-properties/sample.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/all-properties/second.yaml b/pkg/services/provisioning/datasources/testdata/all-properties/second.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/all-properties/second.yaml
rename to pkg/services/provisioning/datasources/testdata/all-properties/second.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/broken-yaml/broken.yaml b/pkg/services/provisioning/datasources/testdata/broken-yaml/broken.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/broken-yaml/broken.yaml
rename to pkg/services/provisioning/datasources/testdata/broken-yaml/broken.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/broken-yaml/commented.yaml b/pkg/services/provisioning/datasources/testdata/broken-yaml/commented.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/broken-yaml/commented.yaml
rename to pkg/services/provisioning/datasources/testdata/broken-yaml/commented.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/double-default/default-1.yaml b/pkg/services/provisioning/datasources/testdata/double-default/default-1.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/double-default/default-1.yaml
rename to pkg/services/provisioning/datasources/testdata/double-default/default-1.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/double-default/default-2.yaml b/pkg/services/provisioning/datasources/testdata/double-default/default-2.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/double-default/default-2.yaml
rename to pkg/services/provisioning/datasources/testdata/double-default/default-2.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/one-datasources.yaml b/pkg/services/provisioning/datasources/testdata/insert-two-delete-two/one-datasources.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/one-datasources.yaml
rename to pkg/services/provisioning/datasources/testdata/insert-two-delete-two/one-datasources.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/two-datasources.yml b/pkg/services/provisioning/datasources/testdata/insert-two-delete-two/two-datasources.yml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/two-datasources.yml
rename to pkg/services/provisioning/datasources/testdata/insert-two-delete-two/two-datasources.yml
diff --git a/pkg/services/provisioning/datasources/test-configs/two-datasources/two-datasources.yaml b/pkg/services/provisioning/datasources/testdata/two-datasources/two-datasources.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/two-datasources/two-datasources.yaml
rename to pkg/services/provisioning/datasources/testdata/two-datasources/two-datasources.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/version-0/version-0.yaml b/pkg/services/provisioning/datasources/testdata/version-0/version-0.yaml
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/version-0/version-0.yaml
rename to pkg/services/provisioning/datasources/testdata/version-0/version-0.yaml
diff --git a/pkg/services/provisioning/datasources/test-configs/zero-datasources/placeholder-for-git b/pkg/services/provisioning/datasources/testdata/zero-datasources/placeholder-for-git
similarity index 100%
rename from pkg/services/provisioning/datasources/test-configs/zero-datasources/placeholder-for-git
rename to pkg/services/provisioning/datasources/testdata/zero-datasources/placeholder-for-git
diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
index b0ca50eb67d..58ec7e2857a 100644
--- a/pkg/services/sqlstore/alert.go
+++ b/pkg/services/sqlstore/alert.go
@@ -82,8 +82,16 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
builder.Write(`WHERE alert.org_id = ?`, query.OrgId)
- if query.DashboardId != 0 {
- builder.Write(` AND alert.dashboard_id = ?`, query.DashboardId)
+ if len(strings.TrimSpace(query.Query)) > 0 {
+ builder.Write(" AND alert.name "+dialect.LikeStr()+" ?", "%"+query.Query+"%")
+ }
+
+ if len(query.DashboardIDs) > 0 {
+ builder.sql.WriteString(` AND alert.dashboard_id IN (?` + strings.Repeat(",?", len(query.DashboardIDs)-1) + `) `)
+
+ for _, dbID := range query.DashboardIDs {
+ builder.AddParams(dbID)
+ }
}
if query.PanelId != 0 {
diff --git a/pkg/services/sqlstore/alert_test.go b/pkg/services/sqlstore/alert_test.go
index 296d16c2f45..be48c7b2f52 100644
--- a/pkg/services/sqlstore/alert_test.go
+++ b/pkg/services/sqlstore/alert_test.go
@@ -3,10 +3,11 @@ package sqlstore
import (
"testing"
+ "time"
+
"github.com/grafana/grafana/pkg/components/simplejson"
m "github.com/grafana/grafana/pkg/models"
. "github.com/smartystreets/goconvey/convey"
- "time"
)
func mockTimeNow() {
@@ -99,7 +100,7 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("Can read properties", func() {
- alertQuery := m.GetAlertsQuery{DashboardId: testDash.Id, PanelId: 1, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
+ alertQuery := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&alertQuery)
alert := alertQuery.Result[0]
@@ -109,7 +110,7 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("Viewer cannot read alerts", func() {
- alertQuery := m.GetAlertsQuery{DashboardId: testDash.Id, PanelId: 1, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_VIEWER}}
+ alertQuery := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_VIEWER}}
err2 := HandleAlertsQuery(&alertQuery)
So(err2, ShouldBeNil)
@@ -134,7 +135,7 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("Alerts should be updated", func() {
- query := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
+ query := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&query)
So(err2, ShouldBeNil)
@@ -183,7 +184,7 @@ func TestAlertingDataAccess(t *testing.T) {
Convey("Should save 3 dashboards", func() {
So(err, ShouldBeNil)
- queryForDashboard := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
+ queryForDashboard := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&queryForDashboard)
So(err2, ShouldBeNil)
@@ -197,7 +198,7 @@ func TestAlertingDataAccess(t *testing.T) {
err = SaveAlerts(&cmd)
Convey("should delete the missing alert", func() {
- query := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
+ query := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&query)
So(err2, ShouldBeNil)
So(len(query.Result), ShouldEqual, 2)
@@ -232,7 +233,7 @@ func TestAlertingDataAccess(t *testing.T) {
So(err, ShouldBeNil)
Convey("Alerts should be removed", func() {
- query := m.GetAlertsQuery{DashboardId: testDash.Id, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
+ query := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_ADMIN}}
err2 := HandleAlertsQuery(&query)
So(testDash.Id, ShouldEqual, 1)
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 39aa2cb7ead..28ba0eef374 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -86,13 +86,13 @@ func (ss *SqlStore) Init() error {
}
func (ss *SqlStore) ensureAdminUser() error {
- statsQuery := m.GetSystemStatsQuery{}
+ systemUserCountQuery := m.GetSystemUserCountStatsQuery{}
- if err := bus.Dispatch(&statsQuery); err != nil {
+ if err := bus.Dispatch(&systemUserCountQuery); err != nil {
fmt.Errorf("Could not determine if admin user exists: %v", err)
}
- if statsQuery.Result.Users > 0 {
+ if systemUserCountQuery.Result.Count > 0 {
return nil
}
@@ -277,8 +277,8 @@ func InitTestDB(t *testing.T) *SqlStore {
t.Fatalf("Failed to init test database: %v", err)
}
- //// sqlstore.engine.DatabaseTZ = time.UTC
- //// sqlstore.engine.TZLocation = time.UTC
+ sqlstore.engine.DatabaseTZ = time.UTC
+ sqlstore.engine.TZLocation = time.UTC
return sqlstore
}
diff --git a/pkg/services/sqlstore/stats.go b/pkg/services/sqlstore/stats.go
index 173a1e56634..3e3e83c4014 100644
--- a/pkg/services/sqlstore/stats.go
+++ b/pkg/services/sqlstore/stats.go
@@ -10,7 +10,9 @@ import (
func init() {
bus.AddHandler("sql", GetSystemStats)
bus.AddHandler("sql", GetDataSourceStats)
+ bus.AddHandler("sql", GetDataSourceAccessStats)
bus.AddHandler("sql", GetAdminStats)
+ bus.AddHandler("sql", GetSystemUserCountStats)
}
var activeUserTimeLimit = time.Hour * 24 * 30
@@ -22,43 +24,51 @@ func GetDataSourceStats(query *m.GetDataSourceStatsQuery) error {
return err
}
+func GetDataSourceAccessStats(query *m.GetDataSourceAccessStatsQuery) error {
+ var rawSql = `SELECT COUNT(*) as count, type, access FROM data_source GROUP BY type, access`
+ query.Result = make([]*m.DataSourceAccessStats, 0)
+ err := x.SQL(rawSql).Find(&query.Result)
+ return err
+}
+
func GetSystemStats(query *m.GetSystemStatsQuery) error {
- var rawSql = `SELECT
- (
- SELECT COUNT(*)
- FROM ` + dialect.Quote("user") + `
- ) AS users,
- (
- SELECT COUNT(*)
- FROM ` + dialect.Quote("org") + `
- ) AS orgs,
- (
- SELECT COUNT(*)
- FROM ` + dialect.Quote("dashboard") + `
- ) AS dashboards,
- (
- SELECT COUNT(*)
- FROM ` + dialect.Quote("data_source") + `
- ) AS datasources,
- (
- SELECT COUNT(*) FROM ` + dialect.Quote("star") + `
- ) AS stars,
- (
- SELECT COUNT(*)
- FROM ` + dialect.Quote("playlist") + `
- ) AS playlists,
- (
- SELECT COUNT(*)
- FROM ` + dialect.Quote("alert") + `
- ) AS alerts,
- (
- SELECT COUNT(*) FROM ` + dialect.Quote("user") + ` where last_seen_at > ?
- ) as active_users
- `
+ sb := &SqlBuilder{}
+ sb.Write("SELECT ")
+ sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("user") + `) AS users,`)
+ sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("org") + `) AS orgs,`)
+ sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("dashboard") + `) AS dashboards,`)
+ sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("data_source") + `) AS datasources,`)
+ sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("star") + `) AS stars,`)
+ sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("playlist") + `) AS playlists,`)
+ sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("alert") + `) AS alerts,`)
activeUserDeadlineDate := time.Now().Add(-activeUserTimeLimit)
+ sb.Write(`(SELECT COUNT(*) FROM `+dialect.Quote("user")+` where last_seen_at > ?) AS active_users,`, activeUserDeadlineDate)
+
+ sb.Write(`(SELECT COUNT(id) FROM `+dialect.Quote("dashboard")+` where is_folder = ?) AS folders,`, dialect.BooleanStr(true))
+
+ sb.Write(`(
+ SELECT COUNT(acl.id)
+ FROM `+dialect.Quote("dashboard_acl")+` as acl
+ inner join `+dialect.Quote("dashboard")+` as d
+ on d.id = acl.dashboard_id
+ WHERE d.is_folder = ?
+ ) AS dashboard_permissions,`, dialect.BooleanStr(false))
+
+ sb.Write(`(
+ SELECT COUNT(acl.id)
+ FROM `+dialect.Quote("dashboard_acl")+` as acl
+ inner join `+dialect.Quote("dashboard")+` as d
+ on d.id = acl.dashboard_id
+ WHERE d.is_folder = ?
+ ) AS folder_permissions,`, dialect.BooleanStr(true))
+
+ sb.Write(`(SELECT COUNT(id) FROM ` + dialect.Quote("dashboard_provisioning") + `) AS provisioned_dashboards,`)
+ sb.Write(`(SELECT COUNT(id) FROM ` + dialect.Quote("dashboard_snapshot") + `) AS snapshots,`)
+ sb.Write(`(SELECT COUNT(id) FROM ` + dialect.Quote("team") + `) AS teams`)
+
var stats m.SystemStats
- _, err := x.SQL(rawSql, activeUserDeadlineDate).Get(&stats)
+ _, err := x.SQL(sb.GetSqlString(), sb.params...).Get(&stats)
if err != nil {
return err
}
@@ -122,3 +132,16 @@ func GetAdminStats(query *m.GetAdminStatsQuery) error {
query.Result = &stats
return err
}
+
+func GetSystemUserCountStats(query *m.GetSystemUserCountStatsQuery) error {
+ var rawSql = `SELECT COUNT(id) AS Count FROM ` + dialect.Quote("user")
+ var stats m.SystemUserCountStats
+ _, err := x.SQL(rawSql).Get(&stats)
+ if err != nil {
+ return err
+ }
+
+ query.Result = &stats
+
+ return err
+}
diff --git a/pkg/services/sqlstore/stats_test.go b/pkg/services/sqlstore/stats_test.go
new file mode 100644
index 00000000000..97f0ca0c43e
--- /dev/null
+++ b/pkg/services/sqlstore/stats_test.go
@@ -0,0 +1,39 @@
+package sqlstore
+
+import (
+ "testing"
+
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestStatsDataAccess(t *testing.T) {
+
+ Convey("Testing Stats Data Access", t, func() {
+ InitTestDB(t)
+
+ Convey("Get system stats should not results in error", func() {
+ query := m.GetSystemStatsQuery{}
+ err := GetSystemStats(&query)
+ So(err, ShouldBeNil)
+ })
+
+ Convey("Get system user count stats should not results in error", func() {
+ query := m.GetSystemUserCountStatsQuery{}
+ err := GetSystemUserCountStats(&query)
+ So(err, ShouldBeNil)
+ })
+
+ Convey("Get datasource stats should not results in error", func() {
+ query := m.GetDataSourceStatsQuery{}
+ err := GetDataSourceStats(&query)
+ So(err, ShouldBeNil)
+ })
+
+ Convey("Get datasource access stats should not results in error", func() {
+ query := m.GetDataSourceAccessStatsQuery{}
+ err := GetDataSourceAccessStats(&query)
+ So(err, ShouldBeNil)
+ })
+ })
+}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index f05c8dddfae..9bae4e35950 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -104,6 +104,7 @@ var (
DefaultTheme string
DisableLoginForm bool
DisableSignoutMenu bool
+ SignoutRedirectUrl string
ExternalUserMngLinkUrl string
ExternalUserMngLinkName string
ExternalUserMngInfo string
@@ -600,6 +601,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
auth := iniFile.Section("auth")
DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)
+ SignoutRedirectUrl = auth.Key("signout_redirect_url").String()
// anonymous access
AnonymousEnabled = iniFile.Section("auth.anonymous").Key("enabled").MustBool(false)
diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go
index a7d33645b9b..136ee241c2e 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -230,8 +230,8 @@ func parseMultiSelectValue(input string) []string {
// Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html
func (e *CloudWatchExecutor) handleGetRegions(ctx context.Context, parameters *simplejson.Json, queryContext *tsdb.TsdbQuery) ([]suggestData, error) {
regions := []string{
- "ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-south-1", "ca-central-1", "cn-north-1",
- "eu-central-1", "eu-west-1", "eu-west-2", "sa-east-1", "us-east-1", "us-east-2", "us-gov-west-1", "us-west-1", "us-west-2",
+ "ap-northeast-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-south-1", "ca-central-1", "cn-north-1", "cn-northwest-1",
+ "eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-gov-west-1", "us-west-1", "us-west-2",
}
result := make([]suggestData, 0)
diff --git a/pkg/tsdb/elasticsearch/client/client.go b/pkg/tsdb/elasticsearch/client/client.go
new file mode 100644
index 00000000000..0cd3eb0d21b
--- /dev/null
+++ b/pkg/tsdb/elasticsearch/client/client.go
@@ -0,0 +1,257 @@
+package es
+
+import (
+ "bytes"
+ "context"
+ "encoding/json"
+ "fmt"
+ "net/http"
+ "net/url"
+ "path"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/tsdb"
+
+ "github.com/grafana/grafana/pkg/models"
+ "golang.org/x/net/context/ctxhttp"
+)
+
+const loggerName = "tsdb.elasticsearch.client"
+
+var (
+ clientLog = log.New(loggerName)
+)
+
+var newDatasourceHttpClient = func(ds *models.DataSource) (*http.Client, error) {
+ return ds.GetHttpClient()
+}
+
+// Client represents a client which can interact with elasticsearch api
+type Client interface {
+ GetVersion() int
+ GetTimeField() string
+ GetMinInterval(queryInterval string) (time.Duration, error)
+ ExecuteMultisearch(r *MultiSearchRequest) (*MultiSearchResponse, error)
+ MultiSearch() *MultiSearchRequestBuilder
+}
+
+// NewClient creates a new elasticsearch client
+var NewClient = func(ctx context.Context, ds *models.DataSource, timeRange *tsdb.TimeRange) (Client, error) {
+ version, err := ds.JsonData.Get("esVersion").Int()
+ if err != nil {
+ return nil, fmt.Errorf("eleasticsearch version is required, err=%v", err)
+ }
+
+ timeField, err := ds.JsonData.Get("timeField").String()
+ if err != nil {
+ return nil, fmt.Errorf("eleasticsearch time field name is required, err=%v", err)
+ }
+
+ indexInterval := ds.JsonData.Get("interval").MustString()
+ ip, err := newIndexPattern(indexInterval, ds.Database)
+ if err != nil {
+ return nil, err
+ }
+
+ indices, err := ip.GetIndices(timeRange)
+ if err != nil {
+ return nil, err
+ }
+
+ clientLog.Debug("Creating new client", "version", version, "timeField", timeField, "indices", strings.Join(indices, ", "))
+
+ switch version {
+ case 2, 5, 56:
+ return &baseClientImpl{
+ ctx: ctx,
+ ds: ds,
+ version: version,
+ timeField: timeField,
+ indices: indices,
+ timeRange: timeRange,
+ }, nil
+ }
+
+ return nil, fmt.Errorf("elasticsearch version=%d is not supported", version)
+}
+
+type baseClientImpl struct {
+ ctx context.Context
+ ds *models.DataSource
+ version int
+ timeField string
+ indices []string
+ timeRange *tsdb.TimeRange
+}
+
+func (c *baseClientImpl) GetVersion() int {
+ return c.version
+}
+
+func (c *baseClientImpl) GetTimeField() string {
+ return c.timeField
+}
+
+func (c *baseClientImpl) GetMinInterval(queryInterval string) (time.Duration, error) {
+ return tsdb.GetIntervalFrom(c.ds, simplejson.NewFromAny(map[string]interface{}{
+ "interval": queryInterval,
+ }), 5*time.Second)
+}
+
+func (c *baseClientImpl) getSettings() *simplejson.Json {
+ return c.ds.JsonData
+}
+
+type multiRequest struct {
+ header map[string]interface{}
+ body interface{}
+ interval tsdb.Interval
+}
+
+func (c *baseClientImpl) executeBatchRequest(uriPath string, requests []*multiRequest) (*http.Response, error) {
+ bytes, err := c.encodeBatchRequests(requests)
+ if err != nil {
+ return nil, err
+ }
+ return c.executeRequest(http.MethodPost, uriPath, bytes)
+}
+
+func (c *baseClientImpl) encodeBatchRequests(requests []*multiRequest) ([]byte, error) {
+ clientLog.Debug("Encoding batch requests to json", "batch requests", len(requests))
+ start := time.Now()
+
+ payload := bytes.Buffer{}
+ for _, r := range requests {
+ reqHeader, err := json.Marshal(r.header)
+ if err != nil {
+ return nil, err
+ }
+ payload.WriteString(string(reqHeader) + "\n")
+
+ reqBody, err := json.Marshal(r.body)
+ if err != nil {
+ return nil, err
+ }
+
+ body := string(reqBody)
+ body = strings.Replace(body, "$__interval_ms", strconv.FormatInt(r.interval.Value.Nanoseconds()/int64(time.Millisecond), 10), -1)
+ body = strings.Replace(body, "$__interval", r.interval.Text, -1)
+
+ payload.WriteString(body + "\n")
+ }
+
+ elapsed := time.Now().Sub(start)
+ clientLog.Debug("Encoded batch requests to json", "took", elapsed)
+
+ return payload.Bytes(), nil
+}
+
+func (c *baseClientImpl) executeRequest(method, uriPath string, body []byte) (*http.Response, error) {
+ u, _ := url.Parse(c.ds.Url)
+ u.Path = path.Join(u.Path, uriPath)
+
+ var req *http.Request
+ var err error
+ if method == http.MethodPost {
+ req, err = http.NewRequest(http.MethodPost, u.String(), bytes.NewBuffer(body))
+ } else {
+ req, err = http.NewRequest(http.MethodGet, u.String(), nil)
+ }
+ if err != nil {
+ return nil, err
+ }
+
+ clientLog.Debug("Executing request", "url", req.URL.String(), "method", method)
+
+ req.Header.Set("User-Agent", "Grafana")
+ req.Header.Set("Content-Type", "application/json")
+
+ if c.ds.BasicAuth {
+ clientLog.Debug("Request configured to use basic authentication")
+ req.SetBasicAuth(c.ds.BasicAuthUser, c.ds.BasicAuthPassword)
+ }
+
+ if !c.ds.BasicAuth && c.ds.User != "" {
+ clientLog.Debug("Request configured to use basic authentication")
+ req.SetBasicAuth(c.ds.User, c.ds.Password)
+ }
+
+ httpClient, err := newDatasourceHttpClient(c.ds)
+ if err != nil {
+ return nil, err
+ }
+
+ start := time.Now()
+ defer func() {
+ elapsed := time.Now().Sub(start)
+ clientLog.Debug("Executed request", "took", elapsed)
+ }()
+ return ctxhttp.Do(c.ctx, httpClient, req)
+}
+
+func (c *baseClientImpl) ExecuteMultisearch(r *MultiSearchRequest) (*MultiSearchResponse, error) {
+ clientLog.Debug("Executing multisearch", "search requests", len(r.Requests))
+
+ multiRequests := c.createMultiSearchRequests(r.Requests)
+ res, err := c.executeBatchRequest("_msearch", multiRequests)
+ if err != nil {
+ return nil, err
+ }
+
+ clientLog.Debug("Received multisearch response", "code", res.StatusCode, "status", res.Status, "content-length", res.ContentLength)
+
+ start := time.Now()
+ clientLog.Debug("Decoding multisearch json response")
+
+ var msr MultiSearchResponse
+ defer res.Body.Close()
+ dec := json.NewDecoder(res.Body)
+ err = dec.Decode(&msr)
+ if err != nil {
+ return nil, err
+ }
+
+ elapsed := time.Now().Sub(start)
+ clientLog.Debug("Decoded multisearch json response", "took", elapsed)
+
+ msr.status = res.StatusCode
+
+ return &msr, nil
+}
+
+func (c *baseClientImpl) createMultiSearchRequests(searchRequests []*SearchRequest) []*multiRequest {
+ multiRequests := []*multiRequest{}
+
+ for _, searchReq := range searchRequests {
+ mr := multiRequest{
+ header: map[string]interface{}{
+ "search_type": "query_then_fetch",
+ "ignore_unavailable": true,
+ "index": strings.Join(c.indices, ","),
+ },
+ body: searchReq,
+ interval: searchReq.Interval,
+ }
+
+ if c.version == 2 {
+ mr.header["search_type"] = "count"
+ }
+
+ if c.version >= 56 {
+ maxConcurrentShardRequests := c.getSettings().Get("maxConcurrentShardRequests").MustInt(256)
+ mr.header["max_concurrent_shard_requests"] = maxConcurrentShardRequests
+ }
+
+ multiRequests = append(multiRequests, &mr)
+ }
+
+ return multiRequests
+}
+
+func (c *baseClientImpl) MultiSearch() *MultiSearchRequestBuilder {
+ return NewMultiSearchRequestBuilder(c.GetVersion())
+}
diff --git a/pkg/tsdb/elasticsearch/client/client_test.go b/pkg/tsdb/elasticsearch/client/client_test.go
new file mode 100644
index 00000000000..11d1cdb1d71
--- /dev/null
+++ b/pkg/tsdb/elasticsearch/client/client_test.go
@@ -0,0 +1,304 @@
+package es
+
+import (
+ "bytes"
+ "context"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "net/http/httptest"
+ "testing"
+ "time"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/tsdb"
+
+ "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestClient(t *testing.T) {
+ Convey("Test elasticsearch client", t, func() {
+ Convey("NewClient", func() {
+ Convey("When no version set should return error", func() {
+ ds := &models.DataSource{
+ JsonData: simplejson.NewFromAny(make(map[string]interface{})),
+ }
+
+ _, err := NewClient(nil, ds, nil)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("When no time field name set should return error", func() {
+ ds := &models.DataSource{
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 5,
+ }),
+ }
+
+ _, err := NewClient(nil, ds, nil)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("When unspported version set should return error", func() {
+ ds := &models.DataSource{
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 6,
+ "timeField": "@timestamp",
+ }),
+ }
+
+ _, err := NewClient(nil, ds, nil)
+ So(err, ShouldNotBeNil)
+ })
+
+ Convey("When version 2 should return v2 client", func() {
+ ds := &models.DataSource{
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 2,
+ "timeField": "@timestamp",
+ }),
+ }
+
+ c, err := NewClient(nil, ds, nil)
+ So(err, ShouldBeNil)
+ So(c.GetVersion(), ShouldEqual, 2)
+ })
+
+ Convey("When version 5 should return v5 client", func() {
+ ds := &models.DataSource{
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 5,
+ "timeField": "@timestamp",
+ }),
+ }
+
+ c, err := NewClient(nil, ds, nil)
+ So(err, ShouldBeNil)
+ So(c.GetVersion(), ShouldEqual, 5)
+ })
+
+ Convey("When version 56 should return v5.6 client", func() {
+ ds := &models.DataSource{
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 56,
+ "timeField": "@timestamp",
+ }),
+ }
+
+ c, err := NewClient(nil, ds, nil)
+ So(err, ShouldBeNil)
+ So(c.GetVersion(), ShouldEqual, 56)
+ })
+ })
+
+ Convey("Given a fake http client", func() {
+ var responseBuffer *bytes.Buffer
+ var req *http.Request
+ ts := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+ req = r
+ buf, err := ioutil.ReadAll(r.Body)
+ if err != nil {
+ t.Fatalf("Failed to read response body, err=%v", err)
+ }
+ responseBuffer = bytes.NewBuffer(buf)
+ }))
+
+ currentNewDatasourceHttpClient := newDatasourceHttpClient
+
+ newDatasourceHttpClient = func(ds *models.DataSource) (*http.Client, error) {
+ return ts.Client(), nil
+ }
+
+ from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
+ to := time.Date(2018, 5, 15, 17, 55, 0, 0, time.UTC)
+ fromStr := fmt.Sprintf("%d", from.UnixNano()/int64(time.Millisecond))
+ toStr := fmt.Sprintf("%d", to.UnixNano()/int64(time.Millisecond))
+ timeRange := tsdb.NewTimeRange(fromStr, toStr)
+
+ Convey("and a v2.x client", func() {
+ ds := models.DataSource{
+ Database: "[metrics-]YYYY.MM.DD",
+ Url: ts.URL,
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 2,
+ "timeField": "@timestamp",
+ "interval": "Daily",
+ }),
+ }
+
+ c, err := NewClient(context.Background(), &ds, timeRange)
+ So(err, ShouldBeNil)
+ So(c, ShouldNotBeNil)
+
+ Convey("When executing multi search", func() {
+ ms, err := createMultisearchForTest(c)
+ So(err, ShouldBeNil)
+ c.ExecuteMultisearch(ms)
+
+ Convey("Should send correct request and payload", func() {
+ So(req, ShouldNotBeNil)
+ So(req.Method, ShouldEqual, http.MethodPost)
+ So(req.URL.Path, ShouldEqual, "/_msearch")
+
+ So(responseBuffer, ShouldNotBeNil)
+
+ headerBytes, err := responseBuffer.ReadBytes('\n')
+ So(err, ShouldBeNil)
+ bodyBytes := responseBuffer.Bytes()
+
+ jHeader, err := simplejson.NewJson(headerBytes)
+ So(err, ShouldBeNil)
+
+ jBody, err := simplejson.NewJson(bodyBytes)
+ So(err, ShouldBeNil)
+
+ fmt.Println("body", string(headerBytes))
+
+ So(jHeader.Get("index").MustString(), ShouldEqual, "metrics-2018.05.15")
+ So(jHeader.Get("ignore_unavailable").MustBool(false), ShouldEqual, true)
+ So(jHeader.Get("search_type").MustString(), ShouldEqual, "count")
+ So(jHeader.Get("max_concurrent_shard_requests").MustInt(10), ShouldEqual, 10)
+
+ Convey("and replace $__interval variable", func() {
+ So(jBody.GetPath("aggs", "2", "aggs", "1", "avg", "script").MustString(), ShouldEqual, "15000*@hostname")
+ })
+
+ Convey("and replace $__interval_ms variable", func() {
+ So(jBody.GetPath("aggs", "2", "date_histogram", "interval").MustString(), ShouldEqual, "15s")
+ })
+ })
+ })
+ })
+
+ Convey("and a v5.x client", func() {
+ ds := models.DataSource{
+ Database: "[metrics-]YYYY.MM.DD",
+ Url: ts.URL,
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 5,
+ "maxConcurrentShardRequests": 100,
+ "timeField": "@timestamp",
+ "interval": "Daily",
+ }),
+ }
+
+ c, err := NewClient(context.Background(), &ds, timeRange)
+ So(err, ShouldBeNil)
+ So(c, ShouldNotBeNil)
+
+ Convey("When executing multi search", func() {
+ ms, err := createMultisearchForTest(c)
+ So(err, ShouldBeNil)
+ c.ExecuteMultisearch(ms)
+
+ Convey("Should send correct request and payload", func() {
+ So(req, ShouldNotBeNil)
+ So(req.Method, ShouldEqual, http.MethodPost)
+ So(req.URL.Path, ShouldEqual, "/_msearch")
+
+ So(responseBuffer, ShouldNotBeNil)
+
+ headerBytes, err := responseBuffer.ReadBytes('\n')
+ So(err, ShouldBeNil)
+ bodyBytes := responseBuffer.Bytes()
+
+ jHeader, err := simplejson.NewJson(headerBytes)
+ So(err, ShouldBeNil)
+
+ jBody, err := simplejson.NewJson(bodyBytes)
+ So(err, ShouldBeNil)
+
+ fmt.Println("body", string(headerBytes))
+
+ So(jHeader.Get("index").MustString(), ShouldEqual, "metrics-2018.05.15")
+ So(jHeader.Get("ignore_unavailable").MustBool(false), ShouldEqual, true)
+ So(jHeader.Get("search_type").MustString(), ShouldEqual, "query_then_fetch")
+ So(jHeader.Get("max_concurrent_shard_requests").MustInt(10), ShouldEqual, 10)
+
+ Convey("and replace $__interval variable", func() {
+ So(jBody.GetPath("aggs", "2", "aggs", "1", "avg", "script").MustString(), ShouldEqual, "15000*@hostname")
+ })
+
+ Convey("and replace $__interval_ms variable", func() {
+ So(jBody.GetPath("aggs", "2", "date_histogram", "interval").MustString(), ShouldEqual, "15s")
+ })
+ })
+ })
+ })
+
+ Convey("and a v5.6 client", func() {
+ ds := models.DataSource{
+ Database: "[metrics-]YYYY.MM.DD",
+ Url: ts.URL,
+ JsonData: simplejson.NewFromAny(map[string]interface{}{
+ "esVersion": 56,
+ "maxConcurrentShardRequests": 100,
+ "timeField": "@timestamp",
+ "interval": "Daily",
+ }),
+ }
+
+ c, err := NewClient(context.Background(), &ds, timeRange)
+ So(err, ShouldBeNil)
+ So(c, ShouldNotBeNil)
+
+ Convey("When executing multi search", func() {
+ ms, err := createMultisearchForTest(c)
+ So(err, ShouldBeNil)
+ c.ExecuteMultisearch(ms)
+
+ Convey("Should send correct request and payload", func() {
+ So(req, ShouldNotBeNil)
+ So(req.Method, ShouldEqual, http.MethodPost)
+ So(req.URL.Path, ShouldEqual, "/_msearch")
+
+ So(responseBuffer, ShouldNotBeNil)
+
+ headerBytes, err := responseBuffer.ReadBytes('\n')
+ So(err, ShouldBeNil)
+ bodyBytes := responseBuffer.Bytes()
+
+ jHeader, err := simplejson.NewJson(headerBytes)
+ So(err, ShouldBeNil)
+
+ jBody, err := simplejson.NewJson(bodyBytes)
+ So(err, ShouldBeNil)
+
+ fmt.Println("body", string(headerBytes))
+
+ So(jHeader.Get("index").MustString(), ShouldEqual, "metrics-2018.05.15")
+ So(jHeader.Get("ignore_unavailable").MustBool(false), ShouldEqual, true)
+ So(jHeader.Get("search_type").MustString(), ShouldEqual, "query_then_fetch")
+ So(jHeader.Get("max_concurrent_shard_requests").MustInt(), ShouldEqual, 100)
+
+ Convey("and replace $__interval variable", func() {
+ So(jBody.GetPath("aggs", "2", "aggs", "1", "avg", "script").MustString(), ShouldEqual, "15000*@hostname")
+ })
+
+ Convey("and replace $__interval_ms variable", func() {
+ So(jBody.GetPath("aggs", "2", "date_histogram", "interval").MustString(), ShouldEqual, "15s")
+ })
+ })
+ })
+ })
+
+ Reset(func() {
+ newDatasourceHttpClient = currentNewDatasourceHttpClient
+ })
+ })
+ })
+}
+
+func createMultisearchForTest(c Client) (*MultiSearchRequest, error) {
+ msb := c.MultiSearch()
+ s := msb.Search(tsdb.Interval{Value: 15 * time.Second, Text: "15s"})
+ s.Agg().DateHistogram("2", "@timestamp", func(a *DateHistogramAgg, ab AggBuilder) {
+ a.Interval = "$__interval"
+
+ ab.Metric("1", "avg", "@hostname", func(a *MetricAggregation) {
+ a.Settings["script"] = "$__interval_ms*@hostname"
+ })
+ })
+ return msb.Build()
+}
diff --git a/pkg/tsdb/elasticsearch/client/index_pattern.go b/pkg/tsdb/elasticsearch/client/index_pattern.go
new file mode 100644
index 00000000000..8391e902ea4
--- /dev/null
+++ b/pkg/tsdb/elasticsearch/client/index_pattern.go
@@ -0,0 +1,312 @@
+package es
+
+import (
+ "fmt"
+ "regexp"
+ "strings"
+ "time"
+
+ "github.com/grafana/grafana/pkg/tsdb"
+)
+
+const (
+ noInterval = ""
+ intervalHourly = "hourly"
+ intervalDaily = "daily"
+ intervalWeekly = "weekly"
+ intervalMonthly = "monthly"
+ intervalYearly = "yearly"
+)
+
+type indexPattern interface {
+ GetIndices(timeRange *tsdb.TimeRange) ([]string, error)
+}
+
+var newIndexPattern = func(interval string, pattern string) (indexPattern, error) {
+ if interval == noInterval {
+ return &staticIndexPattern{indexName: pattern}, nil
+ }
+
+ return newDynamicIndexPattern(interval, pattern)
+}
+
+type staticIndexPattern struct {
+ indexName string
+}
+
+func (ip *staticIndexPattern) GetIndices(timeRange *tsdb.TimeRange) ([]string, error) {
+ return []string{ip.indexName}, nil
+}
+
+type intervalGenerator interface {
+ Generate(from, to time.Time) []time.Time
+}
+
+type dynamicIndexPattern struct {
+ interval string
+ pattern string
+ intervalGenerator intervalGenerator
+}
+
+func newDynamicIndexPattern(interval, pattern string) (*dynamicIndexPattern, error) {
+ var generator intervalGenerator
+
+ switch strings.ToLower(interval) {
+ case intervalHourly:
+ generator = &hourlyInterval{}
+ case intervalDaily:
+ generator = &dailyInterval{}
+ case intervalWeekly:
+ generator = &weeklyInterval{}
+ case intervalMonthly:
+ generator = &monthlyInterval{}
+ case intervalYearly:
+ generator = &yearlyInterval{}
+ default:
+ return nil, fmt.Errorf("unsupported interval '%s'", interval)
+ }
+
+ return &dynamicIndexPattern{
+ interval: interval,
+ pattern: pattern,
+ intervalGenerator: generator,
+ }, nil
+}
+
+func (ip *dynamicIndexPattern) GetIndices(timeRange *tsdb.TimeRange) ([]string, error) {
+ from := timeRange.GetFromAsTimeUTC()
+ to := timeRange.GetToAsTimeUTC()
+ intervals := ip.intervalGenerator.Generate(from, to)
+ indices := make([]string, 0)
+
+ for _, t := range intervals {
+ indices = append(indices, formatDate(t, ip.pattern))
+ }
+
+ return indices, nil
+}
+
+type hourlyInterval struct{}
+
+func (i *hourlyInterval) Generate(from, to time.Time) []time.Time {
+ intervals := []time.Time{}
+ start := time.Date(from.Year(), from.Month(), from.Day(), from.Hour(), 0, 0, 0, time.UTC)
+ end := time.Date(to.Year(), to.Month(), to.Day(), to.Hour(), 0, 0, 0, time.UTC)
+
+ intervals = append(intervals, start)
+
+ for start.Before(end) {
+ start = start.Add(time.Hour)
+ intervals = append(intervals, start)
+ }
+
+ return intervals
+}
+
+type dailyInterval struct{}
+
+func (i *dailyInterval) Generate(from, to time.Time) []time.Time {
+ intervals := []time.Time{}
+ start := time.Date(from.Year(), from.Month(), from.Day(), 0, 0, 0, 0, time.UTC)
+ end := time.Date(to.Year(), to.Month(), to.Day(), 0, 0, 0, 0, time.UTC)
+
+ intervals = append(intervals, start)
+
+ for start.Before(end) {
+ start = start.Add(24 * time.Hour)
+ intervals = append(intervals, start)
+ }
+
+ return intervals
+}
+
+type weeklyInterval struct{}
+
+func (i *weeklyInterval) Generate(from, to time.Time) []time.Time {
+ intervals := []time.Time{}
+ start := time.Date(from.Year(), from.Month(), from.Day(), 0, 0, 0, 0, time.UTC)
+ end := time.Date(to.Year(), to.Month(), to.Day(), 0, 0, 0, 0, time.UTC)
+
+ for start.Weekday() != time.Monday {
+ start = start.Add(-24 * time.Hour)
+ }
+
+ for end.Weekday() != time.Monday {
+ end = end.Add(-24 * time.Hour)
+ }
+
+ year, week := start.ISOWeek()
+ intervals = append(intervals, start)
+
+ for start.Before(end) {
+ start = start.Add(24 * time.Hour)
+ nextYear, nextWeek := start.ISOWeek()
+ if nextYear != year || nextWeek != week {
+ intervals = append(intervals, start)
+ }
+ year = nextYear
+ week = nextWeek
+ }
+
+ return intervals
+}
+
+type monthlyInterval struct{}
+
+func (i *monthlyInterval) Generate(from, to time.Time) []time.Time {
+ intervals := []time.Time{}
+ start := time.Date(from.Year(), from.Month(), 1, 0, 0, 0, 0, time.UTC)
+ end := time.Date(to.Year(), to.Month(), 1, 0, 0, 0, 0, time.UTC)
+
+ month := start.Month()
+ intervals = append(intervals, start)
+
+ for start.Before(end) {
+ start = start.Add(24 * time.Hour)
+ nextMonth := start.Month()
+ if nextMonth != month {
+ intervals = append(intervals, start)
+ }
+ month = nextMonth
+ }
+
+ return intervals
+}
+
+type yearlyInterval struct{}
+
+func (i *yearlyInterval) Generate(from, to time.Time) []time.Time {
+ intervals := []time.Time{}
+ start := time.Date(from.Year(), 1, 1, 0, 0, 0, 0, time.UTC)
+ end := time.Date(to.Year(), 1, 1, 0, 0, 0, 0, time.UTC)
+
+ year := start.Year()
+ intervals = append(intervals, start)
+
+ for start.Before(end) {
+ start = start.Add(24 * time.Hour)
+ nextYear := start.Year()
+ if nextYear != year {
+ intervals = append(intervals, start)
+ }
+ year = nextYear
+ }
+
+ return intervals
+}
+
+var datePatternRegex = regexp.MustCompile("(LT|LL?L?L?|l{1,4}|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|Q)")
+
+var datePatternReplacements = map[string]string{
+ "M": "1", // stdNumMonth 1 2 ... 11 12
+ "MM": "01", // stdZeroMonth 01 02 ... 11 12
+ "MMM": "Jan", // stdMonth Jan Feb ... Nov Dec
+ "MMMM": "January", // stdLongMonth January February ... November December
+ "D": "2", // stdDay 1 2 ... 30 30
+ "DD": "02", // stdZeroDay 01 02 ... 30 31
+ "DDD": "