Bugfix: Drop Column without type and params

master
Markus Kreth 8 years ago
parent 45506b2ff6
commit 2a11bc6bdc
  1. 12
      pom.xml
  2. 10
      src/main/java/de/kreth/dbmanager/DbManager.java

@ -1,12 +1,10 @@
<project <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.kreth</groupId> <groupId>de.kreth</groupId>
<artifactId>databasedefinition</artifactId> <artifactId>databasedefinition</artifactId>
<version>0.0.7-SNAPSHOT</version> <version>0.0.6</version>
<name>DatabaseDefinition</name> <name>DatabaseDefinition</name>
<description>Database creation and definition framework</description> <description>Database creation and definition framework</description>
@ -30,9 +28,9 @@
<plugin> <plugin>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version> <version>2.5.2</version>
<!-- <configuration> --> <!-- <configuration> -->
<!-- <goals>install</goals> --> <!-- <goals>install</goals> -->
<!-- </configuration> --> <!-- </configuration> -->
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

@ -108,6 +108,7 @@ public class DbManager {
} }
public static String createSqlStatement(TableDefinition def) { public static String createSqlStatement(TableDefinition def) {
assert(def != null);
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("CREATE TABLE ").append(def.getTableName()).append(" (\n"); sql.append("CREATE TABLE ").append(def.getTableName()).append(" (\n");
@ -165,7 +166,7 @@ public class DbManager {
} }
public static String createSqlAddColumns(TableDefinition current, ColumnDefinition... columnsToAdd) { public static String createSqlAddColumns(TableDefinition current, ColumnDefinition... columnsToAdd) {
assert(current != null);
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("ALTER TABLE ").append(current.getTableName()); sql.append("ALTER TABLE ").append(current.getTableName());
@ -189,6 +190,7 @@ public class DbManager {
} }
public static String createSqlDropColumns(TableDefinition current, ColumnDefinition... columnsToDrop) { public static String createSqlDropColumns(TableDefinition current, ColumnDefinition... columnsToDrop) {
assert(current != null);
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("ALTER TABLE ").append(current.getTableName()); sql.append("ALTER TABLE ").append(current.getTableName());
@ -201,12 +203,8 @@ public class DbManager {
} }
first = false; first = false;
sql.append("\n\tDROP COLUMN ").append(col.getColumnName()).append(" "); sql.append("\n\tDROP COLUMN ").append(col.getColumnName());
appendType(sql, col);
if (col.getColumnParameters() != null && !col.getColumnParameters().isEmpty()) {
sql.append(" ").append(col.getColumnParameters());
}
} }
sql.append(";"); sql.append(";");
return sql.toString(); return sql.toString();

Loading…
Cancel
Save