You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2021/03/20 18:11:44 UTC
[GitHub] [netbeans] ebresie opened a new pull request #2820: Updates for Sql autocomplete
ebresie opened a new pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820
This allows autocompletion to be possible when no connection is yet established. It provides some basic hints for connection and drivers which link with existing connection actions.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607301210
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/layer.xml
##########
@@ -58,7 +58,7 @@
<folder name="FoldManager">
<file name="CustomFoldManager.instance">
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1200"/>
Review comment:
Please remove the unnecessary whitespace changes.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -131,4 +264,93 @@ public void run() {
TokenHierarchy<?> hierarchy = TokenHierarchy.get(doc);
return hierarchy.tokenSequence(SQLTokenId.language());
}
+
+ private static class SqlNewConnectionFix implements Fix {
Review comment:
This feels a bit strange. We don't put "Install JDK" options into the Java Sourcecode. Why is SQL different?
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/Bundle.properties
##########
@@ -41,3 +41,4 @@ sql-keyword=Keyword
sql-errors=Error
sql-dot=Period
+LAB_db_sql_editor_annotation_warn="Select Connection from the combo box at the top of the SQL Editor window."
Review comment:
This seems to be unused.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
As a new review was requested: this is still broken.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java
##########
@@ -120,23 +120,37 @@ public void query(SQLCompletionResultSet resultSet, SQLCompletionEnv newEnv) {
private void doQuery(final SQLCompletionEnv newEnv) {
try {
+ // DB Connection available
+ if (dbconn != null) {
Review comment:
If dbconn can't be set, all is save - that is the answer. This work is all about not having a connection, so I think it is warranted to be save about this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebarboni commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebarboni commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-874885005
hi @ebresie would be good if you can squash and force push to "remove" from history the technical commit.
git rebase -i HEAD~20 (shoud match hash of you commits)
edit the file to replace pick by squash (except for the first)
edit commit message maybe choose the one with Issue number
apply the rebase
if everything is OK
git push --force
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r599854650
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
Will copy over....
However this does beg the question, when searching for that I notice there are 30 copies of this files (not sure if they are all the same but from the thumbnails they look to be)...why do we have to have all these copies? Why couldn't a "shared resource" folder be used to reduce all these copies? I thought I remember a discussion about this on the mailing list but maybe I'm misremembering.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] vitaly-los commented on pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
vitaly-los commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-803639944
Just interesting is it related commit https://github.com/apache/netbeans/pull/2558?
I see some dead commits are from 2019
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607834613
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/layer.xml
##########
@@ -58,7 +58,7 @@
<folder name="FoldManager">
<file name="CustomFoldManager.instance">
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1200"/>
Review comment:
Looking at the code all the "attr" around this seem to line up.
If I'm not mistaken it looks like previously it was a tab now is 4 spaces as is currently present.
When I formatted the context of the "folder" tag it also does not appear to change.
Does my "spacing formatting" preferences need to be set in some way to conform to a specific spacing standard for xml?
What should the whitespace be set to?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598308167
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
For the linefeed issues: Depends on your environment.
For the build errors: No, most probably the build is just flaky, you need to check the errors.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607821132
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
Removed annotation updates so glyph no longer required
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607852119
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Just for clarification, what is meant by "Standard SQL" in this context? Are you talking about a specific class, a "new class", or referring to "standard SQL syntax"?
Presently the constructor/creators of Quoters that I found was mainly the "SqlIdentifiers.createQuoter which requires a DatabaseMetadata parameter; if the connection is not available, then assume getting the DatabaseMetaData is not possible. There is the "NonASCIIQuoter" but this is a test class and not in the main codebase.
As an alternative, in that code is uses the quoter but if a quoter is not available, could it just return the text with something like
```
if (quoter == null)
return seq.token().text().toString();
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610696904
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
> Looking at one of the [w3 resources SQL syntax page in identifier section](https://www.w3resource.com/sql/sql-syntax.php#IDENTIF) it does look more complicated.
The w3 reference mentions after "SELECT" there can be optionally "DISTINCT | ALL" and either a wildcard ("*") or select List (i.e. identifiers). Unless I've missed it, I'm not sure these cases are handled. Is a new issue for adding that worth wild?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r599928812
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
For the "why another copy" question: The NetBeans IDE is highly modular. Creating a central icon module would be possible, but at what price? You introduce another level of dependency into the ecosystem. Then the question is, at what level will you bundle? If you create one big pack, questions will be raised why "unused" icons are bundled. To my observation the current decentralized approach works.
There are/were discussions, but the only fallout of this is a set of icons that were redrawn as SVG and are already distributed as part of the IDE.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-803620398
> As you already mentioned in your mail, because of the HINTS and FIX, I think so too, that we should separate it. It is out of scope of the ticket and it would be better to have a separated packege/folder whatever where we have SQL Editor related hints and fixes. My 2 cents.
I have created NETBEANS-5474 Add SQL Hints for use during editing to capture changes associated with adding hints to SQL.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607852553
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
What is meant by phpmyadmin? I can't find a file or project with that. Is that in the php.editor or some plugin?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610676066
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Yes, there is a reason the connection object is required - do you gain anything by even calling into this when no connection is available? I think I mentioned it earlier, maybe refitting code, that requires a connection to a connection less world is not the right approach.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r671866097
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Have raises separate tickets to capture refactor changes for connection vs connectionless cases.
NETBEANS-5831 Create a SQL Standard Quoter for Use with Connectionless Cases
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-803652808
There may be a little overlap with that. That one updates the config
screen for auto completion. I think the configuration there could be used
here as well as another check (I think I may have put a todo to do so but
didn’t do anything on that yet).
On Sun, Mar 21, 2021 at 1:46 PM Los Vitaly ***@***.***> wrote:
> Just interesting is it related commit #2558
> <https://github.com/apache/netbeans/pull/2558>?
> I see some dead commits are from 2019
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/apache/netbeans/pull/2820#issuecomment-803639944>, or
> unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAC2RTUEKCWUGE2DZ2VWXUDTEY5JZANCNFSM4ZQVPDDQ>
> .
>
--
Eric Bresie
***@***.***
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610672491
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
> Yes SQL defines default quoting behavior - from the top of my head:
>
> * identifiers are quoted with double quotes: `"IDENTIFIER"`
> * strings are quoted with single quotes: `'STRING'`
> * escaping the quote itself is handled by doubling itself `""""` is the Identifier `"` and `''''` is the string `'`
>
> Sounds simple - it is not because DB vendors screwed up. I remember, that MySQL has some more creative quotes and escapes, which make "MySQL SQL" incompatible" with "Standard SQL".
Looking at one of the [w3 resources SQL syntax page in identifier section](https://www.w3resource.com/sql/sql-syntax.php#IDENTIF) it does look more complicated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610665517
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
> phpmyadmin is a popular PHP based tool for accessing mysql databases. It is often found in hosted setups. In recent version I saw some quick code completion, that could not have been grammar based, but might be an alternative.
Little rusty on my php and don't have that setup at the moment to try this but from what I can tell there is [SqlAutoCompleteController file used for sql autocomplete ](https://github.com/phpmyadmin/phpmyadmin/blob/master/libraries/classes/Controllers/Database/SqlAutoCompleteController.php) which appears to basically creates an array of autocomplete items of db and table name related attributes. I don't see the basic sql side of things which may be elsewhere so I will poke around some more.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607852119
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Just for clarification, what is meant by "Standard SQL" in this context? Are you talking about a specific class, a "new class", or referring to "standard SQL syntax"?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r614042663
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/layer.xml
##########
@@ -58,7 +58,7 @@
<folder name="FoldManager">
<file name="CustomFoldManager.instance">
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1200"/>
Review comment:
Okay...if I did my git correctly, I've removed the layer.xml from changes in the commit and the Resource.properties file which appear to not have any significant changes and unneeded. Is this good for comments against these two files?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598307074
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
Review comment:
I thought I had removed those but must have missed some cases. Will correct.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r611253417
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
When using another tool for SQL it allows user to write without a connection but cannot execute sql or do autocomplete without it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598342018
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
Review comment:
My assumption here is that when "dconn" is null, that essentually no connection is setup (at the top of the SQL Editor) or available. So from this point I assume there needs to be a way to notify the user of the need to do so. In this case (and given the possible "make hints" be a separate ticket maybe this is not the route but) I was adding some hints (like adding drivers, new connections, and "connect" [which results in the existing dialog warning]).
With this in play, then it allows for some basic sql tokens autocompletion
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-894661759
Closing this in favor of https://github.com/apache/netbeans/pull/3074
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607835327
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/Bundle.properties
##########
@@ -41,3 +41,4 @@ sql-keyword=Keyword
sql-errors=Error
sql-dot=Period
+LAB_db_sql_editor_annotation_warn="Select Connection from the combo box at the top of the SQL Editor window."
Review comment:
Removed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r608059205
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -131,4 +264,93 @@ public void run() {
TokenHierarchy<?> hierarchy = TokenHierarchy.get(doc);
return hierarchy.tokenSequence(SQLTokenId.language());
}
+
+ private static class SqlNewConnectionFix implements Fix {
Review comment:
At the time I was trying to make a "fix" to do the same as setting the connection in the upper connection bar. Some of these fixes are really just open other dialogs (like drivers or new connection) as present already so maybe these hint/fixes are not really relevant.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598297170
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
This looks broken. You could create an SQL Standard Quoter, but returning the empty string here looks strange.
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
Please check your settings - the whole file was converted from unix style line endings to windows line endings. This should not be done and according to `.gitattributes` should not be possible.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -131,4 +306,119 @@ public void run() {
TokenHierarchy<?> hierarchy = TokenHierarchy.get(doc);
return hierarchy.tokenSequence(SQLTokenId.language());
}
+
+
+ /**
+ * Related to annotation for hints on the left for use during tip context
+ */
+ private static final class SqlConnectionAnnotation extends Annotation {
Review comment:
As commented above this does not seem to be wired up.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
}
- if (dbconn.getJDBCConnection() == null) {
+
+ // check if DB connection is active
+ if (dbconn != null && dbconn.getJDBCConnection() == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NotConnected");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to "allow to connect" and/or
+ allow further typing and/or other options. */
+// return 0;
+
+ // determine the selected line
+ selection = component.getSelectedText();
+ Document doc = component.getDocument();
+
+ if (selection.length() > 0) {
+ component.replaceSelection("<b>" + selection + "</b>");
+ // use NbEditorUtilities.getLine() to extract a line from the
+ // current document and offset,
+ // for which we need a DocumentListener, as described in the next step:
+ int lineOffset = component.getSelectionStart() - 1;
+
+ Line myLine = NbEditorUtilities.getLine(doc, lineOffset, false);
+
+ // TODO: Figure out how to set message
+ //Here we attach our annotation to the line:
+ SqlConnectionAnnotation.DEFAULT.attach(myLine);
+ }
}
return COMPLETION_QUERY_TYPE;
}
+ private void createSuggestions(JTextComponent component, DatabaseConnection dbconn) {
Review comment:
Not sure when this is used, but I did not see any hints, so this should not be here or is broken.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
Review comment:
Please don't commit uncommented code.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
Review comment:
What should completion do at this point? There is no data available (no connection == no meta data). So what is the purpose of this?
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java
##########
@@ -120,23 +120,37 @@ public void query(SQLCompletionResultSet resultSet, SQLCompletionEnv newEnv) {
private void doQuery(final SQLCompletionEnv newEnv) {
try {
+ // DB Connection available
+ if (dbconn != null) {
Review comment:
Is this save? Could the connection go away between the null check here and the usage in line 126?
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
Please do not use such cross module references - the java cluster could be missing and introducing such a heavy weight dependency will not carry its weight.
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+ <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
+ <module-dependencies>
+ <dependency>
+ <code-name-base>org.netbeans.modules.csl.api</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>2.27</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.csl.types</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <implementation-version/>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db.core</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0-1</release-version>
+ <specification-version>0.8</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.dbapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.2</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>1.53</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0-1</release-version>
+ <specification-version>1.22</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.12</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.document</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.3</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.42</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>4.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>2.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.26</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.lexer</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>1.27</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.26</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.queries</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.15</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0</release-version>
+ <specification-version>1.53</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.spi.java.hints</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.42</specification-version>
+ </run-dependency>
+ </dependency>
Review comment:
This seems to be unused.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
}
- if (dbconn.getJDBCConnection() == null) {
+
+ // check if DB connection is active
+ if (dbconn != null && dbconn.getJDBCConnection() == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NotConnected");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to "allow to connect" and/or
+ allow further typing and/or other options. */
+// return 0;
+
+ // determine the selected line
+ selection = component.getSelectedText();
+ Document doc = component.getDocument();
+
+ if (selection.length() > 0) {
+ component.replaceSelection("<b>" + selection + "</b>");
+ // use NbEditorUtilities.getLine() to extract a line from the
+ // current document and offset,
+ // for which we need a DocumentListener, as described in the next step:
+ int lineOffset = component.getSelectionStart() - 1;
+
+ Line myLine = NbEditorUtilities.getLine(doc, lineOffset, false);
+
+ // TODO: Figure out how to set message
+ //Here we attach our annotation to the line:
+ SqlConnectionAnnotation.DEFAULT.attach(myLine);
+ }
Review comment:
This code turns (| is start and end of selection):
```
select * |from| x WHERE ;
```
into this
```
select * <b>from</b> x WHERE ;
```
This looks like debugging code, so should not be here.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java
##########
@@ -993,6 +1033,9 @@ private Identifier createIdentifier(List<String> parts, boolean incomplete, int
}
// Fine, nothing was typed.
} else {
+ if (quoter == null) {
+ return null;
+ }
Review comment:
Looks strange (see above).
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+ <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
+ <module-dependencies>
+ <dependency>
+ <code-name-base>org.netbeans.modules.csl.api</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>2.27</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.csl.types</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <implementation-version/>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db.core</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0-1</release-version>
+ <specification-version>0.8</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.dbapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.2</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>1.53</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0-1</release-version>
+ <specification-version>1.22</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.12</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.document</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.3</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.42</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>4.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>2.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.26</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.lexer</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>1.27</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.26</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.queries</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.15</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0</release-version>
+ <specification-version>1.53</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.spi.java.hints</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.42</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.swing.plaf</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.34</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.actions</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>6.2</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.awt</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>6.7</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.dialogs</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>6.2</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.explorer</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>6.8</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.filesystems</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>9.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.loaders</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>7.61</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.modules</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>6.2</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.nodes</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>7.23</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.text</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>6.16</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.util</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>9.3</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.util.lookup</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>8.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.openide.util.ui</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>9.3</specification-version>
+ </run-dependency>
+ </dependency>
+ </module-dependencies>
+ <test-dependencies>
+ <test-type>
+ <name>unit</name>
+ <test-dependency>
+ <code-name-base>org.netbeans.libs.junit4</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.csl.api</code-name-base>
+ <recursive/>
+ <compile-dependency/>
+ <test/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.db</code-name-base>
+ <compile-dependency/>
+ <test/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
+ <compile-dependency/>
+ <test/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.lexer</code-name-base>
+ <compile-dependency/>
+ <test/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+ <recursive/>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
+ <recursive/>
+ <compile-dependency/>
+ <test/>
+ </test-dependency>
Review comment:
This seems to be unused.
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
The name of the file looks broken - or shall it end with ".xml.xml"?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r614270302
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/layer.xml
##########
@@ -58,7 +58,7 @@
<folder name="FoldManager">
<file name="CustomFoldManager.instance">
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1200"/>
Review comment:
Yes the changes are gone (git diff locally or the github view are helpful).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607806394
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
Unless otherwise concerned...close out this review item.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598338563
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Silly question, how should that "Quoter" be created?
I see a case like the below using SQLIdentifer to created it, but in this case since there is no conn available, using the meta data I don't believe would be possible.
DatabaseMetaData dmd = conn.getMetaData();
quoter = SQLIdentifiers.createQuoter(dmd)
I also see
NonASCIIQuoter(String quoteString)
So would quoter = new NonASCIIQuoter(""); be what you're suggesting or something else?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-816839492
Okay apparently the adding of the notification as part of ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java broke unit tests. I believe the problem has to do with the dialog opening and waiting for someone to click the button. I assume may need to back this out and/or find a better place to trigger the notification.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598342342
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
}
- if (dbconn.getJDBCConnection() == null) {
+
+ // check if DB connection is active
+ if (dbconn != null && dbconn.getJDBCConnection() == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NotConnected");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to "allow to connect" and/or
+ allow further typing and/or other options. */
+// return 0;
+
+ // determine the selected line
+ selection = component.getSelectedText();
+ Document doc = component.getDocument();
+
+ if (selection.length() > 0) {
+ component.replaceSelection("<b>" + selection + "</b>");
+ // use NbEditorUtilities.getLine() to extract a line from the
+ // current document and offset,
+ // for which we need a DocumentListener, as described in the next step:
+ int lineOffset = component.getSelectionStart() - 1;
+
+ Line myLine = NbEditorUtilities.getLine(doc, lineOffset, false);
+
+ // TODO: Figure out how to set message
+ //Here we attach our annotation to the line:
+ SqlConnectionAnnotation.DEFAULT.attach(myLine);
+ }
Review comment:
This was based on an example adding hints. Will remove the "<b></b>" code around here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598689578
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java
##########
@@ -120,23 +120,37 @@ public void query(SQLCompletionResultSet resultSet, SQLCompletionEnv newEnv) {
private void doQuery(final SQLCompletionEnv newEnv) {
try {
+ // DB Connection available
+ if (dbconn != null) {
Review comment:
Not sure I completely understand (trying to learn here). What might cause that to be changed to null? Is the suggestion in some other context (maybe another thread or file window), the dbconn is set (or unset) in some other way?
The dbconn is set as part of the SQLCompletionQuery constructor which is used during the "SQLCompletionProvider.createTask" with a AsyncCompletionTask constructor, using a dbconn from that context. I believe in those context it may be creating a new instance, but not 100% sure here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598343078
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -131,4 +306,119 @@ public void run() {
TokenHierarchy<?> hierarchy = TokenHierarchy.get(doc);
return hierarchy.tokenSequence(SQLTokenId.language());
}
+
+
+ /**
+ * Related to annotation for hints on the left for use during tip context
+ */
+ private static final class SqlConnectionAnnotation extends Annotation {
Review comment:
Another case of initially I had an Annotation as well and decided to removed it but forgot to remove the class definition. WIll remove this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610674038
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
> As an alternative, in that code it uses the quoter to "unquote" stuff, but if a quoter is not available (due to lack of connection), could it just return the text as is with something like?
>
> ```
> if (quoter == null)
> return seq.token().text().toString();
> ```
Is this more acceptable then returning the "" mentioned in the original comment?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebarboni commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebarboni commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-885511863
change requested moving to 12.6
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-885804690
To reduce the confusion, I would like to close this PR and replaced with a "clean" PR (see https://github.com/apache/netbeans/pull/3074) which can be used going forward.
If this is acceptable, then will need the milestones, tags, labels, reviews to be addressed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607870030
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
}
- if (dbconn.getJDBCConnection() == null) {
+
+ // check if DB connection is active
+ if (dbconn != null && dbconn.getJDBCConnection() == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NotConnected");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to "allow to connect" and/or
+ allow further typing and/or other options. */
+// return 0;
+
+ // determine the selected line
+ selection = component.getSelectedText();
+ Document doc = component.getDocument();
+
+ if (selection.length() > 0) {
+ component.replaceSelection("<b>" + selection + "</b>");
+ // use NbEditorUtilities.getLine() to extract a line from the
+ // current document and offset,
+ // for which we need a DocumentListener, as described in the next step:
+ int lineOffset = component.getSelectionStart() - 1;
+
+ Line myLine = NbEditorUtilities.getLine(doc, lineOffset, false);
+
+ // TODO: Figure out how to set message
+ //Here we attach our annotation to the line:
+ SqlConnectionAnnotation.DEFAULT.attach(myLine);
+ }
}
return COMPLETION_QUERY_TYPE;
}
+ private void createSuggestions(JTextComponent component, DatabaseConnection dbconn) {
Review comment:
With that in mind...after the first attempt at autocomplete, it adds the hints but never "removes" them afterwards.
I'm guessing maybe the warnings should be "cleared out" when a connection is available (i.e. conn != null)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598881943
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
It depends. I was the one, that pointed out, that it is highly problematic to try to create a completion without a corresponding connection. There is Standard SQL, so you can build a quoter based on that, but then you also need to guess what is considered a keyword an d what not.
Maybe there is a different approach possible: Don't try to be clever and use a parser, but use keyword based completion. You could have a look at phpmyadmin completion how it is handled there. I doubt, that they went the way of a full parser in JS, but most probably complete based on keyword prefix matching.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r599845311
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
Since I am removing the annotation for now, this file can go away.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-816706869
> > I suggest to clean this up, remove all unnessary changes, squash and force push.
>
> Sorry, I've not done a lot of squashing and force pushes. Any guidance or pointers to that?
>
> Is that something doable within github, Netbeans git, or git command prompt verIon?
I think the git integration in netbeans is missing a force-push option, so I would use the git cli client:
https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
After the history is cleaned up, you can do a forced push to the tracking branch on github and the PR will be updated with that.
The intention is here to get a clean baseline (and loose all unintended changes) and should be used with care.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598303215
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
I was using the glyph icon from the Java cluster. Is there an alternative common, non Java specific that should be used instead?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r613994896
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Unless I'm assuming incorrectly, when no connection is active, then assume no real need to quote/unquote any table/column would be necessary, so is going with the below reasonable?
```
if (quoter == null)
return seq.token().text().toString();
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-813629288
I suggest to clean this up, remove all unnessary changes, squash and force push. I also notice, that no reference to an issue is given, so the changes are not tracked in jira.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r615002468
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Matthias, I appreciate the feedback. As a new commiter, I know I;m not there yet but will get there with help.
The original scope of this ticket was...if no connection, allow some form of auto completion without connection based details and avoid the connection dialog from preventing futher autocompletion. As it is now I think it does this.
The remaining concenrs is how getUnquotedIdentifier behaves when no connection is available. Initial changes was to returned "", which I realize is wrong, risking the loss of given seq.token.txt details. Next change was to return the results without being "unquoted" with given "return seq.token().text().toString();"; whether it needed or not was dependent on the database in use which if not available is where problems may occur. When quoter is not available or used avoids risk of a null pointers and return the sequence of text in the given context without being concerned without being "unquoted" independent of whether a "quoter" was available or not.
When quoter is available and calls the "unquote" method found in the SQLIdentifer.Quoter abstrace class which is implemented/extended in the DatabaseMetaDataQuoter implementation; if quoter was set correctly previously (when DB is available) then instance of quoter should be available and all is right with the world. However, when quoter is unavailable (not connection and not setup earlier) then something different is needed.
So is the change suggetion to implement a new ConnectionLessQuoter or BasicQuoter under the SqlIdentifer class and use this when connection is not available earlier in the flow?
It seems many of the methods in the Quoter abstract class probably should be static methods. So is the refactoring mentioned involve moving some of these out into a "static" context in some way?
As implemented, "getUnquotedIdentifer" is used in placed like "InsertStatementAnalyzer, SQLStatemenAnalyzer, and SelectStatementAnalyzer, analyzeChosenColumns, etc. In other places, some form of interface is used like "TablesClause" (assume this would be "connection based") used in places such as "DeleteStatementAnalyzer", InsertStatementAnalyzer, SelectStatementAnalyzer, and UpdateStatementAnalyzer". Or uses a call to "parseIdentifier" which also use the getUnquotedIdentifer or parseTableIdent to return table names "Identifiers". So are changes to standardize these across context needed here?
For SqlStatementAnalyizer, the "connection" state is not know directly, but is available previously such as in the SQLCompletionQuery context where it established the quoter and passes forward to applicable as. So in a given Analyzer context, the "quoter" was the way to determine if there was or wasn't a connection without passing around the connections from other scope/context.
Do this type of aspect reflect the "connection vs non-connection" based changes preferred in earlier comment?
Connection may be needed when determining what kind of identifiers to include in the autocomplete options in applicable context of a given sql statement (i.e. between select xxx from, insert .. INTO xxxx, etc.) but not others (i.e. empty line so use initial SQL keywords). WHen available then the identifier such as table and columns identifiers based on the connection are possible which I bleive depneds on connected based DatabaseMetaDataQuoter and related classed. This may help determine if should or shouldn't quote given identifiers (database/schema/table/column) for given DB product. If connection is not available, then maybe able to add "non connection based identifier items" (i.e. "*", Count(*), DISTINCT, etc. - not sure it does this presently; is this where a StandardSQLQuoter might come in to lay?).
In each call to "getUnquotedIdentifer()" it return a list Strings with possible items. It iterates through each token in the current expression and may key on before/after "dot" or if typing an identifier make another call. In other cases it may use the above mentioned "createTable" type style so
Can't really create a DB quoter without a give connection; and no easy way to determine what connection to use without user interaction (i.e. selecting DB connection if available, creating a connection, etc.). Some sort of "default" connection (probably set in the connection pulldown) could be persisted in some way and reused after it was first established to reduce the chance it's not setup, but that also seems like a different type of change (i.e. maybe a new "store selected connection and reused next time file or SQL editor is opened" type ticket).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] Chris2011 commented on pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
Chris2011 commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-803555454
As you already mentioned in your mail, because of the HINTS and FIX, I think so too, that we should separate it. It is out of scope of the ticket and it would be better to have a separated packege/folder whatever where we have SQL Editor related hints and fixes. My 2 cents.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598342753
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
}
- if (dbconn.getJDBCConnection() == null) {
+
+ // check if DB connection is active
+ if (dbconn != null && dbconn.getJDBCConnection() == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NotConnected");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to "allow to connect" and/or
+ allow further typing and/or other options. */
+// return 0;
+
+ // determine the selected line
+ selection = component.getSelectedText();
+ Document doc = component.getDocument();
+
+ if (selection.length() > 0) {
+ component.replaceSelection("<b>" + selection + "</b>");
+ // use NbEditorUtilities.getLine() to extract a line from the
+ // current document and offset,
+ // for which we need a DocumentListener, as described in the next step:
+ int lineOffset = component.getSelectionStart() - 1;
+
+ Line myLine = NbEditorUtilities.getLine(doc, lineOffset, false);
+
+ // TODO: Figure out how to set message
+ //Here we attach our annotation to the line:
+ SqlConnectionAnnotation.DEFAULT.attach(myLine);
+ }
}
return COMPLETION_QUERY_TYPE;
}
+ private void createSuggestions(JTextComponent component, DatabaseConnection dbconn) {
Review comment:
It is used as seen in the earlier comment above.
The hints start to show up until following an attempted the Ctrl+space key component. Not sure this is the way it should or the preferred way for this to be done, but it worked at the time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607819972
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -41,42 +57,190 @@
* @author Andrei Badea
*/
public class SQLCompletionProvider implements CompletionProvider {
+ private static final String SQL_CONNECTION_HINT_ID = "sql_connection_hint";
+ private String selection;
+ private static JTextComponent component = null;
+ private static DatabaseConnection dbconn = null;
+ @Override
public CompletionTask createTask(int queryType, JTextComponent component) {
- if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE || queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+ if (queryType == CompletionProvider.COMPLETION_QUERY_TYPE ||
+ queryType == CompletionProvider.COMPLETION_ALL_QUERY_TYPE) {
+
+ /* to support DB related completion tasks (i.e. auto populating table
+ names or db columns for given schema) check for connection */
DatabaseConnection dbconn = findDBConn(component);
- if (dbconn == null) {
- // XXX perhaps should have an item in the completion instead?
- Completion.get().hideAll();
- SQLExecutionBaseAction.notifyNoDatabaseConnection();
- return null;
+ // No database connection set or active
+ if (SQLCompletionProvider.dbconn == null) {
+ createSuggestions(component,dbconn);
}
+
return new AsyncCompletionTask(new SQLCompletionQuery(dbconn), component);
}
+
+ // not a completion query type so return nothing
return null;
}
+ /**
+ * getAutoQueryTypes is invoked to check whether a popup with suggestions
+ * should be shown without the user explicitly asking for it.
+ *
+ * If either #getAutoQueryTypes return a non-zero value or the user
+ * explicitly asks for completion, #createTask is invoked with the
+ * requested type. In case of SQL see
+ * org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.
+ *
+ * @param component
+ * @param typedText
+ * @return
+ */
public int getAutoQueryTypes(JTextComponent component, String typedText) {
+ /* TODO: Need to check "enable/disable" autocomplete is setting.
+ See NETBEANS-188 */
+
+ // If "." has not been typed then acceptable to start checking for options.
if (!".".equals(typedText)) { // NOI18N
return 0;
}
+ // check typed text if dot is present at the selected offset
if (!isDotAtOffset(component, component.getSelectionStart() - 1)) {
return 0;
}
+
+// List<Fix> fixes = new ArrayList<>(Collections.emptyList());
+// Document doc = component.getDocument();
+// List<ErrorDescription> warnings = new ArrayList<>(Collections.emptyList());
+
+ // check if there is a DB connection
DatabaseConnection dbconn = findDBConn(component);
if (dbconn == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NoDatabaseConnection");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to create new connection and/or
+ allow further typing and/or other options.
+
+ Maybe provide a list of available connections.
+
+ return 0; */
+// createSuggestions(component, doc, fixes, warnings, dbconn);
+ createSuggestions(component, dbconn);
}
- if (dbconn.getJDBCConnection() == null) {
+
+ // check if DB connection is active
+ if (dbconn != null && dbconn.getJDBCConnection() == null) {
String message = NbBundle.getMessage(SQLCompletionProvider.class, "MSG_NotConnected");
StatusDisplayer.getDefault().setStatusText(message);
- return 0;
+ /* TODO: Find How to povide tip to "allow to connect" and/or
+ allow further typing and/or other options. */
+// return 0;
+
+ // determine the selected line
+ selection = component.getSelectedText();
+ Document doc = component.getDocument();
+
+ if (selection.length() > 0) {
+ component.replaceSelection("<b>" + selection + "</b>");
+ // use NbEditorUtilities.getLine() to extract a line from the
+ // current document and offset,
+ // for which we need a DocumentListener, as described in the next step:
+ int lineOffset = component.getSelectionStart() - 1;
+
+ Line myLine = NbEditorUtilities.getLine(doc, lineOffset, false);
+
+ // TODO: Figure out how to set message
+ //Here we attach our annotation to the line:
+ SqlConnectionAnnotation.DEFAULT.attach(myLine);
+ }
Review comment:
Removed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607820680
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
Was removed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r606678566
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
As part of recent check in, I believe I've resolved this issue. Please confirm when able
> I think this needs cleanup before it can be merged. Primarily only changes, that should be in master (and are working) should be in this PR. I left some comments inline, which might help.
>
> My concern right now, that this opens a completly new can of worms, because the core assumption ("real" completion only happens when a connection is available) is no broken. I saw some guards added, but yet I managed to get this:
>
> ```
> java.lang.NullPointerException
> at org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.completeSimpleIdentBasedOnFromClause(SQLCompletionQuery.java:683)
> at org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.completeColumnWithDefinedTuple(SQLCompletionQuery.java:501)
> at org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.completeSelect(SQLCompletionQuery.java:268)
> at org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.doQuery(SQLCompletionQuery.java:211)
> at org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.doQuery(SQLCompletionQuery.java:152)
> at org.netbeans.modules.db.sql.editor.completion.SQLCompletionQuery.query(SQLCompletionQuery.java:101)
> at org.netbeans.spi.editor.completion.support.AsyncCompletionTask.run(AsyncCompletionTask.java:198)
> at org.openide.util.RequestProcessor$Task.run(RequestProcessor.java:1418)
> at org.netbeans.modules.openide.util.GlobalLookup.execute(GlobalLookup.java:45)
> at org.openide.util.lookup.Lookups.executeWith(Lookups.java:278)
> at org.openide.util.RequestProcessor$Processor.run(RequestProcessor.java:2033)
> Caused: org.openide.util.RequestProcessor$FastItem: task failed due to
> ```
>
> from a simple query (completion was invoked at |):
>
> ```
> select * from x WHERE |;
> ```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-817381765
I've squashed most of the changes together. So hopefully it's just about ready fro inclusion.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607821132
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
Removed annotation updates so glyoh no longer required
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r599855508
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
Actually since this is part of the "annotation" xml file I'm removing this may no longer be needed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598308253
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/org-netbeans-modules-db-sql-editor_annotation.xml.xml
##########
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE type PUBLIC
+"-//NetBeans//DTD annotation type 1.1//EN"
+"http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
+<type name="org-netbeans-modules-db-sql-editor_annotation"
+ description_key="LAB_db_sql_editor_annotation_warn"
+ localizing_bundle="org.netbeans.modules.db.sql.editor.resources.Bundle"
+ visible="true"
+ glyph="nbresloc:/org/netbeans/modules/java/resources/error-glyph.gif"
Review comment:
Copy it into the db.sql.editor module. Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie edited a comment on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie edited a comment on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-816702904
> no reference to an issue is given, so the changes are not tracked in jira.
As indicate, I've added the ticket reference [NETBEANS-189] to the PR title and the PR is linked on the NETBEANS ticket. Let me know if anything else is needed here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610036176
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/layer.xml
##########
@@ -58,7 +58,7 @@
<folder name="FoldManager">
<file name="CustomFoldManager.instance">
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1200"/>
Review comment:
The reasoning is simple: Don't change things you don't need to change. Changing whitespace in places, that don't need an update just messes diffs. There are reasons to do this, this is not one of them.
In general: Check the surrounding code - independent of any documentation new code should align with local conventions. If in doubt, I use default netbeans settings.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610695155
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
That said, looking at the w3 reference above, I noticed after "SELECT" there can be optionally "DISTINCT | ALL" and can be "*" or select List (i.e. identifiers). Not sure if the handling of DISTINCT, ALL, and/or * might need to be added at some point. You think maybe a new issue for adding that would be worth wild?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598338563
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Silly question, how should that "Quoter" be created?
I see a case like the below using SQLIdentifer to created it, but in this case since there is no conn available, using the meta data I don't believe would be possible.
DatabaseMetaData dmd = conn.getMetaData();
quoter = SQLIdentifiers.createQuoter(dmd)
I see a constructor for NonASCIIQuoter(String quoteString) which extends from Quoter, however the NonASCIIQuoter is a test class so assume that isn't usable in this case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598304433
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
I checked in with Netbeans git client. I'll see if I missed a lf/cr config option there. Although I may have checked out with external git client at an earlier point. Should the git in Netbeans default to no change in line feed format?
That said, could this likely be the culprit causing the failures during build check issues on Linux and MacOS side?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-816702636
> I suggest to clean this up, remove all unnessary changes, squash and force push.
Sorry, I've not done a lot of squashing and force pushes. Any guidance or pointers to that?
Is that something doable within github, Netbeans git, or git command prompt verIon?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610043898
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Yes SQL defines default quoting behavior - from the top of my head:
- identifiers are quoted with double quotes: `"IDENTIFIER"`
- strings are quoted with single quotes: `'STRING'`
- escaping the quote itself is handled by doubling itself `""""` is the Identifier `"` and `''''` is the string `'`
Sounds simple - it is not because DB vendors screwed up. I remember, that MySQL has some more creative quotes and escapes, which make "MySQL SQL" incompatible" with "Standard SQL".
phpmyadmin is a popular PHP based tool for accessing mysql databases. It is often found in hosted setups. In recent version I saw some quick code completion, that could not have been grammar based, but might be an alternative.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie closed pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie closed pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607820439
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -131,4 +306,119 @@ public void run() {
TokenHierarchy<?> hierarchy = TokenHierarchy.get(doc);
return hierarchy.tokenSequence(SQLTokenId.language());
}
+
+
+ /**
+ * Related to annotation for hints on the left for use during tip context
+ */
+ private static final class SqlConnectionAnnotation extends Annotation {
Review comment:
SqlConnectionAnnotation and related references removed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610643588
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/layer.xml
##########
@@ -58,7 +58,7 @@
<folder name="FoldManager">
<file name="CustomFoldManager.instance">
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1200"/>
Review comment:
Okay understand that changing spaces is a pain in update reviews and should tried to avoid it whenever possible.
But all that said, comparing the change here on that line with the apache/netbeans master branch version of the file...it looks like the master had a tab on that line but all others used spaces for indenting the lines.
Looking through the rest of the file I don't see tabs used anyplace else.
I can revert that line back and add the tab back if that is the preference.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r671866458
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
In the case where connectionless and no quoter is available in the context of getUnquotedIdentifier, returning seq.token().text().toString().
No unquoting is really possible unless a given connection to a specific DB is available to determine how to "unquote" things for the given DB (connection which is not available).
Some of this behavior could changes when implementing NETBEANS-5831 to provide some form of "connection less" unquoting.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r614269178
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
My pain point: Instead of trying to fix logic, that relies hard on a connection, why not refactor this to split connection less and connction required codepaths, then it would be clear and you'd not need to unquote.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610752777
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionProvider.java
##########
@@ -131,4 +264,93 @@ public void run() {
TokenHierarchy<?> hierarchy = TokenHierarchy.get(doc);
return hierarchy.tokenSequence(SQLTokenId.language());
}
+
+ private static class SqlNewConnectionFix implements Fix {
Review comment:
I've removed all "hint/fixes" in recent commit
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-816702904
> I suggest to clean this up, remove all unnessary changes, squash and force push. I also notice, that no reference to an issue is given, so the changes are not tracked in jira.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598304433
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
I checked in with Netbeans git client. I'll see if I missed a lf/cr config option there. Although I may have checked out with external git client at an earlier point. Should the git in Netbeans default to no change in line feed format?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r598305380
##########
File path: ide/db.sql.editor/nbproject/project.xml
##########
@@ -1,341 +1,364 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
- <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
- <module-dependencies>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.csl.types</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <implementation-version/>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.core</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>0.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.dbapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>1.53</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>0-1</release-version>
- <specification-version>1.22</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.12</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.document</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.42</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>3</release-version>
- <specification-version>4.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>1.27</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.projectapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.queries</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.15</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.plaf</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.34</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.actions</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.awt</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.dialogs</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.explorer</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.8</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.loaders</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.61</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.modules</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.2</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.nodes</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>7.23</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.text</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>6.16</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.3</specification-version>
- </run-dependency>
- </dependency>
- </module-dependencies>
- <test-dependencies>
- <test-type>
- <name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.csl.api</code-name-base>
- <recursive/>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.lexer</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
- <recursive/>
- <compile-dependency/>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
- </test-dependency>
- <test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
- <compile-dependency/>
- <test/>
- </test-dependency>
- </test-type>
- </test-dependencies>
- <friend-packages>
- <friend>com.sun.tools.odb</friend>
- <friend>org.netbeans.modules.php.editor</friend>
- <package>org.netbeans.modules.db.sql.editor.api.completion</package>
- </friend-packages>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+ <code-name-base>org.netbeans.modules.db.sql.editor</code-name-base>
+ <module-dependencies>
+ <dependency>
+ <code-name-base>org.netbeans.modules.csl.api</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>2.27</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.csl.types</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <implementation-version/>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db.core</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db.metadata.model</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0-1</release-version>
+ <specification-version>0.8</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.dbapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.2</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>1.53</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0-1</release-version>
+ <specification-version>1.22</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.12</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.document</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.3</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.42</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>4.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>2.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.26</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.lexer</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>2</release-version>
+ <specification-version>1.27</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.26</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.queries</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.15</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>0</release-version>
+ <specification-version>1.53</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.spi.java.hints</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.42</specification-version>
+ </run-dependency>
+ </dependency>
Review comment:
Oops, there had been some extras added when I started with Java Hints. When I changed to more the Common hints that I thought I had removed references to that but must have missed that here and elsewhere. Will remove these.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607852119
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Just for clarification, what is meant by "Standard SQL" in this context? Are you talking about a specific class, a "new class", or referring to "standard SQL syntax"?
Presently the constructor/creators of Quoters that I found was mainly the "SqlIdentifiers.createQuoter which requires a DatabaseMetadata parameter; if the connection is not available, then assume getting the DatabaseMetaData is not possible. There is the "NonASCIIQuoter" but this is a test class and not in the main codebase.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r610643588
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/layer.xml
##########
@@ -58,7 +58,7 @@
<folder name="FoldManager">
<file name="CustomFoldManager.instance">
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1200"/>
Review comment:
Okay understand that changing spaces is a pain in update reviews and should tried to avoid it whenever possible.
But all that said, comparing the change here on that line with the apache/netbeans master branch version of the file...it looks like the master had a tab on that line but all others used spaces for indenting the lines.
Looking through the rest of the file I don't see tabs used anyplace else.
I can
(1) revert that line back and add the tab back if that is the preference or
(2) leave it as is to be consistent with the rest of the file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie edited a comment on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie edited a comment on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-816702636
> I suggest to clean this up, remove all unnessary changes, squash and force push.
Sorry, I've not done a lot of squashing and force pushes. Any guidance or pointers to that?
Is that something doable within github, Netbeans git, or git command prompt verIon?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on pull request #2820: [NETBEANS-189] Updates for Sql autocomplete
Posted by GitBox <gi...@apache.org>.
ebresie commented on pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#issuecomment-873110999
I have raised "NETBEANS-5831 Create a SQL Standard Quoter for Use with Connectionless Cases" to accomidate refactoring elements in the above.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebresie commented on a change in pull request #2820: [NETBEANS-189] Updates for Sql autocomplete WIP
Posted by GitBox <gi...@apache.org>.
ebresie commented on a change in pull request #2820:
URL: https://github.com/apache/netbeans/pull/2820#discussion_r607852119
##########
File path: ide/db.sql.editor/src/org/netbeans/modules/db/sql/analyzer/SQLStatementAnalyzer.java
##########
@@ -239,6 +239,8 @@ protected QualIdent parseIdentifier() {
}
protected String getUnquotedIdentifier() {
+ if (quoter == null)
+ return "";
Review comment:
Just for clarification, what is meant by "Standard SQL" in this context? Are you talking about a specific class, a "new class", or referring to "standard SQL syntax"?
Presently the constructor/creators of Quoters that I found was mainly the "SqlIdentifiers.createQuoter which requires a DatabaseMetadata parameter; if the connection is not available, then assume getting the DatabaseMetaData is not possible. There is the "NonASCIIQuoter" but this is a test class and not in the main codebase.
As an alternative, in that code it uses the quoter to "unquote" stuff, but if a quoter is not available (due to lack of connection), could it just return the text as is with something like?
```
if (quoter == null)
return seq.token().text().toString();
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists