Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improved sql parser.

Browse Source
This commit is contained in:
wenshao
2017-09-13 21:24:24 +08:00
parent f208f42e01
commit 8226eae1de
9 changed files with 102 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java
+31 -28
View File
@@ -416,16 +416,16 @@ public class SQLTransformUtils {
len = ((SQLIntegerExpr) arg0).getNumber().intValue();
}
}
dataType = new SQLDataTypeImpl("varchar", len);
dataType = new SQLDataTypeImpl(SQLDataType.Constants.VARCHAR, len);
} else if (nameHash == FnvHash.Constants.ROWID) {
dataType = new SQLDataTypeImpl("char", 10);
dataType = new SQLDataTypeImpl(SQLDataType.Constants.CHAR, 10);
} else if (nameHash == FnvHash.Constants.BOOLEAN) {
dataType = new SQLDataTypeImpl("tinyint");
} else if (nameHash == FnvHash.Constants.BOOLEAN || nameHash == FnvHash.Constants.SMALLINT) {
dataType = new SQLDataTypeImpl(SQLDataType.Constants.SMALLINT);
} else if (nameHash == FnvHash.Constants.INTEGER
|| nameHash == FnvHash.Constants.INT) {
dataType = new SQLDataTypeImpl("decimal", 38);
dataType = new SQLDataTypeImpl(SQLDataType.Constants.DECIMAL, 38);
} else if (nameHash == FnvHash.Constants.BINARY_FLOAT) {
dataType = new SQLDataTypeImpl("real");
@@ -439,7 +439,7 @@ public class SQLTransformUtils {
} else if (nameHash == FnvHash.Constants.NUMBER) {
if (argumentns.size() == 0) {
dataType = new SQLDataTypeImpl("decimal", 38);
dataType = new SQLDataTypeImpl(SQLDataType.Constants.DECIMAL, 38);
} else {
SQLExpr arg0 = argumentns.get(0);
@@ -468,23 +468,23 @@ public class SQLTransformUtils {
if (scale == 0) {
if (precision < 5) {
dataType = new SQLDataTypeImpl("smallint");
dataType = new SQLDataTypeImpl(SQLDataType.Constants.SMALLINT);
} else if (precision < 9) {
dataType = new SQLDataTypeImpl("int");
dataType = new SQLDataTypeImpl(SQLDataType.Constants.INT);
} else if (precision <= 20) {
dataType = new SQLDataTypeImpl("bigint");
dataType = new SQLDataTypeImpl(SQLDataType.Constants.BIGINT);
} else {
dataType = new SQLDataTypeImpl("decimal", precision);
dataType = new SQLDataTypeImpl(SQLDataType.Constants.DECIMAL, precision);
}
} else {
dataType = new SQLDataTypeImpl("decimal", precision, scale);
dataType = new SQLDataTypeImpl(SQLDataType.Constants.DECIMAL, precision, scale);
}
}
} else if (nameHash == FnvHash.Constants.DEC
|| nameHash == FnvHash.Constants.DECIMAL) {
dataType = x.clone();
dataType.setName("decimal");
dataType.setName(SQLDataType.Constants.DECIMAL);
int precision = 0;
if (argumentns.size() > 0) {
@@ -509,9 +509,9 @@ public class SQLTransformUtils {
} else {
throw new UnsupportedOperationException(SQLUtils.toOracleString(x));
}
dataType = new SQLCharacterDataType("char", len);
dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR, len);
} else if (argumentns.size() == 0) {
dataType = new SQLCharacterDataType("char");
dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR);
} else {
throw new UnsupportedOperationException(SQLUtils.toOracleString(x));
}
@@ -528,17 +528,19 @@ public class SQLTransformUtils {
if (len <= 2000) {
dataType = x;
dataType.setName(SQLDataType.Constants.CHAR);
} else {
dataType = new SQLCharacterDataType("text");
dataType = new SQLCharacterDataType(SQLDataType.Constants.TEXT);
}
} else if (argumentns.size() == 0) {
dataType = new SQLCharacterDataType("char");
dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR);
} else {
throw new UnsupportedOperationException(SQLUtils.toOracleString(x));
}
} else if (nameHash == FnvHash.Constants.NCHAR) {
// no changed
dataType = x;
dataType.setName(SQLDataType.Constants.NCHAR);
} else if (nameHash == FnvHash.Constants.VARCHAR
|| nameHash == FnvHash.Constants.VARCHAR2) {
if (argumentns.size() > 0) {
@@ -551,15 +553,16 @@ public class SQLTransformUtils {
}
if (len <= 4000) {
dataType = new SQLCharacterDataType("varchar", len);
dataType = new SQLCharacterDataType(SQLDataType.Constants.VARCHAR, len);
} else {
dataType = new SQLCharacterDataType("text");
dataType = new SQLCharacterDataType(SQLDataType.Constants.TEXT);
}
} else {
dataType = new SQLCharacterDataType("varchar");
dataType = new SQLCharacterDataType(SQLDataType.Constants.VARCHAR);
}
} else if (nameHash == FnvHash.Constants.NVARCHAR2
} else if (nameHash == FnvHash.Constants.NVARCHAR
|| nameHash == FnvHash.Constants.NVARCHAR2
|| nameHash == FnvHash.Constants.NCHAR_VARYING) {
if (argumentns.size() > 0) {
int len;
@@ -569,13 +572,13 @@ public class SQLTransformUtils {
} else {
throw new UnsupportedOperationException(SQLUtils.toOracleString(x));
}
dataType = new SQLCharacterDataType("varchar", len);
dataType = new SQLCharacterDataType(SQLDataType.Constants.VARCHAR, len);
} else {
dataType = new SQLCharacterDataType("varchar");
dataType = new SQLCharacterDataType(SQLDataType.Constants.VARCHAR);
}
} else if (nameHash == FnvHash.Constants.BFILE) {
dataType = new SQLCharacterDataType("varchar", 255);
dataType = new SQLCharacterDataType(SQLDataType.Constants.VARCHAR, 255);
} else if (nameHash == FnvHash.Constants.DATE
|| nameHash == FnvHash.Constants.DATETIME
@@ -591,24 +594,24 @@ public class SQLTransformUtils {
}
if (len > 0) {
dataType = new SQLDataTypeImpl("timestamp", len);
dataType = new SQLDataTypeImpl(SQLDataType.Constants.TIMESTAMP, len);
} else {
dataType = new SQLDataTypeImpl("timestamp");
dataType = new SQLDataTypeImpl(SQLDataType.Constants.TIMESTAMP);
}
} else if (nameHash == FnvHash.Constants.BLOB
|| nameHash == FnvHash.Constants.LONG_RAW
|| nameHash == FnvHash.Constants.RAW) {
argumentns.clear();
dataType = new SQLDataTypeImpl("bytea");
dataType = new SQLDataTypeImpl(SQLDataType.Constants.BYTEA);
} else if (nameHash == FnvHash.Constants.CLOB
|| nameHash == FnvHash.Constants.NCLOB
|| nameHash == FnvHash.Constants.LONG) {
argumentns.clear();
dataType = new SQLCharacterDataType("text");
dataType = new SQLCharacterDataType(SQLDataType.Constants.TEXT);
} else if (nameHash == FnvHash.Constants.XMLTYPE) {
dataType = new SQLDataTypeImpl("xml");
dataType = new SQLDataTypeImpl(SQLDataType.Constants.XML);
} else {
dataType = x;
}
src/main/java/com/alibaba/druid/sql/ast/SQLDataType.java
+17
View File
@@ -36,4 +36,21 @@ public interface SQLDataType extends SQLObject {
void setDbType(String dbType);
String getDbType();
interface Constants {
String CHAR = "CHAR";
String NCHAR = "NCHAR";
String VARCHAR = "VARCHAR";
String TIMESTAMP = "TIMESTAMP";
String XML = "XML";
String DECIMAL = "DECIMAL";
String NUMBER = "NUMBER";
String TINYINT = "TINYINT";
String SMALLINT = "SMALLINT";
String INT = "INT";
String BIGINT = "BIGINT";
String TEXT = "TEXT";
String BYTEA = "BYTEA";
}
}
src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java
+3 -4
View File
@@ -101,10 +101,8 @@ public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType {
@Override
public int hashCode() {
int result = name != null ? name.hashCode() : 0;
result = 31 * result + (arguments != null ? arguments.hashCode() : 0);
result = 31 * result + (withTimeZone != null ? withTimeZone.hashCode() : 0);
return result;
long value = nameHashCode64();
return (int)(value ^ (value >>> 32));
}
@Override
@@ -143,6 +141,7 @@ public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType {
public void cloneTo(SQLDataTypeImpl x) {
x.dbType = dbType;
x.name = name;
x.nameHashCode64 = nameHashCode64;
for (SQLExpr arg : arguments) {
x.addArgument(arg.clone());
src/main/java/com/alibaba/druid/util/FnvHash.java
+1
View File
@@ -302,6 +302,7 @@ public final class FnvHash {
long TARGET_AFFECT_ROW = fnv1a_64_lower("TARGET_AFFECT_ROW");
long COLLATE = fnv1a_64_lower("COLLATE");
long BOOLEAN = fnv1a_64_lower("BOOLEAN");
long SMALLINT = fnv1a_64_lower("SMALLINT");
long CHARSET = fnv1a_64_lower("CHARSET");
long SEMI = fnv1a_64_lower("SEMI");
long ANTI = fnv1a_64_lower("ANTI");