Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 3
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 9ceaee88 编写于 作者: S Serge Rider
浏览文件
操作

#12 Postgres types model 


Former-commit-id: 292272df
上级 ab0b862c
隐藏空白更改
内联 并排
Showing with 136 addition and 129 deletion
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
浏览文件 @ 9ceaee88
......@@ -118,7 +118,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
databaseCache.getAllObjects(monitor, this);
final PostgreSchema catalogSchema = getDefaultInstance().getSchema(monitor, PostgreConstants.CATALOG_SCHEMA_NAME);
if (catalogSchema != null) {
catalogSchema.getDataTypeCache().getAllObjects(monitor, this);
catalogSchema.getDataTypeCache().getAllObjects(monitor, catalogSchema);
}
// Read catalogs
databaseCache.getAllObjects(monitor, this);
......
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataType.java
浏览文件 @ 9ceaee88
......@@ -17,15 +17,39 @@
*/
package org.jkiss.dbeaver.ext.postgresql.model;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCDataType;
import org.jkiss.dbeaver.model.meta.Property;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.utils.ArrayUtils;
import org.jkiss.utils.CommonUtils;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
/**
* PostgreTypeType
*/
public class PostgreDataType extends JDBCDataType implements PostgreObject
{
static final Log log = Log.getLog(PostgreDataType.class);
private static String[] OID_TYPES = new String[] {
"regproc",
"regprocedure",
"regoper",
"regoperator",
"regclass",
"regtype",
"regconfig",
"regdictionary",
};
private final int typeId;
private final String ownerSchema;
private final PostgreTypeType typeType;
......@@ -60,4 +84,109 @@ public class PostgreDataType extends JDBCDataType implements PostgreObject
return typeCategory;
}
public static PostgreDataType readDataType(@NotNull PostgreObject owner, @NotNull ResultSet dbResult) throws SQLException, DBException
{
int typeId = JDBCUtils.safeGetInt(dbResult, "oid");
String ownerSchema = JDBCUtils.safeGetString(dbResult, "typnsname");
String name = JDBCUtils.safeGetString(dbResult, "typname");
if (CommonUtils.isEmpty(name)) {
return null;
}
int typeLength = JDBCUtils.safeGetInt(dbResult, "typlen");
PostgreTypeType typeType = PostgreTypeType.b;
try {
typeType = PostgreTypeType.valueOf(JDBCUtils.safeGetString(dbResult, "typtype"));
} catch (IllegalArgumentException e) {
log.debug(e);
}
PostgreTypeCategory typeCategory = PostgreTypeCategory.X;
try {
typeCategory = PostgreTypeCategory.valueOf(JDBCUtils.safeGetString(dbResult, "typcategory"));
} catch (IllegalArgumentException e) {
log.debug(e);
}
int valueType;
if (ArrayUtils.contains(OID_TYPES, name) || name.equals("hstore")) {
valueType = Types.VARCHAR;
} else {
switch (typeCategory) {
case A:
case P:
return null;
case B:
valueType = Types.BOOLEAN;
break;
case C:
valueType = Types.STRUCT;
break;
case D:
if (name.startsWith("timestamp")) {
valueType = Types.TIMESTAMP;
} else if (name.startsWith("date")) {
valueType = Types.DATE;
} else {
valueType = Types.TIME;
}
break;
case N:
valueType = Types.NUMERIC;
if (name.startsWith("float")) {
switch (typeLength) {
case 4:
valueType = Types.FLOAT;
break;
case 8:
valueType = Types.DOUBLE;
break;
}
} else {
switch (typeLength) {
case 2:
valueType = Types.SMALLINT;
break;
case 4:
valueType = Types.INTEGER;
break;
case 8:
valueType = Types.BIGINT;
break;
}
}
break;
case S:
// if (name.equals("text")) {
// valueType = Types.CLOB;
// } else {
valueType = Types.VARCHAR;
// }
break;
case U:
switch (name) {
case "bytea":
valueType = Types.BINARY;
break;
case "xml":
valueType = Types.SQLXML;
break;
default:
valueType = Types.OTHER;
break;
}
break;
default:
valueType = Types.OTHER;
break;
}
}
return new PostgreDataType(
owner,
valueType,
name,
typeLength,
typeId,
ownerSchema,
typeType,
typeCategory);
}
}
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataTypeCache.java
浏览文件 @ 9ceaee88
......@@ -23,41 +23,20 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCStatement;
import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectCache;
import org.jkiss.utils.ArrayUtils;
import org.jkiss.utils.CommonUtils;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
/**
* PostgreDataTypeCache
*/
public class PostgreDataTypeCache extends JDBCObjectCache<PostgreDataSource, PostgreDataType>
public class PostgreDataTypeCache extends JDBCObjectCache<PostgreObject, PostgreDataType>
{
static final Log log = Log.getLog(PostgreDataTypeCache.class);
private static String[] OID_TYPES = new String[] {
"regproc",
"regprocedure",
"regoper",
"regoperator",
"regclass",
"regtype",
"regconfig",
"regdictionary",
};
private PostgreSchema schema;
public PostgreDataTypeCache(PostgreSchema schema) {
this.schema = schema;
}
@Override
protected JDBCStatement prepareObjectsStatement(@NotNull JDBCSession session, @NotNull PostgreDataSource owner) throws SQLException
protected JDBCStatement prepareObjectsStatement(@NotNull JDBCSession session, @NotNull PostgreObject owner) throws SQLException
{
final JDBCPreparedStatement dbStat = session.prepareStatement(
"SELECT t.oid,t.* \n" +
......@@ -65,115 +44,14 @@ public class PostgreDataTypeCache extends JDBCObjectCache<PostgreDataSource, Pos
"WHERE t.typnamespace=?\n" +
"AND t.typtype<>'c' AND t.typcategory not in ('A','P')\n" +
"ORDER by t.oid");
dbStat.setInt(1, schema.getObjectId());
dbStat.setInt(1, owner.getObjectId());
return dbStat;
}
@Override
protected PostgreDataType fetchObject(@NotNull JDBCSession session, @NotNull PostgreDataSource owner, @NotNull ResultSet dbResult) throws SQLException, DBException
protected PostgreDataType fetchObject(@NotNull JDBCSession session, @NotNull PostgreObject owner, @NotNull ResultSet dbResult) throws SQLException, DBException
{
int typeId = JDBCUtils.safeGetInt(dbResult, "oid");
String ownerSchema = JDBCUtils.safeGetString(dbResult, "typnsname");
String name = JDBCUtils.safeGetString(dbResult, "typname");
if (CommonUtils.isEmpty(name)) {
return null;
}
int typeLength = JDBCUtils.safeGetInt(dbResult, "typlen");
PostgreTypeType typeType = PostgreTypeType.b;
try {
typeType = PostgreTypeType.valueOf(JDBCUtils.safeGetString(dbResult, "typtype"));
} catch (IllegalArgumentException e) {
log.debug(e);
}
PostgreTypeCategory typeCategory = PostgreTypeCategory.X;
try {
typeCategory = PostgreTypeCategory.valueOf(JDBCUtils.safeGetString(dbResult, "typcategory"));
} catch (IllegalArgumentException e) {
log.debug(e);
}
int valueType;
if (ArrayUtils.contains(OID_TYPES, name) || name.equals("hstore")) {
valueType = Types.VARCHAR;
} else {
switch (typeCategory) {
case A:
case P:
return null;
case B:
valueType = Types.BOOLEAN;
break;
case C:
valueType = Types.STRUCT;
break;
case D:
if (name.startsWith("timestamp")) {
valueType = Types.TIMESTAMP;
} else if (name.startsWith("date")) {
valueType = Types.DATE;
} else {
valueType = Types.TIME;
}
break;
case N:
valueType = Types.NUMERIC;
if (name.startsWith("float")) {
switch (typeLength) {
case 4:
valueType = Types.FLOAT;
break;
case 8:
valueType = Types.DOUBLE;
break;
}
} else {
switch (typeLength) {
case 2:
valueType = Types.SMALLINT;
break;
case 4:
valueType = Types.INTEGER;
break;
case 8:
valueType = Types.BIGINT;
break;
}
}
break;
case S:
// if (name.equals("text")) {
// valueType = Types.CLOB;
// } else {
valueType = Types.VARCHAR;
// }
break;
case U:
switch (name) {
case "bytea":
valueType = Types.BINARY;
break;
case "xml":
valueType = Types.SQLXML;
break;
default:
valueType = Types.OTHER;
break;
}
break;
default:
valueType = Types.OTHER;
break;
}
}
return new PostgreDataType(
owner,
valueType,
name,
typeLength,
typeId,
ownerSchema,
typeType,
typeCategory);
return PostgreDataType.readDataType(owner, dbResult);
}
......
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreSchema.java
浏览文件 @ 9ceaee88
......@@ -77,7 +77,7 @@ public class PostgreSchema implements DBSSchema, DBPSaveableObject, DBPRefreshab
{
this.database = database;
this.name = name;
this.dataTypeCache = new PostgreDataTypeCache(this);
this.dataTypeCache = new PostgreDataTypeCache();
this.loadInfo(dbResult);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或