Revision 44295 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialSQLBuilder.java

View differences:

H2SpatialSQLBuilder.java
293 293
                if( !column.isGeometry() ) {
294 294
                    if (column.isPrimaryKey()) {
295 295
                        builder.append(" PRIMARY KEY");
296
                    }
297
                    if( column.isAutomatic() ) {
298
                        builder.append(" AUTO_INCREMENT");
299
                    }
300
                    if (column.getDefaultValue() == null) {
301
                        if (column.allowNulls()) {
302
                            builder.append(" DEFAULT NULL");
296
                        if( column.isAutomatic() ) {
297
                            builder.append(" AUTO_INCREMENT");
303 298
                        }
304 299
                    } else {
305
                        if( column.getType() == DataTypes.DATE ) {
306
                            builder.append(" DEFAULT ( TIMESTAMP '");
307
                            Date d = (Date) column.getDefaultValue();
308
                            builder.append(MessageFormat.format( "{0,date,yyyy-MM-dd HH:mm:ss.S}",d));
309
                            builder.append("' )");
300
                        if( column.isAutomatic() ) {
301
                            builder.append(" AUTO_INCREMENT");
302
                        }
303
                        if (column.getDefaultValue() == null) {
304
                            if (column.allowNulls()) {
305
                                builder.append(" DEFAULT NULL");
306
                            }
310 307
                        } else {
311
                            builder.append(" DEFAULT '");
312
                            builder.append(column.getDefaultValue().toString());
313
                            builder.append("'");
308
                            if( column.getType() == DataTypes.DATE ) {
309
                                builder.append(" DEFAULT ( TIMESTAMP '");
310
                                Date d = (Date) column.getDefaultValue();
311
                                builder.append(MessageFormat.format( "{0,date,yyyy-MM-dd HH:mm:ss.S}",d));
312
                                builder.append("' )");
313
                            } else {
314
                                builder.append(" DEFAULT '");
315
                                builder.append(column.getDefaultValue().toString());
316
                                builder.append("'");
317
                            }
314 318
                        }
315 319
                    }
316 320
                }

Also available in: Unified diff