From 3779af400d9ec6727ad20105fb3437cc0f50f60f Mon Sep 17 00:00:00 2001 From: Matvey Arye Date: Thu, 24 Jan 2019 16:50:50 -0500 Subject: [PATCH] Change license header to new format in SQL files The license header for SQL test files has been updated, but some tests haven't had this new header applied. This change makes sure the new header is applied to all test files. --- sql/timescaledb_fdw.sql | 8 +++----- tsl/test/expected/chunk_api.out | 7 +++---- tsl/test/expected/hypertable_distributed.out | 7 +++---- tsl/test/expected/remote_connection.out | 7 +++---- tsl/test/expected/remote_connection_cache.out | 7 +++---- tsl/test/expected/remote_txn.out | 7 +++---- tsl/test/expected/remote_txn_id.out | 7 +++---- tsl/test/expected/server.out | 7 +++---- tsl/test/expected/timescaledb_fdw.out | 7 +++---- tsl/test/sql/chunk_api.sql | 7 +++---- tsl/test/sql/hypertable_distributed.sql | 7 +++---- tsl/test/sql/remote_connection.sql | 7 +++---- tsl/test/sql/remote_connection_cache.sql | 7 +++---- tsl/test/sql/remote_txn.sql | 7 +++---- tsl/test/sql/remote_txn_id.sql | 7 +++---- tsl/test/sql/server.sql | 7 +++---- tsl/test/sql/timescaledb_fdw.sql | 7 +++---- 17 files changed, 51 insertions(+), 69 deletions(-) diff --git a/sql/timescaledb_fdw.sql b/sql/timescaledb_fdw.sql index e458cb7a9..3f02cab51 100644 --- a/sql/timescaledb_fdw.sql +++ b/sql/timescaledb_fdw.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Apache License, see LICENSE-APACHE --- at the top level directory of the TimescaleDB distribution. +-- This file and its contents are licensed under the Apache License 2.0. +-- Please see the included NOTICE for copyright information and +-- LICENSE-APACHE for a copy of the license. CREATE FUNCTION timescaledb_fdw_handler() RETURNS fdw_handler @@ -16,4 +15,3 @@ LANGUAGE C STRICT; CREATE FOREIGN DATA WRAPPER timescaledb_fdw HANDLER timescaledb_fdw_handler VALIDATOR timescaledb_fdw_validator; - \ No newline at end of file diff --git a/tsl/test/expected/chunk_api.out b/tsl/test/expected/chunk_api.out index e6456c354..bce973b3e 100644 --- a/tsl/test/expected/chunk_api.out +++ b/tsl/test/expected/chunk_api.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. CREATE TABLE chunkapi (time timestamptz, device int, temp float); SELECT * FROM create_hypertable('chunkapi', 'time', 'device', 2); NOTICE: adding not-null constraint to column "time" diff --git a/tsl/test/expected/hypertable_distributed.out b/tsl/test/expected/hypertable_distributed.out index d81ac3f95..1d0d12ce9 100644 --- a/tsl/test/expected/hypertable_distributed.out +++ b/tsl/test/expected/hypertable_distributed.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- Need to be super user to create extension and add servers \c :TEST_DBNAME :ROLE_SUPERUSER; GRANT USAGE ON FOREIGN DATA WRAPPER timescaledb_fdw TO :ROLE_DEFAULT_PERM_USER; diff --git a/tsl/test/expected/remote_connection.out b/tsl/test/expected/remote_connection.out index b2ff1d61b..27dfffca4 100644 --- a/tsl/test/expected/remote_connection.out +++ b/tsl/test/expected/remote_connection.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- =================================================================== -- create fake fdw to create server and user mapping -- =================================================================== diff --git a/tsl/test/expected/remote_connection_cache.out b/tsl/test/expected/remote_connection_cache.out index 3138ca81a..cd96b3cdc 100644 --- a/tsl/test/expected/remote_connection_cache.out +++ b/tsl/test/expected/remote_connection_cache.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. \c :TEST_DBNAME :ROLE_SUPERUSER CREATE FUNCTION _timescaledb_internal.test_remote_connection_cache() RETURNS void diff --git a/tsl/test/expected/remote_txn.out b/tsl/test/expected/remote_txn.out index 45e502c11..820e5c2a1 100644 --- a/tsl/test/expected/remote_txn.out +++ b/tsl/test/expected/remote_txn.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- =================================================================== -- create FDW objects -- =================================================================== diff --git a/tsl/test/expected/remote_txn_id.out b/tsl/test/expected/remote_txn_id.out index 407116ff8..ec41ddff2 100644 --- a/tsl/test/expected/remote_txn_id.out +++ b/tsl/test/expected/remote_txn_id.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. \c :TEST_DBNAME :ROLE_SUPERUSER CREATE FUNCTION _timescaledb_internal.test_remote_txn_id() RETURNS void diff --git a/tsl/test/expected/server.out b/tsl/test/expected/server.out index 54bf646e8..aa25d93db 100644 --- a/tsl/test/expected/server.out +++ b/tsl/test/expected/server.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- Need to be super user to create extension and add servers \c :TEST_DBNAME :ROLE_SUPERUSER; GRANT USAGE ON FOREIGN DATA WRAPPER timescaledb_fdw TO :ROLE_DEFAULT_PERM_USER; diff --git a/tsl/test/expected/timescaledb_fdw.out b/tsl/test/expected/timescaledb_fdw.out index 5a3ff1121..52ce9253a 100644 --- a/tsl/test/expected/timescaledb_fdw.out +++ b/tsl/test/expected/timescaledb_fdw.out @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. \c :TEST_DBNAME :ROLE_SUPERUSER CREATE SERVER some_server FOREIGN DATA WRAPPER timescaledb_fdw; CREATE FOREIGN TABLE test_ft (c0 int, c1 varchar(10)) SERVER some_server; diff --git a/tsl/test/sql/chunk_api.sql b/tsl/test/sql/chunk_api.sql index 055c169bc..1aed1a11e 100644 --- a/tsl/test/sql/chunk_api.sql +++ b/tsl/test/sql/chunk_api.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. CREATE TABLE chunkapi (time timestamptz, device int, temp float); diff --git a/tsl/test/sql/hypertable_distributed.sql b/tsl/test/sql/hypertable_distributed.sql index bd8366654..19c7b1d58 100644 --- a/tsl/test/sql/hypertable_distributed.sql +++ b/tsl/test/sql/hypertable_distributed.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- Need to be super user to create extension and add servers \c :TEST_DBNAME :ROLE_SUPERUSER; diff --git a/tsl/test/sql/remote_connection.sql b/tsl/test/sql/remote_connection.sql index 3862cb20c..cfb6a1c93 100644 --- a/tsl/test/sql/remote_connection.sql +++ b/tsl/test/sql/remote_connection.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- =================================================================== diff --git a/tsl/test/sql/remote_connection_cache.sql b/tsl/test/sql/remote_connection_cache.sql index 67aaaeaf3..87602d597 100644 --- a/tsl/test/sql/remote_connection_cache.sql +++ b/tsl/test/sql/remote_connection_cache.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. \c :TEST_DBNAME :ROLE_SUPERUSER diff --git a/tsl/test/sql/remote_txn.sql b/tsl/test/sql/remote_txn.sql index 9c99e61a8..74ac79476 100644 --- a/tsl/test/sql/remote_txn.sql +++ b/tsl/test/sql/remote_txn.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- =================================================================== -- create FDW objects diff --git a/tsl/test/sql/remote_txn_id.sql b/tsl/test/sql/remote_txn_id.sql index c03bd3fd3..9fda6b364 100644 --- a/tsl/test/sql/remote_txn_id.sql +++ b/tsl/test/sql/remote_txn_id.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. \c :TEST_DBNAME :ROLE_SUPERUSER CREATE FUNCTION _timescaledb_internal.test_remote_txn_id() diff --git a/tsl/test/sql/server.sql b/tsl/test/sql/server.sql index 9ba596132..e636fa4ba 100644 --- a/tsl/test/sql/server.sql +++ b/tsl/test/sql/server.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. -- Need to be super user to create extension and add servers \c :TEST_DBNAME :ROLE_SUPERUSER; diff --git a/tsl/test/sql/timescaledb_fdw.sql b/tsl/test/sql/timescaledb_fdw.sql index 0b3432a2c..ae8329fad 100644 --- a/tsl/test/sql/timescaledb_fdw.sql +++ b/tsl/test/sql/timescaledb_fdw.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Timescale License, --- see LICENSE-TIMESCALE at the top of the tsl directory. +-- This file and its contents are licensed under the Timescale License. +-- Please see the included NOTICE for copyright information and +-- LICENSE-TIMESCALE for a copy of the license. \c :TEST_DBNAME :ROLE_SUPERUSER CREATE SERVER some_server FOREIGN DATA WRAPPER timescaledb_fdw;