Changeset: 127aae07c920 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=127aae07c920 Modified Files: sql/test/sciql2sql/Tests/create_fixed_arrays.sql sql/test/sciql2sql/Tests/create_range_arrays.sql sql/test/sciql2sql/Tests/select_vector_array.sql sql/test/sciql2sql/Tests/slice_2d_array.sql sql/test/sciql2sql/Tests/slice_fixed_array.sql Branch: SciQL-2 Log Message:
Add initialization to arrays diffs (180 lines): diff --git a/sql/test/sciql2sql/Tests/create_fixed_arrays.sql b/sql/test/sciql2sql/Tests/create_fixed_arrays.sql --- a/sql/test/sciql2sql/Tests/create_fixed_arrays.sql +++ b/sql/test/sciql2sql/Tests/create_fixed_arrays.sql @@ -1,5 +1,10 @@ -- 1 Dimensional fixed array CREATE ARRAY array1D(x TINYINT DIMENSION[4], v INTEGER DEFAULT 1, w INTEGER DEFAULT 0); +INSERT INTO array1D values +( 0, 1, 0), +( 1, 1, 0), +( 2, 1, 0), +( 3, 1, 0); SELECT * FROM array1D; DROP ARRAY array1D; @@ -15,6 +20,23 @@ DROP TABLE array1D; -- a 2 Dimensional fixed array CREATE ARRAY array2D(x TINYINT DIMENSION[4], y BIGINT DIMENSION[4], v INTEGER DEFAULT 2); +INSERT INTO array2D values +( 0, 0, 2 ), +( 0, 1, 2 ), +( 0, 2, 2 ), +( 0, 3, 2 ), +( 1, 0, 2 ), +( 1, 1, 2 ), +( 1, 2, 2 ), +( 1, 3, 2 ), +( 2, 0, 2 ), +( 2, 1, 2 ), +( 2, 2, 2 ), +( 2, 3, 2 ), +( 3, 0, 2 ), +( 3, 1, 2 ), +( 3, 2, 2 ), +( 3, 3, 2 ); SELECT * FROM array2D; DROP ARRAY array2D; @@ -43,6 +65,43 @@ DROP TABLE array2D; -- a 3D data cube CREATE ARRAY array3D(x INT DIMENSION[3], y INT DIMENSION[3], z INT DIMENSION [3], v INT DEFAULT 3); +INSERT INTO array3D values +( 0, 0, 0, 3), +( 0, 0, 0, 3), +( 0, 0, 0, 3), +( 0, 1, 0, 3), +( 0, 1, 0, 3), +( 0, 1, 0, 3), +( 0, 2, 0, 3), +( 0, 2, 0, 3), +( 0, 2, 0, 3), +( 1, 0, 0, 3), +( 1, 0, 0, 3), +( 1, 0, 0, 3), +( 1, 1, 0, 3), +( 1, 1, 0, 3), +( 1, 1, 0, 3), +( 1, 2, 0, 3), +( 1, 2, 0, 3), +( 1, 2, 0, 3), +( 2, 0, 0, 3), +( 2, 0, 0, 3), +( 2, 0, 0, 3), +( 2, 1, 0, 3), +( 2, 1, 0, 3), +( 2, 1, 0, 3), +( 2, 2, 0, 3), +( 2, 2, 0, 3), +( 2, 2, 0, 3), +( 3, 0, 0, 3), +( 3, 0, 0, 3), +( 3, 0, 0, 3), +( 3, 1, 0, 3), +( 3, 1, 0, 3), +( 3, 1, 0, 3), +( 3, 2, 0, 3), +( 3, 2, 0, 3), +( 3, 2, 0, 3); SELECT * FROM array3D; DROP ARRAY array3D; diff --git a/sql/test/sciql2sql/Tests/create_range_arrays.sql b/sql/test/sciql2sql/Tests/create_range_arrays.sql --- a/sql/test/sciql2sql/Tests/create_range_arrays.sql +++ b/sql/test/sciql2sql/Tests/create_range_arrays.sql @@ -1,5 +1,10 @@ -- 1 Dimensional range array with default step size for INTEGER CREATE ARRAY array1Dr(x INTEGER DIMENSION[0:1:4], v INTEGER DEFAULT 1); +INSERT INTO array1Dr values +( 0, 1 ), +( 1, 1 ), +( 2, 1 ), +( 3, 1 ); SELECT * FROM array1Dr; DROP ARRAY array1Dr; @@ -15,6 +20,13 @@ DROP ARRAY array1Dr; -- 1 Dimensional range array with default step size CREATE ARRAY array1Dr(x INTEGER DIMENSION[-4:1:2], v INTEGER DEFAULT 1); +INSERT INTO array1Dr values +( -4, 1 ), +( -3, 1 ), +( -2, 1 ), +( -1, 1 ), +( 0, 1 ), +( 1, 1 ); SELECT * FROM array1Dr; DROP ARRAY array1Dr; @@ -32,6 +44,9 @@ DROP ARRAY array1Dr; -- 1 Dimensional range array with fixed step size CREATE ARRAY array1Dr(x INTEGER DIMENSION[0:2:4], v INTEGER DEFAULT 1); +INSERT INTO array1Dr values +( 0, 1 ), +( 2, 1 ); SELECT * FROM array1Dr; DROP ARRAY array1Dr; diff --git a/sql/test/sciql2sql/Tests/select_vector_array.sql b/sql/test/sciql2sql/Tests/select_vector_array.sql --- a/sql/test/sciql2sql/Tests/select_vector_array.sql +++ b/sql/test/sciql2sql/Tests/select_vector_array.sql @@ -1,5 +1,13 @@ -- Test construction of arrays from a 1D fixed array CREATE ARRAY array1D(x INTEGER DIMENSION[7], v INTEGER DEFAULT 1, w INTEGER DEFAULT 0); +INSERT INTO array1D values +( 0, 1, 1), +( 1, 1, 2), +( 2, 2, 1), +( 3, 2, 5), +( 4, 3, 7), +( 5, 3, 7), +( 6, 4, 1); -- relational equivalent CREATE TABLE vector(x INTEGER CHECK(x >=0 and x < 7), v INTEGER DEFAULT 1, w INTEGER DEFAULT 0); diff --git a/sql/test/sciql2sql/Tests/slice_2d_array.sql b/sql/test/sciql2sql/Tests/slice_2d_array.sql --- a/sql/test/sciql2sql/Tests/slice_2d_array.sql +++ b/sql/test/sciql2sql/Tests/slice_2d_array.sql @@ -1,5 +1,22 @@ -- a 2 Dimensional fixed array CREATE ARRAY array2D(x TINYINT DIMENSION[4], y BIGINT DIMENSION[4], v INTEGER DEFAULT 2); +INSERT INTO array2D values +( 0, 0, 2 ), +( 0, 1, 2 ), +( 0, 2, 2 ), +( 0, 3, 2 ), +( 1, 0, 2 ), +( 1, 1, 2 ), +( 1, 2, 2 ), +( 1, 3, 2 ), +( 2, 0, 2 ), +( 2, 1, 2 ), +( 2, 2, 2 ), +( 2, 3, 2 ), +( 3, 0, 2 ), +( 3, 1, 2 ), +( 3, 2, 2 ), +( 3, 3, 2 ); SELECT * FROM array2D; DROP ARRAY array2D; diff --git a/sql/test/sciql2sql/Tests/slice_fixed_array.sql b/sql/test/sciql2sql/Tests/slice_fixed_array.sql --- a/sql/test/sciql2sql/Tests/slice_fixed_array.sql +++ b/sql/test/sciql2sql/Tests/slice_fixed_array.sql @@ -1,5 +1,13 @@ -- Array slicing examples CREATE ARRAY array1D(x INTEGER DIMENSION[7], v INTEGER DEFAULT 1, w INTEGER DEFAULT 0); +INSERT INTO array1D values +( 0, 1, 1), +( 1, 1, 2), +( 2, 2, 1), +( 3, 2, 5), +( 4, 3, 7), +( 5, 3, 7), +( 6, 4, 1); -- relational equivalent CREATE TABLE vector(x INTEGER CHECK(x >=0 and x < 7), v INTEGER DEFAULT 1, w INTEGER DEFAULT 0); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
