# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /home/matthias/NetBeansProjects/main-golden # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: db.metadata.model/manifest.mf --- db.metadata.model/manifest.mf Base (BASE) +++ db.metadata.model/manifest.mf Locally Modified (Based On LOCAL) @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.db.metadata.model/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/metadata/model/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.1 +OpenIDE-Module-Specification-Version: 1.2 AutoUpdate-Show-In-Client: false Index: db.metadata.model/src/org/netbeans/modules/db/metadata/model/api/Table.java --- db.metadata.model/src/org/netbeans/modules/db/metadata/model/api/Table.java Base (BASE) +++ db.metadata.model/src/org/netbeans/modules/db/metadata/model/api/Table.java Locally Modified (Based On LOCAL) @@ -134,6 +134,10 @@ return "Table[name='" + getName() + "']"; // NOI18N } + public boolean isSystem() { + return impl.isSystem(); + } + /** * Used to find a foreign key if the actual name is null */ Index: db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCSchema.java --- db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCSchema.java Base (BASE) +++ db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCSchema.java Locally Modified (Based On LOCAL) @@ -151,8 +151,8 @@ return "JDBCSchema[name='" + name + "',default=" + _default + ",synthetic=" + synthetic + "]"; // NOI18N } - protected JDBCTable createJDBCTable(String name) { - return new JDBCTable(this, name); + protected JDBCTable createJDBCTable(String name, boolean system) { + return new JDBCTable(this, name, system); } protected JDBCProcedure createJDBCProcedure(String procedureName) { @@ -175,8 +175,9 @@ jdbcCatalog.getName(), name, "%", new String[]{"TABLE", "SYSTEM TABLE"}); // NOI18N try { while (rs.next()) { + String type = MetadataUtilities.trimmed(rs.getString("TABLE_TYPE")); // NOI18N String tableName = MetadataUtilities.trimmed(rs.getString("TABLE_NAME")); // NOI18N - Table table = createJDBCTable(tableName).getTable(); + Table table = createJDBCTable(tableName, type.contains("SYSTEM")).getTable(); newTables.put(tableName, table); LOGGER.log(Level.FINE, "Created table {0}", table); } Index: db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCTable.java --- db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCTable.java Base (BASE) +++ db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCTable.java Locally Modified (Based On LOCAL) @@ -64,6 +64,7 @@ private final JDBCSchema jdbcSchema; private final String name; + private final boolean system; private Map columns; private Map indexes; @@ -76,9 +77,10 @@ private boolean primaryKeyInitialized = false; private static final String SQL_EXCEPTION_NOT_YET_IMPLEMENTED = "not yet implemented"; - public JDBCTable(JDBCSchema jdbcSchema, String name) { + public JDBCTable(JDBCSchema jdbcSchema, String name, boolean system) { this.jdbcSchema = jdbcSchema; this.name = name; + this.system = system; } @Override @@ -134,6 +136,11 @@ } @Override + public boolean isSystem() { + return system; + } + + @Override public String toString() { return "JDBCTable[name='" + name + "']"; // NOI18N } Index: db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/oracle/OracleSchema.java --- db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/oracle/OracleSchema.java Base (BASE) +++ db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/oracle/OracleSchema.java Locally Modified (Based On LOCAL) @@ -54,6 +54,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import org.netbeans.modules.db.metadata.model.MetadataUtilities; import org.netbeans.modules.db.metadata.model.api.MetadataException; import org.netbeans.modules.db.metadata.model.api.Procedure; import org.netbeans.modules.db.metadata.model.api.Table; @@ -87,9 +88,10 @@ ResultSet rs = dmd.getTables(jdbcCatalog.getName(), name, "%", new String[]{"TABLE"}); // NOI18N try { while (rs.next()) { + String type = MetadataUtilities.trimmed(rs.getString("TABLE_TYPE")); // NOI18N String tableName = rs.getString("TABLE_NAME"); // NOI18N if (!recycleBinTables.contains(tableName)) { - Table table = createJDBCTable(tableName).getTable(); + Table table = createJDBCTable(tableName, type.contains("SYSTEM")).getTable(); newTables.put(tableName, table); LOGGER.log(Level.FINE, "Created table {0}", table); } else { Index: db.metadata.model/src/org/netbeans/modules/db/metadata/model/spi/TableImplementation.java --- db.metadata.model/src/org/netbeans/modules/db/metadata/model/spi/TableImplementation.java Base (BASE) +++ db.metadata.model/src/org/netbeans/modules/db/metadata/model/spi/TableImplementation.java Locally Modified (Based On LOCAL) @@ -85,4 +85,6 @@ public abstract ForeignKey getForeignKeyByInternalName(String internalName); public abstract void refresh(); + + public abstract boolean isSystem(); }