1.1 --- a/PLSQL/Utilities/src/org/netbeans/modules/plsql/utilities/PlsqlCommonDbAccessor.java	Thu Apr 11 13:54:39 2013 +0200
     1.2 +++ b/PLSQL/Utilities/src/org/netbeans/modules/plsql/utilities/PlsqlCommonDbAccessor.java	Wed Apr 17 13:55:43 2013 +0530
     1.3 @@ -331,7 +331,11 @@
     1.4                    viewDef.append("   IS '").append(rs.getString("COMMENTS")).append("';\n\n");
     1.5                 }
     1.6  
     1.7 -               query = "SELECT COLUMN_NAME, COMMENTS FROM ALL_COL_COMMENTS WHERE COMMENTS IS NOT NULL AND TABLE_NAME=? AND OWNER = ?";
     1.8 +               query = "SELECT t.COLUMN_NAME, c.COMMENTS "
     1.9 +		 +"FROM ALL_TAB_COLUMNS t, ALL_COL_COMMENTS c "
    1.10 +		 +"WHERE c.COMMENTS IS NOT NULL AND t.TABLE_NAME=? AND t.OWNER = ? "
    1.11 +		 +"AND t.TABLE_NAME = c.TABLE_NAME AND t.COLUMN_NAME = c.COLUMN_NAME AND t.OWNER = c.OWNER "
    1.12 +		 +"ORDER BY t.COLUMN_ID";
    1.13                 stmt = conn.prepareStatement(query);
    1.14                 stmt.setString(1, viewName);
    1.15                 stmt.setString(2, owner);

     2.1 --- a/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseContentUtilities.java	Thu Apr 11 13:54:39 2013 +0200
     2.2 +++ b/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseContentUtilities.java	Wed Apr 17 13:55:43 2013 +0530
     2.3 @@ -251,7 +251,7 @@
     2.4     public static Map<String, String> getColumnNames(String name, String owner, Connection connection) throws SQLException {
     2.5        Map<String, String> columns = new LinkedHashMap<String, String>();
     2.6        PreparedStatement stmt = null;
     2.7 -      String query = "SELECT COLUMN_NAME,DATA_TYPE FROM ALL_TAB_COLUMNS WHERE TABLE_NAME=? AND OWNER=?";
     2.8 +      String query = "SELECT COLUMN_NAME,DATA_TYPE FROM ALL_TAB_COLUMNS WHERE TABLE_NAME=? AND OWNER=? ORDER BY COLUMN_ID";
     2.9        if(!name.startsWith("\"")) {
    2.10           name = name.toUpperCase(Locale.ENGLISH);
    2.11        } else {