mpoeschl 2002/11/11 03:38:24
Modified: xdocs changes.xml
src/java/org/apache/torque/adapter DBFactory.java
Added: src/templates/sql/load/msaccess val.vm row.vm
src/templates/sql/base/msaccess index.vm foreignkey.vm
table.vm tablefk.vm unique.vm db.props drop.vm
primarykey.vm columns.vm
Log:
add support for MS Access
patch by Jakob Braeuchi <[EMAIL PROTECTED]>
Revision Changes Path
1.47 +3 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- changes.xml 11 Nov 2002 11:00:22 -0000 1.46
+++ changes.xml 11 Nov 2002 11:38:24 -0000 1.47
@@ -32,6 +32,9 @@
Added a Maven plugin for executing Torque commands and updated the
<a href="maven-howto.html">Maven Howto</a> to reflect the addition.
</li>
+ <li>
+ Added support for MS Access (using the JDBC-ODBC Bridge driver).
+ </li>
</ul>
</p>
</subsection>
1.1 jakarta-turbine-torque/src/templates/sql/load/msaccess/val.vm
Index: val.vm
===================================================================
#if($column.Column.TorqueType=="VARCHAR" ||
$column.Column.TorqueType=="LONGVARCHAR"|| $column.Column.TorqueType=="DATE" ||
$column.Column.TorqueType=="CHAR")'$column.Value'#else$column.Value#end
1.1 jakarta-turbine-torque/src/templates/sql/load/msaccess/row.vm
Index: row.vm
===================================================================
INSERT INTO $row.Table.Name (##
#set ($comma="")#foreach($col in
$row.ColumnValues)$comma${col.Column.Name}#set($comma=",")#end)
VALUES (#set ($comma="")#foreach($col in
$row.ColumnValues)$comma${generator.parse("sql/load/msaccess/val.vm", "", "column",
$col)}#set ($comma=",")#end);
1.1 jakarta-turbine-torque/src/templates/sql/base/msaccess/index.vm
Index: index.vm
===================================================================
#foreach ($index in $table.Indices)
CREATE #if($index.Unique)UNIQUE#end INDEX $index.Name ON $table.Name
($index.ColumnList);
#end
1.1
jakarta-turbine-torque/src/templates/sql/base/msaccess/foreignkey.vm
Index: foreignkey.vm
===================================================================
#foreach ($fk in $table.ForeignKeys)
FOREIGN KEY ($fk.LocalColumnNames) REFERENCES $fk.ForeignTableName
($fk.ForeignColumnNames),
#end
1.1 jakarta-turbine-torque/src/templates/sql/base/msaccess/table.vm
Index: table.vm
===================================================================
-----------------------------------------------------------------------------
-- $table.Name
-----------------------------------------------------------------------------
$generator.parse("$basepath/drop.vm", "", "table", $tbl)
CREATE TABLE $table.Name
(
#set ( $cols = $generator.parse("$basepath/columns.vm", "", "table", $tbl) )
#set ( $pk = $generator.parse("$basepath/primarykey.vm", "", "table", $tbl) )
##set ( $fk = $generator.parse("$basepath/foreignkey.vm", "", "table", $tbl) )
#set ( $unique = $generator.parse("$basepath/unique.vm", "", "table", $tbl) )
#set ( $index = $generator.parse("$basepath/index.vm", "", "table", $tbl) )
#if($strings.allEmpty([$pk,$fk,$unique,$index]))$strings.chop($cols,2)#else$cols#end
#if($strings.allEmpty([$fk,$unique,$index]) &&
$pk.length()>0)$strings.chop($pk,2)#else$pk#end
##if($strings.allEmpty([$unique,$index]) && $fk.length()
>0)$strings.chop($fk,2)#else$fk#end
#if($unique.length()>0)$strings.chop($unique,2)#else$unique#end
);
#if($index.length() > 0)$strings.chop($index,1)#end
1.1
jakarta-turbine-torque/src/templates/sql/base/msaccess/tablefk.vm
<<Binary file>>
1.1 jakarta-turbine-torque/src/templates/sql/base/msaccess/unique.vm
Index: unique.vm
===================================================================
#foreach ($unique in $table.Unices)
UNIQUE ($unique.ColumnList),
#end
1.1 jakarta-turbine-torque/src/templates/sql/base/msaccess/db.props
Index: db.props
===================================================================
# Taken from java.sql.Types in the IBM 1.3 JDK
# JDBC to MSAccess.
BIT = BIT
TINYINT = TINYINT
SMALLINT = SMALLINT
INTEGER = integer
BIGINT = BIGINT
FLOAT = FLOAT
REAL = REAL
DOUBLE = DOUBLE
NUMERIC = NUMERIC
DECIMAL = DECIMAL
CHAR = VARCHAR
VARCHAR = VARCHAR
LONGVARCHAR = MEMO
DATE = date
TIME = time
TIMESTAMP = timestamp
BINARY = BINARY
VARBINARY = BINARY
LONGVARBINARY = BINARY
NULL = NULL
OTHER = OTHER
JAVA_OBJECT =
DISTINCT =
STRUCT =
ARRAY =
BLOB =
CLOB =
REF =
AUTOINCREMENT = IDENTITY
NOTNULL = NOT NULL
primaryKeyInsideTableDirective = true
indexInsideTableDirective = false
removeNotNullWithAutoIncrement = false
suppressDefaults = true
1.1 jakarta-turbine-torque/src/templates/sql/base/msaccess/drop.vm
Index: drop.vm
===================================================================
drop table $table.Name;
1.1
jakarta-turbine-torque/src/templates/sql/base/msaccess/primarykey.vm
Index: primarykey.vm
===================================================================
#if ($table.hasPrimaryKey())
PRIMARY KEY($table.printPrimaryKey()),
#end
1.1
jakarta-turbine-torque/src/templates/sql/base/msaccess/columns.vm
Index: columns.vm
===================================================================
#foreach ($col in $table.Columns)
#set ( $type = $dbprops.get($col.Type) )
#set ( $size = $col.printSize() )
#set ( $default = $col.DefaultSetting )
#set ( $nullString = $strings.select($col.isNotNull(),
$dbprops.get("NOTNULL"),"") )
#set ( $autoIncrement = $strings.select($col.isAutoIncrement(),
$dbprops.get("AUTOINCREMENT"),"") )
#set ( $entry = "$col.Name $type $size $autoIncrement," )
$strings.sub($strings.collapseSpaces($entry)," ,",",")
#end
1.34 +4 -1
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java
Index: DBFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DBFactory.java 20 Sep 2002 14:18:05 -0000 1.33
+++ DBFactory.java 11 Nov 2002 11:38:24 -0000 1.34
@@ -100,6 +100,7 @@
adapters.put("weblogic.jdbc.pool.Driver", DBWeblogic.class);
adapters.put("org.axiondb.jdbc.AxionDriver", DBAxion.class);
adapters.put("com.informix.jdbc.IfxDriver", DBInformix.class);
+ adapters.put("sun.jdbc.odbc.JdbcOdbcDriver", DBOdbc.class);
// add some short names to be used when drivers are not used
adapters.put("as400", DBDB2400.class);
@@ -118,6 +119,8 @@
adapters.put("weblogic", DBWeblogic.class);
adapters.put("axion", DBAxion.class);
adapters.put("informix", DBInformix.class);
+ adapters.put("odbc", DBOdbc.class);
+ adapters.put("msaccess", DBOdbc.class);
adapters.put("", DBNone.class);
}
--
To unsubscribe, e-mail: <mailto:turbine-torque-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-torque-dev-help@;jakarta.apache.org>
