Skip to content

Commit 33225b1

Browse files
emacarronemacarron
committed
VENDOR -> DB_VENDOR. Fixes #68.
1 parent 1506293 commit 33225b1

File tree

7 files changed

+22
-21
lines changed

7 files changed

+22
-21
lines changed

‎src/main/java/org/apache/ibatis/session/Configuration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public Configuration(Environment environment) {
160160
public Configuration() {
161161
typeAliasRegistry.registerAlias("JDBC", JdbcTransactionFactory.class);
162162
typeAliasRegistry.registerAlias("MANAGED", ManagedTransactionFactory.class);
163+
163164
typeAliasRegistry.registerAlias("JNDI", JndiDataSourceFactory.class);
164165
typeAliasRegistry.registerAlias("POOLED", PooledDataSourceFactory.class);
165166
typeAliasRegistry.registerAlias("UNPOOLED", UnpooledDataSourceFactory.class);
@@ -170,7 +171,7 @@ public Configuration() {
170171
typeAliasRegistry.registerAlias("SOFT", SoftCache.class);
171172
typeAliasRegistry.registerAlias("WEAK", WeakCache.class);
172173

173-
typeAliasRegistry.registerAlias("VENDOR", VendorDatabaseIdProvider.class);
174+
typeAliasRegistry.registerAlias("DB_VENDOR", VendorDatabaseIdProvider.class);
174175

175176
typeAliasRegistry.registerAlias("XML", XMLLanguageDriver.class);
176177
typeAliasRegistry.registerAlias("RAW", RawLanguageDriver.class);

‎src/site/es/xdoc/configuration.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,24 +1361,24 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader,properties);]]
13611361
al fichero mybatis-config.xml file de la siguiente forma:
13621362
</p>
13631363

1364-
<source><![CDATA[<databaseIdProvider type="VENDOR" />
1364+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR" />
13651365
]]></source>
13661366

13671367
<p>
1368-
La implementación VENDOR del databaseIdProvider establece como databaseId el String devuelto por
1368+
La implementación DB_VENDOR del databaseIdProvider establece como databaseId el String devuelto por
13691369
<code>DatabaseMetaData#getDatabaseProductName()</code>.
13701370
Como normalmente este string es demasiado largo, y además, distintas versiones del mismo producto devuelven valores
13711371
similares, puedes traducirlo a un valor más corto añadiendo propiedades de la siguente forma:
13721372
</p>
13731373

1374-
<source><![CDATA[<databaseIdProvider type="VENDOR">
1374+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR">
13751375
<property name="SQL Server" value="sqlserver"/>
13761376
<property name="DB2" value="db2"/>
13771377
<property name="Oracle" value="oracle" />
13781378
</databaseIdProvider>]]></source>
13791379

13801380
<p>
1381-
Cuando se añaden propiedades, el databaseIdProvider VENDOR devuelve el primer valor que corresponde a la primera clave
1381+
Cuando se añaden propiedades, el databaseIdProvider DB_VENDOR devuelve el primer valor que corresponde a la primera clave
13821382
encontrada en el nombre devuelto por <code>DatabaseMetaData#getDatabaseProductName()</code> o "null" si no se encuentra ninguna.
13831383
En este caso, si <code>getDatabaseProductName()</code> devuelve "Oracle (DataDirect)" el databaseId se informará con "oracle".
13841384
</p>

‎src/site/ja/xdoc/configuration.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,15 +1483,15 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader,properties);]]
14831483
複数データベースサポート機能を有効にするには、mybatis-config.xml に <code>databaseIdProvider</code> を追加します。
14841484
</p>
14851485

1486-
<source><![CDATA[<databaseIdProvider type="VENDOR" />
1486+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR" />
14871487
]]></source>
14881488

14891489
<p>
1490-
databaseIdProvider に VENDOR が指定された場合は VendorDatabaseIdProvider がプロバイダとして使われます。
1490+
databaseIdProvider に DB_VENDOR が指定された場合は VendorDatabaseIdProvider がプロバイダとして使われます。
14911491
この実装は、<code>DatabaseMetaData#getDatabaseProductName()</code> から返される製品名の文字列を「現在の databaseId」として返します。この文字列は長すぎる上にバージョンによって異なる値を返すことがあるので、次のようにプロパティを指定して短い文字列に変換できるようになっています。
14921492
</p>
14931493

