Change getMetadataFor to getTable

JumpMind · Nov 15, 2009 · c9d826b · c9d826b
1 parent faa997f
commit c9d826b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
@@ -271,7 +271,7 @@ public String createInitalLoadSqlFor(Node node, TriggerRouter trigger) {
                 node,
                 this,
                 trigger,
-                getMetaDataFor(trigger.getTrigger().getSourceCatalogName(), trigger.getTrigger().getSourceSchemaName(),
+                getTable(trigger.getTrigger().getSourceCatalogName(), trigger.getTrigger().getSourceSchemaName(),
                         trigger.getTrigger().getSourceTableName(), true)).trim();
     }
 
@@ -283,20 +283,20 @@ public String createCsvDataSql(Trigger trigger, String whereClause) {
         return sqlTemplate.createCsvDataSql(
                 this,
                 trigger,
-                getMetaDataFor(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(), trigger
+                getTable(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(), trigger
                         .getSourceTableName(), true), whereClause).trim();
     }
 
     public String createCsvPrimaryKeySql(Trigger trigger, String whereClause) {
         return sqlTemplate.createCsvPrimaryKeySql(
                 this,
                 trigger,
-                getMetaDataFor(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(), trigger
+                getTable(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(), trigger
                         .getSourceTableName(), true), whereClause).trim();
     }
 
-    public Table getMetaDataFor(Trigger trigger, boolean useCache) {
-        return getMetaDataFor(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(), trigger
+    public Table getTable(Trigger trigger, boolean useCache) {
+        return getTable(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(), trigger
                 .getSourceTableName(), useCache);
     }
 
@@ -306,7 +306,7 @@ public Table getMetaDataFor(Trigger trigger, boolean useCache) {
      * Dialect may optionally override this method to more efficiently lookup up table metadata directly against
      * information schemas.
      */
-    public Table getMetaDataFor(String catalogName, String schemaName, String tableName, boolean useCache) {
+    public Table getTable(String catalogName, String schemaName, String tableName, boolean useCache) {
         Table retTable = cachedModel.findTable(tableName);
         if (retTable == null || !useCache) {
             synchronized (this.getClass()) {
@@ -776,7 +776,7 @@ public String getCreateSymmetricDDL() {
     }
 
     public String getCreateTableSQL(TriggerRouter trig) {
-        Table table = getMetaDataFor(null, trig.getTrigger().getSourceSchemaName(), trig.getTrigger()
+        Table table = getTable(null, trig.getTrigger().getSourceSchemaName(), trig.getTrigger()
                 .getSourceTableName(), true);
         String sql = null;
         try {
@@ -830,7 +830,7 @@ protected boolean prefixConfigDatabase(Database targetTables) {
                 table.setName(tblPrefix + table.getName());
                 fixForeignKeys(table, tblPrefix, false);
 
-                if (getMetaDataFor(getDefaultCatalog(), getDefaultSchema(), table.getName(), false) == null) {
+                if (getTable(getDefaultCatalog(), getDefaultSchema(), table.getName(), false) == null) {
                     createTables = true;
                 }
             }
@@ -924,7 +924,7 @@ public String getProductVersion() {
 
     public String replaceTemplateVariables(DataEventType dml, Trigger trigger, TriggerHistory history,
             String targetString) {
-        return sqlTemplate.replaceTemplateVariables(this, dml, trigger, history, tablePrefix, getMetaDataFor(trigger
+        return sqlTemplate.replaceTemplateVariables(this, dml, trigger, history, tablePrefix, getTable(trigger
                 .getSourceCatalogName(), trigger.getSourceSchemaName(), trigger.getSourceTableName(), true),
                 getDefaultCatalog(), getDefaultSchema(), targetString);
     }

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java
@@ -97,9 +97,9 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc
 
     public BinaryEncoding getBinaryEncoding();
 
-    public Table getMetaDataFor(String catalog, String schema, final String tableName, boolean useCache);
+    public Table getTable(String catalogName, String schemaName, final String tableName, boolean useCache);
 
-    public Table getMetaDataFor(Trigger trigger, boolean useCache);
+    public Table getTable(Trigger trigger, boolean useCache);
 
     public String getTransactionTriggerExpression(String defaultCatalog, String defaultSchema, Trigger trigger);
 

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbDialect.java
@@ -66,7 +66,7 @@ protected boolean doesTriggerExistOnPlatform(String catalogName, String schemaNa
      * old and new columns values to bump SQL expressions up against.
      */
     private void createDummyDualTable() {
-        Table table = getMetaDataFor(null, null, DUAL_TABLE, false);
+        Table table = getTable(null, null, DUAL_TABLE, false);
         if (table == null) {
             jdbcTemplate.update("CREATE MEMORY TABLE " + DUAL_TABLE + "(DUMMY VARCHAR(1))");
             jdbcTemplate.update("INSERT INTO " + DUAL_TABLE + " VALUES(NULL)");

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/load/TableTemplate.java b/symmetric/src/main/java/org/jumpmind/symmetric/load/TableTemplate.java
@@ -99,7 +99,7 @@ public TableTemplate(JdbcTemplate jdbcTemplate, IDbDialect dbDialect, String tab
     }
 
     public void resetMetaData(boolean useCache) {
-        table = dbDialect.getMetaDataFor(catalog, schema, tableName, useCache);
+        table = dbDialect.getTable(catalog, schema, tableName, useCache);
         allMetaData = new HashMap<String, Column>();
         statementMap = new HashMap<DmlType, StatementBuilder>();
         keyMetaData = null;

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -159,7 +159,7 @@ public void extractConfiguration(Node node, BufferedWriter writer, DataExtractor
 
         for (int i = 0; i < triggerRouters.size(); i++) {
             TriggerRouter triggerRouter = triggerRouters.get(i);
-            TriggerHistory triggerHistory = new TriggerHistory(dbDialect.getMetaDataFor(triggerRouter.getTrigger(),
+            TriggerHistory triggerHistory = new TriggerHistory(dbDialect.getTable(triggerRouter.getTrigger(),
                     false), triggerRouter.getTrigger());
             triggerHistory.setTriggerHistoryId(Integer.MAX_VALUE - i);
             if (!triggerRouter.getTrigger().getSourceTableName().endsWith(TableConstants.SYM_NODE_IDENTITY)) {
@@ -246,7 +246,7 @@ protected void writeInitialLoad(final Node node, final TriggerRouter triggerRout
         jdbcTemplate.execute(new ConnectionCallback<Object>() {
             public Object doInConnection(Connection conn) throws SQLException, DataAccessException {
                 try {
-                    Table table = dbDialect.getMetaDataFor(triggerRouter.getTrigger(), true);
+                    Table table = dbDialect.getTable(triggerRouter.getTrigger(), true);
                     NodeChannel channel = batch != null ? configurationService.getNodeChannel(batch.getChannelId())
                             : new NodeChannel(Constants.CHANNEL_RELOAD);
                     Set<Node> oneNodeSet = new HashSet<Node>();

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java
@@ -291,7 +291,7 @@ protected void routeData(Data data, Map<String, Long> transactionIdDataId, Route
         List<TriggerRouter> triggerRouters = getTriggerForData(data);
         if (triggerRouters != null && triggerRouters.size() > 0) {
             for (TriggerRouter triggerRouter : triggerRouters) {
-                Table table = dbDialect.getMetaDataFor(triggerRouter.getTrigger(), true);
+                Table table = dbDialect.getTable(triggerRouter.getTrigger(), true);
                 DataMetaData dataMetaData = new DataMetaData(data, table, triggerRouter, context.getChannel());
 
                 context.resetForNextData();

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -489,7 +489,7 @@ protected void updateOrCreateDatabaseTriggers(StringBuilder sqlBuffer, boolean g
 
                 TriggerReBuildReason reason = TriggerReBuildReason.NEW_TRIGGERS;
 
-                Table table = dbDialect.getMetaDataFor(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(),
+                Table table = dbDialect.getTable(trigger.getSourceCatalogName(), trigger.getSourceSchemaName(),
                         trigger.getSourceTableName(), false);
 
                 if (table != null) {

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java
@@ -193,7 +193,7 @@ public void initialLoad() {
     }
 
     private void insertIntoTestTriggerTable(IDbDialect dialect, Object[] values) {
-        Table testTriggerTable = dialect.getMetaDataFor(null, null, "test_triggers_table", true);
+        Table testTriggerTable = dialect.getTable(null, null, "test_triggers_table", true);
         try {
             dialect.prepareTableForDataLoad(testTriggerTable);
             dialect.getJdbcTemplate().update(insertTestTriggerTableSql, values);