Changeset: 873075e01254 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=873075e01254
Removed Files:
sql/storage/store_connections.c
sql/storage/store_connections.h
sql/test/Connections/Tests/All
sql/test/Connections/Tests/connections.py
sql/test/Connections/Tests/connections.stable.err
sql/test/Connections/Tests/connections.stable.err.SunOS
sql/test/Connections/Tests/connections.stable.err.Windows
sql/test/Connections/Tests/connections.stable.out
sql/test/Connections/connections_default_values.sql
sql/test/Connections/connections_semantic.sql
sql/test/Connections/connections_syntax.sql
Modified Files:
clients/Tests/SQL-dump.SQL.py
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
sql/ChangeLog
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_privileges.c
sql/storage/Makefile.ag
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
Branch: default
Log Message:
Removed table sys.connections.
This "fixes" bug 3996.
diffs (truncated from 3931 to 300 lines):
diff --git a/clients/Tests/SQL-dump.SQL.py b/clients/Tests/SQL-dump.SQL.py
--- a/clients/Tests/SQL-dump.SQL.py
+++ b/clients/Tests/SQL-dump.SQL.py
@@ -117,8 +117,6 @@ out += ";"
out += '''
-- auths
select name, grantor from sys.auths;
--- connections (expect empty)
-select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-- db_user_info
select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
-- dependencies
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -82,7 +82,6 @@ Ready.
\dSt sys._tables
\dSt sys.args
\dSt sys.auths
-\dSt sys.connections
\dSt sys.db_user_info
\dSt sys.dependencies
\dSt sys.dependency_types
@@ -374,7 +373,6 @@ SYSTEM TABLE sys._columns
SYSTEM TABLE sys._tables
SYSTEM TABLE sys.args
SYSTEM TABLE sys.auths
-SYSTEM TABLE sys.connections
SYSTEM TABLE sys.db_user_info
SYSTEM TABLE sys.dependencies
SYSTEM TABLE sys.dependency_types
@@ -812,7 +810,6 @@ CREATE TABLE "sys"."_columns" ("id" INTE
CREATE TABLE "sys"."_tables" ("id" INTEGER, "name" VARCHAR(1024), "schema_id"
INTEGER, "query" VARCHAR(2048), "type" SMALLINT, "system" BOOLEAN,
"commit_action" SMALLINT, "access" SMALLINT);
CREATE TABLE "sys"."args" ("id" INTEGER, "func_id" INTEGER, "name"
VARCHAR(256), "type" VARCHAR(1024), "type_digits" INTEGER, "type_scale"
INTEGER, "inout" TINYINT, "number" INTEGER);
CREATE TABLE "sys"."auths" ("id" INTEGER, "name" VARCHAR(1024), "grantor"
INTEGER);
-CREATE TABLE "sys"."connections" ("id" INTEGER, "server" CHAR(1024), "port"
INTEGER, "db" CHAR(64), "db_alias" CHAR(1024), "user" CHAR(1024), "password"
CHAR(1024), "language" CHAR(1024));
CREATE TABLE "sys"."db_user_info" ("name" VARCHAR(1024), "fullname"
VARCHAR(2048), "default_schema" INTEGER);
CREATE TABLE "sys"."dependencies" ("id" INTEGER, "depend_id" INTEGER,
"depend_type" SMALLINT);
CREATE TABLE "sys"."dependency_types" ("dependency_type_id" SMALLINT NOT NULL,
"dependency_type_name" VARCHAR(15) NOT NULL, CONSTRAINT
"dependency_types_dependency_type_id_pkey" PRIMARY KEY ("dependency_type_id"),
CONSTRAINT "dependency_types_dependency_type_name_unique" UNIQUE
("dependency_type_name"));
@@ -1240,8 +1237,6 @@ arg16 (id, id1, name1, type1, type_digit
select s.name, f.name, arg16.name1, arg16.type1, arg16.type_digits1,
arg16.type_scale1, arg16.inout1, arg16.name2, arg16.type2, arg16.type_digits2,
arg16.type_scale2, arg16.inout2, arg16.name3, arg16.type3, arg16.type_digits3,
arg16.type_scale3, arg16.inout3, arg16.name4, arg16.type4, arg16.type_digits4,
arg16.type_scale4, arg16.inout4, arg16.name5, arg16.type5, arg16.type_digits5,
arg16.type_scale5, arg16.inout5, arg16.name6, arg16.type6, arg16.type_digits6,
arg16.type_scale6, arg16.inout6, arg16.name7, arg16.type7, arg16.type_digits7,
arg16.type_scale7, arg16.inout7, arg16.name8, arg16.type8, arg16.type_digits8,
arg16.type_scale8, arg16.inout8, arg16.name9, arg16.type9, arg16.type_digits9,
arg16.type_scale9, arg16.inout9, arg16.name10, arg16.type10,
arg16.type_digits10, arg16.type_scale10, arg16.inout10, arg16.name11,
arg16.type11, arg16.type_digits11, arg16.type_scale11, arg16.inout11,
arg16.name12, arg16.type12, arg16.type_digits12, arg16.type_scale12,
arg16.inout12, arg16.name1
3, arg16.type13, arg16.type_digits13, arg16.type_scale13, arg16.inout13,
arg16.name14, arg16.type14, arg16.type_digits14, arg16.type_scale14,
arg16.inout14, arg16.name15, arg16.type15, arg16.type_digits15,
arg16.type_scale15, arg16.inout15 from arg16, sys.schemas s, sys.functions f
where s.id = f.schema_id and f.id = arg16.id order by s.name, f.name,
arg16.name1, arg16.type1, arg16.type_digits1, arg16.type_scale1, arg16.inout1,
arg16.name2, arg16.type2, arg16.type_digits2, arg16.type_scale2, arg16.inout2,
arg16.name3, arg16.type3, arg16.type_digits3, arg16.type_scale3, arg16.inout3,
arg16.name4, arg16.type4, arg16.type_digits4, arg16.type_scale4, arg16.inout4,
arg16.name5, arg16.type5, arg16.type_digits5, arg16.type_scale5, arg16.inout5,
arg16.name6, arg16.type6, arg16.type_digits6, arg16.type_scale6, arg16.inout6,
arg16.name7, arg16.type7, arg16.type_digits7, arg16.type_scale7, arg16.inout7,
arg16.name8, arg16.type8, arg16.type_digits8, arg16.type_scale8, arg16.inout8,
arg16.name9,
arg16.type9, arg16.type_digits9, arg16.type_scale9, arg16.inout9,
arg16.name10, arg16.type10, arg16.type_digits10, arg16.type_scale10,
arg16.inout10, arg16.name11, arg16.type11, arg16.type_digits11,
arg16.type_scale11, arg16.inout11, arg16.name12, arg16.type12,
arg16.type_digits12, arg16.type_scale12, arg16.inout12, arg16.name13,
arg16.type13, arg16.type_digits13, arg16.type_scale13, arg16.inout13,
arg16.name14, arg16.type14, arg16.type_digits14, arg16.type_scale14,
arg16.inout14, arg16.name15, arg16.type15, arg16.type_digits15,
arg16.type_scale15, arg16.inout15;
-- auths
select name, grantor from sys.auths;
--- connections (expect empty)
-select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-- db_user_info
select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
-- dependencies
@@ -1317,7 +1312,6 @@ drop function pcre_replace(string, strin
[ "sys", "args", NULL, 0, true, 0, 0 ]
[ "sys", "auths", NULL, 0, true, 0, 0 ]
[ "sys", "columns", "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, 0 ]
-[ "sys", "connections", NULL, 0, true, 0, 0 ]
[ "sys", "db_user_info", NULL, 0, true, 0, 0 ]
[ "sys", "dependencies", NULL, 0, true, 0, 0 ]
[ "sys", "dependency_types", NULL, 0, true, 0, 0
]
@@ -1430,14 +1424,6 @@ drop function pcre_replace(string, strin
[ "columns", "null", "boolean", 1, 0, NULL, true, 7,
NULL ]
[ "columns", "number", "int", 32, 0, NULL, true, 8,
NULL ]
[ "columns", "storage", "varchar", 2048, 0, NULL, true,
9, NULL ]
-[ "connections", "id", "int", 32, 0, NULL, true, 0,
NULL ]
-[ "connections", "server", "char", 1024, 0, NULL, true,
1, NULL ]
-[ "connections", "port", "int", 32, 0, NULL, true, 2,
NULL ]
-[ "connections", "db", "char", 64, 0, NULL, true, 3,
NULL ]
-[ "connections", "db_alias", "char", 1024, 0, NULL, true,
4, NULL ]
-[ "connections", "user", "char", 1024, 0, NULL, true, 5,
NULL ]
-[ "connections", "password", "char", 1024, 0, NULL, true,
6, NULL ]
-[ "connections", "language", "char", 1024, 0, NULL, true,
7, NULL ]
[ "db_user_info", "name", "varchar", 1024, 0, NULL, true,
0, NULL ]
[ "db_user_info", "fullname", "varchar", 2048, 0, NULL,
true, 1, NULL ]
[ "db_user_info", "default_schema", "int", 9, 0, NULL,
true, 2, NULL ]
@@ -4870,11 +4856,6 @@ drop function pcre_replace(string, strin
[ "public", 0 ]
[ "sysadmin", 0 ]
[ "monetdb", 0 ]
-#select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-% sys.connections, sys.connections, sys.connections,
sys.connections, .L6, sys.connections, sys.connections #
table_name
-% server, port, db, db_alias, L6, password,
language # name
-% char, int, char, char, varchar, char, char # type
-% 1024, 1, 64, 1024, 0, 1024, 1024 # length
#select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
% .u, .u, .s # table_name
% name, fullname, name # name
@@ -5440,7 +5421,6 @@ drop function pcre_replace(string, strin
[ "args", "public", 1, NULL, 0 ]
[ "auths", "public", 1, NULL, 0 ]
[ "columns", "public", 1, NULL, 0 ]
-[ "connections", "public", 1, NULL, 0 ]
[ "dependencies", "public", 1, NULL, 0 ]
[ "functions", "public", 1, NULL, 0 ]
[ "geometry_columns", "public", 1, "monetdb", 0 ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -78,7 +78,6 @@ Ready.
\dSt sys._tables
\dSt sys.args
\dSt sys.auths
-\dSt sys.connections
\dSt sys.db_user_info
\dSt sys.dependencies
\dSt sys.dependency_types
@@ -370,7 +369,6 @@ SYSTEM TABLE sys._columns
SYSTEM TABLE sys._tables
SYSTEM TABLE sys.args
SYSTEM TABLE sys.auths
-SYSTEM TABLE sys.connections
SYSTEM TABLE sys.db_user_info
SYSTEM TABLE sys.dependencies
SYSTEM TABLE sys.dependency_types
@@ -808,7 +806,6 @@ CREATE TABLE "sys"."_columns" ("id" INTE
CREATE TABLE "sys"."_tables" ("id" INTEGER, "name" VARCHAR(1024), "schema_id"
INTEGER, "query" VARCHAR(2048), "type" SMALLINT, "system" BOOLEAN,
"commit_action" SMALLINT, "access" SMALLINT);
CREATE TABLE "sys"."args" ("id" INTEGER, "func_id" INTEGER, "name"
VARCHAR(256), "type" VARCHAR(1024), "type_digits" INTEGER, "type_scale"
INTEGER, "inout" TINYINT, "number" INTEGER);
CREATE TABLE "sys"."auths" ("id" INTEGER, "name" VARCHAR(1024), "grantor"
INTEGER);
-CREATE TABLE "sys"."connections" ("id" INTEGER, "server" CHAR(1024), "port"
INTEGER, "db" CHAR(64), "db_alias" CHAR(1024), "user" CHAR(1024), "password"
CHAR(1024), "language" CHAR(1024));
CREATE TABLE "sys"."db_user_info" ("name" VARCHAR(1024), "fullname"
VARCHAR(2048), "default_schema" INTEGER);
CREATE TABLE "sys"."dependencies" ("id" INTEGER, "depend_id" INTEGER,
"depend_type" SMALLINT);
CREATE TABLE "sys"."dependency_types" ("dependency_type_id" SMALLINT NOT NULL,
"dependency_type_name" VARCHAR(15) NOT NULL, CONSTRAINT
"dependency_types_dependency_type_id_pkey" PRIMARY KEY ("dependency_type_id"),
CONSTRAINT "dependency_types_dependency_type_name_unique" UNIQUE
("dependency_type_name"));
@@ -1246,8 +1243,6 @@ arg16 (id, id1, name1, type1, type_digit
select s.name, f.name, arg16.name1, arg16.type1, arg16.type_digits1,
arg16.type_scale1, arg16.inout1, arg16.name2, arg16.type2, arg16.type_digits2,
arg16.type_scale2, arg16.inout2, arg16.name3, arg16.type3, arg16.type_digits3,
arg16.type_scale3, arg16.inout3, arg16.name4, arg16.type4, arg16.type_digits4,
arg16.type_scale4, arg16.inout4, arg16.name5, arg16.type5, arg16.type_digits5,
arg16.type_scale5, arg16.inout5, arg16.name6, arg16.type6, arg16.type_digits6,
arg16.type_scale6, arg16.inout6, arg16.name7, arg16.type7, arg16.type_digits7,
arg16.type_scale7, arg16.inout7, arg16.name8, arg16.type8, arg16.type_digits8,
arg16.type_scale8, arg16.inout8, arg16.name9, arg16.type9, arg16.type_digits9,
arg16.type_scale9, arg16.inout9, arg16.name10, arg16.type10,
arg16.type_digits10, arg16.type_scale10, arg16.inout10, arg16.name11,
arg16.type11, arg16.type_digits11, arg16.type_scale11, arg16.inout11,
arg16.name12, arg16.type12, arg16.type_digits12, arg16.type_scale12,
arg16.inout12, arg16.name1
3, arg16.type13, arg16.type_digits13, arg16.type_scale13, arg16.inout13,
arg16.name14, arg16.type14, arg16.type_digits14, arg16.type_scale14,
arg16.inout14, arg16.name15, arg16.type15, arg16.type_digits15,
arg16.type_scale15, arg16.inout15 from arg16, sys.schemas s, sys.functions f
where s.id = f.schema_id and f.id = arg16.id order by s.name, f.name,
arg16.name1, arg16.type1, arg16.type_digits1, arg16.type_scale1, arg16.inout1,
arg16.name2, arg16.type2, arg16.type_digits2, arg16.type_scale2, arg16.inout2,
arg16.name3, arg16.type3, arg16.type_digits3, arg16.type_scale3, arg16.inout3,
arg16.name4, arg16.type4, arg16.type_digits4, arg16.type_scale4, arg16.inout4,
arg16.name5, arg16.type5, arg16.type_digits5, arg16.type_scale5, arg16.inout5,
arg16.name6, arg16.type6, arg16.type_digits6, arg16.type_scale6, arg16.inout6,
arg16.name7, arg16.type7, arg16.type_digits7, arg16.type_scale7, arg16.inout7,
arg16.name8, arg16.type8, arg16.type_digits8, arg16.type_scale8, arg16.inout8,
arg16.name9,
arg16.type9, arg16.type_digits9, arg16.type_scale9, arg16.inout9,
arg16.name10, arg16.type10, arg16.type_digits10, arg16.type_scale10,
arg16.inout10, arg16.name11, arg16.type11, arg16.type_digits11,
arg16.type_scale11, arg16.inout11, arg16.name12, arg16.type12,
arg16.type_digits12, arg16.type_scale12, arg16.inout12, arg16.name13,
arg16.type13, arg16.type_digits13, arg16.type_scale13, arg16.inout13,
arg16.name14, arg16.type14, arg16.type_digits14, arg16.type_scale14,
arg16.inout14, arg16.name15, arg16.type15, arg16.type_digits15,
arg16.type_scale15, arg16.inout15;
-- auths
select name, grantor from sys.auths;
--- connections (expect empty)
-select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-- db_user_info
select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
-- dependencies
@@ -1323,7 +1318,6 @@ drop function pcre_replace(string, strin
[ "sys", "args", NULL, 0, true, 0, 0 ]
[ "sys", "auths", NULL, 0, true, 0, 0 ]
[ "sys", "columns", "SELECT * FROM (SELECT p.* FROM
\"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t)
AS columns;", 1, true, 0, 0 ]
-[ "sys", "connections", NULL, 0, true, 0, 0 ]
[ "sys", "db_user_info", NULL, 0, true, 0, 0 ]
[ "sys", "dependencies", NULL, 0, true, 0, 0 ]
[ "sys", "dependency_types", NULL, 0, true, 0, 0
]
@@ -1436,14 +1430,6 @@ drop function pcre_replace(string, strin
[ "columns", "null", "boolean", 1, 0, NULL, true, 7,
NULL ]
[ "columns", "number", "int", 32, 0, NULL, true, 8,
NULL ]
[ "columns", "storage", "varchar", 2048, 0, NULL, true,
9, NULL ]
-[ "connections", "id", "int", 32, 0, NULL, true, 0,
NULL ]
-[ "connections", "server", "char", 1024, 0, NULL, true,
1, NULL ]
-[ "connections", "port", "int", 32, 0, NULL, true, 2,
NULL ]
-[ "connections", "db", "char", 64, 0, NULL, true, 3,
NULL ]
-[ "connections", "db_alias", "char", 1024, 0, NULL, true,
4, NULL ]
-[ "connections", "user", "char", 1024, 0, NULL, true, 5,
NULL ]
-[ "connections", "password", "char", 1024, 0, NULL, true,
6, NULL ]
-[ "connections", "language", "char", 1024, 0, NULL, true,
7, NULL ]
[ "db_user_info", "name", "varchar", 1024, 0, NULL, true,
0, NULL ]
[ "db_user_info", "fullname", "varchar", 2048, 0, NULL,
true, 1, NULL ]
[ "db_user_info", "default_schema", "int", 9, 0, NULL,
true, 2, NULL ]
@@ -5238,11 +5224,6 @@ drop function pcre_replace(string, strin
[ "public", 0 ]
[ "sysadmin", 0 ]
[ "monetdb", 0 ]
-#select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-% sys.connections, sys.connections, sys.connections,
sys.connections, .L6, sys.connections, sys.connections #
table_name
-% server, port, db, db_alias, L6, password,
language # name
-% char, int, char, char, varchar, char, char # type
-% 1024, 1, 64, 1024, 0, 1024, 1024 # length
#select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
% .u, .u, .s # table_name
% name, fullname, name # name
@@ -5809,7 +5790,6 @@ drop function pcre_replace(string, strin
[ "args", "public", 1, NULL, 0 ]
[ "auths", "public", 1, NULL, 0 ]
[ "columns", "public", 1, NULL, 0 ]
-[ "connections", "public", 1, NULL, 0 ]
[ "dependencies", "public", 1, NULL, 0 ]
[ "functions", "public", 1, NULL, 0 ]
[ "geometry_columns", "public", 1, "monetdb", 0 ]
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Mon Feb 6 2017 Sjoerd Mullender <[email protected]>
+- Removed table sys.connections. It was a remnant of an experimental
+ change that had already been removed in 2012.
+
* Tue Nov 8 2016 Martin Kersten <[email protected]>
- Protect against runaway profiler events If you hit a barrier block
during profiling, the JSON event log may quickly become unwieldy. Event
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -39,7 +39,6 @@ null sys _columns SYSTEM TABLE null null
null sys _tables SYSTEM TABLE null null null null null
null
null sys args SYSTEM TABLE null null null null null
null
null sys auths SYSTEM TABLE null null null null null
null
-null sys connections SYSTEM TABLE null null null null
null null
null sys db_user_info SYSTEM TABLE null null null null
null null
null sys dependencies SYSTEM TABLE null null null null
null null
null sys dependency_types SYSTEM TABLE null null null
null null null
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -1238,36 +1238,6 @@ mvc_check_dependency(mvc * m, int id, in
return NO_DEPENDENCY;
}
-int
-mvc_connect_catalog(mvc *m, const char *server, int port, const char *db,
const char *db_alias, const char *user, const char *passwd, const char *lng)
-{
- if (mvc_debug)
- fprintf(stderr, "#mvc_connect_catalog of database %s on server
%s\n",db, server);
-
- return sql_trans_connect_catalog(m->session->tr, server, port, db,
db_alias, user, passwd, lng);
-
-}
-
-int
-mvc_disconnect_catalog(mvc *m, const char *db_alias)
-{
- if (mvc_debug)
- fprintf(stderr, "#mvc_disconnect_catalog for db_alias
%s\n",db_alias);
-
- return sql_trans_disconnect_catalog(m->session->tr, db_alias);
-
-}
-
-int
-mvc_disconnect_catalog_ALL(mvc *m)
-{
- if (mvc_debug)
- fprintf(stderr, "#mvc_disconnect_catalog_ALL \n");
-
- return sql_trans_disconnect_catalog_ALL(m->session->tr);
-
-}
-
sql_column *
mvc_null(mvc *m, sql_column *col, int isnull)
{
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -214,9 +214,6 @@ extern void mvc_drop_trigger(mvc *m, sql
extern void mvc_create_dependency(mvc *m, int id, int depend_id, int
depend_type);
extern void mvc_create_dependencies(mvc *m, list *id_l, sqlid depend_id, int
dep_type);
extern int mvc_check_dependency(mvc * m, int id, int type, list *ignore_ids);
-extern int mvc_connect_catalog(mvc *m, const char *server, int port, const
char *db, const char *db_alias, const char *user, const char *passwd, const
char *lng);
-extern int mvc_disconnect_catalog(mvc *m, const char *db_alias);
-extern int mvc_disconnect_catalog_ALL(mvc *m);
/* variable management */
extern void stack_push_var(mvc *sql, const char *name, sql_subtype *type);
diff --git a/sql/server/sql_privileges.c b/sql/server/sql_privileges.c
--- a/sql/server/sql_privileges.c
+++ b/sql/server/sql_privileges.c
@@ -852,8 +852,6 @@ sql_create_privileges(mvc *m, sql_schema
table_funcs.table_insert(m->session->tr, privs, &t->base.id, &pub, &p,
&zero, &zero);
t = find_sql_table(s, "dependencies");
table_funcs.table_insert(m->session->tr, privs, &t->base.id, &pub, &p,
&zero, &zero);
- t = find_sql_table(s, "connections");
- table_funcs.table_insert(m->session->tr, privs, &t->base.id, &pub, &p,
&zero, &zero);
t = find_sql_table(s, "_tables");
table_funcs.table_insert(m->session->tr, privs, &t->base.id, &pub, &p,
&zero, &zero);
t = find_sql_table(s, "_columns");
diff --git a/sql/storage/Makefile.ag b/sql/storage/Makefile.ag
--- a/sql/storage/Makefile.ag
+++ b/sql/storage/Makefile.ag
@@ -19,8 +19,8 @@ lib_store = {
NOINST
DIR = libdir
SOURCES = \
- store_dependency.c store_connections.c store_sequence.c \
+ store_dependency.c store_sequence.c \
store.c sql_catalog.c \
- sql_storage.h store_connections.h store_dependency.h \
+ sql_storage.h store_dependency.h \
store_sequence.h
}
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -405,10 +405,6 @@ extern int sql_trans_get_dependency_type
extern int sql_trans_check_dependency(sql_trans *tr, int id, int depend_id,
short depend_type);
extern list* sql_trans_owner_schema_dependencies(sql_trans *tr, int id);
-extern int sql_trans_connect_catalog(sql_trans *tr, const char *server, int
port, const char *db, const char *db_alias, const char *user, const char
*passwd, const char *lng);
-extern int sql_trans_disconnect_catalog(sql_trans *tr, const char *db_alias);
-extern int sql_trans_disconnect_catalog_ALL(sql_trans *tr);
-
extern sql_table *create_sql_table(sql_allocator *sa, const char *name, sht
type, bit system, int persistence, int commit_action);
extern sql_column *create_sql_column(sql_allocator *sa, sql_table *t, const
char *name, sql_subtype *tpe);
extern sql_ukey *create_sql_ukey(sql_allocator *sa, sql_table *t, const char
*nme, key_type kt);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -10,7 +10,6 @@
#include "sql_types.h"
#include "sql_storage.h"
#include "store_dependency.h"
-#include "store_connections.h"
#include "store_sequence.h"
#include <bat/bat_utils.h>
@@ -1462,16 +1461,6 @@ store_load(void) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
