Author: tfischer
Date: Mon Sep 22 12:17:53 2014
New Revision: 1626749
URL: http://svn.apache.org/r1626749
Log:
TORQUE-278 do not create or drop tables in an external schema
Modified:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-ext-schema.html
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.sql
db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml
Modified:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java?rev=1626749&r1=1626748&r2=1626749&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java
Mon Sep 22 12:17:53 2014
@@ -99,4 +99,13 @@ public class Database
* List of all schema names in the tables of the database.
*/
public List<String> schemaNameList = new ArrayList<String>();
+
+ @Override
+ public String toString()
+ {
+ return "Database [name=" + name + ", defaultJavaType="
+ + defaultJavaType + ", defaultIdMethod=" + defaultIdMethod
+ + ", rootDatabaseName=" + rootDatabaseName + "]";
+ }
+
}
Modified:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java?rev=1626749&r1=1626748&r2=1626749&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java
Mon Sep 22 12:17:53 2014
@@ -208,4 +208,14 @@ public class Table
* in a comma-separated String.
*/
public String primaryKeyColumnNames;
+
+ @Override
+ public String toString()
+ {
+ return "Table [name=" + name + ", idMethod=" + idMethod
+ + ", _abstract=" + _abstract + ", javaName=" + javaName
+ + ", skipSql=" + skipSql + ", description=" + description +
"]";
+ }
+
+
}
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml?rev=1626749&r1=1626748&r2=1626749&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
Mon Sep 22 12:17:53 2014
@@ -39,22 +39,22 @@
</mergepoint>
<mergepoint name="tables">
<action xsi:type="traverseAllAction"
- element="allTables"
+ element="tableList"
outlet="torque.sql.ddl.tableSkipDecider"/>
</mergepoint>
<mergepoint name="foreignKeys">
<action xsi:type="traverseAllAction"
- element="allTables"
+ element="tableList"
outlet="torque.sql.ddl.foreignKeySkipDecider"/>
</mergepoint>
<mergepoint name="views">
<action xsi:type="traverseAllAction"
- element="allViews"
+ element="viewList"
outlet="torque.sql.ddl.view"/>
</mergepoint>
<mergepoint name="comments">
<action xsi:type="traverseAllAction"
- element="allTables"
+ element="tableList"
outlet="torque.sql.ddl.commentSkipDecider"/>
</mergepoint>
<mergepoint name="databaseEnd" />
@@ -65,13 +65,13 @@
path="ddl/dropSkipDecider.groovy">
<mergepoint name="drop">
<action xsi:type="traverseAllAction"
- element="allViews"
+ element="viewList"
outlet="torque.sql.ddl.dropView"/>
<action xsi:type="traverseAllAction"
- element="allTables"
+ element="tableList"
outlet="torque.sql.ddl.dropForeignKeySkipDecider"/>
<action xsi:type="traverseAllAction"
- element="allTables"
+ element="tableList"
outlet="torque.sql.ddl.dropTableSkipDecider"/>
<action xsi:type="traverseAllAction"
element="schemaNameList"
Modified:
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-ext-schema.html
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-ext-schema.html?rev=1626749&r1=1626748&r2=1626749&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-ext-schema.html
(original)
+++
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-ext-schema.html
Mon Sep 22 12:17:53 2014
@@ -66,6 +66,20 @@
</tr>
<tr class="detailrow">
+ <td class="detailbackground detailborder detailname foreignkey notnull"
id="extextext_id">extext_id
+ <a href="#extext" title="Foreign key to extext.extext_id" class="link
detailforeignkeylink">(fk)</a>
+ </td>
+ <td class="detailbackground detailborder detailtype">int</td>
+ <td class="detailbackground detailborder detailsize"> </td>
+ <td class="detailbackground detailborder detaildefault"> </td>
+ <td class="detailbackground detailborder detailjavaname">ExtextId</td>
+ <td class="detailbackground detailborder detailpk"><center>
</center></td>
+ <td class="detailbackground detailborder detailfk"><center> X
</center></td>
+ <td class="detailbackground detailborder detailnotnull"><center> X
</center></td>
+ <td class="detailbackground detailborder detaildescription"> </td>
+ </tr>
+ <tr class="detailrow">
+
<td class="detailbackground detailborder detailname notnull"
id="exttest">test
</td>
<td class="detailbackground detailborder detailtype">String</td>
Modified:
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.sql
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.sql?rev=1626749&r1=1626748&r2=1626749&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.sql
(original)
+++
db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.sql
Mon Sep 22 12:17:53 2014
@@ -60,8 +60,6 @@ ALTER TABLE extext_schema
DROP FOREIGN KEY extext_schema_FK_1;
-drop table if exists extext;
-drop table if exists ext;
drop table if exists a;
drop table if exists b;
drop table if exists r_ab;
@@ -77,28 +75,6 @@ drop table if exists extext_schema;
drop table if exists torque.qualified_name;
# -----------------------------------------------------------------------
-# extext
-# -----------------------------------------------------------------------
-CREATE TABLE extext
-(
- extext_id INTEGER NOT NULL AUTO_INCREMENT,
- test VARCHAR(15) NOT NULL,
- PRIMARY KEY(extext_id)
-);
-
-
-# -----------------------------------------------------------------------
-# ext
-# -----------------------------------------------------------------------
-CREATE TABLE ext
-(
- ext_id INTEGER NOT NULL AUTO_INCREMENT,
- test VARCHAR(15) NOT NULL,
- PRIMARY KEY(ext_id)
-);
-
-
-# -----------------------------------------------------------------------
# a
# -----------------------------------------------------------------------
CREATE TABLE a
Modified:
db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml?rev=1626749&r1=1626748&r2=1626749&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml Mon
Sep 22 12:17:53 2014
@@ -35,10 +35,18 @@
type="INTEGER"
/>
<column
+ name="extext_id"
+ required="true"
+ type="INTEGER"
+ />
+ <column
name="test"
required="true"
type="VARCHAR"
size="15"
/>
+ <foreign-key foreignTable="extext">
+ <reference local="extext_id" foreign="extext_id"/>
+ </foreign-key>
</table>
</database>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
