ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/2] ignite git commit: IGNITE-1852 Fixed JDBC dialects.
Date Thu, 05 Nov 2015 05:02:31 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 fe5c43cbd -> c5ea672fb


IGNITE-1852 Fixed JDBC dialects.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99c42077
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99c42077
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99c42077

Branch: refs/heads/ignite-843-rc1
Commit: 99c42077719b5e8b2b8963dfc43159e94e2e7bf9
Parents: fe5c43c
Author: vsisko <vsisko@gridgain.com>
Authored: Thu Nov 5 11:59:09 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Nov 5 11:59:09 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/caches-controller.js                  | 3 ++-
 .../control-center-web/src/main/js/controllers/models/caches.json | 1 +
 .../src/main/js/routes/generator/generator-common.js              | 2 ++
 .../src/main/js/routes/generator/generator-java.js                | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/99c42077/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 40bf1f8..36c7a0a 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -96,11 +96,12 @@ consoleModule.controller('cachesController', [
             ];
 
             $scope.cacheStoreJdbcDialects = [
+                {value: 'Generic', label: 'Generic JDBC'},
                 {value: 'Oracle', label: 'Oracle'},
                 {value: 'DB2', label: 'IBM DB2'},
                 {value: 'SQLServer', label: 'Microsoft SQL Server'},
                 {value: 'MySQL', label: 'MySQL'},
-                {value: 'PostgreSQL', label: 'Postgre SQL'},
+                {value: 'PostgreSQL', label: 'PostgreSQL'},
                 {value: 'H2', label: 'H2 database'}
             ];
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/99c42077/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index 5bec6c3..69a77bd 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -467,6 +467,7 @@
                     "  <li>IBM DB2</li>",
                     "  <li>Microsoft SQL Server</li>",
                     "  <li>MySQL</li>",
+                    "  <li>PostgreSQL</li>",
                     "  <li>H2 database</li>",
                     "</ul>"
                   ]

http://git-wip-us.apache.org/repos/asf/ignite/blob/99c42077/modules/control-center-web/src/main/js/routes/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-common.js b/modules/control-center-web/src/main/js/routes/generator/generator-common.js
index ade462b..7dee51a 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-common.js
@@ -228,6 +228,7 @@ $generatorCommon.MARSHALLERS = {
 
 // Pairs of supported databases and their JDBC dialects.
 $generatorCommon.JDBC_DIALECTS = {
+    Generic: 'org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect',
     Oracle: 'org.apache.ignite.cache.store.jdbc.dialect.OracleDialect',
     DB2: 'org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect',
     SQLServer: 'org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect',
@@ -267,6 +268,7 @@ $generatorCommon.igfsMetaCache = function(igfs) {
 
 // Pairs of supported databases and their data sources.
 $generatorCommon.DATA_SOURCES = {
+    Generic: 'com.mchange.v2.c3p0.jboss.C3P0PooledDataSource',
     Oracle: 'oracle.jdbc.pool.OracleDataSource',
     DB2: 'com.ibm.db2.jcc.DB2DataSource',
     SQLServer: 'com.microsoft.sqlserver.jdbc.SQLServerDataSource',

http://git-wip-us.apache.org/repos/asf/ignite/blob/99c42077/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index 5fc7adb..4588915 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -902,6 +902,9 @@ $generatorJava.cacheStore = function (cache, cacheVarName, res) {
                 if (dataSourceFound)
                     res.line('storeFactoryCfg.setDataSource(dataSource);');
 
+                res.line('storeFactoryCfg.setDialect(new ' +
+                    res.importClass($generatorCommon.jdbcDialectClassName(storeFactory.dialect))
+ '());');
+
                 res.needEmptyLine = true;
 
                 if (cache.metadatas && cache.metadatas.length > 0) {


Mime
View raw message