diff --git a/api/api-javascript/api-database/src/main/resources/db/dao.js b/api/api-javascript/api-database/src/main/resources/db/dao.js
index f591483fd7c..1704615e409 100644
--- a/api/api-javascript/api-database/src/main/resources/db/dao.js
+++ b/api/api-javascript/api-database/src/main/resources/db/dao.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/database.js b/api/api-javascript/api-database/src/main/resources/db/database.js
index b4f911124c4..7827733ca76 100644
--- a/api/api-javascript/api-database/src/main/resources/db/database.js
+++ b/api/api-javascript/api-database/src/main/resources/db/database.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var database = require('db/v4/database');
diff --git a/api/api-javascript/api-database/src/main/resources/db/extensions/modules.js b/api/api-javascript/api-database/src/main/resources/db/extensions/modules.js
index c01776bacc6..634340dfe5c 100644
--- a/api/api-javascript/api-database/src/main/resources/db/extensions/modules.js
+++ b/api/api-javascript/api-database/src/main/resources/db/extensions/modules.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 exports.getContent = function() {
diff --git a/api/api-javascript/api-database/src/main/resources/db/modules.js b/api/api-javascript/api-database/src/main/resources/db/modules.js
index 1de72dec719..50f691f8f90 100644
--- a/api/api-javascript/api-database/src/main/resources/db/modules.js
+++ b/api/api-javascript/api-database/src/main/resources/db/modules.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 exports.getDatabase = function() {
diff --git a/api/api-javascript/api-database/src/main/resources/db/orm.js b/api/api-javascript/api-database/src/main/resources/db/orm.js
index b5231be7529..22199f912f5 100644
--- a/api/api-javascript/api-database/src/main/resources/db/orm.js
+++ b/api/api-javascript/api-database/src/main/resources/db/orm.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/ormstatements.js b/api/api-javascript/api-database/src/main/resources/db/ormstatements.js
index 89c511a9c5c..25d43d20741 100644
--- a/api/api-javascript/api-database/src/main/resources/db/ormstatements.js
+++ b/api/api-javascript/api-database/src/main/resources/db/ormstatements.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/query.js b/api/api-javascript/api-database/src/main/resources/db/query.js
index 9c4646cfe10..fe5eedefefe 100644
--- a/api/api-javascript/api-database/src/main/resources/db/query.js
+++ b/api/api-javascript/api-database/src/main/resources/db/query.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var query = require('db/v4/query');
diff --git a/api/api-javascript/api-database/src/main/resources/db/sequence.js b/api/api-javascript/api-database/src/main/resources/db/sequence.js
index 58c22c3c118..8d626ad193c 100644
--- a/api/api-javascript/api-database/src/main/resources/db/sequence.js
+++ b/api/api-javascript/api-database/src/main/resources/db/sequence.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var sequence = require('db/v4/sequence');
diff --git a/api/api-javascript/api-database/src/main/resources/db/sql.js b/api/api-javascript/api-database/src/main/resources/db/sql.js
index 4b73ef03105..f68bc7e7e98 100644
--- a/api/api-javascript/api-database/src/main/resources/db/sql.js
+++ b/api/api-javascript/api-database/src/main/resources/db/sql.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var sql = require('db/v4/sql');
diff --git a/api/api-javascript/api-database/src/main/resources/db/update.js b/api/api-javascript/api-database/src/main/resources/db/update.js
index d4b32a8ada9..600ce966f71 100644
--- a/api/api-javascript/api-database/src/main/resources/db/update.js
+++ b/api/api-javascript/api-database/src/main/resources/db/update.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var update = require('db/v4/update');
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/dao.js b/api/api-javascript/api-database/src/main/resources/db/v3/dao.js
index 696491d1985..0ac167c9a61 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/dao.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/dao.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/database.js b/api/api-javascript/api-database/src/main/resources/db/v3/database.js
index 0b429efb9d0..418ccad82ef 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/database.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/database.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var java = require('core/v3/java');
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/orm.js b/api/api-javascript/api-database/src/main/resources/db/v3/orm.js
index b3862bd6535..35bfa553a10 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/orm.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/orm.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/ormstatements.js b/api/api-javascript/api-database/src/main/resources/db/v3/ormstatements.js
index fcbca7ce918..52b5e0eea16 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/ormstatements.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/ormstatements.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/query.js b/api/api-javascript/api-database/src/main/resources/db/v3/query.js
index 727d54c7f87..d4acf5132bc 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/query.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/query.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var java = require('core/v3/java');
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/sequence.js b/api/api-javascript/api-database/src/main/resources/db/v3/sequence.js
index f9a83b06f0f..854821f49f0 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/sequence.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/sequence.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var java = require('core/v3/java');
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/sql.js b/api/api-javascript/api-database/src/main/resources/db/v3/sql.js
index 5f02c99a3ac..a8d37316f43 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/sql.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/sql.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var java = require('core/v3/java');
diff --git a/api/api-javascript/api-database/src/main/resources/db/v3/update.js b/api/api-javascript/api-database/src/main/resources/db/v3/update.js
index a306a419a30..5e48154c0a2 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v3/update.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v3/update.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 var java = require('core/v3/java');
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/dao.js b/api/api-javascript/api-database/src/main/resources/db/v4/dao.js
index b31cf5e6912..8cfcee5ec13 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/dao.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/dao.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/database.js b/api/api-javascript/api-database/src/main/resources/db/v4/database.js
index 8602d7cbf03..e00553c1cd6 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/database.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/database.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 /**
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/orm.js b/api/api-javascript/api-database/src/main/resources/db/v4/orm.js
index 2ec0f1669ef..ec7e15f9cc6 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/orm.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/orm.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/ormstatements.js b/api/api-javascript/api-database/src/main/resources/db/v4/ormstatements.js
index efcbcbd992d..985d8301152 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/ormstatements.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/ormstatements.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 "use strict";
@@ -18,13 +18,6 @@ var ORMStatements = function(orm, dialect){
 	this.orm.properties.forEach(function(property) {
 		property.columnName = property.column;
 	});
-	let isCaseSensitive = require("core/v4/configurations").get("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE");
-	if (isCaseSensitive) {
-		this.orm.table = "\"" + this.orm.table + "\"";
-		this.orm.properties.forEach(function(property) {
-			property.column = "\"" + property.column + "\"" ;
-		});
-	};
 	this.dialect = dialect || require('db/v4/sql').getDialect();
 };
 ORMStatements.prototype.constructor = ORMStatements;
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/query.js b/api/api-javascript/api-database/src/main/resources/db/v4/query.js
index 4f0e8770996..d7e593984f0 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/query.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/query.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 /**
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/sequence.js b/api/api-javascript/api-database/src/main/resources/db/v4/sequence.js
index 80730af2329..36a8d644d13 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/sequence.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/sequence.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 /**
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/sql.js b/api/api-javascript/api-database/src/main/resources/db/v4/sql.js
index 2e54287ba1c..5c932977f23 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/sql.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/sql.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 /**
diff --git a/api/api-javascript/api-database/src/main/resources/db/v4/update.js b/api/api-javascript/api-database/src/main/resources/db/v4/update.js
index 28a113f7acb..2568e2335e2 100644
--- a/api/api-javascript/api-database/src/main/resources/db/v4/update.js
+++ b/api/api-javascript/api-database/src/main/resources/db/v4/update.js
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 /**
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/AbstractSqlBuilder.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/AbstractSqlBuilder.java
index 2a4928fb398..1b6196f39ea 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/AbstractSqlBuilder.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/AbstractSqlBuilder.java
@@ -120,7 +120,7 @@ protected String encapsulateMany(String line) {
 		String[] words = line.split(regex);
 		Set<Set> functionsNames = getDialect().getFunctionsNames();
 		for (String word : words) {
-			if (isNumeric(word)) {
+			if (isNumeric(word) || isValue(word)) {
 				continue;
 			}
 			if (!"".equals(word.trim())
@@ -144,4 +144,11 @@ protected boolean isNumeric(String s) {
 	    }
 	    return numericPattern.matcher(s).matches();
 	}
+
+	protected boolean isValue(String s) {
+		if (s == null) {
+			return false;
+		}
+		return s.startsWith("'") || s.endsWith("'");
+	}
 }
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/records/DeleteBuilder.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/records/DeleteBuilder.java
index 40cd09222ad..85978b52aea 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/records/DeleteBuilder.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/builders/records/DeleteBuilder.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.builders.records;
@@ -98,7 +98,7 @@ public String generate() {
 	 */
 	protected void generateTable(StringBuilder sql) {
 		String tableName = (isCaseSensitive()) ? encapsulate(this.getTable()) : this.getTable();
-		sql.append(SPACE).append(KEYWORD_FROM).append(SPACE).append(this.table);
+		sql.append(SPACE).append(KEYWORD_FROM).append(SPACE).append(tableName);
 	}
 
 	/**
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/DefaultSqlDialect.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/DefaultSqlDialect.java
index 3f85b1993e5..57c3853a353 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/DefaultSqlDialect.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/DefaultSqlDialect.java
@@ -203,6 +203,7 @@ public class DefaultSqlDialect<SELECT extends SelectBuilder, INSERT extends Inse
 			"version",
 			
 			"and",
+			"or",
 			"between",
 			"binary",
 			"case",
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/h2/H2SqlDialect.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/h2/H2SqlDialect.java
index cadf00cd0ef..b9810c321e3 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/h2/H2SqlDialect.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/h2/H2SqlDialect.java
@@ -202,6 +202,7 @@ public class H2SqlDialect extends
 			"any",
 			"count",
 			
+			
 			"stddev_pop",
 			"stddev_samp",
 			"var_pop",
@@ -222,8 +223,22 @@ public class H2SqlDialect extends
 			"mode",
 			"json",
 			"json_objectagg",
-			"json_arrayagg"
+			"json_arrayagg",
 			
+			"and",
+			"or",
+			"between",
+			"binary",
+			"case",
+			"div",
+			"in",
+			"is",
+			"not",
+			"null",
+			"like",
+			"rlike",
+			"xor"
+
 			})));
 	
 	/*
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaSqlDialect.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaSqlDialect.java
index bac830ca1c3..8a55567fb9c 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaSqlDialect.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/hana/HanaSqlDialect.java
@@ -252,6 +252,7 @@ public class HanaSqlDialect extends
 			"max",
 			
 			"and",
+			"or",
 			"between",
 			"binary",
 			"case",
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/mysql/MySQLSqlDialect.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/mysql/MySQLSqlDialect.java
index d444f6fe3a2..1a4c74cbd72 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/mysql/MySQLSqlDialect.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/mysql/MySQLSqlDialect.java
@@ -257,6 +257,7 @@ public class MySQLSqlDialect extends
 			"md5",
 			"member",
 			"of",
+			"or",
 			"microsecond",
 			"mid",
 			"min",
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/postgres/PostgresSqlDialect.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/postgres/PostgresSqlDialect.java
index fac81bc6a3c..43ac0db2752 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/postgres/PostgresSqlDialect.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/postgres/PostgresSqlDialect.java
@@ -74,6 +74,7 @@ public class PostgresSqlDialect extends
 			"max",
 			
 			"and",
+			"or",
 			"between",
 			"binary",
 			"case",
@@ -341,13 +342,19 @@ public String getDataTypeName(DataType dataType) {
 	 */
 	@Override
 	public boolean exists(Connection connection, String table) throws SQLException {
+		boolean exists = false;
+		ResultSet resultSet = null;
+
 		table = normalizeTableName(table);
 		DatabaseMetaData metadata = connection.getMetaData();
-		ResultSet resultSet = metadata.getTables(null, null, DefaultSqlDialect.normalizeTableName(table.toLowerCase()), ISqlKeywords.METADATA_TABLE_TYPES.toArray(new String[] {}));
-		if (resultSet.next()) {
-			return true;
+
+		resultSet = metadata.getTables(null, null, DefaultSqlDialect.normalizeTableName(table), ISqlKeywords.METADATA_TABLE_TYPES.toArray(new String[] {}));
+		exists = resultSet != null && resultSet.next();
+		if (!exists) {
+			resultSet = metadata.getTables(null, null, DefaultSqlDialect.normalizeTableName(table.toLowerCase()), ISqlKeywords.METADATA_TABLE_TYPES.toArray(new String[] {}));
+			exists = resultSet != null && resultSet.next();
 		}
-		return false;
+		return exists;
 	}
 
 	/*
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/sybase/SybaseSqlDialect.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/sybase/SybaseSqlDialect.java
index e8b0ccd448b..00d74255a6b 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/sybase/SybaseSqlDialect.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/dialects/sybase/SybaseSqlDialect.java
@@ -267,8 +267,22 @@ public class SybaseSqlDialect extends
 			"width_bucket",
 			"year",
 			"years",
-			"ymd"
-			
+			"ymd",
+
+			"and",
+			"or",
+			"between",
+			"binary",
+			"case",
+			"div",
+			"in",
+			"is",
+			"not",
+			"null",
+			"like",
+			"rlike",
+			"xor"
+
 			})));
 
 	/*
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateTableTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateTableTest.java
index 3a33dbe2ded..f0fac25662f 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateTableTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateTableTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.DataType;
 import org.eclipse.dirigible.database.sql.Modifiers;
 import org.eclipse.dirigible.database.sql.SqlFactory;
@@ -41,6 +42,28 @@ public void createTableGeneric() {
 				sql);
 	}
 
+	/**
+	 * Creates the table case sensitive generic.
+	 */
+	@Test
+	public void createTableCaseSensitiveGeneric() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault().create()
+					.table("CUSTOMERS")
+					.column("ID", DataType.INTEGER, Modifiers.PRIMARY_KEY, Modifiers.NOT_NULL, Modifiers.NON_UNIQUE)
+					.column("FIRST_NAME", DataType.VARCHAR, Modifiers.REGULAR, Modifiers.NOT_NULL, Modifiers.UNIQUE, "(20)")
+					.column("LAST_NAME", DataType.VARCHAR, Modifiers.REGULAR, Modifiers.NULLABLE, Modifiers.NON_UNIQUE, "(30)")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("CREATE TABLE \"CUSTOMERS\" ( \"ID\" INTEGER NOT NULL PRIMARY KEY , \"FIRST_NAME\" VARCHAR (20) NOT NULL UNIQUE , \"LAST_NAME\" VARCHAR (30) )",
+					sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
+
 	/**
 	 * Creates the table type safe.
 	 */
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateViewTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateViewTest.java
index 8c5edd08785..8877e1019f1 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateViewTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/CreateViewTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.SqlFactory;
 import org.junit.Test;
 
@@ -41,4 +42,26 @@ public void createViewAsSelect() {
 		assertEquals("CREATE VIEW CUSTOMERS_VIEW ( ID , FIRST_NAME , LAST_NAME ) AS SELECT * FROM CUSTOMERS", sql);
 	}
 
+	/**
+	 * Creates the view as select case sensitive.
+	 */
+	@Test
+	public void createViewAsSelectCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.create().view("CUSTOMERS_VIEW")
+					.column("ID")
+					.column("FIRST_NAME")
+					.column("LAST_NAME")
+					.asSelect(SqlFactory.getDefault().select().column("*").from("CUSTOMERS").build())
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("CREATE VIEW \"CUSTOMERS_VIEW\" ( \"ID\" , \"FIRST_NAME\" , \"LAST_NAME\" ) AS SELECT * FROM \"CUSTOMERS\"", sql);
+			
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 }
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DeleteTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DeleteTest.java
index 4f52c50a0f8..58aedf51bec 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DeleteTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DeleteTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.SqlFactory;
 import org.junit.Test;
 
@@ -53,4 +54,23 @@ public void deleteWhere() {
 			assertEquals("DELETE FROM CUSTOMERS WHERE (AGE > ?) AND (COMPANY = 'SAP')", sql);
 	}
 
+	/**
+	 * Select column and where clause in case sensitive mode
+	 */
+	@Test
+	public void deleteWehereWithSpecialCharsCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+				.delete()
+				.from("CUSTOMERS")
+				.where("PRICE_BASIC1$ LIKE ?")
+				.build();
+			
+			assertNotNull(sql);
+			assertEquals("DELETE FROM \"CUSTOMERS\" WHERE (\"PRICE_BASIC1$\" LIKE ?)", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 }
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropTableTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropTableTest.java
index f7294618d92..32e05db4686 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropTableTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropTableTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.SqlFactory;
 import org.junit.Test;
 
@@ -36,6 +37,23 @@ public void dropTable() {
 		assertNotNull(sql);
 		assertEquals("DROP TABLE CUSTOMERS", sql);
 	}
-	
-	
+
+	/**
+	 * Drop table case sensitive.
+	 */
+	@Test
+	public void dropTableCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.drop()
+					.table("CUSTOMERS")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("DROP TABLE \"CUSTOMERS\"", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 }
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropViewTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropViewTest.java
index d5c29b80bd8..4ee47cdfdb2 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropViewTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/DropViewTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.SqlFactory;
 import org.junit.Test;
 
@@ -34,4 +35,19 @@ public void dropTable() {
 		assertEquals("DROP VIEW CUSTOMERS_VIEW", sql);
 	}
 
+	/**
+	 * Drop table case sensitive.
+	 */
+	@Test
+	public void dropTableCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault().drop().view("CUSTOMERS_VIEW").build();
+			
+			assertNotNull(sql);
+			assertEquals("DROP VIEW \"CUSTOMERS_VIEW\"", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 }
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/InsertTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/InsertTest.java
index 9e5b88c90e3..70ff84b8f39 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/InsertTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/InsertTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.SqlFactory;
 import org.junit.Test;
 
@@ -38,6 +39,27 @@ public void insertSimple() {
 		assertNotNull(sql);
 		assertEquals("INSERT INTO CUSTOMERS (FIRST_NAME, LAST_NAME) VALUES (?, ?)", sql);
 	}
+
+	/**
+	 * Insert simple case sensitive.
+	 */
+	@Test
+	public void insertSimpleCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.insert()
+					.into("CUSTOMERS")
+					.column("FIRST_NAME")
+					.column("LAST_NAME")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("INSERT INTO \"CUSTOMERS\" (\"FIRST_NAME\", \"LAST_NAME\") VALUES (?, ?)", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 	
 	/**
 	 * Insert values.
@@ -56,7 +78,31 @@ public void insertValues() {
 		assertNotNull(sql);
 		assertEquals("INSERT INTO CUSTOMERS (FIRST_NAME, LAST_NAME) VALUES (?, 'Smith')", sql);
 	}
-	
+
+
+	/**
+	 * Insert values case sensitive.
+	 */
+	@Test
+	public void insertValuesCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.insert()
+					.into("CUSTOMERS")
+					.column("FIRST_NAME")
+					.column("LAST_NAME")
+					.value("?")
+					.value("'Smith'")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("INSERT INTO \"CUSTOMERS\" (\"FIRST_NAME\", \"LAST_NAME\") VALUES (?, 'Smith')", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
+
 	/**
 	 * Insert select.
 	 */
@@ -74,4 +120,25 @@ public void insertSelect() {
 		assertEquals("INSERT INTO CUSTOMERS (FIRST_NAME, LAST_NAME) SELECT * FROM SUPPLIERS", sql);
 	}
 
+	/**
+	 * Insert select case sensitive.
+	 */
+	@Test
+	public void insertSelectCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.insert()
+					.into("CUSTOMERS")
+					.column("FIRST_NAME")
+					.column("LAST_NAME")
+					.select(SqlFactory.getDefault().select().column("*").from("SUPPLIERS").build())
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("INSERT INTO \"CUSTOMERS\" (\"FIRST_NAME\", \"LAST_NAME\") SELECT * FROM \"SUPPLIERS\"", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 }
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/SequenceTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/SequenceTest.java
index d3e630d2b14..253e2fe6206 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/SequenceTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/SequenceTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.SqlFactory;
 import org.junit.Test;
 
@@ -36,7 +37,26 @@ public void createSequence() {
 		assertNotNull(sql);
 		assertEquals("CREATE SEQUENCE CUSTOMERS_SEQUENCE", sql);
 	}
-	
+
+	/**
+	 * Creates the sequence case sensitive.
+	 */
+	@Test
+	public void createSequenceCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.create()
+					.sequence("CUSTOMERS_SEQUENCE")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("CREATE SEQUENCE \"CUSTOMERS_SEQUENCE\"", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
+
 	/**
 	 * Drop sequnce.
 	 */
@@ -50,7 +70,26 @@ public void dropSequnce() {
 		assertNotNull(sql);
 		assertEquals("DROP SEQUENCE CUSTOMERS_SEQUENCE", sql);
 	}
-	
+
+	/**
+	 * Drop sequnce case sensitive.
+	 */
+	@Test
+	public void dropSequnceCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.drop()
+					.sequence("CUSTOMERS_SEQUENCE")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("DROP SEQUENCE \"CUSTOMERS_SEQUENCE\"", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
+
 	/**
 	 * Nextval sequnce.
 	 */
@@ -64,4 +103,21 @@ public void nextvalSequnce() {
 		assertEquals("SELECT NEXT VALUE FOR CUSTOMERS_SEQUENCE", sql);
 	}
 
+	/**
+	 * Nextval sequnce case sensitive.
+	 */
+	@Test
+	public void nextvalSequnceCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.nextval("CUSTOMERS_SEQUENCE")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("SELECT NEXT VALUE FOR \"CUSTOMERS_SEQUENCE\"", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 }
diff --git a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/UpdateTest.java b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/UpdateTest.java
index 6c4b2fb072c..ef772a6f8dd 100644
--- a/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/UpdateTest.java
+++ b/modules/database/database-sql/src/test/java/org/eclipse/dirigible/database/sql/test/UpdateTest.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * Copyright (c) 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v20.html
  *
- * SPDX-FileCopyrightText: 2010-2020 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-FileCopyrightText: 2010-2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.dirigible.database.sql.test;
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.eclipse.dirigible.commons.config.Configuration;
 import org.eclipse.dirigible.database.sql.SqlFactory;
 import org.junit.Test;
 
@@ -38,6 +39,27 @@ public void updateSimple() {
 		assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John'", sql);
 	}
 
+	
+	/**
+	 * Update simple case sensitive.
+	 */
+	@Test
+	public void updateSimpleCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.update()
+					.table("CUSTOMERS")
+					.set("FIRST_NAME", "'John'")
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("UPDATE \"CUSTOMERS\" SET \"FIRST_NAME\" = 'John'", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
+
 	/**
 	 * Update values.
 	 */
@@ -50,10 +72,31 @@ public void updateValues() {
 				.set("LAST_NAME", "'Smith'")
 				.build();
 			
+		assertNotNull(sql);
+		assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', LAST_NAME = 'Smith'", sql);
+	}
+
+	/**
+	 * Update values case sensitive.
+	 */
+	@Test
+	public void updateValuesCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.update()
+					.table("CUSTOMERS")
+					.set("FIRST_NAME", "'John'")
+					.set("LAST_NAME", "'Smith'")
+					.build();
+			
 			assertNotNull(sql);
-			assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', LAST_NAME = 'Smith'", sql);
+			assertEquals("UPDATE \"CUSTOMERS\" SET \"FIRST_NAME\" = 'John', \"LAST_NAME\" = 'Smith'", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
 	}
-	
+
 	/**
 	 * Update where.
 	 */
@@ -68,8 +111,31 @@ public void updateWhere() {
 				.where("COMPANY = 'SAP'")
 				.build();
 			
+		assertNotNull(sql);
+		assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', LAST_NAME = 'Smith' WHERE (AGE > ?) AND (COMPANY = 'SAP')", sql);
+	}
+
+	/**
+	 * Update where case sensitive.
+	 */
+	@Test
+	public void updateWhereCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.update()
+					.table("CUSTOMERS")
+					.set("FIRST_NAME", "'John'")
+					.set("LAST_NAME", "'Smith'")
+					.where("AGE > ?")
+					.where("COMPANY = 'SAP'")
+					.build();
+			
 			assertNotNull(sql);
-			assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', LAST_NAME = 'Smith' WHERE (AGE > ?) AND (COMPANY = 'SAP')", sql);
+			assertEquals("UPDATE \"CUSTOMERS\" SET \"FIRST_NAME\" = 'John', \"LAST_NAME\" = 'Smith' WHERE (\"AGE\" > ?) AND (\"COMPANY\" = 'SAP')", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
 	}
 
 	/**
@@ -85,8 +151,30 @@ public void updateWhereSelect() {
 				.where("COMPANY = 'SAP'")
 				.build();
 			
+		assertNotNull(sql);
+		assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', SALARY = SELECT MAX(SALARY) FROM BENEFITS WHERE (COMPANY = 'SAP')", sql);
+	}
+
+	/**
+	 * Update where select case sensitive.
+	 */
+	@Test
+	public void updateWhereSelectCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.update()
+					.table("CUSTOMERS")
+					.set("FIRST_NAME", "'John'")
+					.set("SALARY", SqlFactory.getDefault().select().column("MAX(SALARY)").from("BENEFITS").build())
+					.where("COMPANY = 'SAP'")
+					.build();
+			
 			assertNotNull(sql);
-			assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', SALARY = SELECT MAX(SALARY) FROM BENEFITS WHERE (COMPANY = 'SAP')", sql);
+			assertEquals("UPDATE \"CUSTOMERS\" SET \"FIRST_NAME\" = 'John', \"SALARY\" = SELECT MAX(\"SALARY\") FROM \"BENEFITS\" WHERE (\"COMPANY\" = 'SAP')", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
 	}
 
 	/**
@@ -102,8 +190,29 @@ public void updateWhereExpr() {
 				.where(SqlFactory.getDefault().expression().and("PRICE > ?").or("AMOUNT < ?").and("COMPANY = 'SAP'").build())
 				.build();
 			
-			assertNotNull(sql);
-			assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', LAST_NAME = 'Smith' WHERE (PRICE > ? OR AMOUNT < ? AND COMPANY = 'SAP')", sql);
+		assertNotNull(sql);
+		assertEquals("UPDATE CUSTOMERS SET FIRST_NAME = 'John', LAST_NAME = 'Smith' WHERE (PRICE > ? OR AMOUNT < ? AND COMPANY = 'SAP')", sql);
 	}
 
+	/**
+	 * Update where expr case sensitive.
+	 */
+	@Test
+	public void updateWhereExprCaseSensitive() {
+		Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "true");
+		try {
+			String sql = SqlFactory.getDefault()
+					.update()
+					.table("CUSTOMERS")
+					.set("FIRST_NAME", "'John'")
+					.set("LAST_NAME", "'Smith'")
+					.where(SqlFactory.getDefault().expression().and("PRICE > ?").or("AMOUNT < ?").and("COMPANY = 'SAP'").build())
+					.build();
+			
+			assertNotNull(sql);
+			assertEquals("UPDATE \"CUSTOMERS\" SET \"FIRST_NAME\" = 'John', \"LAST_NAME\" = 'Smith' WHERE (\"PRICE\" > ? OR \"AMOUNT\" < ? AND \"COMPANY\" = 'SAP')", sql);
+		} finally {
+			Configuration.set("DIRIGIBLE_DATABASE_NAMES_CASE_SENSITIVE", "false");
+		}
+	}
 }