1494-
<source><![CDATA[<databaseIdProvider type="VENDOR">
1494+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR">
14951495
<property name="SQL Server" value="sqlserver"/>
14961496
<property name="DB2" value="db2"/>
14971497
<property name="Oracle" value="oracle" />

‎src/site/ko/xdoc/configuration.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,20 +1297,20 @@ data_source 프로퍼티가 InitialContext 에서 직접 찾을 것이다.</li>
12971297
다중 지원을 사용하기 위해서는 mybatis-config.xmlo 파일에 다음처럼 <code>databaseIdProvider</code> 를 추가하라:
12981298
</p>
12991299

1300-
<source><![CDATA[<databaseIdProvider type="VENDOR" />
1300+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR" />
13011301
]]></source>
13021302

1303-
<p>VENDOR구현체 databaseIdProvider는 <code>DatabaseMetaData#getDatabaseProductName()</code>에 의해 리턴된 문자열로 databaseId를 셋팅한다.
1303+
<p>DB_VENDOR구현체 databaseIdProvider는 <code>DatabaseMetaData#getDatabaseProductName()</code>에 의해 리턴된 문자열로 databaseId를 셋팅한다.
13041304
이때 리턴되는 문자열이 너무 길거나 같은 제품의 서로다른 버전으로 다른 값을 리턴하는 경우, 다음처럼 프로퍼티를 추가해서 짧게 처리할 수도 있다:
13051305
</p>
13061306

1307-
<source><![CDATA[<databaseIdProvider type="VENDOR">
1307+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR">
13081308
<property name="SQL Server" value="sqlserver"/>
13091309
<property name="DB2" value="db2"/>
13101310
<property name="Oracle" value="oracle" />
13111311
</databaseIdProvider>]]></source>
13121312

1313-
<p>프로퍼터가 제공되면, VENDOR databaseIdProvider는 리턴된 데이터베이스 제품명에서 찾은 첫번째 프로퍼티값이나 일치하는 프로퍼티가 없다면 "null" 을 찾을 것이다.
1313+
<p>프로퍼터가 제공되면, DB_VENDOR databaseIdProvider는 리턴된 데이터베이스 제품명에서 찾은 첫번째 프로퍼티값이나 일치하는 프로퍼티가 없다면 "null" 을 찾을 것이다.
13141314
이 경우, <code>getDatabaseProductName()</code>가 "Oracle (DataDirect)"를 리턴한다면, databaseId는 "oracle"로 셋팅될 것이다. </p>
13151315

13161316
<p><code>org.apache.ibatis.mapping.DatabaseIdProvider</code> 인터페이스를 구현해서 자신만의 DatabaseIdProvider를 빌드하고 mybatis-config.xml파일에 등록할 수 있다:

‎src/site/xdoc/configuration.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,24 +1691,24 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader,properties);]]
16911691
to mybatis-config.xml file as follows:
16921692
</p>
16931693

1694-
<source><![CDATA[<databaseIdProvider type="VENDOR" />
1694+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR" />
16951695
]]></source>
16961696

16971697
<p>
1698-
The VENDOR implementation databaseIdProvider sets as a databaseId the String returned by
1698+
The DB_VENDOR implementation databaseIdProvider sets as a databaseId the String returned by
16991699
<code>DatabaseMetaData#getDatabaseProductName()</code>.
17001700
As usually that string is too long and also, different versions of the same product return different values,
17011701
so you may want to translate it to a shorter one by adding properties like follows:
17021702
</p>
17031703

1704-
<source><![CDATA[<databaseIdProvider type="VENDOR">
1704+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR">
17051705
<property name="SQL Server" value="sqlserver"/>
17061706
<property name="DB2" value="db2"/>
17071707
<property name="Oracle" value="oracle" />
17081708
</databaseIdProvider>]]></source>
17091709

17101710
<p>
1711-
When properties are provided, the VENDOR databaseIdProvider will search the property value corresponding to the
1711+
When properties are provided, the DB_VENDOR databaseIdProvider will search the property value corresponding to the
17121712
first key found in the returned database product name or "null" if there is not a matching property.
17131713
In this case, if <code>getDatabaseProductName()</code> returns "Oracle (DataDirect)" the databaseId will be set to "oracle".
17141714
</p>

‎src/site/zh/xdoc/configuration.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,24 +1581,24 @@ data_source 属性将会直接以 initialContext 为背景再次寻找。
15811581
to mybatis-config.xml file as follows:
15821582
</p>
15831583

1584-
<source><![CDATA[<databaseIdProvider type="VENDOR" />
1584+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR" />
15851585
]]></source>
15861586

15871587
<p>
1588-
The VENDOR implementation databaseIdProvider sets as a databaseId the String returned by
1588+
The DB_VENDOR implementation databaseIdProvider sets as a databaseId the String returned by
15891589
<code>DatabaseMetaData#getDatabaseProductName()</code>.
15901590
As usually that string is too long and also, different versions of the same product return different values,
15911591
so you may want to translate it to a shorter one by adding properties like follows:
15921592
</p>
15931593

1594-
<source><![CDATA[<databaseIdProvider type="VENDOR">
1594+
<source><![CDATA[<databaseIdProvider type="DB_VENDOR">
15951595
<property name="SQL Server" value="sqlserver"/>
15961596
<property name="DB2" value="db2"/>
15971597
<property name="Oracle" value="oracle" />
15981598
</databaseIdProvider>]]></source>
15991599

16001600
<p>
1601-
When properties are provided, the VENDOR databaseIdProvider will search the property value corresponding to the
1601+
When properties are provided, the DB_VENDOR databaseIdProvider will search the property value corresponding to the
16021602
first key found in the returned database product name or "null" if there is not a matching property.
16031603
In this case, if <code>getDatabaseProductName()</code> returns "Oracle (DataDirect)" the databaseId will be set to "oracle".
16041604
</p>

‎src/test/java/org/apache/ibatis/submitted/multidb/MultiDbConfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</environment>
3737
</environments>
3838

39-
<databaseIdProvider type="VENDOR">
39+
<databaseIdProvider type="DB_VENDOR">
4040
<property name="HSQL Database Engine" value="hsql" />
4141
</databaseIdProvider>
4242

0 commit comments

Comments
 (0)