Author: tomdz
Date: Sun Jul 2 14:53:07 2006
New Revision: 418653
URL: http://svn.apache.org/viewvc?rev=418653&view=rev
Log:
Fixes to the axion platform
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/axion/AxionPlatform.java
db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestAxionPlatform.java
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/axion/AxionPlatform.java
URL:
http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/axion/AxionPlatform.java?rev=418653&r1=418652&r2=418653&view=diff
==============================================================================
---
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/axion/AxionPlatform.java
(original)
+++
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/axion/AxionPlatform.java
Sun Jul 2 14:53:07 2006
@@ -55,7 +55,6 @@
info.setPrimaryKeyEmbedded(true);
info.setForeignKeysEmbedded(false);
info.setIndicesEmbedded(false);
- info.setDefaultValueUsedForIdentitySpec(true);
info.setLastIdentityValueReadable(false);
info.addNativeTypeMapping(Types.ARRAY, "BLOB",
Types.BLOB);
info.addNativeTypeMapping(Types.BIT, "BOOLEAN");
Modified:
db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestAxionPlatform.java
URL:
http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestAxionPlatform.java?rev=418653&r1=418652&r2=418653&view=diff
==============================================================================
---
db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestAxionPlatform.java
(original)
+++
db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestAxionPlatform.java
Sun Jul 2 14:53:07 2006
@@ -55,8 +55,8 @@
"CREATE TABLE coltype\n"+
"(\n"+
" COL_ARRAY BLOB,\n"+
- " COL_BIGINT LONG,\n"+
- " COL_BINARY VARBINARY,\n"+
+ " COL_BIGINT BIGINT,\n"+
+ " COL_BINARY BINARY,\n"+
" COL_BIT BOOLEAN,\n"+
" COL_BLOB BLOB,\n"+
" COL_BOOLEAN BOOLEAN,\n"+
@@ -64,25 +64,25 @@
" COL_CLOB CLOB,\n"+
" COL_DATALINK VARBINARY,\n"+
" COL_DATE DATE,\n"+
- " COL_DECIMAL NUMBER(15,3),\n"+
- " COL_DECIMAL_NOSCALE NUMBER(15,0),\n"+
+ " COL_DECIMAL DECIMAL(15,3),\n"+
+ " COL_DECIMAL_NOSCALE DECIMAL(15,0),\n"+
" COL_DISTINCT VARBINARY,\n"+
- " COL_DOUBLE FLOAT,\n"+
+ " COL_DOUBLE DOUBLE,\n"+
" COL_FLOAT FLOAT,\n"+
" COL_INTEGER INTEGER,\n"+
" COL_JAVA_OBJECT JAVA_OBJECT,\n"+
- " COL_LONGVARBINARY VARBINARY,\n"+
- " COL_LONGVARCHAR VARCHAR,\n"+
+ " COL_LONGVARBINARY LONGVARBINARY,\n"+
+ " COL_LONGVARCHAR LONGVARCHAR,\n"+
" COL_NULL VARBINARY,\n"+
- " COL_NUMERIC NUMBER(15,0),\n"+
+ " COL_NUMERIC NUMERIC(15,0),\n"+
" COL_OTHER BLOB,\n"+
- " COL_REAL FLOAT,\n"+
+ " COL_REAL REAL,\n"+
" COL_REF VARBINARY,\n"+
- " COL_SMALLINT SHORT,\n"+
+ " COL_SMALLINT SMALLINT,\n"+
" COL_STRUCT VARBINARY,\n"+
" COL_TIME TIME,\n"+
" COL_TIMESTAMP TIMESTAMP,\n"+
- " COL_TINYINT SHORT,\n"+
+ " COL_TINYINT SMALLINT,\n"+
" COL_VARBINARY VARBINARY(15),\n"+
" COL_VARCHAR VARCHAR(15)\n"+
");\n",
@@ -99,11 +99,11 @@
"CREATE TABLE constraints\n"+
"(\n"+
" COL_PK VARCHAR(32),\n"+
- " COL_PK_AUTO_INCR INTEGER IDENTITY,\n"+
- " COL_NOT_NULL VARBINARY(100) NOT NULL,\n"+
- " COL_NOT_NULL_DEFAULT FLOAT DEFAULT -2.0 NOT NULL,\n"+
+ " COL_PK_AUTO_INCR INTEGER GENERATED BY DEFAULT AS
IDENTITY,\n"+
+ " COL_NOT_NULL BINARY(100) NOT NULL,\n"+
+ " COL_NOT_NULL_DEFAULT DOUBLE DEFAULT -2.0 NOT NULL,\n"+
" COL_DEFAULT CHAR(4) DEFAULT 'test',\n"+
- " COL_AUTO_INCR LONG IDENTITY,\n"+
+ " COL_AUTO_INCR BIGINT GENERATED BY DEFAULT AS
IDENTITY,\n"+
" PRIMARY KEY (COL_PK, COL_PK_AUTO_INCR)\n"+
");\n",
createTestDatabase(COLUMN_CONSTRAINT_TEST_SCHEMA));
@@ -124,8 +124,8 @@
"(\n"+
" COL_PK_1 VARCHAR(32) NOT NULL,\n"+
" COL_PK_2 INTEGER,\n"+
- " COL_INDEX_1 VARBINARY(100) NOT NULL,\n"+
- " COL_INDEX_2 FLOAT NOT NULL,\n"+
+ " COL_INDEX_1 BINARY(100) NOT NULL,\n"+
+ " COL_INDEX_2 DOUBLE NOT NULL,\n"+
" COL_INDEX_3 CHAR(4),\n"+
" PRIMARY KEY (COL_PK_1, COL_PK_2)\n"+
");\n"+
