Standardize license headers

benesch · benesch · commit e78cf0483e5a · 2019-06-04T10:54:12.000-04:00
Standardize the license header, removing the Grove Enterprise copyright notice where it exists per apache#58. Also add a CI check to ensure that files without license headers don't get merged. Fix apache#58.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,10 @@ before_script:
   - cargo install cargo-update || echo "cargo-update already installed"
   - cargo install cargo-travis || echo "cargo-travis already installed"
   - cargo install-update -a  # updates cargo-travis, if the cached version is outdated
-  - rustup component add clippy rustfmt
+  - rustup component add clippy
+  # The license_template_path setting we use to verify copyright headers is
+  # only available on the nightly rustfmt.
+  - rustup toolchain install nightly && rustup component add --toolchain nightly rustfmt
 
 script:
   # Clippy must be run first, as its lints are only triggered during
@@ -46,7 +49,7 @@ script:
   - travis-cargo clippy -- --all-targets --all-features -- -D warnings
   - travis-cargo build
   - travis-cargo test
-  - travis-cargo fmt -- -- --check
+  - travis-cargo --only nightly fmt -- -- --check --config-path <(echo 'license_template_path = "HEADER"')
 
 after_success:
   - cargo coveralls --verbose
diff --git a/HEADER b/HEADER
@@ -0,0 +1,11 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
diff --git a/examples/cli.rs b/examples/cli.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #![warn(clippy::all)]
 
 use simple_logger;
diff --git a/examples/parse_select.rs b/examples/parse_select.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #![warn(clippy::all)]
 
 use sqlparser::dialect::GenericSqlDialect;
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1 +1 @@
-# We use rustfmt's default settings to format the source code
+# We use rustfmt's default settings to format the source code
diff --git a/src/dialect/ansi_sql.rs b/src/dialect/ansi_sql.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use crate::dialect::Dialect;
 
 #[derive(Debug)]
diff --git a/src/dialect/generic_sql.rs b/src/dialect/generic_sql.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use crate::dialect::Dialect;
 
 #[derive(Debug)]
diff --git a/src/dialect/keywords.rs b/src/dialect/keywords.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 ///! This module defines
 /// 1) a list of constants for every keyword that
 /// can appear in SQLWord::keyword:
diff --git a/src/dialect/mod.rs b/src/dialect/mod.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 mod ansi_sql;
 mod generic_sql;
 pub mod keywords;
diff --git a/src/dialect/mssql.rs b/src/dialect/mssql.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use crate::dialect::Dialect;
 
 #[derive(Debug)]
diff --git a/src/dialect/postgresql.rs b/src/dialect/postgresql.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use crate::dialect::Dialect;
 
 #[derive(Debug)]
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,3 @@
-// Copyright 2018 Grove Enterprises LLC
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/src/sqlast/mod.rs b/src/sqlast/mod.rs
@@ -1,5 +1,3 @@
-// Copyright 2018 Grove Enterprises LLC
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/src/sqlast/query.rs b/src/sqlast/query.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use super::*;
 
 /// The most complete variant of a `SELECT` query expression, optionally
diff --git a/src/sqlast/sql_operator.rs b/src/sqlast/sql_operator.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /// SQL Operator
 #[derive(Debug, Clone, PartialEq, Hash)]
 pub enum SQLOperator {
diff --git a/src/sqlast/sqltype.rs b/src/sqlast/sqltype.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use super::SQLObjectName;
 
 /// SQL data types
diff --git a/src/sqlast/table_key.rs b/src/sqlast/table_key.rs
@@ -0,0 +1,73 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::{SQLIdent, SQLObjectName};
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum AlterOperation {
+    AddConstraint(TableKey),
+    RemoveConstraint { name: SQLIdent },
+}
+
+impl ToString for AlterOperation {
+    fn to_string(&self) -> String {
+        match self {
+            AlterOperation::AddConstraint(table_key) => {
+                format!("ADD CONSTRAINT {}", table_key.to_string())
+            }
+            AlterOperation::RemoveConstraint { name } => format!("REMOVE CONSTRAINT {}", name),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct Key {
+    pub name: SQLIdent,
+    pub columns: Vec<SQLIdent>,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum TableKey {
+    PrimaryKey(Key),
+    UniqueKey(Key),
+    Key(Key),
+    ForeignKey {
+        key: Key,
+        foreign_table: SQLObjectName,
+        referred_columns: Vec<SQLIdent>,
+    },
+}
+
+impl ToString for TableKey {
+    fn to_string(&self) -> String {
+        match self {
+            TableKey::PrimaryKey(ref key) => {
+                format!("{} PRIMARY KEY ({})", key.name, key.columns.join(", "))
+            }
+            TableKey::UniqueKey(ref key) => {
+                format!("{} UNIQUE KEY ({})", key.name, key.columns.join(", "))
+            }
+            TableKey::Key(ref key) => format!("{} KEY ({})", key.name, key.columns.join(", ")),
+            TableKey::ForeignKey {
+                key,
+                foreign_table,
+                referred_columns,
+            } => format!(
+                "{} FOREIGN KEY ({}) REFERENCES {}({})",
+                key.name,
+                key.columns.join(", "),
+                foreign_table.to_string(),
+                referred_columns.join(", ")
+            ),
+        }
+    }
+}
diff --git a/src/sqlast/value.rs b/src/sqlast/value.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use ordered_float::OrderedFloat;
 
 /// Primitive SQL values such as number and string
diff --git a/src/sqlparser.rs b/src/sqlparser.rs
@@ -1,5 +1,3 @@
-// Copyright 2018 Grove Enterprises LLC
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/src/sqltokenizer.rs b/src/sqltokenizer.rs
@@ -1,5 +1,3 @@
-// Copyright 2018 Grove Enterprises LLC
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/src/test_utils.rs b/src/test_utils.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use std::fmt::Debug;
 
 use super::dialect::*;
diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #![warn(clippy::all)]
 //! Test SQL syntax, which all sqlparser dialects must parse in the same way.
 //!
diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #![warn(clippy::all)]
 //! Test SQL syntax specific to Microsoft's T-SQL. The parser based on the
 //! generic dialect is also tested (on the inputs it can handle).
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #![warn(clippy::all)]
 //! Test SQL syntax specific to PostgreSQL. The parser based on the
 //! generic dialect is also tested (on the inputs it can handle).

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# We use rustfmt's default settings to format the source code`
	`1`	`+# We use rustfmt's default settings to format the source code`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// Copyright 2018 Grove Enterprises LLC`
`2`		`-//`
`3`	`1`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`2`	`// you may not use this file except in compliance with the License.`
`5`	`3`	`// You may obtain a copy of the License at`