Revision 48a1b276
Added by Andreas Müller over 6 years ago
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java | ||
---|---|---|
75 | 75 |
static public CdmDataSource NewSqlServer2005Instance(String server, String database, int port, String username, String password){ |
76 | 76 |
return new CdmDataSource(DatabaseTypeEnum.SqlServer2005, server, database, port, username, password, null, null); |
77 | 77 |
} |
78 |
|
|
78 |
static public CdmDataSource NewSqlServer2008Instance(String server, String database, int port, String username, String password){ |
|
79 |
return new CdmDataSource(DatabaseTypeEnum.SqlServer2008, server, database, port, username, password, null, null); |
|
80 |
} |
|
81 |
static public CdmDataSource NewSqlServer2012Instance(String server, String database, int port, String username, String password){ |
|
82 |
return new CdmDataSource(DatabaseTypeEnum.SqlServer2012, server, database, port, username, password, null, null); |
|
83 |
} |
|
79 | 84 |
|
80 | 85 |
/** in work |
81 | 86 |
* @param code TODO*/ |
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DatabaseTypeEnum.java | ||
---|---|---|
27 | 27 |
import eu.etaxonomy.cdm.database.types.OracleDatabaseType; |
28 | 28 |
import eu.etaxonomy.cdm.database.types.PostgreSQLDatabaseType; |
29 | 29 |
import eu.etaxonomy.cdm.database.types.SqlServer2005DatabaseType; |
30 |
import eu.etaxonomy.cdm.database.types.SqlServer2008DatabaseType; |
|
31 |
import eu.etaxonomy.cdm.database.types.SqlServer2012DatabaseType; |
|
30 | 32 |
import eu.etaxonomy.cdm.database.types.SybaseDatabaseType; |
31 | 33 |
|
32 | 34 |
/** |
... | ... | |
42 | 44 |
//SqlServer2000(6), |
43 | 45 |
SqlServer2005(7), |
44 | 46 |
Sybase(8), |
45 |
H2(9) |
|
46 |
; |
|
47 |
H2(9), |
|
48 |
SqlServer2008(10), |
|
49 |
SqlServer2012(11), |
|
50 |
; |
|
47 | 51 |
|
48 |
/** |
|
49 |
* |
|
50 |
*/ |
|
51 |
private static final String P6SPY_DRIVER_CLASS_NAME = "com.p6spy.engine.spy.P6SpyDriver"; |
|
52 |
private boolean useP6Spy = false; |
|
53 |
|
|
54 |
|
|
55 |
/** |
|
56 |
* @return the useP6Spy |
|
57 |
*/ |
|
58 |
public boolean isUseP6Spy() { |
|
59 |
return useP6Spy; |
|
60 |
} |
|
61 |
|
|
62 |
/** |
|
63 |
* @param useP6Spy the useP6Spy to set |
|
64 |
*/ |
|
65 |
public void setUseP6Spy(boolean useP6Spy) { |
|
66 |
this.useP6Spy = useP6Spy; |
|
67 |
} |
|
52 |
// /** |
|
53 |
// * |
|
54 |
// */ |
|
55 |
// private static final String P6SPY_DRIVER_CLASS_NAME = "com.p6spy.engine.spy.P6SpyDriver"; |
|
68 | 56 |
|
69 | 57 |
/** |
70 | 58 |
* Constructor |
... | ... | |
91 | 79 |
this.dbType = new SybaseDatabaseType(); break; |
92 | 80 |
case 9: |
93 | 81 |
this.dbType = new H2DatabaseType(); break; |
82 |
case 10: |
|
83 |
this.dbType = new SqlServer2008DatabaseType(); break; |
|
84 |
case 11: |
|
85 |
this.dbType = new SqlServer2012DatabaseType(); break; |
|
94 | 86 |
default: |
95 | 87 |
//TODO Exception |
96 | 88 |
} |
... | ... | |
116 | 108 |
* @return |
117 | 109 |
*/ |
118 | 110 |
public String getDriverClassName(){ |
119 |
if(useP6Spy){ |
|
120 |
return P6SPY_DRIVER_CLASS_NAME; |
|
121 |
|
|
122 |
} else { |
|
111 |
// if(useP6Spy){
|
|
112 |
// return P6SPY_DRIVER_CLASS_NAME;
|
|
113 |
// |
|
114 |
// } else {
|
|
123 | 115 |
return dbType.getClassString(); |
124 |
} |
|
116 |
// }
|
|
125 | 117 |
} |
126 | 118 |
|
127 | 119 |
/** |
... | ... | |
200 | 192 |
* @return List of DatabaseEnums |
201 | 193 |
*/ |
202 | 194 |
public static List<DatabaseTypeEnum> getAllTypes(){ |
203 |
List<DatabaseTypeEnum> result = new ArrayList<DatabaseTypeEnum>();
|
|
195 |
List<DatabaseTypeEnum> result = new ArrayList<>(); |
|
204 | 196 |
for (DatabaseTypeEnum dbEnum : DatabaseTypeEnum.values()){ |
205 | 197 |
result.add(dbEnum); |
206 | 198 |
} |
... | ... | |
272 | 264 |
//TODO we need to distinguish versions here once we have sql server 2008 database enum |
273 | 265 |
// metaData.getDatabaseProductVersion() |
274 | 266 |
return SqlServer2005; |
267 |
//XX |
|
275 | 268 |
}else if (product.toLowerCase().matches("\\.*h2\\.*")) { |
276 | 269 |
return H2; |
277 | 270 |
} |
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2012DatabaseType.java | ||
---|---|---|
1 |
/** |
|
2 |
* Copyright (C) 2007 EDIT |
|
3 |
* European Distributed Institute of Taxonomy |
|
4 |
* http://www.e-taxonomy.eu |
|
5 |
* |
|
6 |
* The contents of this file are subject to the Mozilla Public License Version 1.1 |
|
7 |
* See LICENSE.TXT at the top of this package for the full license terms. |
|
8 |
*/ |
|
9 |
|
|
10 |
package eu.etaxonomy.cdm.database.types; |
|
11 |
|
|
12 |
import org.hibernate.dialect.Dialect; |
|
13 |
import org.hibernate.dialect.SQLServer2012Dialect; |
|
14 |
|
|
15 |
|
|
16 |
|
|
17 |
/** |
|
18 |
* @author a.mueller |
|
19 |
* |
|
20 |
*/ |
|
21 |
//TODO not yet checked if anything else is needed |
|
22 |
public class SqlServer2012DatabaseType extends SqlServer2005DatabaseType { |
|
23 |
|
|
24 |
//hibernate dialect |
|
25 |
protected Dialect hibernateDialect = new SQLServer2012Dialect(); |
|
26 |
|
|
27 |
|
|
28 |
//Constructor |
|
29 |
public SqlServer2012DatabaseType() { |
|
30 |
init (typeName, classString, urlString, defaultPort, hibernateDialect ); |
|
31 |
} |
|
32 |
|
|
33 |
} |
Also available in: Unified diff
ref #4957 add SQLServer 2008 and 2012 to database types.