http://git-wip-us.apache.org/repos/asf/phoenix/blob/22e26dcc/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java index eb81ae3..64935d2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java @@ -57,7 +57,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT { props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10)); Connection conn = DriverManager.getConnection(getUrl(), props); conn.setAutoCommit(true); - PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + TestUtil.PTSDB_NAME + " (inst,host,date) VALUES(?,'b',CURRENT_DATE())"); + PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + TestUtil.PTSDB_NAME + " (inst,host,\"DATE\") VALUES(?,'b',CURRENT_DATE())"); stmt.setString(1, "a"); stmt.execute(); stmt.execute(); @@ -316,8 +316,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT { PreparedStatement stmt = null; try { conn = DriverManager.getConnection(getUrl(), props); - stmt = conn.prepareStatement("create table UpsertTimestamp (a integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))"); - stmt.execute(); + conn.createStatement().execute("create table UpsertTimestamp (a integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))"); } finally { closeStmtAndConn(stmt, conn); } @@ -357,8 +356,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT { PreparedStatement stmt = null; try { conn = DriverManager.getConnection(getUrl(), props); - stmt = conn.prepareStatement("create table UpsertTimestamp (a integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))"); - stmt.execute(); + conn.createStatement().execute("create table UpsertTimestamp (a integer NOT NULL, t timestamp NOT NULL CONSTRAINT pk PRIMARY KEY (a, t))"); } finally { closeStmtAndConn(stmt, conn); } @@ -455,8 +453,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT { PreparedStatement stmt = null; try { conn = DriverManager.getConnection(getUrl(), props); - stmt = conn.prepareStatement("create table UpsertFloat (k varchar primary key, v float)"); - stmt.execute(); + conn.createStatement().execute("create table UpsertFloat (k varchar primary key, v float)"); } finally { closeStmtAndConn(stmt, conn); } @@ -496,8 +493,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT { String tableName = BaseTest.generateUniqueName(); try { conn = DriverManager.getConnection(getUrl(), props); - pstmt = conn.prepareStatement("create table " + tableName + " (k varchar primary key, v integer)"); - pstmt.execute(); + conn.createStatement().execute("create table " + tableName + " (k varchar primary key, v integer)"); } finally { closeStmtAndConn(pstmt, conn); } @@ -587,8 +583,7 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT { PreparedStatement stmt = null; try { conn = DriverManager.getConnection(getUrl(), props); - stmt = conn.prepareStatement("create table UpsertTimestamp (k varchar, v unsigned_date not null, constraint pk primary key (k,v desc))"); - stmt.execute(); + conn.createStatement().execute("create table UpsertTimestamp (k varchar, v unsigned_date not null, constraint pk primary key (k,v desc))"); } finally { closeStmtAndConn(stmt, conn); } @@ -629,9 +624,8 @@ public class UpsertValuesIT extends BaseClientManagedTimeIT { PreparedStatement stmt = null; try { conn = DriverManager.getConnection(getUrl(), props); - stmt = conn.prepareStatement("create table UpsertDateVal (k varchar, v date not null, t timestamp" + + conn.createStatement().execute("create table UpsertDateVal (k varchar, v date not null, t timestamp" + ", tt time constraint pk primary key (k,v desc))"); - stmt.execute(); } finally { closeStmtAndConn(stmt, conn); }
http://git-wip-us.apache.org/repos/asf/phoenix/blob/22e26dcc/phoenix-core/src/test/java/org/apache/phoenix/compile/JoinQueryCompilerTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/JoinQueryCompilerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/JoinQueryCompilerTest.java index f62e716..8c1f536 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/compile/JoinQueryCompilerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/JoinQueryCompilerTest.java @@ -58,14 +58,14 @@ public class JoinQueryCompilerTest extends BaseConnectionlessQueryTest { " \"item_id\" varchar(10), " + " price integer, " + " quantity integer, " + - " date timestamp)"); + " \"date\" timestamp)"); conn.createStatement().execute("create table " + JOIN_CUSTOMER_TABLE_FULL_NAME + " (\"customer_id\" varchar(10) not null primary key, " + " name varchar, " + " phone varchar(12), " + " address varchar, " + " loc_id varchar(5), " + - " date date)"); + " \"date\" date)"); conn.createStatement().execute("create table " + JOIN_ITEM_TABLE_FULL_NAME + " (\"item_id\" varchar(10) not null primary key, " + " name varchar, " + @@ -86,7 +86,7 @@ public class JoinQueryCompilerTest extends BaseConnectionlessQueryTest { @Test public void testExplainPlan() throws Exception { Connection conn = DriverManager.getConnection(getUrl()); - String query = "EXPLAIN SELECT s.\"supplier_id\", \"order_id\", c.name, i.name, quantity, o.\"DATE\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o LEFT JOIN " + String query = "EXPLAIN SELECT s.\"supplier_id\", \"order_id\", c.name, i.name, quantity, o.\"date\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o LEFT JOIN " + JOIN_CUSTOMER_TABLE_FULL_NAME + " c ON o.\"customer_id\" = c.\"customer_id\" AND c.name LIKE 'C%' LEFT JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN " + JOIN_SUPPLIER_TABLE_FULL_NAME + " s ON s.\"supplier_id\" = i.\"supplier_id\" WHERE i.name LIKE 'T%'"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/22e26dcc/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java index 8daefc0..04cd93f 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java @@ -17,6 +17,8 @@ */ package org.apache.phoenix.compile; +import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA; +import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_STATS_TABLE; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.apache.phoenix.util.TestUtil.assertDegenerate; import static org.junit.Assert.assertArrayEquals; @@ -500,7 +502,7 @@ public class QueryCompilerTest extends BaseConnectionlessQueryTest { "SELECT count(1) FROM atable GROUP BY organization_id,substr(entity_id,1,3),entity_id", "SELECT count(1) FROM atable GROUP BY entity_id,organization_id", "SELECT count(1) FROM atable GROUP BY substr(entity_id,1,3),organization_id", - "SELECT count(1) FROM ptsdb GROUP BY host,inst,round(date,'HOUR')", + "SELECT count(1) FROM ptsdb GROUP BY host,inst,round(\"DATE\",'HOUR')", "SELECT count(1) FROM atable GROUP BY organization_id", }; List<Object> binds = Collections.emptyList(); @@ -1539,7 +1541,7 @@ public class QueryCompilerTest extends BaseConnectionlessQueryTest { try{ Statement statement = conn1.createStatement(); statement.execute("create table example (id integer not null,fn varchar," - + "ln varchar constraint pk primary key(id)) DEFAULT_COLUMN_FAMILY='F'"); + + "\"ln\" varchar constraint pk primary key(id)) DEFAULT_COLUMN_FAMILY='F'"); try { statement.execute("create local index my_idx on example (fn) DEFAULT_COLUMN_FAMILY='F'"); fail(); @@ -1701,7 +1703,7 @@ public class QueryCompilerTest extends BaseConnectionlessQueryTest { Integer.MAX_VALUE + "," + Long.MAX_VALUE + "," + (Integer.MAX_VALUE - 1) + "," + (Long.MAX_VALUE - 1) + "," + ((long)Integer.MAX_VALUE + 1) + "," + oneMoreThanMaxLong + - " FROM " + PhoenixDatabaseMetaData.SYSTEM_STATS_NAME + " LIMIT 1"; + " FROM " + "\""+ SYSTEM_CATALOG_SCHEMA + "\".\"" + SYSTEM_STATS_TABLE + "\"" + " LIMIT 1"; List<Object> binds = Collections.emptyList(); QueryPlan plan = getQueryPlan(query, binds); RowProjector p = plan.getProjector();
