diff --git a/benchmarks/benchmarks.properties b/benchmarks/benchmarks.properties index 931e55221c6ef8..2f3477f168cb90 100644 --- a/benchmarks/benchmarks.properties +++ b/benchmarks/benchmarks.properties @@ -14,6 +14,24 @@ # sample.sql.output.dir=. + # + # Specify the database type of the generated SQL files. + # + #sample.sql.db.type=db2 + #sample.sql.db.type=derby + #sample.sql.db.type=firebird + #sample.sql.db.type=hypersonic + #sample.sql.db.type=informix + #sample.sql.db.type=ingres + #sample.sql.db.type=interbase + #sample.sql.db.type=jdatastore + sample.sql.db.type=mysql + #sample.sql.db.type=oracle + #sample.sql.db.type=postgresql + #sample.sql.db.type=sap + #sample.sql.db.type=sqlserver + #sample.sql.db.type=sybase + # # Specify the number of comments to generate per blogs entry. # diff --git a/benchmarks/build.xml b/benchmarks/build.xml index 5ab9d0146b2b04..0a0d8d6e1a7e89 100644 --- a/benchmarks/build.xml +++ b/benchmarks/build.xml @@ -18,6 +18,7 @@ > + diff --git a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/SampleSQLBuilder.java b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/SampleSQLBuilder.java index b46d32a16b934b..e76c95221abd7b 100644 --- a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/SampleSQLBuilder.java +++ b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/SampleSQLBuilder.java @@ -71,6 +71,7 @@ public static void main(String[] args) { InitUtil.initWithSpring(); String outputDir = System.getProperty("sample.sql.output.dir"); + String dbType = System.getProperty("sample.sql.db.type"); int maxBlogsEntryCommentCount = GetterUtil.getInteger( System.getProperty("sample.sql.blogs.entry.comment.count")); int maxBlogsEntryCount = GetterUtil.getInteger( @@ -97,7 +98,7 @@ public static void main(String[] args) { System.getProperty("sample.sql.security.enabled")); new SampleSQLBuilder( - outputDir, maxBlogsEntryCommentCount, maxBlogsEntryCount, + outputDir, dbType, maxBlogsEntryCommentCount, maxBlogsEntryCount, maxGroupCount, maxMBCategoryCount, maxMBMessageCount, maxMBThreadCount, maxUserCount, maxUserToGroupCount, maxWikiNodeCount, maxWikiPageCommentCount, maxWikiPageCount, @@ -105,14 +106,16 @@ public static void main(String[] args) { } public SampleSQLBuilder( - String outputDir, int maxBlogsEntryCommentCount, int maxBlogsEntryCount, - int maxGroupCount, int maxMBCategoryCount, int maxMBMessageCount, - int maxMBThreadCount, int maxUserCount, int maxUserToGroupCount, - int maxWikiNodeCount, int maxWikiPageCommentCount, int maxWikiPageCount, + String outputDir, String dbType, int maxBlogsEntryCommentCount, + int maxBlogsEntryCount, int maxGroupCount, int maxMBCategoryCount, + int maxMBMessageCount, int maxMBThreadCount, int maxUserCount, + int maxUserToGroupCount, int maxWikiNodeCount, + int maxWikiPageCommentCount, int maxWikiPageCount, boolean securityEnabled) { try { _outputDir = outputDir; + _dbType = dbType; _maxBlogsEntryCommentCount = maxBlogsEntryCommentCount; _maxBlogsEntryCount = maxBlogsEntryCount; _maxGroupCount = maxGroupCount; @@ -155,11 +158,12 @@ public SampleSQLBuilder( _writerGeneric.flush(); - // MySQL + // Specific - _writerMySQL = new FileWriter(_outputDir + "/sample-mysql.sql"); + _writerSpecific = new FileWriter( + _outputDir + "/sample-" + dbType + ".sql"); - DB mysqlDB = DBFactoryUtil.getDB(DB.TYPE_MYSQL); + DB specificDB = DBFactoryUtil.getDB(_dbType); boolean previousBlankLine = false; @@ -169,14 +173,14 @@ public SampleSQLBuilder( String s = null; while ((s = br.readLine()) != null) { - s = mysqlDB.buildSQL(s).trim(); + s = specificDB.buildSQL(s).trim(); - _writerMySQL.write(s); + _writerSpecific.write(s); if (previousBlankLine && Validator.isNull(s)) { } else { - _writerMySQL.write(StringPool.NEW_LINE); + _writerSpecific.write(StringPool.NEW_LINE); } if (Validator.isNull(s)) { @@ -186,7 +190,7 @@ public SampleSQLBuilder( br.close(); - _writerMySQL.flush(); + _writerSpecific.flush(); } catch (Exception e) { e.printStackTrace(); @@ -399,6 +403,7 @@ protected void put(Map context, String key, Object value) { private SimpleCounter _counter; private DataFactory _dataFactory; + private String _dbType; private int _maxBlogsEntryCommentCount; private int _maxBlogsEntryCount; private int _maxGroupCount; @@ -431,6 +436,6 @@ protected void put(Map context, String key, Object value) { private String _tplWikiPage = _TPL_ROOT + "wiki_page.ftl"; private SimpleCounter _userScreenNameIncrementer; private Writer _writerGeneric; - private Writer _writerMySQL; + private Writer _writerSpecific; } \ No newline at end of file