Changeset: 5b37b295fcac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b37b295fcac
Modified Files:
monetdb5/modules/atoms/inet.c
sql/test/testdb/Tests/testdb-dump.stable.out
sql/test/testdb/Tests/testdb-load.sql
Branch: Oct2014
Log Message:
Fix parsing of INET value with netmask; added INET type to load/dump test.
diffs (51 lines):
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -142,7 +142,8 @@ INETfromString(str src, int *len, inet *
goto error;
}
- return(i);
+ return (int) (endptr - src);
+
error: /* catch exception: return NULL */
in_setnil(*retval);
*len = 0; /* signal INETnew something went wrong */
diff --git a/sql/test/testdb/Tests/testdb-dump.stable.out
b/sql/test/testdb/Tests/testdb-dump.stable.out
--- a/sql/test/testdb/Tests/testdb-dump.stable.out
+++ b/sql/test/testdb/Tests/testdb-dump.stable.out
@@ -101170,11 +101170,12 @@ CREATE TABLE "testschema"."typestest" (
"character" CHAR(1),
"varchar100" VARCHAR(100),
"character10" CHAR(10),
- "uuid" UUID
+ "uuid" UUID,
+ "inet" INET
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 1000000 10000000000 1e+30 1.00000002e+20
1.000 123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000.000 108000.000
120000.000 100000.000 36000.000 6000.000 2000.000
600.000 100.000 10.000 1995-07-15 07:30:00.000000 1995-07-15
07:30:00.00000 1995-07-15 07:30:00.000000+00:00 1995-07-15
07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "x"
"varchar" "0123456789" 7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45
-NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL
+true 10 10000 1000000 1000000 10000000000 1e+30 1.00000002e+20
1.000 123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000.000 108000.000
120000.000 100000.000 36000.000 6000.000 2000.000
600.000 100.000 10.000 1995-07-15 07:30:00.000000 1995-07-15
07:30:00.00000 1995-07-15 07:30:00.000000+00:00 1995-07-15
07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "x"
"varchar" "0123456789" 7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45
192.168.10.0/24
+NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
"key2" INTEGER NOT NULL,
diff --git a/sql/test/testdb/Tests/testdb-load.sql
b/sql/test/testdb/Tests/testdb-load.sql
--- a/sql/test/testdb/Tests/testdb-load.sql
+++ b/sql/test/testdb/Tests/testdb-load.sql
@@ -101149,11 +101149,12 @@ CREATE TABLE "testschema"."typestest" (
"character" CHAR(1),
"varchar100" VARCHAR(100),
"character10" CHAR(10),
- "uuid" UUID
+ "uuid" UUID,
+ "inet" INET
);
COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
-true 10 10000 1000000 1000000 10000000000 1e+30 1.00000002e+20
1 123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000 108000 120000 100000 36000
6000 2000 600 100 10 1995-07-15 07:30:00.000000
1995-07-15 07:30:00.00000 1995-07-15 07:30:00.000000+00:00
1995-07-15 07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "x"
"varchar" "0123456789" 7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45
-NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL
+true 10 10000 1000000 1000000 10000000000 1e+30 1.00000002e+20
1 123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000 108000 120000 100000 36000
6000 2000 600 100 10 1995-07-15 07:30:00.000000
1995-07-15 07:30:00.00000 1995-07-15 07:30:00.000000+00:00
1995-07-15 07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "x"
"varchar" "0123456789" 7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45
192.168.10.0/24
+NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL NULL NULL
CREATE TABLE "testschema"."keytest1" (
"key1" INTEGER NOT NULL,
"key2" INTEGER NOT NULL,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
