You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/27 08:11:56 UTC
[13/39] cayenne git commit: fix procedure names
fix procedure names
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/177a25bd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/177a25bd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/177a25bd
Branch: refs/heads/CAY-1946_1
Commit: 177a25bd8f6ebb9323fa6918a4c1364f04ba8f35
Parents: 62d137c
Author: Savva Kolbechev <s....@gmail.com>
Authored: Fri Nov 21 14:58:27 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Fri Nov 21 14:58:27 2014 +0300
----------------------------------------------------------------------
.../cayenne/access/DataContextProcedureQueryIT.java | 8 ++++----
.../java/org/apache/cayenne/map/MapLoaderLoadTest.java | 2 +-
.../java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java | 2 +-
.../java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java | 4 ++--
.../java/org/apache/cayenne/unit/OracleUnitDbAdapter.java | 2 +-
.../org/apache/cayenne/unit/PostgresUnitDbAdapter.java | 2 +-
.../java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java | 4 ++--
cayenne-server/src/test/resources/testmap.map.xml | 10 +++++-----
8 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
index 423047b..d8e6b0b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
@@ -51,10 +51,10 @@ import static org.junit.Assert.assertTrue;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class DataContextProcedureQueryIT extends ServerCase {
- public static final String UPDATE_STORED_PROCEDURE = "cayenne_test_upd_proc";
- public static final String UPDATE_STORED_PROCEDURE_NOPARAM = "cayenne_test_upd_proc2";
- public static final String SELECT_STORED_PROCEDURE = "cayenne_test_select_proc";
- public static final String OUT_STORED_PROCEDURE = "cayenne_test_out_proc";
+ public static final String UPDATE_STORED_PROCEDURE = "cayenne_tst_upd_proc";
+ public static final String UPDATE_STORED_PROCEDURE_NOPARAM = "cayenne_tst_upd_proc2";
+ public static final String SELECT_STORED_PROCEDURE = "cayenne_tst_select_proc";
+ public static final String OUT_STORED_PROCEDURE = "cayenne_tst_out_proc";
@Inject
private DataContext context;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
index 4e078e6..de5053c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
@@ -95,7 +95,7 @@ public class MapLoaderLoadTest {
assertNotNull(map);
// test procedures
- Procedure procedure = map.getProcedure("cayenne_test_upd_proc");
+ Procedure procedure = map.getProcedure("cayenne_tst_upd_proc");
assertNotNull(procedure);
List<ProcedureParameter> params = procedure.getCallParameters();
assertNotNull(params);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
index 10ae06c..c78791f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
@@ -52,7 +52,7 @@ public class HSQLDBUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "hsqldb", "create-sp-aliases.sql");
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
index 61d7cbb..2ada884 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
@@ -91,7 +91,7 @@ public class MySQLUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "mysql", "create-select-sp.sql");
executeDDL(con, "mysql", "create-update-sp.sql");
executeDDL(con, "mysql", "create-update-sp2.sql");
@@ -105,7 +105,7 @@ public class MySQLUnitDbAdapter extends UnitDbAdapter {
DataMap map,
Collection<String> tablesToDrop) throws Exception {
- Procedure proc = map.getProcedure("cayenne_test_select_proc");
+ Procedure proc = map.getProcedure("cayenne_tst_select_proc");
if (proc != null && proc.getDataMap() == map) {
executeDDL(conn, "mysql", "drop-select-sp.sql");
executeDDL(conn, "mysql", "drop-update-sp.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
index 38dcee2..f0ebb94 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
@@ -80,7 +80,7 @@ public class OracleUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "oracle", "create-types-pkg.sql");
executeDDL(con, "oracle", "create-select-sp.sql");
executeDDL(con, "oracle", "create-update-sp.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
index 794f799..4042979 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
@@ -54,7 +54,7 @@ public class PostgresUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "postgresql", "create-select-sp.sql");
executeDDL(con, "postgresql", "create-update-sp.sql");
executeDDL(con, "postgresql", "create-update-sp2.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
index 0e33821..559ca4d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
@@ -55,7 +55,7 @@ public class SybaseUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- Procedure proc = map.getProcedure("cayenne_test_select_proc");
+ Procedure proc = map.getProcedure("cayenne_tst_select_proc");
if (proc != null && proc.getDataMap() == map) {
executeDDL(con, "sybase", "create-select-sp.sql");
executeDDL(con, "sybase", "create-update-sp.sql");
@@ -116,7 +116,7 @@ public class SybaseUnitDbAdapter extends UnitDbAdapter {
}
protected void dropProcedures(Connection con, DataMap map) throws Exception {
- Procedure proc = map.getProcedure("cayenne_test_select_proc");
+ Procedure proc = map.getProcedure("cayenne_tst_select_proc");
if (proc != null && proc.getDataMap() == map) {
executeDDL(con, "sybase", "drop-select-sp.sql");
executeDDL(con, "sybase", "drop-update-sp.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/testmap.map.xml b/cayenne-server/src/test/resources/testmap.map.xml
index 52a8a67..d64eb79 100644
--- a/cayenne-server/src/test/resources/testmap.map.xml
+++ b/cayenne-server/src/test/resources/testmap.map.xml
@@ -8,18 +8,18 @@
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="test.client"/>
<property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/>
- <procedure name="cayenne_test_out_proc">
+ <procedure name="cayenne_tst_out_proc">
<procedure-parameter name="in_param" type="INTEGER" direction="in"/>
<procedure-parameter name="out_param" type="INTEGER" direction="out"/>
</procedure>
- <procedure name="cayenne_test_select_proc">
+ <procedure name="cayenne_tst_select_proc">
<procedure-parameter name="aName" type="VARCHAR" length="254" direction="in"/>
<procedure-parameter name="paintingPrice" type="INTEGER" direction="in"/>
</procedure>
- <procedure name="cayenne_test_upd_proc">
+ <procedure name="cayenne_tst_upd_proc">
<procedure-parameter name="paintingPrice" type="INTEGER" direction="in"/>
</procedure>Ï
- <procedure name="cayenne_test_upd_proc2">
+ <procedure name="cayenne_tst_upd_proc2">
</procedure>
<db-entity name="ARTGROUP">
<db-attribute name="GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -271,7 +271,7 @@ VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_test_select_proc" result-entity="Artist">
+ <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
</query>
<query name="QueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>