Changeset: a6bcc084ddee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a6bcc084ddee
Added Files:
sql/test/BugTracker-2024/Tests/7511-password-hash-missing-error.test
sql/test/BugTracker-2024/Tests/7513-uri-authority-parse-issue.test
Modified Files:
monetdb5/modules/atoms/url.c
sql/test/BugTracker-2024/Tests/All
Branch: Dec2023
Log Message:
fixed issue #7513, the uri parsing didn't reset the port after finding the
username:password@
added tests
diffs (51 lines):
diff --git a/monetdb5/modules/atoms/url.c b/monetdb5/modules/atoms/url.c
--- a/monetdb5/modules/atoms/url.c
+++ b/monetdb5/modules/atoms/url.c
@@ -107,8 +107,10 @@ skip_authority(const char *uri, const ch
port = pass = uri + 1;
else
port = uri + 1;
- } else if (*uri == '@')
+ } else if (*uri == '@') {
host = uri + 1;
+ port = NULL;
+ }
uri += *uri == '%' ? 3 : 1;
}
if (user == host) {
diff --git
a/sql/test/BugTracker-2024/Tests/7511-password-hash-missing-error.test
b/sql/test/BugTracker-2024/Tests/7511-password-hash-missing-error.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7511-password-hash-missing-error.test
@@ -0,0 +1,3 @@
+
+statement error 42000!SELECT: Failed to retrieve password hash
+SELECT PASSWORD_HASH('1');
diff --git a/sql/test/BugTracker-2024/Tests/7513-uri-authority-parse-issue.test
b/sql/test/BugTracker-2024/Tests/7513-uri-authority-parse-issue.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7513-uri-authority-parse-issue.test
@@ -0,0 +1,15 @@
+
+query T
+SELECT GETHOST('https://me:p...@www.monetdb.org/Doc');
+----
+www.monetdb.org
+
+query T
+SELECT GETHOST('https://me:p...@www.monetdb.org/Doc');
+----
+www.monetdb.org
+
+query T
+SELECT GETHOST('https://me:p...@www.monetdb.org/Doc');
+----
+www.monetdb.org
diff --git a/sql/test/BugTracker-2024/Tests/All
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -53,3 +53,4 @@ rel2bin_select-Bug-7496
multicolumn_IN_value_list-Bug-7497
field-arg-error-Bug-7506
7511-password-hash-missing-error
+7513-uri-authority-parse-issue
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
