Author: adrianc
Date: Tue Jul 27 04:51:58 2010
New Revision: 979531
URL: http://svn.apache.org/viewvc?rev=979531&view=rev
Log:
Merged rev 958752 and 958758 from trunk - Advantage database fixes.
Updated fieldtypeadvantage.xml. Some of the SQL types were wrong - causing the
tests to fail.
This commit will require anyone using the Advantage database to alter the data
types on their existing database - which can be done with the Data Architect.
Changed Advantage database setting in entityengine.xml.
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/framework/entity/config/entityengine.xml
ofbiz/branches/release10.04/framework/entity/fieldtype/fieldtypeadvantage.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 04:51:58 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,979104
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958953,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,979104
Modified: ofbiz/branches/release10.04/framework/entity/config/entityengine.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/config/entityengine.xml?rev=979531&r1=979530&r2=979531&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/entity/config/entityengine.xml
(original)
+++ ofbiz/branches/release10.04/framework/entity/config/entityengine.xml Tue
Jul 27 04:51:58 2010
@@ -611,7 +611,7 @@ access. For a detailed description see t
field-type-name="advantage"
check-on-start="true"
add-missing-on-start="true"
- check-indices-on-start="true"
+ check-indices-on-start="false"
use-foreign-keys="false"
use-foreign-key-indices="true"
join-style="ansi-no-parenthesis"
Modified:
ofbiz/branches/release10.04/framework/entity/fieldtype/fieldtypeadvantage.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/fieldtype/fieldtypeadvantage.xml?rev=979531&r1=979530&r2=979531&view=diff
==============================================================================
---
ofbiz/branches/release10.04/framework/entity/fieldtype/fieldtypeadvantage.xml
(original)
+++
ofbiz/branches/release10.04/framework/entity/fieldtype/fieldtypeadvantage.xml
Tue Jul 27 04:51:58 2010
@@ -31,11 +31,12 @@ under the License.
<field-type-def type="date" sql-type="Date"
java-type="java.sql.Date"></field-type-def>
<field-type-def type="time" sql-type="Time"
java-type="java.sql.Time"></field-type-def>
- <field-type-def type="currency-amount" sql-type="Money"
java-type="java.math.BigDecimal"><validate
method="isSignedDouble"/></field-type-def>
- <field-type-def type="currency-precise" sql-type="Double"
java-type="java.math.BigDecimal"><validate
method="isSignedDouble"/></field-type-def>
- <field-type-def type="fixed-point" sql-type="Double"
java-type="java.math.BigDecimal"><validate
method="isSignedDouble"/></field-type-def>
+ <!-- Advantage numeric fields are 2 bytes longer than the value to be
stored - to hold the sign and decimal point. -->
+ <field-type-def type="currency-amount" sql-type="Numeric(20,2)"
java-type="java.math.BigDecimal"><validate
method="isSignedDouble"/></field-type-def>
+ <field-type-def type="currency-precise" sql-type="Numeric(20,3)"
java-type="java.math.BigDecimal"><validate
method="isSignedDouble"/></field-type-def>
+ <field-type-def type="fixed-point" sql-type="Numeric(20,6)"
java-type="java.math.BigDecimal"><validate
method="isSignedDouble"/></field-type-def>
<field-type-def type="floating-point" sql-type="Double"
java-type="Double"><validate method="isSignedDouble"/></field-type-def>
- <field-type-def type="numeric" sql-type="Integer"
java-type="Long"><validate method="isSignedLong"/></field-type-def>
+ <field-type-def type="numeric" sql-type="Numeric(20,0)"
java-type="Long"><validate method="isSignedLong"/></field-type-def>
<field-type-def type="id" sql-type="Char(20)"
java-type="String"></field-type-def>
<field-type-def type="id-long" sql-type="Char(60)"
java-type="String"></field-type-def>
