Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
efea5da4
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
efea5da4
编写于
11月 03, 2003
作者:
D
Dave Cramer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
accept url and fk action fix from Kris Jurka
上级
90e53f0c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
52 addition
and
11 deletion
+52
-11
src/interfaces/jdbc/org/postgresql/Driver.java.in
src/interfaces/jdbc/org/postgresql/Driver.java.in
+9
-5
src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
...c/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
+3
-1
src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
...ces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
+4
-3
src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
.../jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
+33
-1
src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
...interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
+3
-1
未找到文件。
src/interfaces/jdbc/org/postgresql/Driver.java.in
浏览文件 @
efea5da4
...
...
@@ -6,7 +6,7 @@
*
Copyright
(
c
)
2003
,
PostgreSQL
Global
Development
Group
*
*
IDENTIFICATION
*
$
Header
:
/
cvsroot
/
pgsql
/
src
/
interfaces
/
jdbc
/
org
/
postgresql
/
Attic
/
Driver
.
java
.
in
,
v
1.3
6
2003
/
09
/
13
04
:
02
:
12
barry
Exp
$
*
$
Header
:
/
cvsroot
/
pgsql
/
src
/
interfaces
/
jdbc
/
org
/
postgresql
/
Attic
/
Driver
.
java
.
in
,
v
1.3
7
2003
/
11
/
03
15
:
22
:
06
davec
Exp
$
*
*-------------------------------------------------------------------------
*/
...
...
@@ -111,7 +111,7 @@ public class Driver implements java.sql.Driver
*
*
Our
protocol
takes
the
forms
:
*
<
PRE
>
*
jdbc
:
org
.
postgresql
://
host
:
port
/
database
?
param1
=
val1
&...
*
jdbc
:
postgresql
://
host
:
port
/
database
?
param1
=
val1
&...
*
</
PRE
>
*
*
@
param
url
the
URL
of
the
database
to
connect
to
...
...
@@ -163,7 +163,7 @@ public class Driver implements java.sql.Driver
*
Returns
true
if
the
driver
thinks
it
can
open
a
connection
to
the
*
given
URL
.
Typically
,
drivers
will
return
true
if
they
understand
*
the
subprotocol
specified
in
the
URL
and
false
if
they
don
't. Our
* protocols start with jdbc:
org.
postgresql:
* protocols start with jdbc:postgresql:
*
* @see java.sql.Driver#acceptsURL
* @param url the URL of the driver
...
...
@@ -286,7 +286,8 @@ public class Driver implements java.sql.Driver
//parse the server part of the url
StringTokenizer st = new StringTokenizer(l_urlServer, ":/", true);
for (int count = 0; (st.hasMoreTokens()); count++)
int count;
for (count = 0; (st.hasMoreTokens()); count++)
{
String token = st.nextToken();
...
...
@@ -357,6 +358,9 @@ public class Driver implements java.sql.Driver
}
}
}
if (count <= 1) {
return null;
}
// if we extracted an IPv6 address out earlier put it back
if (ipv6address != null)
...
...
@@ -364,7 +368,7 @@ public class Driver implements java.sql.Driver
//parse the args part of the url
StringTokenizer qst = new StringTokenizer(l_urlArgs, "&");
for (
int
count = 0; (qst.hasMoreTokens()); count++)
for (count = 0; (qst.hasMoreTokens()); count++)
{
String token = qst.nextToken();
int l_pos = token.indexOf('
=
');
...
...
src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
浏览文件 @
efea5da4
...
...
@@ -3114,7 +3114,7 @@ public abstract class AbstractJdbc1DatabaseMetaData
if
(
deleteRule
!=
null
)
{
String
rule
=
updateRule
.
substring
(
8
,
upda
teRule
.
length
()
-
4
);
String
rule
=
deleteRule
.
substring
(
8
,
dele
teRule
.
length
()
-
4
);
int
action
=
java
.
sql
.
DatabaseMetaData
.
importedKeyNoAction
;
if
(
"cascade"
.
equals
(
rule
))
...
...
@@ -3123,6 +3123,8 @@ public abstract class AbstractJdbc1DatabaseMetaData
action
=
java
.
sql
.
DatabaseMetaData
.
importedKeySetNull
;
else
if
(
"setdefault"
.
equals
(
rule
))
action
=
java
.
sql
.
DatabaseMetaData
.
importedKeySetDefault
;
else
if
(
"restrict"
.
equals
(
rule
))
action
=
java
.
sql
.
DatabaseMetaData
.
importedKeyRestrict
;
tuple
[
10
]
=
Integer
.
toString
(
action
).
getBytes
();
}
...
...
src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
浏览文件 @
efea5da4
...
...
@@ -9,7 +9,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.2
2 2003/10/29 02:39:09
davec Exp $
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.2
3 2003/11/03 15:22:07
davec Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -210,8 +210,8 @@ public abstract class AbstractJdbc1ResultSet implements BaseResultSet
public
byte
getByte
(
int
columnIndex
)
throws
SQLException
{
String
s
=
getString
(
columnIndex
);
if
(
s
!=
null
)
if
(
s
!=
null
)
{
try
{
...
...
@@ -232,6 +232,7 @@ public abstract class AbstractJdbc1ResultSet implements BaseResultSet
s
=
s
.
trim
();
break
;
}
if
(
s
.
length
()
==
0
)
return
0
;
return
Byte
.
parseByte
(
s
);
}
catch
(
NumberFormatException
e
)
...
...
src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
浏览文件 @
efea5da4
...
...
@@ -9,7 +9,7 @@ import java.sql.*;
*
* PS: Do you know how difficult it is to type on a train? ;-)
*
* $Id: DatabaseMetaDataTest.java,v 1.1
8 2003/05/29 04:39:48 barry
Exp $
* $Id: DatabaseMetaDataTest.java,v 1.1
9 2003/11/03 15:22:07 davec
Exp $
*/
public
class
DatabaseMetaDataTest
extends
TestCase
...
...
@@ -137,6 +137,38 @@ public class DatabaseMetaDataTest extends TestCase
fail
(
ex
.
getMessage
());
}
}
public
void
testForeignKeyActions
()
{
try
{
Connection
conn
=
TestUtil
.
openDB
();
TestUtil
.
createTable
(
conn
,
"pkt"
,
"id int primary key"
);
TestUtil
.
createTable
(
conn
,
"fkt1"
,
"id int references pkt on update restrict on delete cascade"
);
TestUtil
.
createTable
(
conn
,
"fkt2"
,
"id int references pkt on update set null on delete set default"
);
DatabaseMetaData
dbmd
=
conn
.
getMetaData
();
ResultSet
rs
=
dbmd
.
getImportedKeys
(
null
,
""
,
"fkt1"
);
assertTrue
(
rs
.
next
());
assertTrue
(
rs
.
getInt
(
"UPDATE_RULE"
)
==
DatabaseMetaData
.
importedKeyRestrict
);
assertTrue
(
rs
.
getInt
(
"DELETE_RULE"
)
==
DatabaseMetaData
.
importedKeyCascade
);
rs
.
close
();
rs
=
dbmd
.
getImportedKeys
(
null
,
""
,
"fkt2"
);
assertTrue
(
rs
.
next
());
assertTrue
(
rs
.
getInt
(
"UPDATE_RULE"
)
==
DatabaseMetaData
.
importedKeySetNull
);
assertTrue
(
rs
.
getInt
(
"DELETE_RULE"
)
==
DatabaseMetaData
.
importedKeySetDefault
);
rs
.
close
();
TestUtil
.
dropTable
(
conn
,
"fkt2"
);
TestUtil
.
dropTable
(
conn
,
"fkt1"
);
TestUtil
.
dropTable
(
conn
,
"pkt"
);
}
catch
(
SQLException
ex
)
{
fail
(
ex
.
getMessage
());
}
}
public
void
testForeignKeys
()
{
try
...
...
src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
浏览文件 @
efea5da4
...
...
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
import
java.sql.*
;
/*
* $Id: DriverTest.java,v 1.
5 2002/08/14 20:35:40 barry
Exp $
* $Id: DriverTest.java,v 1.
6 2003/11/03 15:22:07 davec
Exp $
*
* Tests the dynamically created class org.postgresql.Driver
*
...
...
@@ -37,10 +37,12 @@ public class DriverTest extends TestCase
assertTrue
(
drv
.
acceptsURL
(
"jdbc:postgresql://localhost:5432/test"
));
assertTrue
(
drv
.
acceptsURL
(
"jdbc:postgresql://127.0.0.1/anydbname"
));
assertTrue
(
drv
.
acceptsURL
(
"jdbc:postgresql://127.0.0.1:5433/hidden"
));
assertTrue
(
drv
.
acceptsURL
(
"jdbc:postgresql://[::1]:5740/db"
));
// Badly formatted url's
assertTrue
(!
drv
.
acceptsURL
(
"jdbc:postgres:test"
));
assertTrue
(!
drv
.
acceptsURL
(
"postgresql:test"
));
assertTrue
(!
drv
.
acceptsURL
(
"db"
));
}
catch
(
SQLException
ex
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录