mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 14:20:33 -04:00
0c00a1e18f
- Fix table creation for autoincrement feature in Postgresql PR: 75032 Submitted by: maintainer
86 lines
5.4 KiB
Text
86 lines
5.4 KiB
Text
$FreeBSD$
|
|
|
|
This patch allows JBoss to correctly create tables when
|
|
using the auto-increment feature with Postgresql.
|
|
|
|
diff -r -u ./server/src/etc/conf/default/standardjbosscmp-jdbc.xml /tmp/jboss-4.0.0-src/server/src/etc/conf/default/standardjbosscmp-jdbc.xml
|
|
--- ./server/src/etc/conf/default/standardjbosscmp-jdbc.xml Thu Sep 16 03:48:58 2004
|
|
+++ /tmp/jboss-4.0.0-src/server/src/etc/conf/default/standardjbosscmp-jdbc.xml Sun Dec 5 22:21:18 2004
|
|
@@ -1169,7 +1169,7 @@
|
|
<row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
|
|
<pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
|
|
<fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
|
|
- <auto-increment-template>?1</auto-increment-template>
|
|
+ <auto-increment-template>?1 serial</auto-increment-template>
|
|
<alias-header-prefix>t</alias-header-prefix>
|
|
<alias-header-suffix>_</alias-header-suffix>
|
|
<alias-max-length>32</alias-max-length>
|
|
@@ -1296,7 +1296,7 @@
|
|
<row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
|
|
<pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
|
|
<fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
|
|
- <auto-increment-template>?1</auto-increment-template>
|
|
+ <auto-increment-template>?1 serial</auto-increment-template>
|
|
<alias-header-prefix>t</alias-header-prefix>
|
|
<alias-header-suffix>_</alias-header-suffix>
|
|
<alias-max-length>32</alias-max-length>
|
|
@@ -1423,7 +1423,7 @@
|
|
<row-locking-template/>
|
|
<pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
|
|
<fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
|
|
- <auto-increment-template>?1 IDENTITY</auto-increment-template>
|
|
+ <auto-increment-template>?1 ?2 ?3 IDENTITY</auto-increment-template>
|
|
<add-column-template>ALTER TABLE ?1 ADD COLUMN ?2 ?3</add-column-template>
|
|
<drop-column-template>ALTER TABLE ?1 DROP COLUMN ?2</drop-column-template>
|
|
<alias-header-prefix>t</alias-header-prefix>
|
|
@@ -1717,7 +1717,7 @@
|
|
<fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
|
|
-->
|
|
<fk-constraint-template>ALTER TABLE ?1 ADD INDEX (?3), ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
|
|
- <auto-increment-template>?1 auto_increment</auto-increment-template>
|
|
+ <auto-increment-template>?1 ?2 ?3 auto_increment</auto-increment-template>
|
|
<alter-column-template>ALTER TABLE ?1 MODIFY ?2 ?3</alter-column-template>
|
|
<alias-header-prefix>t</alias-header-prefix>
|
|
<alias-header-suffix>_</alias-header-suffix>
|
|
@@ -1857,7 +1857,7 @@
|
|
<row-locking-template>SELECT ?1 FROM ?2 with (updlock) WHERE ?3 ORDER BY ?4</row-locking-template>
|
|
<pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
|
|
<fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
|
|
- <auto-increment-template>?1 IDENTITY</auto-increment-template>
|
|
+ <auto-increment-template>?1 ?2 ?3 IDENTITY</auto-increment-template>
|
|
<alter-column-template>ALTER TABLE ?1 ALTER COLUMN ?2 ?3</alter-column-template>
|
|
<alias-header-prefix>t</alias-header-prefix>
|
|
<alias-header-suffix>_</alias-header-suffix>
|
|
@@ -1989,7 +1989,7 @@
|
|
<row-locking-template>SELECT ?1 FROM ?2 with (xlock) WHERE ?3 ORDER BY ?4</row-locking-template>
|
|
<pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
|
|
<fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
|
|
- <auto-increment-template>?1 IDENTITY</auto-increment-template>
|
|
+ <auto-increment-template>?1 ?2 ?3 IDENTITY</auto-increment-template>
|
|
<alias-header-prefix>t</alias-header-prefix>
|
|
<alias-header-suffix>_</alias-header-suffix>
|
|
<alias-max-length>32</alias-max-length>
|
|
diff -r -u ./server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java /tmp/jboss-4.0.0-src/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java
|
|
--- ./server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java Tue Sep 14 09:23:02 2004
|
|
+++ /tmp/jboss-4.0.0-src/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java Sun Dec 5 22:04:56 2004
|
|
@@ -916,14 +916,18 @@
|
|
// apply auto-increment template
|
|
if(type.getAutoIncrement()[0])
|
|
{
|
|
- String columnClause = SQLUtil.getCreateTableColumnsClause(type);
|
|
JDBCFunctionMappingMetaData autoIncrement =
|
|
manager.getMetaData().getTypeMapping().getAutoIncrementTemplate();
|
|
if(autoIncrement == null)
|
|
{
|
|
throw new IllegalStateException("auto-increment template not found");
|
|
}
|
|
- String[] args = new String[]{columnClause};
|
|
+ String[] args = new String[]
|
|
+ {
|
|
+ type.getColumnNames () [0],
|
|
+ type.getSQLTypes () [0],
|
|
+ type.getNotNull () [0] ? " not null " : ""
|
|
+ };
|
|
autoIncrement.getFunctionSql(args, sqlBuffer);
|
|
}
|
|
else
|