clean-up

Author: zorancv

store/postgres/src/connection_pool.rs

@@ -1136,7 +1136,6 @@ fn migrate_schema(logger: &Logger, conn: &mut PgConnection) -> Result<MigrationC
     let mut harness = HarnessWithOutput::new(conn, &mut output);
 
     info!(logger, "Running migrations");
-    // let result = conn.run_pending_migrations(MIGRATIONS);
     let result = harness.run_pending_migrations(MIGRATIONS);
     info!(logger, "Migrations finished");
 

store/postgres/src/deployment_store.rs

@@ -584,8 +584,8 @@ impl DeploymentStore {
         &self,
         namespace: &crate::primary::Namespace,
     ) -> Result<(), StoreError> {
-        let conn = &mut *self.get_conn()?;
-        deployment::drop_schema(conn, namespace)
+        let mut conn = self.get_conn()?;
+        deployment::drop_schema(&mut conn, namespace)
     }
 
     // Only used for tests
@@ -1412,21 +1412,6 @@ impl DeploymentStore {
             }
         }
 
-        // Don't revert past a graft point
-        let info = self.subgraph_info_with_conn(&mut conn, site.as_ref())?;
-        if let Some(graft_block) = info.graft_block {
-            if graft_block > block_ptr_to.number {
-                return Err(constraint_violation!(
-                    "Can not revert subgraph `{}` to block {} as it was \
-                        grafted at block {} and reverting past a graft point \
-                        is not possible",
-                    site.deployment.clone(),
-                    block_ptr_to.number,
-                    graft_block
-                ));
-            }
-        }
-
         self.rewind_or_truncate_with_conn(&mut conn, site, block_ptr_to, firehose_cursor, false)
     }
 

store/postgres/src/primary.rs

@@ -1452,7 +1452,7 @@ impl<'a> Connection<'a> {
             .filter(a::node_id.eq_any(&nodes))
             .select((a::node_id, sql::<BigInt>("count(*)")))
             .group_by(a::node_id)
-            .order_by(sql::<Integer>("count(*)"))
+            .order_by(sql::<BigInt>("count(*)"))
             .load::<(String, i64)>(self.conn.as_mut())?;
 
         // Any nodes without assignments will be missing from `assigned`