implement open worksheet with code to call utPLSQL for selected path

unit test not yet automatically executed, default worksheet naming

Author: PhilippSalvisberg

sqldev/pom.xml

@@ -116,6 +116,20 @@
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/lib/dbapi.jar</systemPath>
 		</dependency>
+		<dependency>
+			<groupId>oracle</groupId>
+			<artifactId>oracle.ide.db</artifactId>
+			<version>12.2.1</version>
+			<scope>system</scope>
+			<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.db.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>oracle</groupId>
+			<artifactId>oracle.jdeveloper.db.connection</artifactId>
+			<version>12.2.1</version>
+			<scope>system</scope>
+			<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.db.connection.jar</systemPath>
+		</dependency>
 		<!-- SQL Developer specific dependencies part 2 (available in public maven repositories) -->
 		<dependency>
 			<!-- SQL Developer is using this older version -->
@@ -388,10 +402,12 @@
 						</_exportcontents>
 						<Require-Bundle>
 							oracle.javatools-nodeps,
+							oracle.jdeveloper.db.connection,
 							oracle.idert,
 							oracle.ide,
 							oracle.ide.db,
 							oracle.sqldeveloper,
+							oracle.sqldeveloper.worksheet,
 							oracle.uic
 						</Require-Bundle>
 						<Import-Package>!*</Import-Package>

sqldev/src/main/java/org/utplsql/sqldev/editor/menu/UtplsqlEditorController.xtend

@@ -16,27 +16,38 @@ package org.utplsql.sqldev.editor.menu
 
 import java.util.logging.Logger
 import javax.swing.JEditorPane
+import oracle.dbtools.raptor.navigator.impl.DatabaseSourceNode
+import oracle.dbtools.raptor.utils.Connections
+import oracle.dbtools.worksheet.editor.OpenWorksheetWizard
+import oracle.dbtools.worksheet.editor.Worksheet
 import oracle.ide.Context
 import oracle.ide.Ide
+import oracle.ide.config.Preferences
 import oracle.ide.controller.Controller
 import oracle.ide.controller.IdeAction
 import oracle.ide.editor.Editor
 import oracle.ide.^extension.RegisteredByExtension
+import oracle.ide.model.Node
+import org.utplsql.sqldev.model.preference.PreferenceModel
 import org.utplsql.sqldev.parser.UtplsqlParser
+import org.utplsql.sqldev.resources.UtplsqlResources
 
 @RegisteredByExtension("org.utplsql.sqldev")
 class UtplsqlEditorController implements Controller {
 	public static int UTLPLSQL_EDITOR_TEST_CMD_ID = Ide.findCmdID("utplsql.editor.test")
 	private static final Logger logger = Logger.getLogger(UtplsqlEditorController.name);
-	
+
 	override handleEvent(IdeAction action, Context context) {
 		if (action.commandId === UTLPLSQL_EDITOR_TEST_CMD_ID) {
-			runTest(context)
+			val Runnable runnable = [|runTest(context)]
+			val thread = new Thread(runnable)
+			thread.name = "utPLSQL run test"
+			thread.start
 			return true
 		}
 		return false
 	}
-	
+
 	override update(IdeAction action, Context context) {
 		if (action.commandId === UTLPLSQL_EDITOR_TEST_CMD_ID) {
 			action.enabled = false
@@ -54,20 +65,50 @@ class UtplsqlEditorController implements Controller {
 		}
 		return false
 	}
-		
+
 	def runTest(Context context) {
 		logger.fine("Start utPLSQL test from editor.")
+		logger.fine('''context.view is of type «context.view.class.name».''')
+		logger.fine('''context.node is of type «context.node.class.name».''')
 		val view = context.view
 		if (view instanceof Editor) {
 			val component = view.defaultFocusComponent
 			if (component instanceof JEditorPane) {
 				val parser = new UtplsqlParser(component.text)
 				val position = component.caretPosition
-				// TODO: open new worksheet and call utPLSQL
+				var String connectionName = null;				
+				val Node node = context.node
+				if (node instanceof DatabaseSourceNode) {
+					connectionName = node.connectionName
+				} else if (view instanceof Worksheet) {
+					connectionName = view.connectionName
+				}
+				val preferences = PreferenceModel.getInstance(Preferences.getPreferences());
+				if (connectionName !== null && preferences.unsharedWorksheet) {
+					connectionName = Connections.instance.createPrivateConnection(connectionName)
+				}
+				val code = '''
+					SET SERVEROUTPUT ON SIZE 1000000
+					«IF preferences.resetPackage»
+						BEGIN
+						   dbms_session.reset_package;
+						END;
+						/
+					«ENDIF»
+					BEGIN
+					   ut.run('«parser.getPathAt(position)»');
+					END;
+					/
+				'''
+				val worksheet = OpenWorksheetWizard.openNewTempWorksheet(connectionName, code) as Worksheet
+				if (connectionName === null) {
+					worksheet.comboConnection = null
+				}
+				// TODO make update Title work
+				worksheet.updateTitle(UtplsqlResources.getString("WORKSHEET_TITLE"))
+				// TODO exeucte code in worksheet when preferences.autoExecute		
 				logger.fine('''Cursor is at «position». Calling «parser.getPathAt(position)»''')
 			}
 		}
-		logger.fine ("utPLSQL test started successfully.")
 	}
-	
 }

sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend

@@ -103,8 +103,8 @@ class UtplsqlParser {
 		return name
 	}
 
-	private def removeQuotes(String name) {
-		return name.replace("\"", "")
+	private def fixName(String name) {
+		return name.replace("\"", "").replace(";", "")
 	}
 
 	def getObjects() {
@@ -126,9 +126,9 @@ class UtplsqlParser {
 		if (!objectName.empty) {
 			var unitName = getUnitNameAt(position)
 			if (unitName.empty) {
-				return objectName.removeQuotes
+				return objectName.fixName
 			} else {
-				return '''«objectName.removeQuotes».«unitName.removeQuotes»'''
+				return '''«objectName.fixName».«unitName.fixName»'''
 			}
 		}
 		return ""

sqldev/src/main/resources/org/utplsql/sqldev/resources/UtplsqlResources.properties

@@ -13,3 +13,4 @@ PREF_RESET_PACKAGE_LABEL=Reset package before running utPLSQL?
 PREF_AUTO_EXECUTE_LABEL=Execute unit test automatically?
 PREF_UNSHARED_WORKSHEET_LABEL=Open an unshared worksheet for utPLSQL execution?
 MENU_RUN_TEST_LABEL=Run utPLSQL test
+WORKSHEET_TITLE=utPLSQL