1.1 --- a/logger/ExceptionUtils/db/clearDB.sql Tue Nov 20 16:51:05 2007 +0000
1.2 +++ b/logger/ExceptionUtils/db/clearDB.sql Tue Nov 20 18:45:53 2007 +0000
1.3 @@ -34,6 +34,8 @@
1.4
1.5 DROP TABLE PRODUCT_VERSION;
1.6
1.7 +DROP TABLE INNOCENT_CLASS;
1.8 +
1.9 DROP TABLE SEQUENCE;
1.10
1.11 SET FOREIGN_KEY_CHECKS = 1;
2.1 --- a/logger/ExceptionUtils/db/createDB.sql Tue Nov 20 16:51:05 2007 +0000
2.2 +++ b/logger/ExceptionUtils/db/createDB.sql Tue Nov 20 18:45:53 2007 +0000
2.3 @@ -168,6 +168,10 @@
2.4 NAME VARCHAR(30) PRIMARY KEY
2.5 ) ENGINE=INNODB;
2.6
2.7 +CREATE TABLE INNOCENT_CLASS(
2.8 + CLASSNAME VARCHAR(100) PRIMARY KEY
2.9 +) ENGINE=INNODB;
2.10 +
2.11 CREATE TABLE SEQUENCE(/* sequence table for autogenerated keys */
2.12 SEQ_NAME VARCHAR(50) PRIMARY KEY,
2.13 SEQ_COUNT DECIMAL
3.1 --- a/logger/uihandlerserver/src/java/org/netbeans/server/uihandler/DbInsertion.java Tue Nov 20 16:51:05 2007 +0000
3.2 +++ b/logger/uihandlerserver/src/java/org/netbeans/server/uihandler/DbInsertion.java Tue Nov 20 18:45:53 2007 +0000
3.3 @@ -232,6 +232,14 @@
3.4 if (productVersion == null){
3.5 productVersion = new ProductVersion();
3.6 productVersion.setProductVersion(params[version_idx]);
3.7 + String nbVersionName = org.netbeans.modules.exceptions.utils.Utils.getNbVersion(params[version_idx]);
3.8 + Nbversion nbVersion = getExistNbVersion(nbVersionName);
3.9 + if (nbVersion == null){
3.10 + nbVersion = new Nbversion();
3.11 + nbVersion.setVersion(nbVersionName);
3.12 + persUtil.persist(nbVersion);
3.13 + }
3.14 + productVersion.setNbversionId(nbVersion);
3.15 persUtil.persist(productVersion);
3.16 }
3.17
3.18 @@ -503,7 +511,11 @@
3.19 private ProductVersion getExistProductVersion(String versionName){
3.20 return (ProductVersion) getExist("ProductVersion.findByProductVersion", versionName);// NOI18N
3.21 }
3.22 -
3.23 +
3.24 + private Nbversion getExistNbVersion(String versionName){
3.25 + return (Nbversion) getExist("Nbversion.findByVersion", versionName);// NOI18N
3.26 + }
3.27 +
3.28 private Object getExist(String queryName, String subjectName){
3.29 TreeMap<String, Object> params = new TreeMap<String, Object>();
3.30 params.put("name", subjectName);// NOI18N
4.1 --- a/logger/uihandlerserver/test/org/netbeans/server/uihandler/DbInsertionTest.java Tue Nov 20 16:51:05 2007 +0000
4.2 +++ b/logger/uihandlerserver/test/org/netbeans/server/uihandler/DbInsertionTest.java Tue Nov 20 18:45:53 2007 +0000
4.3 @@ -228,6 +228,8 @@
4.4 assertNull("IP is null - it was not set", logFile.getIp());
4.5 assertNotNull(logFile.getProductVersionId());
4.6 assertEquals("PRODUCT VERSION CHECK", productVersion[0], logFile.getProductVersionId().getProductVersion());
4.7 + assertEquals("NBVersion CHECK", "NetBeans IDE Dev", logFile.getProductVersionId().getNbversionId().getVersion());
4.8 +
4.9 //---SECOND--//
4.10 logFile = logFiles.get(1);
4.11 assertEquals("Build Number", logFile.getBuildnumber(), Long.valueOf("070416"));
4.12 @@ -237,6 +239,7 @@
4.13 assertNull("IP is null - it was not set", logFile.getIp());
4.14 assertNotNull(logFile.getProductVersionId());
4.15 assertEquals("PRODUCT VERSION CHECK", productVersion[1], logFile.getProductVersionId().getProductVersion());
4.16 + assertEquals("NBVersion CHECK", "NetBeans IDE Dev", logFile.getProductVersionId().getNbversionId().getVersion());
4.17 }
4.18
4.19 private void doIssueZillaId() throws Exception {