add delimiters list

smi2 · Dec 7, 2016 · a92ed41 · a92ed41
1 parent 8dd2c34
commit a92ed41
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/app/sql/sql.html b/src/app/sql/sql.html
@@ -210,6 +210,15 @@ <h4 class="mt0 mb+++">
             </md-checkbox>
         </md-input-container>
 
+        <md-input-container class="width-100 mt mb+">
+            <label>Разделитель запросов</label>
+            <md-select ng-model="vars.delimiter">
+                <md-option ng-repeat="delimiter in vars.delimiters" ng-value="delimiter" ng-click="vars.delimiter = delimiter">
+                    {{delimiter.name}}
+                </md-option>
+            </md-select>
+        </md-input-container>
+
         <md-button ng-click="toggleSidenav('right')" class="md-primary ml0 mt+++" style="line-height: inherit;">
             Закрыть
         </md-button>

diff --git a/src/app/sql/sql.js b/src/app/sql/sql.js
@@ -50,6 +50,16 @@ window.global_keywords_tables = "";
             saveTabs: localStorageService.get(SQL_SAVE_TABS_KEY) || false,
             uiTheme: ThemeService.themeObject,
             uiThemes: ThemeService.list,
+            delimiters : [
+                {
+                    name: ';; Двойной',
+                    delimiter : ';;'
+                },
+                {
+                    name: '; Одинарный',
+                    delimiter : ';'
+                }
+            ],
             currentTab: {},
             selectedTab: 0,
             sqlLog: localStorageService.get(SQL_LOG_KEY) || [],
@@ -67,6 +77,8 @@ window.global_keywords_tables = "";
             fontSize: localStorageService.get('editorFontSize') || 16,
             theme: localStorageService.get('editorTheme') || 'cobalt'
         };
+
+        $scope.vars.delimiter = $scope.vars.delimiters[0];
         $scope.vars.format = $scope.vars.formats[0];
         $scope.vars.themes = [
             'ambiance',
@@ -122,6 +134,7 @@ window.global_keywords_tables = "";
                         sql: tab.sql,
                         buttonTitle: tab.buttonTitle,
                         format: tab.format,
+                        delimiter:tab.delimiter,
                         results: [],
                         editor: null,
                         selectedResultTab: 0
@@ -543,6 +556,13 @@ window.global_keywords_tables = "";
          */
         $scope.$watch('vars.limitRows', (curr) => localStorageService.set('editorLimitRows', curr));
 
+
+        /**
+         * Watch and save settings in LocalStorage
+         */
+
+        $scope.$watch('vars.delimiter', (curr) => localStorageService.set('delimiter', curr));
+
         /**
          * Watch and save settings in LocalStorage
          */