• made usage of more constants to avoid double-storing strings

• fixed JavaScript alert and confirm window in HTML output window

1 files changed, 37 insertions, 13 deletions

diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index e6ce8771..d118b6b6 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -305,26 +305,50 @@ NSString *SPBundleTaskScriptCommandFilePath                 = @"/tmp/SP_BUNDLE_S
 NSString *SPBundleTaskCopyBlobFileDirectory                 = @"/tmp/SP_BUNDLE_COPY_BLOB_FILES";
 NSString *SPBundleTaskTableMetaDataFilePath                 = @"/tmp/SP_BUNDLE_TABLE_META_DATA";
 
+NSString *SPBundleShellVariableAllDatabases                 = @"SP_ALL_DATABASES";
+NSString *SPBundleShellVariableAllFunctions                 = @"SP_ALL_FUNCTIONS";
+NSString *SPBundleShellVariableAllProcedures                = @"SP_ALL_PROCEDURES";
+NSString *SPBundleShellVariableAllTables                    = @"SP_ALL_TABLES";
+NSString *SPBundleShellVariableAllViews                     = @"SP_ALL_VIEWS";
+NSString *SPBundleShellVariableAppResourcesDirectory        = @"SP_APP_RESOURCES_DIRECTORY";
+NSString *SPBundleShellVariableBlobFileDirectory            = @"SP_BUNDLE_BLOB_FILES_DIRECTORY";
+NSString *SPBundleShellVariableBundlePath                   = @"SP_BUNDLE_PATH";
+NSString *SPBundleShellVariableBundleScope                  = @"SP_BUNDLE_SCOPE";
+NSString *SPBundleShellVariableCurrentEditedColumnName      = @"SP_CURRENT_EDITED_COLUMN_NAME";
+NSString *SPBundleShellVariableCurrentEditedTable           = @"SP_CURRENT_EDITED_TABLE";
+NSString *SPBundleShellVariableCurrentHost                  = @"SP_CURRENT_HOST";
+NSString *SPBundleShellVariableCurrentLine                  = @"SP_CURRENT_LINE";
+NSString *SPBundleShellVariableCurrentPort                  = @"SP_CURRENT_PORT";
+NSString *SPBundleShellVariableCurrentQuery                 = @"SP_CURRENT_QUERY";
+NSString *SPBundleShellVariableCurrentUser                  = @"SP_CURRENT_USER";
+NSString *SPBundleShellVariableCurrentWord                  = @"SP_CURRENT_WORD";
+NSString *SPBundleShellVariableDatabaseEncoding             = @"SP_DATABASE_ENCODING";
+NSString *SPBundleShellVariableDataTableSource              = @"SP_DATA_TABLE_SOURCE";
+NSString *SPBundleShellVariableExitInsertAsHTML             = @"SP_BUNDLE_EXIT_SHOW_AS_HTML";
+NSString *SPBundleShellVariableExitInsertAsHTMLTooltip      = @"SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP";
+NSString *SPBundleShellVariableExitInsertAsSnippet          = @"SP_BUNDLE_EXIT_INSERT_AS_SNIPPET";
+NSString *SPBundleShellVariableExitInsertAsText             = @"SP_BUNDLE_EXIT_INSERT_AS_TEXT";
+NSString *SPBundleShellVariableExitInsertAsTextTooltip      = @"SP_BUNDLE_EXIT_SHOW_AS_TEXT_TOOLTIP";
+NSString *SPBundleShellVariableExitNone                     = @"SP_BUNDLE_EXIT_NONE";
+NSString *SPBundleShellVariableExitReplaceContent           = @"SP_BUNDLE_EXIT_REPLACE_CONTENT";
+NSString *SPBundleShellVariableExitReplaceSelection         = @"SP_BUNDLE_EXIT_REPLACE_SELECTION";
+NSString *SPBundleShellVariableIconFile                     = @"SP_ICON_FILE";
 NSString *SPBundleShellVariableInputFilePath                = @"SP_BUNDLE_INPUT";
+NSString *SPBundleShellVariableInputTableMetaData           = @"SP_BUNDLE_INPUT_TABLE_METADATA";
 NSString *SPBundleShellVariableOutputFilePath               = @"SP_BUNDLE_OUTPUT";
-NSString *SPBundleShellVariableBundlePath                   = @"SP_BUNDLE_PATH";
-NSString *SPBundleShellVariableBlobFileDirectory            = @"SP_BUNDLE_BLOB_FILES_DIRECTORY";
+NSString *SPBundleShellVariableProcessID                    = @"SP_PROCESS_ID";
 NSString *SPBundleShellVariableQueryFile                    = @"SP_QUERY_FILE";
 NSString *SPBundleShellVariableQueryResultFile              = @"SP_QUERY_RESULT_FILE";
-NSString *SPBundleShellVariableQueryResultStatusFile        = @"SP_QUERY_RESULT_STATUS_FILE";
 NSString *SPBundleShellVariableQueryResultMetaFile          = @"SP_QUERY_RESULT_META_FILE";
-NSString *SPBundleShellVariableInputTableMetaData           = @"SP_BUNDLE_INPUT_TABLE_METADATA";
-NSString *SPBundleShellVariableScope                        = @"SP_BUNDLE_SCOPE";
-NSString *SPBundleShellVariableUsedQueryForTable            = @"SP_USED_QUERY_FOR_TABLE";
-NSString *SPBundleShellVariableCurrentEditedColumnName      = @"SP_CURRENT_EDITED_COLUMN_NAME";
+NSString *SPBundleShellVariableQueryResultStatusFile        = @"SP_QUERY_RESULT_STATUS_FILE";
+NSString *SPBundleShellVariableRDBMSType                    = @"SP_RDBMS_TYPE";
+NSString *SPBundleShellVariableRDBMSVersion                 = @"SP_RDBMS_VERSION";
+NSString *SPBundleShellVariableSelectedDatabase             = @"SP_SELECTED_DATABASE";
+NSString *SPBundleShellVariableSelectedRowIndices           = @"SP_SELECTED_ROW_INDICES";
 NSString *SPBundleShellVariableSelectedTable                = @"SP_SELECTED_TABLE";
-NSString *SPBundleShellVariableCurrentEditedTable           = @"SP_CURRENT_EDITED_TABLE";
-NSString *SPBundleShellVariableDataTableSource              = @"SP_DATA_TABLE_SOURCE";
-NSString *SPBundleShellVariableCurrentQuery                 = @"SP_CURRENT_QUERY";
+NSString *SPBundleShellVariableSelectedTables               = @"SP_SELECTED_TABLES";
 NSString *SPBundleShellVariableSelectedText                 = @"SP_SELECTED_TEXT";
-NSString *SPBundleShellVariableCurrentWord                  = @"SP_CURRENT_WORD";
-NSString *SPBundleShellVariableCurrentLine                  = @"SP_CURRENT_LINE";
-NSString *SPBundleShellVariableSelectedRowIndices           = @"SP_SELECTED_ROW_INDICES";
+NSString *SPBundleShellVariableUsedQueryForTable            = @"SP_USED_QUERY_FOR_TABLE";
 
 const NSInteger SPBundleRedirectActionNone                 = 200;
 const NSInteger SPBundleRedirectActionReplaceSection       = 201;