empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From der...@apache.org
Subject empire-db git commit: EMPIREDB-264 MySQL Keywords: fixed test
Date Fri, 13 Oct 2017 10:30:13 GMT
Repository: empire-db
Updated Branches:
  refs/heads/master 7f35a3514 -> 13c6dad6b


EMPIREDB-264 MySQL Keywords: fixed test

Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/13c6dad6
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/13c6dad6
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/13c6dad6

Branch: refs/heads/master
Commit: 13c6dad6b74546525013e498a70962232e5f6dd8
Parents: 7f35a35
Author: Jan Glaubitz <jan@glaubitz.org>
Authored: Fri Oct 13 12:29:04 2017 +0200
Committer: Jan Glaubitz <jan@glaubitz.org>
Committed: Fri Oct 13 12:29:04 2017 +0200

----------------------------------------------------------------------
 .../db/mysql/DBDatabaseDriverMySQLTest.java     | 220 +++++++++----------
 1 file changed, 110 insertions(+), 110 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/empire-db/blob/13c6dad6/empire-db/src/test/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQLTest.java
----------------------------------------------------------------------
diff --git a/empire-db/src/test/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQLTest.java
b/empire-db/src/test/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQLTest.java
index 5d39f38..60b7458 100644
--- a/empire-db/src/test/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQLTest.java
+++ b/empire-db/src/test/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQLTest.java
@@ -1,110 +1,110 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.empire.db.mysql;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.empire.data.DataType;
-import org.apache.empire.db.CompanyDB;
-import org.apache.empire.db.CompanyDB.Departments;
-import org.apache.empire.db.DBCommand;
-import org.apache.empire.db.DBDatabaseDriver;
-import org.junit.Test;
-
-public class DBDatabaseDriverMySQLTest {
-	
-	@Test
-	public void appendSQLTextValue()
-	{
-
-        CompanyDB db = new CompanyDB();
-        DBDatabaseDriver driver = new DBDatabaseDriverMySQL();
-        db.open(driver, null);
-
-        Departments TD = db.DEPARTMENT;
-        
-		DBCommand cmd = db.createCommand();
-
-		// Test 1
-		cmd.select(TD.count());
-		cmd.where(TD.NAME.is("\\LCI\\"));
-		assertTrue(cmd.getSelect().endsWith(("NAME='\\\\LCI\\\\'"))); // Must be double escaped
-		
-		cmd = db.createCommand();
-
-		// Test 2
-		cmd.select(TD.count());
-		cmd.where(TD.NAME.is("'"));
-		assertTrue(cmd.getSelect().contains("NAME=''''"));
-
-		cmd = db.createCommand();
-		
-		// \ and '
-		cmd.select(TD.count());
-		cmd.where(TD.NAME.is("Tarkk\\'ampujankatu"));
-		assertTrue(cmd.getSelect().contains("NAME='Tarkk\\\\''ampujankatu'"));
-		
-	}
-	
-	@Test
-	public void testGetConvertPhrase()
-	{
-		
-        DBDatabaseDriver driver = new DBDatabaseDriverMySQL();
-
-        // BOOL
-        assertEquals("CAST(? AS UNSIGNED)", driver.getConvertPhrase(DataType.BOOL, null,
null));
-        assertEquals("CAST(? AS UNSIGNED)", driver.getConvertPhrase(DataType.BOOL, null,
"test"));
-        
-        // INTEGER
-        assertEquals("CAST(? AS SIGNED)", driver.getConvertPhrase(DataType.INTEGER, null,
null));
-        assertEquals("CAST(? AS SIGNED)", driver.getConvertPhrase(DataType.INTEGER, null,
"test"));
-
-        // DECIMAL
-        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.DECIMAL, null,
null));
-        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.DECIMAL, null,
"test"));
-        
-        // FLOAT
-        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.FLOAT, null,
null));
-        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.FLOAT, null,
"test"));
-        
-        // DATE
-        assertEquals("CAST(? AS DATE)", driver.getConvertPhrase(DataType.DATE, null, null));
-        assertEquals("CAST(? AS DATE)", driver.getConvertPhrase(DataType.DATE, null, "test"));
-        
-        // DATETIME
-        assertEquals("CAST(? AS DATETIME)", driver.getConvertPhrase(DataType.DATETIME, null,
null));
-        assertEquals("CAST(? AS DATETIME)", driver.getConvertPhrase(DataType.DATETIME, null,
"test"));
-        
-        // TEXT
-        assertEquals("CAST(? AS CHAR CHARACTER SET cp1250)", driver.getConvertPhrase(DataType.TEXT,
null, "CHARACTER SET cp1250"));
-        assertEquals("CAST(? AS CHAR)", driver.getConvertPhrase(DataType.TEXT, null, null));
-        
-        // BLOB
-        assertEquals("CAST(? AS BLOB)", driver.getConvertPhrase(DataType.BLOB, null, null));
-        assertEquals("CAST(? AS BLOB)", driver.getConvertPhrase(DataType.BLOB, null, "test"));
-        
-     // Unknown Type
-        assertEquals("?", driver.getConvertPhrase(DataType.AUTOINC, null, null));
-        assertEquals("?", driver.getConvertPhrase(DataType.AUTOINC, null, "test"));
-        
-	}
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.empire.db.mysql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.empire.data.DataType;
+import org.apache.empire.db.CompanyDB;
+import org.apache.empire.db.CompanyDB.Departments;
+import org.apache.empire.db.DBCommand;
+import org.apache.empire.db.DBDatabaseDriver;
+import org.junit.Test;
+
+public class DBDatabaseDriverMySQLTest {
+	
+	@Test
+	public void appendSQLTextValue()
+	{
+
+        CompanyDB db = new CompanyDB();
+        DBDatabaseDriver driver = new DBDatabaseDriverMySQL();
+        db.open(driver, null);
+
+        Departments TD = db.DEPARTMENT;
+        
+		DBCommand cmd = db.createCommand();
+
+		// Test 1
+		cmd.select(TD.count());
+		cmd.where(TD.NAME.is("\\LCI\\"));
+		assertTrue(cmd.getSelect().endsWith(("`NAME`='\\\\LCI\\\\'"))); // Must be double escaped
+		
+		cmd = db.createCommand();
+
+		// Test 2
+		cmd.select(TD.count());
+		cmd.where(TD.NAME.is("'"));
+		assertTrue(cmd.getSelect().contains("`NAME`=''''"));
+
+		cmd = db.createCommand();
+		
+		// \ and '
+		cmd.select(TD.count());
+		cmd.where(TD.NAME.is("Tarkk\\'ampujankatu"));
+		assertTrue(cmd.getSelect().contains("`NAME`='Tarkk\\\\''ampujankatu'"));
+		
+	}
+	
+	@Test
+	public void testGetConvertPhrase()
+	{
+		
+        DBDatabaseDriver driver = new DBDatabaseDriverMySQL();
+
+        // BOOL
+        assertEquals("CAST(? AS UNSIGNED)", driver.getConvertPhrase(DataType.BOOL, null,
null));
+        assertEquals("CAST(? AS UNSIGNED)", driver.getConvertPhrase(DataType.BOOL, null,
"test"));
+        
+        // INTEGER
+        assertEquals("CAST(? AS SIGNED)", driver.getConvertPhrase(DataType.INTEGER, null,
null));
+        assertEquals("CAST(? AS SIGNED)", driver.getConvertPhrase(DataType.INTEGER, null,
"test"));
+
+        // DECIMAL
+        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.DECIMAL, null,
null));
+        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.DECIMAL, null,
"test"));
+        
+        // FLOAT
+        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.FLOAT, null,
null));
+        assertEquals("CAST(? AS DECIMAL)", driver.getConvertPhrase(DataType.FLOAT, null,
"test"));
+        
+        // DATE
+        assertEquals("CAST(? AS DATE)", driver.getConvertPhrase(DataType.DATE, null, null));
+        assertEquals("CAST(? AS DATE)", driver.getConvertPhrase(DataType.DATE, null, "test"));
+        
+        // DATETIME
+        assertEquals("CAST(? AS DATETIME)", driver.getConvertPhrase(DataType.DATETIME, null,
null));
+        assertEquals("CAST(? AS DATETIME)", driver.getConvertPhrase(DataType.DATETIME, null,
"test"));
+        
+        // TEXT
+        assertEquals("CAST(? AS CHAR CHARACTER SET cp1250)", driver.getConvertPhrase(DataType.TEXT,
null, "CHARACTER SET cp1250"));
+        assertEquals("CAST(? AS CHAR)", driver.getConvertPhrase(DataType.TEXT, null, null));
+        
+        // BLOB
+        assertEquals("CAST(? AS BLOB)", driver.getConvertPhrase(DataType.BLOB, null, null));
+        assertEquals("CAST(? AS BLOB)", driver.getConvertPhrase(DataType.BLOB, null, "test"));
+        
+     // Unknown Type
+        assertEquals("?", driver.getConvertPhrase(DataType.AUTOINC, null, null));
+        assertEquals("?", driver.getConvertPhrase(DataType.AUTOINC, null, "test"));
+        
+	}
+	
+}


Mime
View raw message