Fixes #17 - Add preference to check for availability of "Run utPLSQL test"

More precisely this will reduce the number of costly SQL queries on the UI thread. This affects also the parser which will get no connection and therefore may return procedures which are not utPLSQL tests.

Author: PhilippSalvisberg

sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend

@@ -28,6 +28,7 @@ class PreferencePanel extends DefaultTraversablePanel {
 	val JCheckBox resetPackageCheckBox = new JCheckBox
 	val JCheckBox clearScreenCheckBox = new JCheckBox
 	val JCheckBox autoExecuteCheckBox = new JCheckBox
+	val JCheckBox checkRunUtplsqlTestCheckBox = new JCheckBox
 
 	new() {
 		layoutControls()
@@ -48,6 +49,9 @@ class PreferencePanel extends DefaultTraversablePanel {
 		builder.add(
 			builder.field.label.withText(UtplsqlResources.getString("PREF_AUTO_EXECUTE_LABEL")).component(
 				autoExecuteCheckBox))
+		builder.add(
+			builder.field.label.withText(UtplsqlResources.getString("PREF_CHECK_RUN_UTPLSQL_TEST_LABEL")).component(
+				checkRunUtplsqlTestCheckBox))
 		builder.addVerticalSpring
 	}
 
@@ -57,6 +61,7 @@ class PreferencePanel extends DefaultTraversablePanel {
 		resetPackageCheckBox.selected = info.resetPackage
 		clearScreenCheckBox.selected = info.clearScreen
 		autoExecuteCheckBox.selected = info.autoExecute
+		checkRunUtplsqlTestCheckBox.selected = info.checkRunUtplsqlTest
 		super.onEntry(traversableContext)
 	}
 
@@ -66,6 +71,7 @@ class PreferencePanel extends DefaultTraversablePanel {
 		info.resetPackage = resetPackageCheckBox.selected
 		info.clearScreen = clearScreenCheckBox.selected
 		info.autoExecute = autoExecuteCheckBox.selected
+		info.checkRunUtplsqlTest = checkRunUtplsqlTestCheckBox.selected
 		super.onExit(traversableContext)
 	}
 

sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.xtend

@@ -27,12 +27,14 @@ import oracle.dbtools.raptor.utils.Connections
 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 org.utplsql.sqldev.UtplsqlWorksheet
 import org.utplsql.sqldev.dal.UtplsqlDao
 import org.utplsql.sqldev.model.URLTools
+import org.utplsql.sqldev.model.preference.PreferenceModel
 import org.utplsql.sqldev.parser.UtplsqlParser
 
 class UtplsqlController implements Controller {
@@ -52,21 +54,26 @@ class UtplsqlController implements Controller {
 
 	override update(IdeAction action, Context context) {
 		if (action.commandId === UTLPLSQL_TEST_CMD_ID) {
+			val preferences = PreferenceModel.getInstance(Preferences.preferences)
 			action.enabled = false
 			val view = context.view
 			if (view instanceof Editor) {
 				val component = view.defaultFocusComponent
 				if (component instanceof JEditorPane) {
-					val node = context.node
-					var String connectionName = null;
-					if (node instanceof DatabaseSourceNode) {
-						connectionName = node.connectionName
-					} else if (view instanceof Worksheet) {
-						connectionName = view.connectionName
-					}
-					logger.fine('''connectionName: «connectionName»''')
-					val parser = new UtplsqlParser(component.text, Connections.instance.getConnection(connectionName))
-					if (!parser.getPathAt(component.caretPosition).empty) {
+					if (preferences.checkRunUtplsqlTest) {
+						val node = context.node
+						var String connectionName = null;
+						if (node instanceof DatabaseSourceNode) {
+							connectionName = node.connectionName
+						} else if (view instanceof Worksheet) {
+							connectionName = view.connectionName
+						}
+						logger.fine('''connectionName: «connectionName»''')
+						val parser = new UtplsqlParser(component.text, Connections.instance.getConnection(connectionName))
+						if (!parser.getPathAt(component.caretPosition).empty) {
+							action.enabled = true
+						}
+					} else {
 						action.enabled = true
 					}
 				}
@@ -75,7 +82,7 @@ class UtplsqlController implements Controller {
 					val element = context.selection.get(0)
 					if (Connections.instance.isConnectionOpen(context.URL.connectionName)) {
 						val dao = new UtplsqlDao(Connections.instance.getConnection(context.URL.connectionName))
-						if (dao.utAnnotationManagerInstalled) {
+						if (preferences.checkRunUtplsqlTest && dao.utAnnotationManagerInstalled) {
 							if (element instanceof DatabaseConnection) {
 								action.enabled = dao.containsUtplsqlTest(element.connection.schema)
 							} else if (element instanceof ObjectFolder) {
@@ -133,7 +140,7 @@ class UtplsqlController implements Controller {
 	def runTest(Context context) {
 		val view = context.view
 		val node = context.node
-		logger.finer('''Run utPLSQL from view «view?.class?.name» and node «node?.class?.name».''')		
+		logger.finer('''Run utPLSQL from view «view?.class?.name» and node «node?.class?.name».''')
 		if (view instanceof Editor) {
 			val component = view.defaultFocusComponent
 			if (component instanceof JEditorPane) {
@@ -144,7 +151,8 @@ class UtplsqlController implements Controller {
 					connectionName = view.connectionName
 				}
 				logger.fine('''connectionName: «connectionName»''')
-				val parser = new UtplsqlParser(component.text, Connections.instance.getConnection(connectionName))
+				val preferences = PreferenceModel.getInstance(Preferences.preferences)
+				val parser = new UtplsqlParser(component.text, if (preferences.checkRunUtplsqlTest) {Connections.instance.getConnection(connectionName)} else {null})
 				val position = component.caretPosition
 				val path = parser.getPathAt(position)
 				val utPlsqlWorksheet = new UtplsqlWorksheet(path, connectionName)

sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend

@@ -35,6 +35,7 @@ class PreferenceModel extends HashStructureAdapter {
 	static final String KEY_RESET_PACKAGE = "resetPackage"
 	static final String KEY_CLEAR_SCREEN = "clearScreen"
 	static final String KEY_AUTO_EXECUTE = "autoExecute"
+	static final String KEY_CHECK_RUN_UTPLSQL_TEST = "checkRunUtplsqlTest"
 
 	def isUnsharedWorksheet() {
 		return getHashStructure.getBoolean(PreferenceModel.KEY_UNSHARED_WORKSHEET, true)
@@ -68,6 +69,16 @@ class PreferenceModel extends HashStructureAdapter {
 		getHashStructure.putBoolean(PreferenceModel.KEY_AUTO_EXECUTE, autoExecute)
 	}
 
+	def isCheckRunUtplsqlTest() {
+		return getHashStructure.getBoolean(PreferenceModel.KEY_CHECK_RUN_UTPLSQL_TEST, false)
+	}
+
+	def setCheckRunUtplsqlTest(boolean autoExecute) {
+		getHashStructure.putBoolean(PreferenceModel.KEY_CHECK_RUN_UTPLSQL_TEST, autoExecute)
+	}
+
+
+
 	override toString() {
 		new ToStringBuilder(this).addAllFields.toString
 	}

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

@@ -12,5 +12,6 @@ PREF_UNSHARED_WORKSHEET_LABEL=Open an unshared worksheet?
 PREF_RESET_PACKAGE_LABEL=Reset package before running utPLSQL?
 PREF_CLEAR_SCREEN_LABEL=Clear script output panel before running utPLSQL?
 PREF_AUTO_EXECUTE_LABEL=Execute unit test automatically?
+PREF_CHECK_RUN_UTPLSQL_TEST_LABEL=Check availability of "Run utPLSQL test" menu option?
 MENU_RUN_TEST_LABEL=Run utPLSQL test
 WORKSHEET_TITLE=utPLSQL

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

@@ -6,5 +6,6 @@ PREF_UNSHARED_WORKSHEET_LABEL=Arbeitsblatt mit eigener Verbindung 
 PREF_RESET_PACKAGE_LABEL=Package vor der Ausführung von utPLSQL zurücksetzen?
 PREF_CLEAR_SCREEN_LABEL=Skriptausgabe-Fenster vor der Ausführung von utPLSQL leeren?
 PREF_AUTO_EXECUTE_LABEL=Unit Test automatisch ausführen?
+PREF_CHECK_RUN_UTPLSQL_TEST_LABEL=Verfügbarkeit der Menüoption "utPLSQL Test ausführen" prüfen?
 MENU_RUN_TEST_LABEL=utPLSQL Test ausführen
 WORKSHEET_TITLE=utPLSQL

sqldev/src/test/java/org/utplsql/sqldev/tests/PreferenceModelTest.xtend

@@ -28,5 +28,6 @@ class PreferenceModelTest {
 		Assert.assertFalse(model.resetPackage)
 		Assert.assertFalse(model.clearScreen)
 		Assert.assertTrue(model.autoExecute)
+		Assert.assertFalse(model.checkRunUtplsqlTest)
 	}	
 }