提交 2f43898e 编写于 作者: S Serge Rider 提交者: GitHub

Merge pull request #9910 from dbeaver/sqlite-autoinc#9637

Sqlite autoinc#9637

Former-commit-id: aefe21ab
...@@ -47,8 +47,7 @@ import java.util.regex.Pattern; ...@@ -47,8 +47,7 @@ import java.util.regex.Pattern;
/** /**
* SQLiteMetaModel * SQLiteMetaModel
*/ */
public class SQLiteMetaModel extends GenericMetaModel implements DBCQueryTransformProvider public class SQLiteMetaModel extends GenericMetaModel implements DBCQueryTransformProvider {
{
private static final Log log = Log.getLog(SQLiteMetaModel.class); private static final Log log = Log.getLog(SQLiteMetaModel.class);
private static final Pattern TYPE_WITH_LENGTH_PATTERN = Pattern.compile("(.+)\\s*\\(([0-9]+)\\)"); private static final Pattern TYPE_WITH_LENGTH_PATTERN = Pattern.compile("(.+)\\s*\\(([0-9]+)\\)");
...@@ -185,4 +184,12 @@ public class SQLiteMetaModel extends GenericMetaModel implements DBCQueryTransfo ...@@ -185,4 +184,12 @@ public class SQLiteMetaModel extends GenericMetaModel implements DBCQueryTransfo
return new SQLiteTableColumn(table, columnName, typeName, valueType, sourceType, ordinalPos, columnSize, charLength, scale, precision, radix, notNull, remarks, defaultValue, autoIncrement, autoGenerated); return new SQLiteTableColumn(table, columnName, typeName, valueType, sourceType, ordinalPos, columnSize, charLength, scale, precision, radix, notNull, remarks, defaultValue, autoIncrement, autoGenerated);
} }
@Override
public String getAutoIncrementClause(GenericTableColumn column) {
if (column.isAutoIncrement()) {
return "PRIMARY KEY AUTOINCREMENT";
}
return null;
}
} }
...@@ -23,7 +23,6 @@ import org.jkiss.dbeaver.model.impl.DBDummyNumberTransformer; ...@@ -23,7 +23,6 @@ import org.jkiss.dbeaver.model.impl.DBDummyNumberTransformer;
import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.meta.Property;
public class SQLiteTableColumn extends GenericTableColumn implements DBPNamedObject2 { public class SQLiteTableColumn extends GenericTableColumn implements DBPNamedObject2 {
public SQLiteTableColumn(GenericTableBase table, String columnName, String typeName, int valueType, int sourceType, int ordinalPosition, long columnSize, long charLength, Integer scale, Integer precision, int radix, boolean notNull, String remarks, String defaultValue, boolean autoIncrement, boolean autoGenerated) { public SQLiteTableColumn(GenericTableBase table, String columnName, String typeName, int valueType, int sourceType, int ordinalPosition, long columnSize, long charLength, Integer scale, Integer precision, int radix, boolean notNull, String remarks, String defaultValue, boolean autoIncrement, boolean autoGenerated) {
super(table, columnName, typeName, valueType, sourceType, ordinalPosition, columnSize, charLength, scale, precision, radix, notNull, remarks, defaultValue, autoIncrement, autoGenerated); super(table, columnName, typeName, valueType, sourceType, ordinalPosition, columnSize, charLength, scale, precision, radix, notNull, remarks, defaultValue, autoIncrement, autoGenerated);
} }
...@@ -34,6 +33,12 @@ public class SQLiteTableColumn extends GenericTableColumn implements DBPNamedObj ...@@ -34,6 +33,12 @@ public class SQLiteTableColumn extends GenericTableColumn implements DBPNamedObj
return super.isAutoGenerated(); return super.isAutoGenerated();
} }
@Property(viewable = true, editable = true, order = 52, editableExpr = "!object.table.persisted")
@Override
public boolean isAutoIncrement() {
return super.isAutoIncrement();
}
@Property(viewable = true, editable = true, order = 40, valueRenderer = DBDummyNumberTransformer.class) @Property(viewable = true, editable = true, order = 40, valueRenderer = DBDummyNumberTransformer.class)
@Override @Override
public long getMaxLength() { public long getMaxLength() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册